gettext_i18n_rails_js 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1b5907d21b5b2433ed3277842c3b20091a1912
-  data.tar.gz: 4f8ec5b71d44cbb522cb469b9e26a11c8bf23315
+  metadata.gz: b6c9be7f40d1ccdd5cde0c1bb93d85d4174957d1
+  data.tar.gz: 6ed13ca56f91509c75416cea2c42942305ad0c0a
 SHA512:
-  metadata.gz: 0dd2b745b857659a2249c6f70047b4249b35b1c13469cfb0f8dc64a35a8affd155a6d67c8e43bf298ff26e025d5bb222022e0ae2ef9a2053ab54650ea31c1cad
-  data.tar.gz: 575ff0e579024f2c34acacd34fb429d7f3c07d8576f71b04aea08751ef9708ac318aa06536be47e157fdb061a8e3de264aa82f5afedc92051c7182f8e8747d90
+  metadata.gz: da0f449e49c3cde558b8b0e8dc7214e715befb293573a4d8efb6045753839ff2a78b73972e790cc5f8423508f0cf14a7e2dd9126263942bc2292f12036a83953
+  data.tar.gz: fc95857165d43b45bb9c4417bdce81531acc150c5a3bc10dd1b967dc5a271984821e041df1230ccd5db3b91bcd756c7f8c36ce5fa7f5bee2ffd5d4a1ec0e3ae1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.3.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.3.0) - 2017-03-16
+
+* Fixed Handlebars translations with options (@mikezaby)
+* Fixed latest Rubocop offenses (@mikezaby)
+* Dropped failing coveralls, fixed codeclimate (@tboerger)
+
 ## [1.2.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.2.0) - 2016-06-02
 
 * Support for JSX files (@artemv)

data/lib/gettext_i18n_rails_js/parser/handlebars.rb

@@ -62,15 +62,15 @@ module GettextI18nRailsJs
         # * Remaining arguments
         # * Function call closing parenthesis
         #
-
         /
           \B[{]{2}(
             ([snN]?#{gettext_function})
             \s+
             (
-              ".*?"
-              .*?
+              (["'])(?:\\?+.)*?\4
+              (?:\s+(["'])(?:\\?+.)*?\5)?
             )
+            .*?
           )
           [}]{2}
         /x

data/lib/gettext_i18n_rails_js/version.rb

@@ -26,7 +26,7 @@
 module GettextI18nRailsJs
   class Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
 
     PRE = nil

data/spec/gettext_i18n_rails_js/parser/handlebars_spec.rb

@@ -60,14 +60,14 @@ describe GettextI18nRailsJs::Parser::Handlebars do
   describe "#parse" do
     it "finds plural messages" do
       content = <<-EOF
-        <div>{{n__ "xxxx" "yyyy\" "zzzz" some_count}}</div>
+        <div>{{n__ "xxxx" "yyyy" some_count}}</div>
       EOF
 
       with_file content do |path|
         expect(parser.parse(path, [])).to(
           eq(
             [
-              ["xxxx\000yyyy\000zzzz", "#{path}:1"]
+              ["xxxx\000yyyy", "#{path}:1"]
             ]
           )
         )
@@ -76,7 +76,7 @@ describe GettextI18nRailsJs::Parser::Handlebars do
 
     it "finds namespaced messages" do
       content = <<-EOF
-        <div>{{__ "xxxx", "yyyy"}}</div>
+        <div>{{__ "xxxx" "yyyy"}}</div>
       EOF
 
       with_file content do |path|
@@ -106,6 +106,22 @@ describe GettextI18nRailsJs::Parser::Handlebars do
       end
     end
 
+    it "finds single quote messages" do
+      content = <<-EOF
+      <div>{{__ 'blah'}}</div>
+      EOF
+
+      with_file content do |path|
+        expect(parser.parse(path, [])).to(
+          eq(
+            [
+              ["blah", "#{path}:1"]
+            ]
+          )
+        )
+      end
+    end
+
     # it "finds messages with newlines/tabs" do
     #   content = <<-EOF
     #     bla = __("xxxx\n\tfoo")
@@ -234,6 +250,24 @@ describe GettextI18nRailsJs::Parser::Handlebars do
       end
     end
 
+    it "does not parse options" do
+      content = <<-EOF
+        <div>
+        {{__ "test with %{param}" param="something"}}
+        </div>
+      EOF
+
+      with_file content do |path|
+        expect(parser.parse(path, [])).to(
+          eq(
+            [
+              ["test with %{param}", "#{path}:1"]
+            ]
+          )
+        )
+      end
+    end
+
     # it "does not parse internal functions" do
     #   content = <<-EOF
     #     bla = n__("items (single)", "i (more)", item.count()) + __('foobar')
@@ -279,7 +313,7 @@ describe GettextI18nRailsJs::Parser::Handlebars do
         <div>
           {{gettext \"Hello {yourname}\"}}
           <span>
-            {{ngettext \"item\", \"items\", 44}}
+            {{ngettext \"item\" \"items\" 44}}
           </span>
         </div>
       EOF

data/spec/spec_helper.rb

@@ -24,26 +24,10 @@
 #
 
 require "simplecov"
+require "codeclimate-test-reporter" if ENV["CODECLIMATE_REPO_TOKEN"]
 
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "coveralls"
-  require "codeclimate-test-reporter"
-
-  Coveralls.wear!
-  CodeClimate::TestReporter.start
-
-  SimpleCov.start do
-    add_filter "/spec"
-
-    formatter SimpleCov::Formatter::MultiFormatter[
-      SimpleCov::Formatter::HTMLFormatter,
-      CodeClimate::TestReporter::Formatter
-    ]
-  end
-else
-  SimpleCov.start do
-    add_filter "/spec"
-  end
+SimpleCov.start do
+  add_filter "/spec"
 end
 
 require "gettext_i18n_rails_js"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails_js
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Thomas Boerger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,18 +178,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Extends gettext_i18n_rails making your .po files available to client side
   javascript as JSON
 test_files:
-- spec/fixtures/example.js
-- spec/fixtures/example.handlebars
 - spec/fixtures/example.coffee
-- spec/support/with_file.rb
-- spec/gettext_i18n_rails_js/parser/javascript_spec.rb
+- spec/fixtures/example.handlebars
+- spec/fixtures/example.js
 - spec/gettext_i18n_rails_js/parser/handlebars_spec.rb
+- spec/gettext_i18n_rails_js/parser/javascript_spec.rb
 - spec/gettext_i18n_rails_js_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/with_file.rb