gettext_i18n_rails_js 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a64135b2b1246753cdc84b6ae55c6fd3300241f670fe5165ddb285c8fc6cdff
-  data.tar.gz: dd9907de4a4e8f45e25a2f92d4f5716843f9971fa08d26b005fc7ef6f8bceb02
+  metadata.gz: daae36f91fe3d18ef004de9c310dfecd375cfcdc374324fd94955b0284b88d0c
+  data.tar.gz: 53fcf1bf4c8aeb76f669b71b71f61b816da23d011b62fb17bcf2e0b3cc73fa92
 SHA512:
-  metadata.gz: 69484dec873a3c1e521bb32045e37ef8403a179a3464f63b5554663ff4a95bf832fbb3b40cb4bf1379102182f56646ea65dc61af1f5c265871988398220c53e1
-  data.tar.gz: a3b9f155f735ddc98e84e83b0739dab5c20342e5a42895bd9d6c62208705a462809c6f3e3ee71efa0067f12672295eb81b59bb4e0810329c660ac25ddd830438
+  metadata.gz: d8c598c772c463cb2330b8932ff9630165a8ce8913b7cfc2c64bae8b78403987cc5c1d0052d7f1beaaae05866db2a7d49bb1ec3b8d4c9f63fdbff4401e46b25b
+  data.tar.gz: 44a48ac7b393f1320c092c273d9f17dca2e1d7b9bfa8b0a38073150a1a7af64299e09dab295f5615a388c7110e849273f0392497706cf080c149bf360d446481

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [1.3.1](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.4.0) - 2021-12-08
+## [1.4.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.4.0) - 2024-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
@@ -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

@@ -27,8 +27,8 @@
 module GettextI18nRailsJs
   class Version
     MAJOR = 1
-    MINOR = 3
-    PATCH = 1
+    MINOR = 4
+    PATCH = 0
 
     PRE = nil
 

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: 1.4.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-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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/support/with_file.rb
 - spec/spec_helper.rb
+- spec/gettext_i18n_rails_js_spec.rb
 - spec/fixtures/example.js
-- spec/fixtures/example.coffee
 - spec/fixtures/example.vue
 - spec/fixtures/example.handlebars
+- spec/fixtures/example.coffee