Merge pull request #168 from prograils/proper_ruby_3_0_compatibility

Proper Ruby 3.0.0 compatibility

Author: mlitwiniuk

.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.3

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.7.2
+  - 2.7.3
   - 3.0.0
 gemfile:
   - gemfiles/rails_5.2.gemfile

Appraisals

@@ -2,7 +2,7 @@ appraise 'rails-5.2' do
   source 'https://rubygems.org'
   gem 'rails', '~> 5.2.0'
   gem 'devise'
-  gem 'pg', '~> 1.1.3'
+  gem 'pg', '~> 1.2.3'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -15,13 +15,14 @@ appraise 'rails-5.2' do
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'minitest'
+  gem 'm', '~> 1.5.0'
 end
 
 appraise 'rails-6.0' do
   source 'https://rubygems.org'
   gem 'rails', '~> 6.0.3'
   gem 'devise'
-  gem 'pg', '~> 1.1.4'
+  gem 'pg', '~> 1.2.3'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -34,13 +35,14 @@ appraise 'rails-6.0' do
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'minitest'
+  gem 'm', '~> 1.5.0'
 end
 
 appraise 'rails-6.1' do
   source 'https://rubygems.org'
   gem 'rails', '~> 6.1.3'
   gem 'devise'
-  gem 'pg', '~> 1.1.4'
+  gem 'pg', '~> 1.2.3'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -53,4 +55,5 @@ appraise 'rails-6.1' do
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'minitest'
+  gem 'm', '~> 1.5.0'
 end

app/controllers/lit/cloud_translations_controller.rb

@@ -18,7 +18,7 @@ def show
           from: params[:from],
           to: @target_localization.locale.locale
         }.compact
-      @translated_text = Lit::CloudTranslation.translate(opts)
+      @translated_text = Lit::CloudTranslation.translate(**opts)
     rescue Lit::CloudTranslation::TranslationError => e
       @error_message = "Translation failed. #{e.message}"
     end

app/helpers/lit/frontend_helper.rb

@@ -9,7 +9,7 @@ def translate(key, options = {})
         key = scope_key_by_partial(key)
         key = pluralized_key(key, count) if count
 
-        content = super(key, options.symbolize_keys)
+        content = super(key, **options.symbolize_keys)
         if !options[:skip_lit] && lit_authorized?
           content = get_translateable_span(key, content)
         end

app/models/lit/base.rb

@@ -21,7 +21,7 @@ def rolledback_after_update?
 
   private
 
-  def create_or_update(*args, &block)
+  def create_or_update(**kwargs, &block)
     @was_saved_with_insert = true if new_record?
     @was_saved_with_update = true if persisted?
 

gemfiles/rails_5.2.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
 gem "devise"
-gem "pg", "~> 1.1.3"
+gem "pg", "~> 1.2.3"
 gem "redis"
 gem "capybara"
 gem "database_cleaner"
@@ -17,5 +17,6 @@ gem "coffee-rails"
 gem "pry-rails"
 gem "rails-controller-testing"
 gem "minitest"
+gem "m", "~> 1.5.0"
 
 gemspec path: "../"