gettext_i18n_rails_js 0.0.7 → 0.0.8

data/lib/gettext_i18n_rails_js/js_and_coffee_parser.rb

@@ -34,17 +34,21 @@ module GettextI18nRailsJs
     def self.parse(file, msgids = [])
       _ = self.js_gettext_function
 
+      arg_regex = /
+        \s*                     # Some whitespace
+        ('(?:[^'\\]|\\.)*?'|    # A token inside the argument list, like a single quoted string
+         "(?:[^"\\]|\\.)*?"|    # ...Double quote string, both support escapes
+         [a-zA-Z0-9_\.()]*?)    # ...a number, variable name, or called function lik: 33, foo, Foo.bar()
+        \s*                     # More whitespace
+      /x
+
       # We first parse full invocations
       invoke_regex = /
-        (\b[snN]?#{_})               # Matches the function call grouping the method used (__, n__, N__, etc)
-          \(                         # and a parenthesis to start the arguments to the function.
-            (('.*?'|                 # Then a token inside the argument list, like a single quoted string
-              ".*?"|                 # ...Double quote string
-              [a-zA-Z0-9_\.()]*?|    # ...a number, variable name, or called function lik: 33, foo, Foo.bar()
-              [ ]|                   # ...a white space
-              ,)                     # ...or a comma, which separates all of the above.
-            *)                       # There may be many arguments to the same function call.
-          \)                         # function call closing parenthesis
+        (\b[snN]?#{_})          # Matches the function call grouping the method used (__, n__, N__, etc)
+          \(                    # and a parenthesis to start the arguments to the function.
+            ((#{arg_regex},)*   # There may be many arguments to the same function call
+              #{arg_regex})?    # then the last, or only argument to the function call.
+          \)                    # function call closing parenthesis
       /x
 
       File.new(file).each_line.each_with_index.collect do |line, idx|

data/lib/gettext_i18n_rails_js/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRailsJs
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/tasks/gettext_i18n_rails_js_tasks.rake

@@ -1,6 +1,7 @@
 if RUBY_PLATFORM != 'java'
-  require_relative '../gettext_i18n_rails_js/js_and_coffee_parser'
-  require_relative '../gettext_i18n_rails_js/handlebars_parser'
+  dir = File.dirname(__FILE__)
+  require File.join(dir, '../gettext_i18n_rails_js/js_and_coffee_parser')
+  require File.join(dir, '../gettext_i18n_rails_js/handlebars_parser')
   require 'gettext_i18n_rails/tasks'
-  require_relative '../gettext_i18n_rails_js/tasks'
+  require File.join(dir, '../gettext_i18n_rails_js/tasks')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails_js
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails