i18n-tasks 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc184ed8233c7a409de36ee6fd654fa4830e2f2
-  data.tar.gz: c846f15fa5b8e278d4b0dab8b3ec021759b8f603
+  metadata.gz: 6c8f584095c296651d391ff4d7bda8f7976ed897
+  data.tar.gz: '0886ab5028387f20c2b6a5a246fb9435a7285ce1'
 SHA512:
-  metadata.gz: 558d0ee6c04e5630c48f1e1c206f37931a38c60da5ff3392042940c814bfdbbab94ca0a51840f0b963fcd6adab4c9b3e2d4b5d15ee764670a4b49cd444194242
-  data.tar.gz: 8b955b0dd45d4761a9fde64ef0baa81fa3725d51f72ce136ebbac95c0bedb88a0a8392b1029253d780bf60a33fbaf7c1beb801f6430a9311dbe4d4cfe2a6aa9d
+  metadata.gz: 84624f8fda11ae08790761f4e6f2490abe6cd3f04d8783b2e3bfd0e809b40eecaae7dfa6643b6db45e3c92152fedf9ca8e131808295b9ff08469e8c8bfe82c53
+  data.tar.gz: 660b804e12dec65e30ccd96f0441fd8eea8fcc0b20a8eb3a64b8fb7e5f5bce18927f45c5fddb8844a058d3d98faaa17a0ae785599b026215a317db3088140e70

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.9.17'
+gem 'i18n-tasks', '~> 0.9.18'
 ```
 
 Copy the default [configuration file](#configuration):

data/lib/i18n/tasks/scanners/pattern_scanner.rb

@@ -92,8 +92,12 @@ module I18n::Tasks::Scanners
       # capture only the first argument
       /
       #{translate_call_re} [\( ] \s* (?# fn call begin )
-      (#{literal_re})                (?# capture the first argument)
+      (#{first_argument_re})         (?# capture the first argument)
       /x
     end
+
+    def first_argument_re
+      literal_re
+    end
   end
 end

data/lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb

@@ -32,6 +32,11 @@ module I18n::Tasks::Scanners
       end
     end
 
+    # parse expressions with literals and variable
+    def first_argument_re
+      /(?: (?: #{literal_re} ) | #{variable_re} )/x
+    end
+
     # strip literals, convert expressions to #{interpolations}
     def strip_literal(val)
       if val =~ /\A\w/
@@ -56,6 +61,12 @@ module I18n::Tasks::Scanners
       /[\w():"'.\s]+/x
     end
 
+    # match variable key
+    # e.g: t(key, scope: 'scope') => t('scope.#{key}')
+    def variable_re
+      /\w+/
+    end
+
     # extract literal or array of literals
     # returns nil on any other input
     # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.17'
+    VERSION = '0.9.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport