i18nliner 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a54d15655300760797d011db9521a123b23892478badcee8cfab3c7c890e25
-  data.tar.gz: 97409ad1106e9ed7c68567038bca41495e204545fce5b605b2b30e591072c399
+  metadata.gz: bbb90fe50e15cd800c8fe6266435e6ad65da7f403939cbf619c866b843b6792e
+  data.tar.gz: cf1778863ed5faf6346c491162c90acd52c0e51e4efda4a114bbd13e99f04ed7
 SHA512:
-  metadata.gz: d81cc7123036ef5a7f19224d2400b384f4049bee9be1ea9a99d40b12ea2db8739f547861e93bff7c51f7639c1877c0ae672a850325e85a59817ba678b455d31a
-  data.tar.gz: 0b465bc13a850bd61ffdbc2459d698f55719cc5cc5cab1bd55ca8e8bfabba8a12a7214def2c95a0fd682b50d4fd4af03092fd4815702081524f1fe92e468a18c
+  metadata.gz: 74400054da78cccfd58e5a54eb452bf46b79464ea2d398536acb62ff37cbba84b044c757cbf45c0950ab22f493dd3d0ac018613a6bcc66e2d40bcca34b36e507
+  data.tar.gz: 05fddfa85858798700910737ba60e57e0e8da23605792fa6e822ce6ef524f5a98e41fb22face1ad9aed57f4ef9da7d1f0db797898273ffdf4ac71ac33de03dd5

data/lib/i18nliner/extensions/controller.rb

@@ -13,7 +13,7 @@ module I18nliner
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
         options[:i18nliner_scope] = i18nliner_scope
-        super(key, options)
+        super(key, **options)
       end
       alias :t :translate
       alias :t! :translate

data/lib/i18nliner/extensions/core.rb

@@ -17,14 +17,15 @@ module I18nliner
         end
 
         wrappers = options.delete(:wrappers) || options.delete(:wrapper)
-        result = super(key, options)
+        result = super(key, **options)
 
-        # In rails 6.1+ views, sometimes an Object is used for the default, and that object needs to remain
-        # an object or it won't be recognized if it comes back as a string
-        return result if result.nil? || result.instance_of?(Object)
+        # Exit now unless we have a string or a thing that delegates to a string
+        return result unless result.respond_to?(:gsub)
 
+        was_html_safe = result.html_safe?
         # If you are actually using nonprintable characters in your source string, you should feel ashamed
         result = result.gsub("\\\\", "\uE124").gsub("\\*", "\uE123")
+        result = result.html_safe if was_html_safe
         if wrappers
           result = apply_wrappers(result, wrappers)
         end

data/lib/i18nliner/extensions/model.rb

@@ -13,7 +13,7 @@ module I18nliner
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
         options[:i18nliner_scope] = i18nliner_scope
-        I18n.translate(key, options)
+        I18n.translate(key, **options)
       end
       alias :t :translate
       alias :t! :translate

data/lib/i18nliner/extensions/view.rb

@@ -17,7 +17,7 @@ module I18nliner
         key, options = CallHelpers.infer_arguments(args)
         options = inferpolate(options) if I18nliner.infer_interpolation_values
         options[:i18nliner_scope] = i18nliner_scope
-        super(key, options)
+        super(key, **options)
       rescue ArgumentError
         raise
       end

data/spec/extensions/controller_spec.rb

@@ -8,7 +8,7 @@ describe I18nliner::Extensions::Controller do
       extend(Module.new do
         def translate(key, options)
           options.delete(:i18nliner_inferred_key)
-          I18n.translate(key, options)
+          I18n.translate(key, **options)
         end
 
         def controller_name

data/spec/extensions/core_spec.rb

@@ -5,11 +5,15 @@ describe I18nliner::Extensions::Core do
   let(:i18n) do
     Module.new do
       extend(Module.new do
-        def translate(*args)
-          simple_translate(args[0], args[1])
+        def translate(key, **options)
+          if RUBY_VERSION >= '3.0'
+            simple_translate(key, **options)
+          else
+            simple_translate(key, options)
+          end
         end
 
-        def simple_translate(key, options)
+        def simple_translate(key, **options)
           string = options.delete(:default)
           interpolate_hash(string, options)
         end
@@ -48,7 +52,11 @@ describe I18nliner::Extensions::Core do
     end
 
     it "should stringify array keys, but not the array itself" do
-      expect(i18n).to receive(:simple_translate).with(["bar", "baz"], {})
+      if RUBY_VERSION >= '3.0'
+        expect(i18n).to receive(:simple_translate).with(["bar", "baz"])
+      else
+        expect(i18n).to receive(:simple_translate).with(["bar", "baz"], {})
+      end
       i18n.translate([:bar, :baz])
     end
 

data/spec/extensions/view_spec.rb

@@ -6,9 +6,9 @@ describe I18nliner::Extensions::View do
   let(:i18n) do
     Module.new do
       extend(Module.new do
-        def translate(key, options)
+        def translate(key, **options)
           options.delete(:i18nliner_inferred_key)
-          I18n.translate(key, options)
+          I18n.translate(key, **options)
         end
       end)
       extend I18nliner::Extensions::View

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.6
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement