gettext_i18n_rails_js 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a64135b2b1246753cdc84b6ae55c6fd3300241f670fe5165ddb285c8fc6cdff
-  data.tar.gz: dd9907de4a4e8f45e25a2f92d4f5716843f9971fa08d26b005fc7ef6f8bceb02
+  metadata.gz: 8ab326162602b66ba040e58caf4f70bb47ab86534a4b6af2c8db0b80ed8476e7
+  data.tar.gz: aeedf1ab2bf77d3714997cd245c20678ff2ac704597d9c166e5d92f20c8cdd49
 SHA512:
-  metadata.gz: 69484dec873a3c1e521bb32045e37ef8403a179a3464f63b5554663ff4a95bf832fbb3b40cb4bf1379102182f56646ea65dc61af1f5c265871988398220c53e1
-  data.tar.gz: a3b9f155f735ddc98e84e83b0739dab5c20342e5a42895bd9d6c62208705a462809c6f3e3ee71efa0067f12672295eb81b59bb4e0810329c660ac25ddd830438
+  metadata.gz: '0943368677d65bf340f39226d4b63772f7d34034727b47e2c61d185ad0eeb8108da68662029977a5c43bf4732fe277122cab99efc8f898f5fac7e1b9448edb7d'
+  data.tar.gz: 648ff70f6cc5366b2093775df8f4fc2dc6a922696f858f590b0abd4cff9e5d7e8ffb8380229aeeb17dfecae48bdc3ec95f709d0ddcdf045624cfd93aaf7744cf

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [1.3.1](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.4.0) - 2021-12-08
+## [2.0.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v2.0.0) - 2023-07-20
+
+*   Upgrade to latest po_to_json which fixes double quotes within msgid (@tboerger)
+
+## [1.4.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.4.0) - 2023-05-01
+
+*   Added support for doing conversion for different domains and rails engines (@adamruzicka)
+
+## [1.3.1](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.3.1) - 2021-12-08
 
 *   Fixed multiline translation strings (@delxen)
 *   Switched to Codacy for coverage reports (@tboerger)

data/README.md

@@ -1,9 +1,6 @@
 # gettext_i18n_rails_js
 
