lit 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3b3569eb99f453aea4b65451511bdeb76680774b664ab108f445359b9e10f0
-  data.tar.gz: cbf55f8eefb23231f5201087e612a58172e2ce4537fc0c8211a597ebba8e5f88
+  metadata.gz: 1bda244665d30fcad8f9ad16a593e47ffd6cf54d8d7c9a6a777d5038bad75f1b
+  data.tar.gz: 7217df2945e7a5b1813d2a4892eebf46fcf8a97cdd8e9d8648c7a23a2962715f
 SHA512:
-  metadata.gz: be93a781bdea6ff7a095bd86a60fc671c5f325f6d6f37a45bfea883b549f3655c4d9d5e768b125181501b944303dccc89d3032180952f4f870a8878bc7d6816d
-  data.tar.gz: 8655233c8aba69f06bf775bd28df3bc7e17f81f4378dab0f8818c6fac05e22e521ef966c5ae3706dfc3f2552d747687d22c241422f51aeab1f34764bc30bd698
+  metadata.gz: 5b6f9f9d65dc9463316c0abd3a56ad2ddcff9a56b6a8a4ed86b4fc6a1b526ac90b46298adf5109d40d58eccd2f5b5164f5e5f4ef424787b156c7248d6f94c2a1
+  data.tar.gz: 3f7888ee62c7c037b32d83ca184cc06715e90366a789f7c39f51f4205d1f0134aa8460755228f169e66d3b1724e23bf87f2b88589f34f09d7f68a02453158743

data/README.md

@@ -22,9 +22,14 @@ Highly inspired by Copycopter by thoughtbot.
 9. (On request) stores paths where translation keys were called
 10. (On request) is able to show all translation keys used to render current page
 
+
 ### Screenshots
 
