i18nliner 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9f3816293c70dfd95ca1cd66cb80d611f283c416e2dc0bd9eec08723d33f32e
-  data.tar.gz: e41ce0ba376064862cc64d063b2ac2cdf48002136446079f403255e9cb6a69b9
+  metadata.gz: 3cae685053ab3a06d205244fb111de3040ca1d81224d099e2350f016d07f0d55
+  data.tar.gz: f41863a6a11fffc2839cae6bbf5c4fb98c67e7f71a6b8524b9f5aa49bbee1b26
 SHA512:
-  metadata.gz: b31d8fdd70c548e770d92584e9c35f6ce15ca60a6bc8a1d835cb2b90653b6de63029d35fcd2465245d473f1cab5914634a290faa344c8a5ec0e115dfcb4947b1
-  data.tar.gz: 90a338c6438b59dfa6b0f51af4f4c97b747b068390e975f68e8a6af9ba5ddf3b0c735ffc2e46ca7fe63effc8c5ce2f037e6a808b6a50ae197a9d5110a5088895
+  metadata.gz: 4b89963344f03ce3f822a917ad6005278763ef23aeead3044d5dd06160cc3583b2ae9662baa5113dddf870e9dd5dd0bd279c2c6d2e7decdd54682a68ec4e1d4a
+  data.tar.gz: 970fa32baf0fb3bb378d793f664296d67ea2199ba0e6bc8193f4b72eeb12a4917b944742b8d4b9766c942fc54525183c864b4b84c77488c3852766d165bb06ad

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,7 +17,7 @@ module I18nliner
         end
 
         wrappers = options.delete(:wrappers) || options.delete(:wrapper)
-        result = super(key, options)
+        result = super(key, **options)
 
         # Exit now unless we have a string or a thing that delegates to a string
         return result unless result.respond_to?(:gsub)

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/lib/i18nliner/extractors/ruby_extractor.rb

@@ -84,6 +84,9 @@ module I18nliner
       end
 
       def evaluate_expression(exp)
+        # value omissions in hashes will be nil and can just be considered UnsupportedExpression
+        # since they are equivalent to a method call
+        return UnsupportedExpression if exp.nil?
         return raw(exp) if exp.sexp_type == :lit
         return string_from(exp) if stringish?(exp)
         return hash_from(exp) if exp.sexp_type == :hash

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

data/spec/extractors/ruby_extractor_spec.rb

@@ -49,6 +49,10 @@ describe I18nliner::Extractors::RubyExtractor do
         {'foo' => "Foo"})
     end
 
+    it "should handle omitted values in hashes" do
+      expect { extract("t('foo %{count}', count:)") }.not_to raise_error
+    end
+
     it "should bail on invalid t calls" do
       assert_error "t foo", I18nliner::InvalidSignatureError
       assert_error "t :foo, foo", I18nliner::InvalidSignatureError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Jon Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2023-06-05 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
@@ -210,7 +224,7 @@ files:
 homepage: http://github.com/jenseng/i18nliner
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: I18n made simple
 test_files: []