gettext_i18n_rails_js 0.0.5 → 0.0.6

data/lib/gettext_i18n_rails_js.rb

@@ -1,6 +1,6 @@
 require 'gettext_i18n_rails'
 require 'gettext_i18n_rails_js/engine'
-require 'gettext_i18n_rails_js/js_and_coffee_parser'
+require 'gettext_i18n_rails_js/js_and_coffee_parser' if RUBY_PLATFORM != 'java'
 
 module GettextI18nRailsJs
 end

data/lib/gettext_i18n_rails_js/js_and_coffee_parser.rb

@@ -2,11 +2,11 @@ require 'gettext/tools/xgettext'
 
 module GettextI18nRailsJs
   class JsAndCoffeeParser
-    
+
     class << self
       # The gettext function name can be configured at the module level as js_gettext_function
       # This is to provide a way to avoid conflicts with other javascript libraries.
-      # You only need to define the base function name to replace '_' and all the 
+      # You only need to define the base function name to replace '_' and all the
       # other variants (s_, n_, N_) will be deduced automatically.
       attr_accessor :js_gettext_function
     end
@@ -34,31 +34,33 @@ module GettextI18nRailsJs
     def self.parse(file, msgids = [])
       _ = self.js_gettext_function
 
-      # We first parse full invocations 
+      # We first parse full invocations
       invoke_regex = /
-        (\b[snN]?#{_})                # Matches the function call grouping the method used (__, n__, N__, etc)
+        (\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-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
       /x
 
-      File.read(file).scan(invoke_regex).collect do |function, arguments|
-        separator = function == "n#{_}" ? "\000" : "\004"
-        key = arguments.scan(/('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/).
-          collect{|match| match.first[1..-2]}.
-          join(separator)
-        next if key == ''
-        key.gsub!("\n", '\n')
-        key.gsub!("\t", '\t')
-        key.gsub!("\0", '\0')
-          
-        [key, "#{file}:1"]
-      end.compact
+      File.new(file).each_line.each_with_index.collect do |line, idx|
+        line.scan(invoke_regex).collect do |function, arguments|
+          separator = function == "n#{_}" ? "\000" : "\004"
+          key = arguments.scan(/('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/).
+            collect{|match| match.first[1..-2]}.
+            join(separator)
+          next if key == ''
+          key.gsub!("\n", '\n')
+          key.gsub!("\t", '\t')
+          key.gsub!("\0", '\0')
+
+          [key, "#{file}:#{idx+1}"]
+        end
+      end.inject(:+).compact
     end
 
   end

data/lib/gettext_i18n_rails_js/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRailsJs
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/tasks/gettext_i18n_rails_js_tasks.rake

@@ -1,5 +1,6 @@
-require_relative '../gettext_i18n_rails_js/js_and_coffee_parser'
-require_relative '../gettext_i18n_rails_js/handlebars_parser'
-require 'gettext_i18n_rails/tasks'
-require_relative '../gettext_i18n_rails_js/tasks'
-
+if RUBY_PLATFORM != 'java'
+  require_relative '../gettext_i18n_rails_js/js_and_coffee_parser'
+  require_relative '../gettext_i18n_rails_js/handlebars_parser'
+  require 'gettext_i18n_rails/tasks'
+  require_relative '../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.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70354807710200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,15 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70354807710200
-- !ruby/object:Gem::Dependency
-  name: gettext
-  requirement: &70354807708800 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70354807708800
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: gettext_i18n_rails
-  requirement: &70354807705080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70354807705080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: po_to_json
-  requirement: &70354807688080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70354807688080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70354807686020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354807686020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354807683640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +85,28 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70354807683640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: gettext_i18n_rails will find translations inside your .js and .coffee
   files, then it will create JSON versions of your .PO files and will let you serve
   them with the rest of your assets, thus letting you access all your translations
@@ -97,7 +127,7 @@ files:
 - lib/tasks/gettext_i18n_rails_js_tasks.rake
 - MIT-LICENSE
 - Rakefile
-- Readme.md
+- README.md
 homepage: http://github.com/nubis/gettext_i18n_rails_js
 licenses: []
 post_install_message: 
@@ -118,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extends gettext_i18n_rails making your .po files available to client side