-Check wiki: [Screenshots](https://github.com/prograils/lit/wiki/Screenshots)
+[Feature overview on YouTube](https://www.youtube.com/watch?v=_T9Kg05VvLI)
+
+![lit live translation](https://prograils-com-stuff.s3.amazonaws.com/lit/lit-front.gif)
+
+Check wiki for more: [Screenshots](https://github.com/prograils/lit/wiki/Screenshots)
 
 ### Installation
 
@@ -130,6 +135,10 @@ Lit::CloudTranslation.provider = Lit::CloudTranslation::Providers::Google
 ```
 gem 'google-cloud-translate', '~> 1.2.4'
 ```
+...we also support V2 of Google Cloud Translate gem, should you need it:
+```
+gem 'google-cloud-translate', '~> 2.1.2'
+```
 
 To use translation via Google, you need to obtain a [service account key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys) containing all the credentials required by the API.
 
@@ -199,17 +208,17 @@ Also applies to upgrading from `0.4.pre.alpha` versions.
 
 1. Add `Lit::FrontendHelper` to your `ApplicationController`
 
-	```ruby
-	helper Lit::FrontendHelper
-	```
+```ruby
+helper Lit::FrontendHelper
+```
 
 2. In you layout file include lit assets
 
-	```erb
-	<% if admin_user_signed_in? %>
-	  <%= lit_frontend_assets %>
-	<% end %>
-	```
+```erb
+<% if admin_user_signed_in? %>
+  <%= lit_frontend_assets %>
+<% end %>
+```
 
 3. You're good to go - now log in to lit (if required) and open your frontend in separate tab (to have session persisted). On the bottom-right of your page you should see "Enable / disable lit highlight" - after enabling it you'll be able to click and translate phrases directly in your frontend
 
@@ -217,13 +226,14 @@ Also applies to upgrading from `0.4.pre.alpha` versions.
 
 5. This feature requires jQuery! (at least for now)
 
+
 ### Storing request info
 
-1. Include `Lit::Concerns::RequestInfoStore` concern in your `ApplicationController`
+1. Include `Lit::RequestInfoStore` concern in your `ApplicationController`
 
-	```ruby
-	include Lit::Concerns::RequestInfoStore
-	```
+```ruby
+include Lit::RequestInfoStore
+```
 
 2. In lit initializer (`lit.rb`) set `store_request_info` config to true
 
@@ -238,25 +248,31 @@ Lit.store_request_info = true
 
 1. Add `Lit::FrontendHelper` in your `ApplicationController`
 
-	```ruby
-	include Lit::FrontendHelper
-	```
+```ruby
+helper Lit::FrontendHelper
+```
+
+2. Include `Lit::RequestKeysStore` concern in your `ApplicationController`
+
+```ruby
+include Lit::RequestKeysStore
+```
 
-2. Include `Lit::Concerns::RequestKeysStore` concern in your `ApplicationController`
+3. Enable storing of request keys in lit initializer `config/initializers/lit.rb`
 
-	```ruby
-	include Lit::Concerns::RequestKeysStore
-	```
+```ruby
+Lit.store_request_keys = true
+```
 
-3. On the bottom of you layout file call `lit_translations_info` helper function
+4. On the bottom of you layout file call `lit_translations_info` helper function
 
-	```erb
-	<%= lit_translations_info %>
-	```
+```erb
+<%= lit_translations_info %>
+```
 
-4. From now on you'll be able to see all translation keys that were used to render current page. This feature works great with on-site live translations!
+5. From now on you'll be able to see all translation keys that were used to render current page. This feature works great with on-site live translations!
 
-5. Lit authorized user must be signed in for this feature to work! This feature requires jQuery!
+6. Lit authorized user must be signed in for this feature to work! This feature requires jQuery!
 
 
 

data/app/assets/stylesheets/lit/lit_frontend.css

@@ -1,9 +1,11 @@
 .lit-key-generic {
 }
-.lit-key-highlight{
-  text-decoration: underline wavy red !important;
+.lit-key-highlight {
+  text-decoration: underline !important;
+  text-decoration-color: red !important;
+  text-decoration-style: wavy !important;
 }
-#lit_button_wrapper{
+#lit_button_wrapper {
   position: fixed;
   bottom: 20px;
   right: 20px;
@@ -15,16 +17,15 @@
   cursor: pointer;
   color: white;
 }
-#lit_button_wrapper.lit-highlight-enabled{
+#lit_button_wrapper.lit-highlight-enabled {
   background-color: lightgreen;
 }
-#lit_textarea{
+#lit_textarea {
   position: absolute;
   padding: 0 0 1px 0;
   margin: 0 0 0 0;
   border: 0;
   border-bottom: 1px solid red;
-
 }
 .lit-translations-info.collapsed {
   position: fixed;
@@ -38,7 +39,7 @@
   cursor: pointer;
   color: white;
 }
-.lit-translations-info.expanded{
+.lit-translations-info.expanded {
   position: absolute;
   display: block;
   width: 80%;
@@ -52,16 +53,16 @@
   z-index: 90;
 }
 
-.lit-translations-info.collapsed span.lit-open-button{
+.lit-translations-info.collapsed span.lit-open-button {
   display: block;
 }
-.lit-translations-info.expanded span.lit-open-button{
+.lit-translations-info.expanded span.lit-open-button {
   display: none;
 }
-.lit-translations-info.collapsed span.lit-close-button{
+.lit-translations-info.collapsed span.lit-close-button {
   display: none;
 }
-.lit-translations-info.expanded span.lit-close-button{
+.lit-translations-info.expanded span.lit-close-button {
   display: block;
   position: fixed;
   right: 10%;
@@ -71,16 +72,16 @@
   background-color: white;
   padding: 10px 10px 5px;
 }
-.lit-translations-info.collapsed ul.lit-translations-list{
+.lit-translations-info.collapsed ul.lit-translations-list {
   display: none;
 }
-.lit-translations-info.expanded ul.lit-translations-list{
+.lit-translations-info.expanded ul.lit-translations-list {
 }
 
-.lit-translations-info.expanded ul.lit-translations-list li{
+.lit-translations-info.expanded ul.lit-translations-list li {
   margin: 5px;
 }
 
-.lit-translations-info.expanded #lit_textarea{
+.lit-translations-info.expanded #lit_textarea {
   padding: 2px;
 }

data/app/controllers/lit/concerns/request_info_store.rb

@@ -1,18 +1,3 @@
-module Lit
-  module RequestInfoStore
-    extend ::ActiveSupport::Concern
-    included do
-      before_action :store_request_path
-    end
-
-    private
-
-    def store_request_path
-      Thread.current[:lit_current_request_path] = request&.path
-    end
-  end
-end
-
 module Lit::Concerns::RequestInfoStore
   extend ActiveSupport::Concern
 

data/app/controllers/lit/concerns/request_keys_store.rb

@@ -1,18 +1,3 @@
-module Lit
-  module RequestKeysStore
-    extend ::ActiveSupport::Concern
-    included do
-      before_action :init_request_keys
-    end
-
-    private
-
-    def init_request_keys
-      Thread.current[:lit_request_keys] = {}
-    end
-  end
-end
-
 module Lit::Concerns::RequestKeysStore
   extend ActiveSupport::Concern
 

data/app/controllers/lit/request_info_store.rb

@@ -0,0 +1,10 @@
+module Lit::RequestInfoStore
+  extend ::ActiveSupport::Concern
+  included { before_action :store_request_path }
+
+  private
+
+  def store_request_path
+    Thread.current[:lit_current_request_path] = request&.path
+  end
+end

data/app/controllers/lit/request_keys_store.rb

@@ -0,0 +1,10 @@
+module Lit::RequestKeysStore
+  extend ::ActiveSupport::Concern
+  included { before_action :init_request_keys }
+
+  private
+
+  def init_request_keys
+    Thread.current[:lit_request_keys] = {}
+  end
+end

data/app/helpers/lit/frontend_helper.rb

@@ -1,83 +1,95 @@
-module Lit
-  module FrontendHelper
-    include ActionView::Helpers::TranslationHelper
-
-    module TranslationKeyWrapper
-      def translate(key, options = {})
-        count = options[:count]
-        options = options.with_indifferent_access
-        key = scope_key_by_partial(key)
-        key = pluralized_key(key, count) if count
-
-        content = super(key, **options.symbolize_keys)
-        if !options[:skip_lit] && lit_authorized?
-          content = get_translateable_span(key, content)
-        end
-        content
-      end
+module Lit::FrontendHelper
+  include ActionView::Helpers::TranslationHelper
 
-      def pluralized_key(key, count)
-        pluralizer = I18n.backend.send(:pluralizer, locale)
-        return unless pluralizer.respond_to?(:call)
-        last = count.zero? ? :zero : pluralizer.call(count)
-        format '%<key>s.%<last>s', key: key, last: last
-      end
+  module TranslationKeyWrapper
+    def translate(key, options = {})
+      count = options[:count]
+      options = options.with_indifferent_access
+      key = scope_key_by_partial(key)
+      key = pluralized_key(key, count) if count
 
-      def t(key, options = {})
-        translate(key, options)
-      end
+      content = super(key, **options.symbolize_keys)
+      content = get_translateable_span(key, content) if !options[:skip_lit] && lit_authorized?
+      content
     end
-    prepend Lit::FrontendHelper::TranslationKeyWrapper
 
-    def javascript_lit_tag
-      javascript_include_tag 'lit/lit_frontend'
+    def pluralized_key(key, count)
+      pluralizer = I18n.backend.send(:pluralizer, locale)
+      return unless pluralizer.respond_to?(:call)
+      last = count.zero? ? :zero : pluralizer.call(count)
+      format '%<key>s.%<last>s', key: key, last: last
     end
 
-    def stylesheet_lit_tag
-      stylesheet_link_tag 'lit/lit_frontend'
+    def t(key, options = {})
+      translate(key, options)
     end
 
-    def lit_frontend_assets
-      return unless lit_authorized?
-      meta = content_tag :meta,
-                         '',
-                         value: lit.find_localization_localization_keys_path,
-                         name: 'lit-url-base'
-      safe_join [javascript_lit_tag, stylesheet_lit_tag, meta]
+    def missing_translation(key, options)
+      # We try to humanize the key. Rails will do
+      # it anyway in below call to super, but then it will wrap it also in
+      # translation_missing span.
+      # Humanizing key should be last resort
+      if Lit::Services::HumanizeService.should_humanize?(key)
+        return Lit::Services::HumanizeService.humanize_and_cache(key, options)
+      end
+
+      super(key, options)
     end
+  end
+  prepend Lit::FrontendHelper::TranslationKeyWrapper
 
-    def lit_translations_info
-      return if Thread.current[:lit_request_keys].nil?
-      return unless lit_authorized?
-      content_tag :div, class: 'lit-translations-info collapsed' do
-        concat content_tag(:span, 'Show translations', class: 'lit-open-button')
-        concat content_tag(:span, 'X', class: 'lit-close-button')
-        concat translations_list_content_tag
-      end
+  def javascript_lit_tag
+    javascript_include_tag 'lit/lit_frontend'
+  end
+
+  def stylesheet_lit_tag
+    stylesheet_link_tag 'lit/lit_frontend'
+  end
+
+  def lit_frontend_assets
+    return unless lit_authorized?
+
+    meta = content_tag :meta, '', value: lit.find_localization_localization_keys_path, name: 'lit-url-base'
+    safe_join [javascript_lit_tag, stylesheet_lit_tag, meta]
+  end
+
+  def lit_translations_info
+    return if Thread.current[:lit_request_keys].nil?
+    return unless lit_authorized?
+
+    content_tag :div, class: 'lit-translations-info collapsed' do
+      concat content_tag(:span, 'Show translations', class: 'lit-open-button')
+      concat content_tag(:span, 'X', class: 'lit-close-button')
+      concat translations_list_content_tag
     end
+  end
 
-    def translations_list_content_tag
-      content_tag :ul, class: 'lit-translations-list' do
-        Lit.init.cache.request_keys.each do |k, v|
-          concat(content_tag(:li) do
-            concat content_tag(:code, "#{k}:")
-            concat get_translateable_span(k, v, alternative_text: '[empty]')
-          end)
+  def translations_list_content_tag
+    content_tag :ul, class: 'lit-translations-list' do
+      Lit
+        .init
+        .cache
+        .request_keys
+        .each do |k, v|
+          concat(
+            content_tag(:li) do
+              concat content_tag(:code, "#{k}:")
+              concat get_translateable_span(k, v, alternative_text: '[empty]')
+            end,
+          )
         end
-      end
     end
+  end
 
-    def lit_authorized?
-      return false if Lit.authentication_verification.blank?
-      send Lit.authentication_verification
-    end
+  def lit_authorized?
+    return false if Lit.authentication_verification.blank?
 
-    def get_translateable_span(key, localization, alternative_text: nil)
-      content_tag :span,
-                  class: 'lit-key-generic',
-                  data: { key: key, locale: I18n.locale } do
-        localization.blank? ? alternative_text : localization
-      end
+    send Lit.authentication_verification
+  end
+
+  def get_translateable_span(key, localization, alternative_text: nil)
+    content_tag :span, class: 'lit-key-generic', data: { key: key, locale: I18n.locale } do
+      localization.blank? ? alternative_text : localization
     end
   end
 end

data/lib/generators/lit/install/templates/{initializer.rb → initializer.erb}

@@ -3,7 +3,7 @@
 # `nil` will let everyone in.
 Lit.authentication_function = <%= @authentication_function || 'nil' %>
 
-# Which authentication verification function to use (ie. :user_signed_in)?
+# Which authentication verification function to use (ie. :user_signed_in?)?
 # This is used together with frontend translation module to determine, if
 # helper button should be applied and translations wrapped in custom span
 Lit.authentication_verification = <%= @authentication_verification || 'nil' %>
@@ -53,6 +53,11 @@ Lit.set_last_updated_at_upon_creation = true
 # For more information please check the README.md
 Lit.store_request_info = false
 
+# Store request keys - this will store all keys used to render a page. Useful
+# only when combined with Lit::RequestKeysStore concern to view those keys in
+# frontend
+Lit.store_request_keys = false
+
 # Initialize lit
 Lit.init
 

data/lib/generators/lit/install_generator.rb

@@ -11,24 +11,22 @@ module Lit
       desc 'Automates Lit installation'
 
       def set_authentication_function
-        @authentication_function = options['authentication-function'].presence ||
-              ask("What's the authentication function, ie. :authenticate_user! :").presence ||
-              nil
+        @authentication_function =
+          options['authentication-function'].presence ||
+            ask("What's the authentication function, ie. :authenticate_user! :").presence || nil
       end
 
       def set_key_value_engine
-        @key_value_engine = options['key-value-engine'].presence ||
-              ask("What's the key value engine? ([hash] OR redis):").presence ||
-              :hash
+        @key_value_engine =
+          options['key-value-engine'].presence || ask("What's the key value engine? ([hash] OR redis):").presence ||
+            :hash
       end
 
       def add_redis_dependency
         if @key_value_engine == 'redis'
           puts 'Adding redis dependency'
           gem 'redis'
-          Bundler.with_clean_env do
-            run 'bundle install'
-          end
+          Bundler.with_clean_env { run 'bundle install' }
         end
       end
 
@@ -42,7 +40,7 @@ module Lit
           puts 'Skipping config/initializers/lit.rb creation, file already exists!'
         else
           puts 'Adding lit initializer (config/initializers/lit.rb)...'
-          template 'initializer.rb', path
+          template 'initializer.erb', path
         end
       end
 

data/lib/lit/adapters/hash_storage.rb

@@ -1,4 +1,4 @@
-module Lit
+module Lit::Adapters
   class HashStorage < Hash
     def incr(key)
       self[key] ||= 0
@@ -25,7 +25,7 @@ module Lit
 
       cache_localizations = form_cache_localizations(keys_of_subtree)
 
-      full_subtree = Lit::LocalizationKeysToHashService.call(cache_localizations)
+      full_subtree = Lit::Services::LocalizationKeysToHashService.call(cache_localizations)
       requested_part = full_subtree.dig(*key.split('.'))
       return nil if requested_part.blank?
       return requested_part if requested_part.is_a?(String)

data/lib/lit/adapters/redis_storage.rb

@@ -13,7 +13,7 @@ module Lit
     Lit.redis_url || ENV[ENV['REDIS_PROVIDER'] || 'REDIS_URL']
   end
 
-  class RedisStorage
+  class Adapters::RedisStorage
     def initialize
       Lit.redis
     end
@@ -44,9 +44,7 @@ module Lit
       delete(k)
       if v.is_a?(Array)
         Lit.redis.set(_prefixed_key_for_array(k), '1')
-        v.each do |ve|
-          Lit.redis.rpush(_prefixed_key(k), ve.to_s)
-        end
+        v.each { |ve| Lit.redis.rpush(_prefixed_key(k), ve.to_s) }
       elsif v.nil?
         Lit.redis.set(_prefixed_key_for_nil(k), '1')
         Lit.redis.set(_prefixed_key(k), '')
@@ -79,9 +77,7 @@ module Lit
     end
 
     def sort
-      Lit.redis.keys.sort.map do |k|
-        [k, self.[](k)]
-      end
+      Lit.redis.keys.sort.map { |k| [k, self.[](k)] }
     end
 
     def prefix
@@ -119,7 +115,7 @@ module Lit
       values_of_subtree = Lit.redis.mget(keys_of_subtree)
       cache_localizations = form_cache_localizations(keys_of_subtree, values_of_subtree)
 
-      full_subtree = Lit::LocalizationKeysToHashService.call(cache_localizations)
+      full_subtree = Lit::Services::LocalizationKeysToHashService.call(cache_localizations)
       requested_part = full_subtree.dig(*key.split('.'))
       return nil if requested_part.blank?
       return requested_part if requested_part.is_a?(String)

data/lib/lit/adapters.rb

@@ -0,0 +1,2 @@
+module Lit::Adapters
+end

data/lib/lit/cloud_translation/providers/google.rb

@@ -45,13 +45,10 @@ module Lit::CloudTranslation::Providers
   #   end
   class Google < Base
     def translate(text:, from: nil, to:, **opts)
-      @client ||=
-        ::Google::Cloud::Translate.new(project_id: config.keyfile_hash['project_id'],
-                                       credentials: config.keyfile_hash)
-      result = @client.translate(sanitize_text(text), from: from, to: to, **opts)
+      result = client.translate(sanitize_text(text), from: from, to: to, **opts)
       unsanitize_text(
         case result
-        when ::Google::Cloud::Translate::Translation then result.text
+        when translation_class then result.text
         when Array then result.map(&:text)
         end
       )
@@ -67,6 +64,27 @@ module Lit::CloudTranslation::Providers
 
     private
 
+    def client
+      @client ||= begin
+        args = {
+          project_id: config.keyfile_hash['project_id'], credentials: config.keyfile_hash,
+          version: :v2
+        }
+        if Gem.loaded_specs['google-cloud-translate'].version < Gem::Version.create('2.0')
+          args = args.tap { |hs| hs.delete(:version) }
+        end
+        ::Google::Cloud::Translate.new(**args)
+      end
+    end
+
+    def translation_class
+      if Gem.loaded_specs['google-cloud-translate'].version < Gem::Version.create('2.0')
+        ::Google::Cloud::Translate::Translation
+      else
+        ::Google::Cloud::Translate::V2::Translation
+      end
+    end
+
     def default_config
       if ENV['GOOGLE_TRANSLATE_API_KEYFILE'].blank?
         env_keys = ENV.keys.grep(/\AGOOGLE_TRANSLATE_API_/)
@@ -93,7 +111,7 @@ module Lit::CloudTranslation::Providers
     def sanitize_text(text_or_array)
       case text_or_array
       when String
-        text_or_array.gsub(/%{(.+?)}/, '<code>__LIT__\1__LIT__</code>')
+        text_or_array.gsub(/%{(.+?)}/, '<code>__LIT__\1__LIT__</code>').gsub(/\r\n/, '<code>0</code>')
       when Array
         text_or_array.map { |s| sanitize_text(s) }
       when nil
@@ -106,7 +124,7 @@ module Lit::CloudTranslation::Providers
     def unsanitize_text(text_or_array)
       case text_or_array
       when String
-        text_or_array.gsub(/<code>__LIT__(.+?)__LIT__<\/code>/, '%{\1}')
+        text_or_array.gsub(%r{<code>0</code>}, "\r\n").gsub(%r{<code>__LIT__(.+?)__LIT__</code>}, '%{\1}')
       when Array
         text_or_array.map { |s| unsanitize_text(s) }
       else

data/lib/lit/engine.rb

@@ -3,7 +3,8 @@ module Lit
     require 'jquery-rails'
 
     config.autoload_paths += %W[#{Lit::Engine.root}/app/controllers/lit/concerns]
-    paths.add 'lib', eager_load: true # Zeitwerk compatibility
+
+    paths.add 'lib'
 
     isolate_namespace Lit
 
@@ -13,16 +14,12 @@ module Lit
     end
 
     initializer 'lit.reloader' do |app|
-      config.to_prepare do
-        Lit.loader.cache.reset_local_cache if Lit.loader
-      end
+      config.to_prepare { Lit.loader.cache.reset_local_cache if Lit.loader }
     end
 
     initializer 'lit.migrations.append' do |app|
       unless app.root.to_s.include?(root.to_s)
-        config.paths['db/migrate'].expanded.each do |expanded_path|
-          app.config.paths['db/migrate'] << expanded_path
-        end
+        config.paths['db/migrate'].expanded.each { |expanded_path| app.config.paths['db/migrate'] << expanded_path }
       end
     end
 

data/lib/lit/export.rb

@@ -4,7 +4,7 @@ require 'lit/services/localization_keys_to_hash_service'
 module Lit
   class Export
     def self.call(locale_keys:, format:, include_hits_count: false)
-      raise ArgumentError, "format must be yaml or csv" if %i[yaml csv].exclude?(format)
+      raise ArgumentError, 'format must be yaml or csv' if %i[yaml csv].exclude?(format)
       Lit.loader.cache.load_all_translations
       localizations_scope = Lit::Localization.active
       if locale_keys.present?
@@ -12,13 +12,11 @@ module Lit
         localizations_scope = localizations_scope.where(locale_id: locale_ids) unless locale_ids.empty?
       end
       db_localizations = {}
-      localizations_scope.find_each do |l|
-        db_localizations[l.full_key] = l.translation
-      end
+      localizations_scope.find_each { |l| db_localizations[l.full_key] = l.translation }
 
       case format
       when :yaml
-        exported_keys = Lit::LocalizationKeysToHashService.call(db_localizations)
+        exported_keys = Lit::Services::LocalizationKeysToHashService.call(db_localizations)
         exported_keys.to_yaml
       when :csv
         relevant_locales = locale_keys.presence || I18n.available_locales.map(&:to_s)
@@ -46,9 +44,7 @@ module Lit
               relevant_locales.map { |l| Array.wrap(db_localizations["#{l}.#{key_without_locale}"]) }
             transpose(key_localizations_per_locale).each do |translation_series|
               csv_row = [key_without_locale, *translation_series]
-              if include_hits_count
-                csv_row << (Lit.init.cache.get_global_hits_counter(key_without_locale) || 0)
-              end
+              csv_row << (Lit.init.cache.get_global_hits_counter(key_without_locale) || 0) if include_hits_count
               csv << csv_row
             end
           end
@@ -59,9 +55,7 @@ module Lit
     # This is like Array#transpose but ignores size differences between inner arrays.
     private_class_method def self.transpose(matrix)
       maxlen = matrix.max { |x| x.length }.length
-      matrix.each do |array|
-        array[maxlen - 1] = nil if array.length < maxlen
-      end
+      matrix.each { |array| array[maxlen - 1] = nil if array.length < maxlen }
       matrix.transpose
     end
   end

data/lib/lit/i18n_backend.rb

@@ -1,4 +1,5 @@
 require 'i18n'
+require 'lit/services/humanize_service'
 
 module Lit
   class I18nBackend
@@ -16,9 +17,22 @@ module Lit
       I18n.const_set(:RESERVED_KEYS, reserved_keys.freeze)
     end
 
+    ## DOC
+    ## Translation flow starts with Rails-provided ActionView::Helpers::TranslationHelper `translate` method
+    ## In that method any calls to `I18n.translate` are catched by this method below (because Lit acts as I18 backend)
+    ## Any calls in Lit to `super` go straight to I18n
     def translate(locale, key, options = {})
       options[:lit_default_copy] = options[:default].dup if can_dup_default(options)
       content = super(locale, key, options)
+
+      if on_rails_6_1_or_higher?
+        @untranslated_key = key if key.present? && options[:default].instance_of?(Object)
+
+        if key.nil? && options[:lit_default_copy].present?
+          update_default_localization(locale, options)
+        end
+      end
+
       if Lit.all_translations_are_html_safe && content.respond_to?(:html_safe)
         content.html_safe
       else
@@ -54,6 +68,19 @@ module Lit
 
     private
 
+    def on_rails_6_1_or_higher?
+      "#{::Rails::VERSION::MAJOR}#{::Rails::VERSION::MINOR}".to_i == 61 ||
+        ::Rails::VERSION::MAJOR >= 7
+    end
+
+    def update_default_localization(locale, options)
+      parts = I18n.normalize_keys(locale, @untranslated_key, options[:scope], options[:separator])
+      key_with_locale = parts.join('.')
+      content = options[:lit_default_copy]
+      # we do not force array on singular strings packed into Array
+      @cache.update_locale(key_with_locale, content, content.is_a?(Array) && content.length > 1)
+    end
+
     def can_dup_default(options = {})
       return false unless options.key?(:default)
       return true if options[:default].is_a?(String)
@@ -94,12 +121,18 @@ module Lit
             if options[:lit_default_copy].is_a?(Array)
               default = options[:lit_default_copy].map do |key_or_value|
                 if key_or_value.is_a?(Symbol)
-                  I18n.normalize_keys(nil, key_or_value.to_s, options[:scope], options[:separator]).join('.').to_sym
+                  normalized = I18n.normalize_keys(
+                    nil, key_or_value.to_s, options[:scope], options[:separator]
+                  ).join('.')
+                  if on_rails_6_1_or_higher? && Lit::Services::HumanizeService.should_humanize?(key)
+                    Lit::Services::HumanizeService.humanize(normalized)
+                  else
+                    normalized.to_sym
+                  end
                 else
                   key_or_value
                 end
               end
-              default = default.first if default.is_a?(Array)
             else
               default = options[:lit_default_copy]
             end
@@ -107,22 +140,16 @@ module Lit
           end
           # if we have content now, let's store it in cache
           if content.present?
-            @cache[key_with_locale] = content
-            content = @cache[key_with_locale]
-          end
-          # content might be nil - default value passed to cache was in fact
-          # useless.
-          # if content is still nil, we may try to humanize it. Rails will do
-          # it anyway if we return nil, but then it will wrap it also in
-          # translation_missing span.
-          # Humanizing key should be last resort
-          if content.nil? && Lit.humanize_key && Lit.humanize_key_ignored.match(key).nil?
-            content = key.to_s.split('.').last.humanize
-            if content.present?
-              @cache[key_with_locale] = content
-              content = @cache[key_with_locale]
+            content = Array.wrap(content).compact.reject(&:empty?).reverse.find do |default_cand|
+              @cache[key_with_locale] = default_cand
+              @cache[key_with_locale]
             end
           end
+
+          if content.nil? && !on_rails_6_1_or_higher? && Lit::Services::HumanizeService.should_humanize?(key)
+            @cache[key_with_locale] = Lit::Services::HumanizeService.humanize(key)
+            content = @cache[key_with_locale]
+          end
         end
       end
       # return translated content

data/lib/lit/services/humanize_service.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Lit
+  module Services
+    # Checks if should humanize based on config and blacklist.
+    # Performs humanize if required
+    # Caches the value of humanization
+    class HumanizeService
+      def self.should_humanize?(key)
+        Lit.humanize_key && Lit.humanize_key_ignored.match(key).nil?
+      end
+
+      def self.humanize(key)
+        key.to_s.split('.').last.humanize
+      end
+
+      def self.humanize_and_cache(key, options)
+        content = humanize(key)
+        parts = I18n.normalize_keys(
+          options[:locale] || I18n.locale, key, options[:scope], options[:separator]
+        )
+        key_with_locale = parts.join('.')
+        I18n.cache_store[key_with_locale] = content
+        I18n.cache_store[key_with_locale]
+      end
+    end
+  end
+end

data/lib/lit/services/localization_keys_to_hash_service.rb

@@ -1,23 +1,26 @@
 # frozen_string_literal: true
 
 module Lit
-  # Converts flat hash with localization_keys as keys and translations as values to nested hash
-  # by nesting on '.' localization key dots
-  class LocalizationKeysToHashService
-    # http://subtech.g.hatena.ne.jp/cho45/20061122
-    def self.call(db_localizations)
-      deep_proc = proc do |_k, s, o|
-        next s.merge(o, &deep_proc) if s.is_a?(Hash) && o.is_a?(Hash)
+  module Services
+    # Converts flat hash with localization_keys as keys and translations as values to nested hash
+    # by nesting on '.' localization key dots
+    class LocalizationKeysToHashService
+      # http://subtech.g.hatena.ne.jp/cho45/20061122
+      def self.call(db_localizations)
+        deep_proc =
+          proc do |_k, s, o|
+            next s.merge(o, &deep_proc) if s.is_a?(Hash) && o.is_a?(Hash)
 
-        next o
+            next o
+          end
+        nested_keys = {}
+        db_localizations.sort.each do |k, v|
+          key_parts = k.to_s.split('.')
+          converted = key_parts.reverse.reduce(v) { |a, n| { n => a } }
+          nested_keys.merge!(converted, &deep_proc)
+        end
+        nested_keys
       end
-      nested_keys = {}
-      db_localizations.sort.each do |k, v|
-        key_parts = k.to_s.split('.')
-        converted = key_parts.reverse.reduce(v) { |a, n| { n => a } }
-        nested_keys.merge!(converted, &deep_proc)
-      end
-      nested_keys
     end
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,17 @@
+# frozen_string_literal: true
+
 module Lit
-  VERSION = '1.1.2'.freeze
+  module_function
+
+  def version
+    Gem::Version.new Version::STRING
+  end
+
+  module Version
+    MAJOR = 1
+    MINOR = 1
+    TINY = 6
+
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+  end
 end

data/lib/lit.rb

@@ -1,5 +1,6 @@
 require 'lit/engine'
 require 'lit/loader'
+require 'lit/adapters'
 
 module Lit
   mattr_accessor :authentication_function
@@ -30,7 +31,7 @@ module Lit
       self.loader ||= Loader.new
       Lit.humanize_key = false if Lit.humanize_key.nil?
       Lit.humanize_key_ignored_keys = [] if Lit.humanize_key_ignored_keys.nil?
-      Lit.humanize_key_ignored = %w[i18n date datetime number time support ]
+      Lit.humanize_key_ignored = %w[i18n date datetime number time support]
       Lit.humanize_key_ignored |= Lit.humanize_key_ignored_keys
       Lit.humanize_key_ignored = Regexp.new("(#{Lit.humanize_key_ignored.join('|')}).*")
       Lit.ignore_yaml_on_startup = true if Lit.ignore_yaml_on_startup.nil?
@@ -42,6 +43,7 @@ module Lit
       Lit.hits_counter_enabled = false if Lit.hits_counter_enabled.nil?
       Lit.store_request_info = false if Lit.store_request_info.nil?
       Lit.store_request_keys = false if Lit.store_request_keys.nil?
+
       # if loading all translations on start, migrations have to be already
       # performed, fails on first deploy
       # self.loader.cache.load_all_translations
@@ -55,10 +57,10 @@ module Lit
   rescue ActiveRecord::ActiveRecordError => e
     log_txt =
       "An #{e.class} error has been raised during Lit initialization. " \
-      "Lit assumes that database tables do not exist.\n\n" \
-      "Error: #{e.message}\n\n" \
-      "Backtrace:\n" \
-      "#{e.backtrace.join("\n")}"
+        "Lit assumes that database tables do not exist.\n\n" \
+        "Error: #{e.message}\n\n" \
+        "Backtrace:\n" \
+        "#{e.backtrace.join("\n")}"
     Logger.new(STDOUT).error(log_txt) if ::Rails.env.test? # ensure this is logged to stdout in test
     ::Rails.logger.error(log_txt)
     false
@@ -68,18 +70,16 @@ module Lit
     case Lit.key_value_engine
     when 'redis'
       require 'lit/adapters/redis_storage'
-      return RedisStorage.new
+      return ::Lit::Adapters::RedisStorage.new
     else
       require 'lit/adapters/hash_storage'
-      return HashStorage.new
+      return ::Lit::Adapters::HashStorage.new
     end
   end
 
   def self.fallback=(_value)
-    ::Rails.logger.error "[DEPRECATION] Lit.fallback= has been deprecated, please use `config.i18n.fallbacks` instead"
+    ::Rails.logger.error '[DEPRECATION] Lit.fallback= has been deprecated, please use `config.i18n.fallbacks` instead'
   end
 end
 
-if defined? Rails
-  require 'lit/rails'
-end
+require 'lit/rails' if defined?(Rails)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - Maciej Litwiniuk
 - Piotr Boniecki
 - Michał Buszkiewicz
 - Szymon Soppa
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -111,20 +111,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.7.1
-- !ruby/object:Gem::Dependency
-  name: google-cloud-translate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +219,8 @@ files:
 - app/controllers/lit/locales_controller.rb
 - app/controllers/lit/localization_keys_controller.rb
 - app/controllers/lit/localizations_controller.rb
+- app/controllers/lit/request_info_store.rb
+- app/controllers/lit/request_keys_store.rb
 - app/controllers/lit/sources_controller.rb
 - app/helpers/lit/application_helper.rb
 - app/helpers/lit/dashboard_helper.rb
@@ -305,9 +293,10 @@ files:
 - db/migrate/20181018075955_lit_add_localization_key_is_deleted_to_localization_keys.rb
 - db/migrate/20181030111522_lit_add_is_visited_again_to_localization_keys.rb
 - db/migrate/20181129103819_lit_add_localization_key_locale_unique_index_to_localizations.rb
-- lib/generators/lit/install/templates/initializer.rb
+- lib/generators/lit/install/templates/initializer.erb
 - lib/generators/lit/install_generator.rb
 - lib/lit.rb
+- lib/lit/adapters.rb
 - lib/lit/adapters/hash_storage.rb
 - lib/lit/adapters/redis_storage.rb
 - lib/lit/cache.rb
@@ -323,6 +312,7 @@ files:
 - lib/lit/middleware.rb
 - lib/lit/rails.rb
 - lib/lit/railtie.rb
+- lib/lit/services/humanize_service.rb
 - lib/lit/services/localization_keys_to_hash_service.rb
 - lib/lit/version.rb
 - lib/tasks/lit_tasks.rake
@@ -330,7 +320,7 @@ homepage: https://github.com/prograils/lit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -346,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Database powered i18n backend with web gui
 test_files: []