gettext_i18n_rails_js 0.0.2 → 0.0.3

data/Readme.md

@@ -6,7 +6,7 @@ It will find translations inside your .js and .coffee files, then it will create
 
 ## Installation
 
-It requires rails 3.2 or later, any version of 'gettext_i18n_rails' will do though.
+Requires rails 3.2 or later.
 
 #### Add the following to your gemfile:
 

data/lib/gettext_i18n_rails_js.rb

@@ -1,5 +1,6 @@
 require 'gettext_i18n_rails'
 require 'gettext_i18n_rails_js/engine'
+require 'gettext_i18n_rails_js/js_and_coffee_parser'
 
 module GettextI18nRailsJs
 end

data/lib/gettext_i18n_rails_js/handlebars_parser.rb

@@ -0,0 +1,65 @@
+require 'gettext/tools/xgettext'
+
+module GettextI18nRailsJs
+  class HandlebarsParser
+
+    class << self
+      # The gettext function name can be configured at the module level as handlebars_gettext_function
+      attr_accessor :handlebars_gettext_function
+    end
+
+    self.handlebars_gettext_function = '_'
+
+    def self.target?(file)
+      [/\.handlebars\Z/, /\.handlebars.erb\Z/].any? {|regexp| file.match regexp}
+    end
+
+    # We're lazy and klumsy, so this is a regex based parser that looks for
+    # invocations of the various gettext functions. Once captured, we
+    # scan them once again to fetch all the function arguments.
+    # Invoke regex captures like this:
+    # source: "{{ _ "foo"}}"
+    # matches:
+    # [0]: {{_ "foo"}}
+    # [1]: _
+    # [2]: "foo"
+    #
+    # source: "{{ _ "foo" "foos" 3}}"
+    # matches:
+    # [0]: {{ _ "foo" "foos" 3}}
+    # [1]: _
+    # [2]: "foo" "foos" 3'
+
+    def self.parse(file, msgids = [])
+      cookie = self.handlebars_gettext_function
+
+      # We first parse full invocations
+      invoke_regex = /
+        \B[{]{2}(([snN]?#{cookie})      # Matches the function handlebars helper call grouping "{{"
+                  \s+                   # and a parenthesis to start the arguments to the function.
+                  (".*?"                # Then double quote string
+                   .*?                  # remaining arguments
+                 )
+                )
+          [}]{2}                   # function call closing parenthesis
+      /x
+
+      File.read(file).scan(invoke_regex).collect do |whole, function, arguments|
+        separator = function == "n#{cookie}" ? "\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
+    end
+
+  end
+end
+
+require 'gettext_i18n_rails/gettext_hooks'
+GettextI18nRails::GettextHooks.add_parser(GettextI18nRailsJs::HandlebarsParser)

data/lib/gettext_i18n_rails_js/js_and_coffee_parser.rb

@@ -49,9 +49,9 @@ module GettextI18nRailsJs
 
       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)
+        key = arguments.scan(/('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/).
+          collect{|match| match.first[1..-2]}.
+          join(separator)
         next if key == ''
         key.gsub!("\n", '\n')
         key.gsub!("\t", '\t')

data/lib/gettext_i18n_rails_js/tasks.rb

@@ -2,8 +2,9 @@ namespace :gettext do
   desc "Convert PO files to js files in app/assets/locales"
   task :po_to_json => :environment do
     require 'po_to_json'
+    require 'gettext_i18n_rails_js/js_and_coffee_parser'
 
-    GettextI18nRails::JsAndCoffeeParser.js_gettext_function = js_gettext_function
+    GettextI18nRailsJs::JsAndCoffeeParser.js_gettext_function = js_gettext_function
 
     po_files = Dir["#{locale_path}/**/*.po"]
     if po_files.empty?
@@ -39,7 +40,7 @@ namespace :gettext do
 
   def files_to_translate
     puts 'translate these files'
-    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim,js,coffee}")
+    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim,js,coffee,handlebars}")
   end
  
   # The parser will use this as the function basename when parsing translations.

data/lib/gettext_i18n_rails_js/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRailsJs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tasks/gettext_i18n_rails_js_tasks.rake

@@ -1,4 +1,5 @@
 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'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails_js
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70147763466400 !ruby/object:Gem::Requirement
+  requirement: &70327314868040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147763466400
+  version_requirements: *70327314868040
 - !ruby/object:Gem::Dependency
   name: gettext
-  requirement: &70147763463880 !ruby/object:Gem::Requirement
+  requirement: &70327314866780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147763463880
+  version_requirements: *70327314866780
 - !ruby/object:Gem::Dependency
   name: gettext_i18n_rails
-  requirement: &70147763477920 !ruby/object:Gem::Requirement
+  requirement: &70327314882420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70147763477920
+  version_requirements: *70327314882420
+- !ruby/object:Gem::Dependency
+  name: po_to_json
+  requirement: &70327314881920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70327314881920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70147763474740 !ruby/object:Gem::Requirement
+  requirement: &70327314881000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147763474740
+  version_requirements: *70327314881000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147763485780 !ruby/object:Gem::Requirement
+  requirement: &70327314880040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70147763485780
+  version_requirements: *70327314880040
 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
@@ -78,6 +89,7 @@ files:
 - lib/assets/javascripts/gettext/all.js
 - lib/assets/javascripts/gettext/jed.js
 - lib/gettext_i18n_rails_js/engine.rb
+- lib/gettext_i18n_rails_js/handlebars_parser.rb
 - lib/gettext_i18n_rails_js/js_and_coffee_parser.rb
 - lib/gettext_i18n_rails_js/tasks.rb
 - lib/gettext_i18n_rails_js/version.rb