i18nliner 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb90fe50e15cd800c8fe6266435e6ad65da7f403939cbf619c866b843b6792e
-  data.tar.gz: cf1778863ed5faf6346c491162c90acd52c0e51e4efda4a114bbd13e99f04ed7
+  metadata.gz: c65c8bd881edfdc231120af22f283b85770bfa2befdf3495d273848101393062
+  data.tar.gz: ce466b775c3e449efc57ba5d6083f59c8c5a0a63243a0301be8515dedca6c9f0
 SHA512:
-  metadata.gz: 74400054da78cccfd58e5a54eb452bf46b79464ea2d398536acb62ff37cbba84b044c757cbf45c0950ab22f493dd3d0ac018613a6bcc66e2d40bcca34b36e507
-  data.tar.gz: 05fddfa85858798700910737ba60e57e0e8da23605792fa6e822ce6ef524f5a98e41fb22face1ad9aed57f4ef9da7d1f0db797898273ffdf4ac71ac33de03dd5
+  metadata.gz: b4e7c18f79f693a815ea3f6b6b84f46be8b56d8e739cdf7c064e0d2632cef23138cfb1e75c344077c44ace0f9c63d4b79cce32f19c8df9a79a28f7a07a71e92d
+  data.tar.gz: 8455844299eeca26b8d017e17ccfca90172d597f942b5331069e2b07e409167e425c16ceb8d59511066b5035c96bdee587f1c2fa0abe6793987fc4d40a4cc3be

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/lib/i18nliner/pre_processors/erb_pre_processor.rb

@@ -2,8 +2,6 @@ require 'i18nliner/errors'
 require 'i18nliner/call_helpers'
 require 'i18nliner/extractors/sexp_helper'
 require 'nokogiri'
-require 'ruby_parser'
-require 'ruby2ruby'
 
 module I18nliner
   module PreProcessors
@@ -37,8 +35,14 @@ module I18nliner
         DEFINITIONS = [
           {:method => :link_to, :pattern => /link_to/, :arg => 0}
         ]
-        RUBY2RUBY = Ruby2Ruby.new
-        PARSER = RubyParser.new
+
+        def self.parser
+          @parser ||= (require 'ruby_parser'; RubyParser.new)
+        end
+
+        def self.ruby2ruby
+          @ruby2ruby ||= (require 'ruby2ruby'; Ruby2Ruby.new)
+        end
 
         def self.match_for(string)
           DEFINITIONS.each do |info|
@@ -60,7 +64,7 @@ module I18nliner
         def wrappable?
           return @wrappable if !@wrappable.nil?
           begin
-            sexps = PARSER.parse(@source)
+            sexps = self.class.parser.parse(@source)
             @wrappable = sexps.sexp_type == :call &&
                          sexps[1].nil? &&
                          sexps[2] == @method &&
@@ -75,10 +79,10 @@ module I18nliner
           if stringish?(sexp)
             @content = string_from(sexp)
           else
-            @placeholder = RUBY2RUBY.process(sexp)
+            @placeholder = self.class.ruby2ruby.process(sexp)
           end
           sexps[@arg + SEXP_ARG_OFFSET] = Sexp.new(:str, "\\1")
-          @wrapper = RUBY2RUBY.process(sexps)
+          @wrapper = self.class.ruby2ruby.process(sexps)
         end
       end
 

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,13 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Jon Jensen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,7 +223,6 @@ files:
 homepage: http://github.com/jenseng/i18nliner
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -239,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: I18n made simple
 test_files: []