-[![Test Status](https://github.com/webhippie/gettext_i18n_rails_js/actions/workflows/testing.yml/badge.svg)](https://github.com/webhippie/gettext_i18n_rails_js/actions/workflows/testing.yaml)
-[![Join the Matrix chat at https://matrix.to/#/#webhippie:matrix.org](https://img.shields.io/badge/matrix-%23webhippie%3Amatrix.org-7bc9a4.svg)](https://matrix.to/#/#webhippie:matrix.org)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/51f241a0f0d7490cae0bdc04387f9d13)](https://www.codacy.com/gh/webhippie/gettext_i18n_rails_js/dashboard?utm_source=github.com&utm_medium=referral&utm_content=webhippie/gettext_i18n_rails_js&utm_campaign=Badge_Grade)
-[![Gem Version](https://badge.fury.io/rb/gettext_i18n_rails_js.svg)](https://badge.fury.io/rb/gettext_i18n_rails_js)
+[![Test Status](https://github.com/webhippie/gettext_i18n_rails_js/actions/workflows/testing.yml/badge.svg)](https://github.com/webhippie/gettext_i18n_rails_js/actions/workflows/testing.yaml) [![Join the Matrix chat at https://matrix.to/#/#webhippie:matrix.org](https://img.shields.io/badge/matrix-%23webhippie%3Amatrix.org-7bc9a4.svg)](https://matrix.to/#/#webhippie:matrix.org) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/51f241a0f0d7490cae0bdc04387f9d13)](https://app.codacy.com/gh/webhippie/gettext_i18n_rails_js/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Gem Version](https://badge.fury.io/rb/gettext_i18n_rails_js.svg)](https://badge.fury.io/rb/gettext_i18n_rails_js)
 
 Extends [gettext_i18n_rails](https://github.com/grosser/gettext_i18n_rails),
 making your .PO files available to client side javascript as JSON. It will find
@@ -20,7 +17,7 @@ look at the [wokflow][workflow].
 ## Installation
 
 ```ruby
-gem "gettext_i18n_rails_js", "~> 1.2"
+gem "gettext_i18n_rails_js", "~> 2.0"
 ```
 
 ## Versioning
@@ -37,7 +34,7 @@ gem using the [Pessimistic Version Constraint][pvc] with two digits of precision
 For example:
 
 ```ruby
-spec.add_dependency "gettext_i18n_rails_js", "~> 1.2"
+spec.add_dependency "gettext_i18n_rails_js", "~> 2.0"
 ```
 
 ## Usage
@@ -102,11 +99,6 @@ GettextI18nRailsJs.config do |config|
 end
 ```
 
-## Todo
-
-*   More deep testing against multiple Rails versions
-*   Extend the current test suite, especially handlebars
-
 ## Contributing
 
 Fork -> Patch -> Spec -> Push -> Pull Request

data/lib/gettext_i18n_rails_js/config.rb

@@ -29,13 +29,17 @@ module GettextI18nRailsJs
     attr_accessor :output_path,
                   :handlebars_function,
                   :javascript_function,
-                  :jed_options
+                  :jed_options,
+                  :rails_engine,
+                  :domain
 
     def initialize(&block)
       @output_path = defaults[:output_path]
       @handlebars_function = defaults[:handlebars_function]
       @javascript_function = defaults[:javascript_function]
       @jed_options = defaults[:jed_options].symbolize_keys
+      @rails_engine = defaults[:rails_engine]
+      @domain = defaults[:domain]
 
       instance_eval(&block) if block_given?
     end
@@ -59,7 +63,9 @@ module GettextI18nRailsJs
         javascript_function: "__",
         jed_options: {
           pretty: false
-        }
+        },
+        rails_engine: ::Rails,
+        domain: "app"
       }
 
       if file.exist?

data/lib/gettext_i18n_rails_js/parser/base.rb

@@ -71,12 +71,17 @@ module GettextI18nRailsJs
       # [0]: __('foo', 'foos', 3)
       # [1]: __
       # [2]: 'foo', 'foos', 3
+      #
+      # The PO file outputs to a "" string.
+      # single quotes are unescped (if they are escaped)
+      # double quotes are escaped (if they are not already escaped)
       def parse(file, _msgids = [])
         collect_for(file) do |function, arguments, line|
           key = arguments.scan(
             /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*`)/
           ).collect do |match|
-            match.first[1..-2]
+            contents = match.first[1..-2]
+            contents.gsub(/\\'/, "'").gsub(/(?<=[^\\])"/, "\\\"")
           end.join(separator_for(function))
 
           next if key == ""

data/lib/gettext_i18n_rails_js/task.rb

@@ -45,12 +45,12 @@ module GettextI18nRailsJs
       path = output_path.join(lang)
       path.mkpath
 
-      path.join("app.js").open("w") do |f|
+      path.join("#{domain}.js").open("w") do |f|
         f.rewind
         f.write yield
       end
 
-      puts "Created app.js in #{path}"
+      puts "Created #{domain}.js in #{path}"
     end
 
     def lang_for(file)
@@ -103,11 +103,19 @@ module GettextI18nRailsJs
     end
 
     def output_path
-      ::Rails.root.join(
+      engine_root.join(
         GettextI18nRailsJs.config.output_path
       )
     end
 
+    def engine_root
+      GettextI18nRailsJs.config.rails_engine.root
+    end
+
+    def domain
+      GettextI18nRailsJs.config.domain
+    end
+
     def print_footer
       puts
       puts "All files created, make sure they are being added to your assets."

data/lib/gettext_i18n_rails_js/version.rb

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

data/lib/gettext_i18n_rails_js.rb

@@ -27,7 +27,7 @@
 gem "rails", version: ">= 3.2.0"
 gem "gettext", version: ">= 3.0.2"
 gem "gettext_i18n_rails", version: ">= 0.7.1"
-gem "po_to_json", version: ">= 0.1.0"
+gem "po_to_json", version: ">= 2.0.0"
 
 require "rails"
 require "gettext"

data/spec/gettext_i18n_rails_js/parser/handlebars_spec.rb

@@ -161,7 +161,7 @@ describe GettextI18nRailsJs::Parser::Handlebars do
         expect(parser.parse(path, [])).to(
           eq(
             [
-              ["Hello, my name is <span class=\"name\">John Doe</span>
+              ["Hello, my name is <span class=\\\"name\\\">John Doe</span>
                     and this is a very long string", "#{path}:1"],
             ]
           )
@@ -263,7 +263,6 @@ describe GettextI18nRailsJs::Parser::Handlebars do
       end
     end
 
-    # rubocop:disable Style/FormatStringToken
     it "does not parse options" do
       content = <<-EOF
         <div>
@@ -281,7 +280,6 @@ describe GettextI18nRailsJs::Parser::Handlebars do
         )
       end
     end
-    # rubocop:enable Style/FormatStringToken
 
     # it "does not parse internal functions" do
     #   content = <<-EOF

data/spec/gettext_i18n_rails_js/parser/javascript_spec.rb

@@ -185,7 +185,8 @@ describe GettextI18nRailsJs::Parser::Javascript do
 
     it "finds strings that use escaped strings" do
       content = <<-'EOF'
-        __("hello \"dude\"") + __('how is it \'going\' ')
+        __("hello \"dude\"") + __('how is it \'going\' ') +
+        __('stellar "dude"') + __("it's 'going' good")
       EOF
 
       with_file content do |path|
@@ -193,7 +194,9 @@ describe GettextI18nRailsJs::Parser::Javascript do
           eq(
             [
               ["hello \\\"dude\\\"", "#{path}:1"],
-              ["how is it \\'going\\' ", "#{path}:1"]
+              ["how is it 'going' ", "#{path}:1"],
+              ["stellar \\\"dude\\\"", "#{path}:2"],
+              ["it's 'going' good", "#{path}:2"]
             ]
           )
         )
@@ -212,7 +215,7 @@ describe GettextI18nRailsJs::Parser::Javascript do
         expect(parser.parse(path, [])).to(
           eq(
             [
-              ["Hello, my name is <span class=\"name\">John Doe</span> and this is a very long string", "#{path}:2"]
+              ["Hello, my name is <span class=\\\"name\\\">John Doe</span> and this is a very long string", "#{path}:2"]
             ]
           )
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails_js
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas Boerger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +184,12 @@ specification_version: 4
 summary: Extends gettext_i18n_rails making your .po files available to client side
   javascript as JSON
 test_files:
-- spec/support/with_file.rb
-- spec/gettext_i18n_rails_js_spec.rb
 - spec/gettext_i18n_rails_js/parser/handlebars_spec.rb
 - spec/gettext_i18n_rails_js/parser/javascript_spec.rb
-- spec/spec_helper.rb
-- spec/fixtures/example.js
+- spec/support/with_file.rb
+- spec/gettext_i18n_rails_js_spec.rb
 - spec/fixtures/example.coffee
 - spec/fixtures/example.vue
+- spec/fixtures/example.js
 - spec/fixtures/example.handlebars
+- spec/spec_helper.rb