i18n-js 3.8.3 → 3.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ecff24d70edad3fce1aafa3f96872f4d7a9fc7a0ff7fdcb5fe112ee5f79d410
-  data.tar.gz: ee563efe72631f54c5c36536803a3bf0c31fe1c98f996763a36921b14cf21c2a
+  metadata.gz: 228b00c6b2733537cc164228e6da21dfee1531b26186258861b2f710b7c80cae
+  data.tar.gz: 000d759f9753bb29900a7e09eca044f643cbdde5b0779eeb71683805ac780e14
 SHA512:
-  metadata.gz: 59ebc7bd38d3cd451631107c711d1a53001d3677a073327fdb66c043d4c5f37b6f7429b0fd2e7ff495201b575670bb4baabdaccb5e3cbebabc973f17f9db74bf
-  data.tar.gz: 9e841a4b949c5993894b3f74296ca7837594cc1d1a68552b1c840578694501ad3a163dca443fac0f9bd6fa2fc198aec3fbdf299da45f96a283fc1ce215d1bd72
+  metadata.gz: a180630b6968c7e38723f8d42828e3d9aa6c32d0250e2e28c4a56a644d6a943124bd7183908f5e05616237dc9ebefd69c21a1f0190f2995062745fb12f7b76d9
+  data.tar.gz: b301cb38ecf02cbf08b92798b0d7457fc00c1903f3fb27ca9c5d821c0c9fdf7f7f500b19b935a1eb3052a066b3057bc763635c4e0e8daf8f7448c500ffc90746

data/CHANGELOG.md

@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.8.4]
+
+### Fixed
+
+- [Ruby] Fix proc exported to JS/JSON file(s) causing issues like git merge conflicts  
+  (PR: https://github.com/fnando/i18n-js/pull/591)
+
+
 ## [3.8.3]
 
 ### Changed
@@ -501,7 +509,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.8.3...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.8.4...HEAD
+[3.8.4]:      https://github.com/fnando/i18n-js/compare/v3.8.3...v3.8.4
 [3.8.3]:      https://github.com/fnando/i18n-js/compare/v3.8.2...v3.8.3
 [3.8.2]:      https://github.com/fnando/i18n-js/compare/v3.8.1...v3.8.2
 [3.8.1]:      https://github.com/fnando/i18n-js/compare/v3.8.0...v3.8.1

data/lib/i18n/js/segment.rb

@@ -50,6 +50,7 @@ module I18n
       def write_file(_file = @file, _translations = @translations)
         FileUtils.mkdir_p File.dirname(_file)
         _translations = Utils.deep_key_sort(_translations) if @sort_translation_keys
+        _translations = Utils.deep_remove_procs(_translations)
         contents = formatter.format(_translations)
 
         return if File.exist?(_file) && File.read(_file) == contents

data/lib/i18n/js/utils.rb

@@ -73,6 +73,19 @@ module I18n
           seed[key] = value.is_a?(Hash) ? deep_key_sort(value) : value
         end
       end
+
+      def self.deep_remove_procs(hash)
+        # procs exist in `i18n.plural.rule` as pluralizer
+        # But having it in translation causes the exported JS/JSON changes every time
+        # https://github.com/ruby-i18n/i18n/blob/v1.8.7/lib/i18n/backend/pluralization.rb#L51
+        hash.keys.
+          each_with_object({}) do |key, seed|
+          value = hash[key]
+          next if value.is_a?(Proc)
+
+          seed[key] = value.is_a?(Hash) ? deep_remove_procs(value) : value
+        end
+      end
     end
   end
 end

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.8.3"
+    VERSION = "3.8.4"
   end
 end

data/package.json

@@ -8,7 +8,7 @@
     "i18n"
   ],
   "devDependencies": {
-    "jasmine-node": "^1.14.5"
+    "jasmine-node": "^3.0.0"
   },
   "main": "app/assets/javascripts/i18n.js",
   "scripts": {

data/spec/ruby/i18n/js/segment_spec.rb

@@ -257,5 +257,30 @@ MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] ||
         EOF
       end
     end
+
+    context "when translation entries contain procs" do
+      let(:translations) do
+        {
+          en: {
+            "test" => "Test",
+            "i18n" => {"plural" => {"rule" => proc {} }},
+          },
+          fr: {
+            "test" => "Test2",
+            "i18n" => {"plural" => {"rule" => proc {} }},
+          },
+        }
+      end
+
+      it "should write files without procs or their string representations" do
+        file_should_exist "segment.js"
+
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
+MyNamespace.translations || (MyNamespace.translations = {});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"i18n":{"plural":{}},"test":"Test"}'));
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), JSON.parse('{"i18n":{"plural":{}},"test":"Test2"}'));
+        EOF
+      end
+    end
   end
 end

