i18n-js 3.0.0.rc10 → 3.0.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b54325d787e4471fabea3b33981f0b4ada0e660
-  data.tar.gz: 94c1e7e0ef79bfb984f9725453c40aef5290d3e6
+  metadata.gz: 9a4b7236b1fa082ab83114e4015b4a4ba230c1f5
+  data.tar.gz: 8e55ab185ee081ea88b5452d1caedfc0f4feb44b
 SHA512:
-  metadata.gz: 63dedf3a5d8d7f144773e922ba113d5586c1eb608f5745608a363dd3b5604acd38863a4978bd1bce091bfc6b033ad85bf59915985b790d96beafa7681d739833
-  data.tar.gz: 30ee692d8f29ad98fc71014e119d41ae82490cddbd1a21a808cff54c97c25bf0c3abda5102555684c131a191e302eb93cd7fe98559dbc8aee2c8df9912d5fd79
+  metadata.gz: 0127486af42b8210f21513c91eadaf1481f639be02cb4197335619e11609d877c9ab7ce8f372818127c9dc04744e9251e2aef21a5d38ac82276b5dfb87684631
+  data.tar.gz: 9b3bd3240f25b722eb8e00332cbafc72b01f872c5ffb2e5f2236736ec4ff32026e5f317ef5dff20c30cafd8bd17f4b4a21a0e4577a7eba9cf95804e4e23c524a

data/CHANGELOG.md

@@ -8,6 +8,19 @@
 ### bug fixes
 
 
+
+## 3.0.0.rc11
+
+### breaking changes
+
+### enhancements
+
+### bug fixes
+
+- [Ruby] Handle fallback locale without any translation properly ([#338](https://github.com/fnando/i18n-js/pull/338))
+- [Ruby] Prevent translation entry with null value to override value in fallback locale(s), if enabled ([#334](https://github.com/fnando/i18n-js/pull/334))
+
+
 ## 3.0.0.rc10
 
 ### breaking changes

data/README.md

@@ -1,7 +1,8 @@
 # I18n.js
 
-[![Build Status](https://travis-ci.org/fnando/i18n-js.svg?branch=master)](https://travis-ci.org/fnando/i18n-js)
-[![Code Climate](https://codeclimate.com/github/fnando/i18n-js.png)](https://codeclimate.com/github/fnando/i18n-js)
+[![Build Status](http://img.shields.io/travis/fnando/i18n-js.svg?style=flat-square)](https://travis-ci.org/fnando/i18n-js)
+[![Code Climate](http://img.shields.io/codeclimate/github/fnando/i18n-js.svg?style=flat-square)](https://codeclimate.com/github/fnando/i18n-js)
+[![Gitter](https://img.shields.io/badge/gitter-join%20chat-1dce73.svg?style=flat-square)](https://gitter.im/fnando/i18n-js)
 
 It's a small library to provide the Rails I18n translations on the JavaScript.
 
@@ -73,7 +74,11 @@ Then get the JS files following the instructions below.
 
 #### Export Configuration (For translations)
 
-Exported translation files generated by `I18n::JS::Middleware` or `rake i18n:js:export` can be customized with config file `config/i18n-js.yml` (use `rails generate i18n:js:config` to create it). You can even get more files generated to different folders and with different translations to best suit your needs. But this does not affect anything if you use Asset Pipeline.
+Exported translation files generated by `I18n::JS::Middleware` or `rake i18n:js:export` can be customized with config file `config/i18n-js.yml`  
+(use `rails generate i18n:js:config` to create it).  
+You can even get more files generated to different folders and with different translations to best suit your needs.  
+The config file also affects developers using Asset Pipeline to require translations.  
+Except the option `file`, since all translations are required by adding `//= require i18n/translations`.
 
 Examples:
 ```yaml

data/i18n-js.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "i18n", "~> 0.6"
   s.add_development_dependency "appraisal", "~> 2.0"
-  s.add_development_dependency "activesupport", ">= 3"
+  s.add_development_dependency "activesupport", ">= 3.2.22"
   s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "gem-release", ">= 0.7"
 
   s.required_ruby_version = ">= 1.9.3"

data/lib/i18n/js.rb

@@ -65,7 +65,8 @@ module I18n
       I18n.available_locales.each do |locale|
         fallback_locales = FallbackLocales.new(fallbacks, locale)
         fallback_locales.each do |fallback_locale|
-          result[locale] = Utils.deep_merge(result[fallback_locale], result[locale] || {})
+          # `result[fallback_locale]` could be missing
+          result[locale] = Utils.deep_merge(result[fallback_locale] || {}, result[locale] || {})
         end
       end
     end

data/lib/i18n/js/utils.rb

@@ -2,8 +2,9 @@ module I18n
   module JS
     module Utils
       # deep_merge by Stefan Rusterholz, see <http://www.ruby-forum.com/topic/142809>.
-      MERGER = proc do |key, v1, v2|
-        Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2
+      # The last result is modified to treat `nil` as missing key
+      MERGER = proc do |_key, v1, v2|
+        Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : (v2.nil? ? v1 : v2)
       end
 
       HASH_NIL_VALUE_CLEANER_PROC = proc do |k, v|

data/lib/i18n/js/version.rb

@@ -4,7 +4,7 @@ module I18n
       MAJOR = 3
       MINOR = 0
       PATCH = 0
-      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc10"
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc11"
     end
   end
 end

data/spec/fixtures/js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml

@@ -0,0 +1,4 @@
+fallbacks: :pirate
+
+translations:
+- file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/locales.yml

@@ -36,9 +36,11 @@ en:
       title: "Edit"
   foo: "Foo"
   fallback_test: "Success"
+  null_test: "fallback for null"
 
 de:
   fallback_test: "Erfolg"
+  null_test: ~
 
 fr:
   date:

data/spec/i18n_js_spec.rb

@@ -259,28 +259,53 @@ EOS
   end
 
   context "fallbacks" do
-    subject do
+    subject(:translations) do
       I18n::JS.translation_segments.first.translations
     end
 
     it "exports without fallback when disabled" do
       set_config "js_file_per_locale_without_fallbacks.yml"
       subject[:fr][:fallback_test].should eql(nil)
+      subject[:fr][:null_test].should eql(nil)
+      subject[:de][:null_test].should eql(nil)
     end
 
     it "exports with default_locale as fallback when enabled" do
       set_config "js_file_per_locale_with_fallbacks_enabled.yml"
       subject[:fr][:fallback_test].should eql("Success")
+      subject[:fr][:null_test].should eql("fallback for null")
+      subject[:de][:null_test].should eql("fallback for null")
     end
 
     it "exports with default_locale as fallback when enabled with :default_locale" do
       set_config "js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml"
       subject[:fr][:fallback_test].should eql("Success")
+      subject[:fr][:null_test].should eql("fallback for null")
+      subject[:de][:null_test].should eql("fallback for null")
     end
 
     it "exports with given locale as fallback" do
       set_config "js_file_per_locale_with_fallbacks_as_locale.yml"
       subject[:fr][:fallback_test].should eql("Erfolg")
+      subject[:fr][:null_test].should eql(nil)
+      subject[:de][:null_test].should eql(nil)
+    end
+
+    context "when given locale is in `I18n.available_locales` but its translation is missing" do
+      subject { translations[:fr][:fallback_test] }
+
+      let(:new_locale) { :pirate }
+      let!(:old_available_locales) { I18n.config.available_locales }
+      let!(:new_available_locales) { I18n.config.available_locales + [new_locale] }
+      before do
+        I18n.config.available_locales = new_available_locales
+        set_config "js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml"
+      end
+      after do
+        I18n.config.available_locales = old_available_locales
+      end
+
+      it {should eql(nil)}
     end
 
     context "with I18n::Fallbacks enabled" do
@@ -556,7 +581,7 @@ EOS
         it "exports with the keys sorted" do
           expect(subject).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["en"] = {"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}},"format":{"delimiter":",","precision":3,"separator":"."}},"time":{"am":"am","formats":{"default":"%a, %d %b %Y %H:%M:%S %z","long":"%B %d, %Y %H:%M","short":"%d %b %H:%M"},"pm":"pm"}};
+I18n.translations["en"] = {"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","null_test":"fallback for null","number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}},"format":{"delimiter":",","precision":3,"separator":"."}},"time":{"am":"am","formats":{"default":"%a, %d %b %Y %H:%M:%S %z","long":"%B %d, %Y %H:%M","short":"%d %b %H:%M"},"pm":"pm"}};
 EOS
 )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc10
+  version: 3.0.0.rc11
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.2.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.2.22
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_hash.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_enabled.yml
 - spec/fixtures/js_file_per_locale_without_fallbacks.yml
 - spec/fixtures/js_file_with_namespace_and_pretty_print.yml
@@ -212,6 +213,7 @@ test_files:
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_hash.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_as_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml
 - spec/fixtures/js_file_per_locale_with_fallbacks_enabled.yml
 - spec/fixtures/js_file_per_locale_without_fallbacks.yml
 - spec/fixtures/js_file_with_namespace_and_pretty_print.yml