lit 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dcf44da1e10a331cafdd9352461c1d9b985c6ea3d97e61744a1390e036be71a
-  data.tar.gz: 3c03d7e70b3c172092d807539543f0389e4e04c7f0420c66ffb5f96f742a4fa6
+  metadata.gz: 1bda244665d30fcad8f9ad16a593e47ffd6cf54d8d7c9a6a777d5038bad75f1b
+  data.tar.gz: 7217df2945e7a5b1813d2a4892eebf46fcf8a97cdd8e9d8648c7a23a2962715f
 SHA512:
-  metadata.gz: ecf7688c8aa6f32c6c01fab3b14024720f75155b66ed1be9494c40f0ed4755855e2b73b9d1d528a7a215513316a27ceb3427a84e72e0420f611a4c7e877b6ce0
-  data.tar.gz: 5f4fe480d203c6ade865f44385b4dfb951aa4a32c33f8e224b9371e3f36f5a16acd444ef73136bc28f7278d6518b7681d29540dca11833e6f7ecfc3b776b1386
+  metadata.gz: 5b6f9f9d65dc9463316c0abd3a56ad2ddcff9a56b6a8a4ed86b4fc6a1b526ac90b46298adf5109d40d58eccd2f5b5164f5e5f4ef424787b156c7248d6f94c2a1
+  data.tar.gz: 3f7888ee62c7c037b32d83ca184cc06715e90366a789f7c39f51f4205d1f0134aa8460755228f169e66d3b1724e23bf87f2b88589f34f09d7f68a02453158743

data/app/helpers/lit/frontend_helper.rb

@@ -23,6 +23,18 @@ module Lit::FrontendHelper
     def t(key, options = {})
       translate(key, options)
     end
+
+    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
 

data/lib/lit/i18n_backend.rb

@@ -1,4 +1,5 @@
 require 'i18n'
+require 'lit/services/humanize_service'
 
 module Lit
   class I18nBackend
@@ -28,7 +29,7 @@ module Lit
         @untranslated_key = key if key.present? && options[:default].instance_of?(Object)
 
         if key.nil? && options[:lit_default_copy].present?
-          update_default_localization(locale, content, options)
+          update_default_localization(locale, options)
         end
       end
 
@@ -72,10 +73,12 @@ module Lit
         ::Rails::VERSION::MAJOR >= 7
     end
 
-    def update_default_localization(locale, content, options)
+    def update_default_localization(locale, options)
       parts = I18n.normalize_keys(locale, @untranslated_key, options[:scope], options[:separator])
       key_with_locale = parts.join('.')
-      @cache.update_locale(key_with_locale, content, content.is_a?(Array))
+      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 = {})
@@ -118,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
@@ -131,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/version.rb

@@ -10,7 +10,7 @@ module Lit
   module Version
     MAJOR = 1
     MINOR = 1
-    TINY = 5
+    TINY = 6
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Maciej Litwiniuk
 - Piotr Boniecki
 - Michał Buszkiewicz
 - Szymon Soppa
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -312,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
@@ -319,7 +320,7 @@ homepage: https://github.com/prograils/lit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -335,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: []