Merge pull request #165 from prograils/zeitwerk_compatibility

Remove Rails 5.1 Support. Add zeitwerk support

Author: mlitwiniuk

.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 2.5.8
-  - 2.6.6
+  - 2.7.2
+  - 3.0.0
 gemfile:
-  - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 services:
   - postgresql
   - redis-server

Appraisals

@@ -1,8 +1,8 @@
-appraise 'rails-5.1' do
+appraise 'rails-5.2' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 5.1.0'
+  gem 'rails', '~> 5.2.0'
   gem 'devise'
-  gem 'pg', '~> 0.21.0'
+  gem 'pg', '~> 1.1.3'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -17,11 +17,11 @@ appraise 'rails-5.1' do
   gem 'minitest'
 end
 
-appraise 'rails-5.2' do
+appraise 'rails-6.0' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 5.2.0'
+  gem 'rails', '~> 6.0.3'
   gem 'devise'
-  gem 'pg', '~> 1.1.3'
+  gem 'pg', '~> 1.1.4'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -36,9 +36,9 @@ appraise 'rails-5.2' do
   gem 'minitest'
 end
 
-appraise 'rails-6.0' do
+appraise 'rails-6.1' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 6.0.0.beta3'
+  gem 'rails', '~> 6.1.3'
   gem 'devise'
   gem 'pg', '~> 1.1.4'
   gem 'redis'
@@ -53,4 +53,4 @@ appraise 'rails-6.0' do
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'minitest'
-end
+end

README.md

@@ -37,10 +37,10 @@ gem 'lit'
 
 2. run `bundle install`
 
-3. run installation generator `bundle exec rails g lit:install`
-  (for production/staging environment `redis` is suggested as key value engine. `hash` will not work in multi process environment)
+3. Add `config.i18n.available_locales = [...]` to `application.rb` - it's required to precompile appropriate language flags in lit backend.
 
-4. Add `config.i18n.available_locales = [...]` to `application.rb` - it's required to precompile appropriate language flags in lit backend.
+4. run installation generator `bundle exec rails g lit:install`
+  (for production/staging environment `redis` is suggested as key value engine. `hash` will not work in multi process environment)
 
 5. After doing above and restarting app, point your browser to `http://app/lit`
 
@@ -145,10 +145,10 @@ These credentials can be given in three ways:
       ... # see Google docs link above for reference
     }
   end
-  
+
   # For example, for Rails 6, from encrypted credentials file (HashWithIndifferentAccess is used, because the keys in
    the credentials.config could be strings or, as well, symbols):
-  
+
   Lit::CloudTranslation.configure do |config|
     config.keyfile_hash = HashWithIndifferentAccess.new(Rails.application.credentials.config[:google_translate_api])
   end

app/controllers/lit/concerns/request_info_store.rb

@@ -1,17 +1,23 @@
 module Lit
-  module Concerns
-    module RequestInfoStore
-      extend ::ActiveSupport::Concern
-      included do
-        before_action :store_request_path
-      end
+  module RequestInfoStore
+    extend ::ActiveSupport::Concern
+    included do
+      before_action :store_request_path
+    end
 
-      private
+    private
 
-      def store_request_path
-        Thread.current[:lit_current_request_path] = request&.path
-      end
+    def store_request_path
+      Thread.current[:lit_current_request_path] = request&.path
     end
   end
 end
 
+module Lit::Concerns::RequestInfoStore
+  extend ActiveSupport::Concern
+
+  included do
+    Rails.logger.info 'DEPRECATED: Use include Lit::RequestInfoStore'
+    include Lit::RequestInfoStore
+  end
+end

app/controllers/lit/concerns/request_keys_store.rb

@@ -1,16 +1,23 @@
 module Lit
-  module Concerns
-    module RequestKeysStore
-      extend ::ActiveSupport::Concern
-      included do
-        before_action :init_request_keys
-      end
+  module RequestKeysStore
+    extend ::ActiveSupport::Concern
+    included do
+      before_action :init_request_keys
+    end
 
-      private
+    private
 
-      def init_request_keys
-        Thread.current[:lit_request_keys] = {}
-      end
+    def init_request_keys
+      Thread.current[:lit_request_keys] = {}
     end
   end
 end
+
+module Lit::Concerns::RequestKeysStore
+  extend ActiveSupport::Concern
+
+  included do
+    Rails.logger.info 'DEPRECATED: Use include Lit::RequestKeysStore'
+    include Lit::RequestKeysStore
+  end
+end

gemfiles/rails_5.2.gemfile.lock

@@ -267,4 +267,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.3
+   2.2.13

gemfiles/rails_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0.beta3"
+gem "rails", "~> 6.0.3"
 gem "devise"
 gem "pg", "~> 1.1.4"
 gem "redis"

gemfiles/rails_6.0.gemfile.lock

@@ -274,7 +274,7 @@ DEPENDENCIES
   pg (~> 1.1.4)
   pry-byebug (~> 3.9.0)
   pry-rails
-  rails (~> 6.0.0.beta3)
+  rails (~> 6.0.3)
   rails-controller-testing
   redis
   sass-rails
@@ -283,4 +283,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.3
+   2.2.13

gemfiles/rails_5.1.gemfile gemfiles/rails_6.1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 6.1.3"
 gem "devise"
-gem "pg", "~> 0.21.0"
+gem "pg", "~> 1.1.4"
 gem "redis"
 gem "capybara"
 gem "database_cleaner"