data/spec/ruby/i18n/js/utils_spec.rb

@@ -103,4 +103,36 @@ describe I18n::JS::Utils do
       expect(described_class.scopes_match?([:a, :b, :c], [:a, '*', '*'])).to eql true
     end
   end
+
+  describe ".deep_remove_procs" do
+    let(:proc_obj) { proc {} }
+    let(:hash_with_proc) do
+      {
+        :a => :b,
+        :c => proc_obj,
+        :d => {
+          :e => proc_obj,
+          :f => :g,
+        }
+      }
+    end
+    subject { described_class.deep_remove_procs(hash_with_proc) }
+
+    it "performs a deep keys sort without changing the original hash" do
+      should eql({
+        :a => :b,
+        :d => {
+          :f => :g,
+        }
+      })
+      expect(hash_with_proc).to eql({
+        :a => :b,
+        :c => proc_obj,
+        :d => {
+          :e => proc_obj,
+          :f => :g,
+        }
+      })
+    end
+  end
 end

data/yarn.lock

@@ -13,9 +13,10 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-coffeescript@>=1.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.3.1.tgz#a25f69c251d25805c9842e57fc94bfc453ef6aed"
+coffeescript@~1.12.7:
+  version "1.12.7"
+  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
+  integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -50,9 +51,10 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-growl@^1.10.2:
+growl@^1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -65,24 +67,26 @@ inherits@2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-jasmine-growl-reporter@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jasmine-growl-reporter/-/jasmine-growl-reporter-1.0.1.tgz#375306cef1fbf6357ad7913ca0358aa2285d6d39"
+jasmine-growl-reporter@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jasmine-growl-reporter/-/jasmine-growl-reporter-2.0.0.tgz#4943a2481193d66a8a68ee2f38b6c360fb037859"
+  integrity sha512-RYwVfPaGgxQQSHDOt6jQ99/KAkFQ/Fiwg/AzBS+uO9A4UhGhxb7hwXaUUSU/Zs0MxBoFNqmIRC+7P4/+5O3lXg==
   dependencies:
-    growl "^1.10.2"
+    growl "^1.10.5"
 
-jasmine-node@^1.14.5:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/jasmine-node/-/jasmine-node-1.15.0.tgz#d5e9a92623c111f55e4b83ff2ab0407ddbc2a5b7"
+jasmine-node@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jasmine-node/-/jasmine-node-3.0.0.tgz#f12b6fdd24633402ec23e8ea6fef6ffbcb464f90"
+  integrity sha512-vUa5Q7bQYwHHqi6FlJYndiKqZp+d+c3MKe0QUMwwrC4JRmoRV3zkg0buxB/uQ6qLh0NO34TNstpAnvaZ6xGlAA==
   dependencies:
-    coffeescript ">=1.0.1"
+    coffeescript "~1.12.7"
     gaze "~1.1.2"
-    jasmine-growl-reporter "~1.0.1"
+    jasmine-growl-reporter "~2.0.0"
     jasmine-reporters "~1.0.0"
     mkdirp "~0.3.5"
-    requirejs ">=0.27.1"
-    underscore ">= 1.3.1"
-    walkdir ">= 0.0.1"
+    requirejs "~2.3.6"
+    underscore "~1.9.1"
+    walkdir "~0.0.12"
 
 jasmine-reporters@~1.0.0:
   version "1.0.2"
@@ -91,8 +95,8 @@ jasmine-reporters@~1.0.0:
     mkdirp "~0.3.5"
 
 lodash@~4.17.10:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
 
 minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
@@ -114,17 +118,20 @@ path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-requirejs@>=0.27.1:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
+requirejs@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
+  integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
-"underscore@>= 1.3.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
+underscore@~1.9.1:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"
+  integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==
 
-"walkdir@>= 0.0.1":
+walkdir@~0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.12.tgz#2f24f1ade64aab1e458591d4442c8868356e9281"
+  integrity sha512-HFhaD4mMWPzFSqhpyDG48KDdrjfn409YQuVW7ckZYhW4sE87mYtWifdB/+73RA7+p4s4K18n5Jfx1kHthE1gBw==
 
 wrappy@1:
   version "1.0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.4
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.24
 signing_key:
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.