i18n-js 3.0.0.rc14 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a07ab318e610dfc7102d3d88015d8a55c42a76
-  data.tar.gz: 21fa8daa428b711f6d592c3b14bad7183e5af2f8
+  metadata.gz: 353417f345acd62bc99d23f7a5fec4009cc0ee3e
+  data.tar.gz: f06f7d88940146630ad37d71dc64d0ed7e746a75
 SHA512:
-  metadata.gz: cef3f6f68e7ca327e96902093069c47df6897074d35db121700076e3e7137d1ae68a9222e76ded1bea5e8d3145597cc0f37c9651d12a3b62ccbf766ce8374186
-  data.tar.gz: 6940d5acc297f6482cb74caa56f64c85b2be20065a069fd26267956ee157ce139b2f92b425c9e2e55ce983c285bd66dcdae861454bc4371aa4e478687613da4d
+  metadata.gz: 40cb6d125502a38e0a9e87bb57fb57f3a4913ad6647a0431bd9c81cfa40b60b37b77562bec24c93c0a3b40687be33163107c63e9af7abc7a2d35a323dfc8fcee
+  data.tar.gz: a6503dbaecb63aa9638f348e28625df2854399dd5c4cacacc776a13f2fdfd88aef8ca21f0aed3d6b6e1cb56571c83d8ca270ba6f949c4b14c452cdf177472fcd

data/.travis.yml

@@ -5,18 +5,20 @@ language: ruby
 cache:
   - bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.5
   # Since the Travis Build Env does not recognize `2.3` alias yet
   # We need to specify the version precisely
-  - 2.3.0
+  - 2.3.3
+  - 2.4.0
   - ruby-head
-before_install: # Need to install something extra to test JS
-- npm install jasmine-node@1.14.2
+before_install:
+# Need to install something extra to test JS
+- npm install
 gemfile:
   - gemfiles/i18n_0_6.gemfile
   - gemfiles/i18n_0_7.gemfile
+  - gemfiles/i18n_0_8.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -6,3 +6,7 @@ end
 appraise "i18n_0_7" do
   gem "i18n", "~> 0.7.0"
 end
+
+appraise "i18n_0_8" do
+  gem "i18n", "~> 0.8.0"
+end

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
 ## [Unreleased]
 
 ### Added
@@ -17,6 +18,57 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.0] - 2017-04-01
+
+This is a fake official release, the *real* one will be `3.0.0.rc17`  
+And today is not April Fools' Day  
+
+### Fixed
+
+- Ends the longest Release Candidate period among all ruby gems  
+  (v3.0.0.rc1 released at 2012-05-10)  
+
+
+## [3.0.0.rc16] - 2017-03-13
+
+### Changed
+
+- [Ruby] Drop support for Ruby < `2.1.0`
+
+### Fixed
+
+- [JS] Make defaultValue works on plural translation
+- [JS] Fix UMD pattern so the global/root won’t be undefined
+
+
+## [3.0.0.rc15] - 2016-12-07
+
+### Added
+
+- Nothing
+
+### Changed
+
+- [JS] Allow `defaultValue` to work in pluralization  
+  (PR: https://github.com/fnando/i18n-js/pull/433)  
+- [Ruby] Stop validating the fallback locales against `I18n.available_locales`  
+  This allows some locales to be used as fallback locales, but not to be generated in JS.  
+  (PR: https://github.com/fnando/i18n-js/pull/425)  
+- [Ruby] Remove dependency on gem `activesupport`  
+
+### Fixed
+
+- [JS] Stop converting numeric & boolean values into objects  
+  when merging objects with `I18n.extend`  
+  (PR: https://github.com/fnando/i18n-js/pull/420)  
+- [JS] Fix I18n pluralization fallback when tree is empty  
+  (PR: https://github.com/fnando/i18n-js/pull/435)  
+- [Ruby] Use old syntax to define lambda for compatibility with older Rubies  
+  (Issue: https://github.com/fnando/i18n-js/issues/419)  
+- [Ruby] Fix error raised in middleware cache cleaning in parallel test   
+  (Issue: https://github.com/fnando/i18n-js/issues/436)  
+
+
 ## [3.0.0.rc14] - 2016-08-29
 
 ### Changed
@@ -188,7 +240,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc14...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.0...HEAD
+[3.0.0]:      https://github.com/fnando/i18n-js/compare/v3.0.0.rc16...v3.0.0
+[3.0.0.rc16]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc15...v3.0.0.rc16
+[3.0.0.rc15]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc14...v3.0.0.rc15
 [3.0.0.rc14]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc13...v3.0.0.rc14
 [3.0.0.rc13]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc12...v3.0.0.rc13
 [3.0.0.rc12]: https://github.com/fnando/i18n-js/compare/v3.0.0.rc11...v3.0.0.rc12

data/README.md

@@ -1,7 +1,12 @@
 # I18n.js
 
+[![Gem Version](http://img.shields.io/gem/v/i18n-js.svg?style=flat-square)](http://badge.fury.io/rb/i18n-js)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](https://opensource.org/licenses/MIT)
+
 [![Build Status](http://img.shields.io/travis/fnando/i18n-js.svg?style=flat-square)](https://travis-ci.org/fnando/i18n-js)
+[![Dependency Status](http://img.shields.io/gemnasium/fnando/i18n-js.svg?style=flat-square)](https://gemnasium.com/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.
@@ -27,11 +32,7 @@ The `master` branch (including this README) is for latest `3.0.0.rc` instead of
 
 Add the gem to your Gemfile.
 ```ruby
-source "https://rubygems.org"
-gem "rails", "your_rails_version"
-# You only need this RC version constraint during the development of `3.0.0`, once stable version is released you can remove `rc11` suffix
-# `3.0.0.rc11` is the latest version of released RC version when this entry is changed, you might want to change it later
-gem "i18n-js", ">= 3.0.0.rc11"
+gem "i18n-js"
 ```
 
 #### Rails app with [Asset Pipeline](http://guides.rubyonrails.org/asset_pipeline.html)
@@ -603,6 +604,27 @@ The accepted formats are:
 
 Check out `spec/*.spec.js` files for more examples!
 
+#### Using pluralization and number formatting together
+Sometimes you might want to display translation with formatted number, like adding thousand delimiters to displayed number  
+You can do this:  
+```json
+{
+  "en": {
+    "point": {
+      "one": "1 Point",
+      "other": "{{formatted_number}} Points",
+      "zero": "0 Points"
+    }
+  }
+}
+```
+```js
+var point_in_number = 1000;
+I18n.t('point', { count: point_in_number, formatted_number: I18n.toNumber(point_in_number) });
+```
+Output should be `1,000 points`
+
+
 ## Using multiple exported translation files on a page.
 This method is useful for very large apps where a single contained translations.js file is not desirable. Examples would be a global translations file and a more specific route translation file.
 
@@ -742,6 +764,7 @@ I18n.translations["pt-BR"] = {
 }
 ```
 
+
 ## Known Issues
 
 ### Missing translations in precompiled file(s) after adding any new locale file
@@ -774,6 +797,16 @@ This means that new locale files will not be detected, and so they will not trig
 
 **Note:** See issue [#213](https://github.com/fnando/i18n-js/issues/213) for more details and discussion of this issue.
 
+### Translations in JS are not updated when Sprockets not loaded before this gem
+
+The "rails engine" declaration will try to detect existence of "sprockets" before adding the initailizer
+If sprockets is loaded after this gem, the preprocessor for 
+making JS translations file cache to depend on content of locale files will not be hooked.
+So ensure sprockets is loaded before this gem like moving entry of sprockets in Gemfile or adding "require" statements for sprockets somewhere.
+
+**Note:** See issue [#404](https://github.com/fnando/i18n-js/issues/404) for more details and discussion of this issue.
+
+
 ## Maintainer
 
 - Nando Vieira - <http://nandovieira.com.br>

data/app/assets/javascripts/i18n/filtered.js.erb

@@ -1,17 +1,22 @@
 <%# encoding: utf-8 %>
 
-;(function(factory) {
-  if (typeof module !== 'undefined' && module.exports) {
-    // Node/CommonJS
-    factory(require('i18n'));
-  } else if (typeof define === 'function' && define.amd) {
-    // AMD
-    define(['i18n'], factory);
+// Using UMD pattern from
+// https://github.com/umdjs/umd#regular-module
+// `returnExports.js` version
+;(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(["i18n"], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    factory(require("i18n"));
   } else {
-    // Browser globals
-    factory(this.I18n);
+    // Browser globals (root is window)
+    factory(root.I18n);
   }
-}(function(I18n) {
+}(this, function(I18n) {
   "use strict";
 
   I18n.translations = <%= I18n::JS.filtered_translations.to_json %>;

data/app/assets/javascripts/i18n.js

@@ -12,19 +12,23 @@
 // See tests for specific formatting like numbers and dates.
 //
 
-;(function(factory) {
-  if (typeof module !== 'undefined' && module.exports) {
-    // Node/CommonJS
-    module.exports = factory(this);
-  } else if (typeof define === 'function' && define.amd) {
-    // AMD
-    var global=this;
-    define('i18n', function(){ return factory(global);});
+// Using UMD pattern from
+// https://github.com/umdjs/umd#regular-module
+// `returnExports.js` version
+;(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define("i18n", function(){ return factory(root);});
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory(root);
   } else {
-    // Browser globals
-    this.I18n = factory(this);
+    // Browser globals (root is window)
+    root.I18n = factory(root);
   }
-}(function(global) {
+}(this, function(global) {
   "use strict";
 
   // Use previously defined object if exists in current scope
@@ -53,11 +57,23 @@
 
   // Is a given value an array?
   // Borrowed from Underscore.js
-  var isArray = function(obj) {
+  var isArray = function(val) {
     if (Array.isArray) {
-      return Array.isArray(obj);
+      return Array.isArray(val);
     };
-    return Object.prototype.toString.call(obj) === '[object Array]';
+    return Object.prototype.toString.call(val) === '[object Array]';
+  };
+
+  var isString = function(val) {
+    return typeof value == 'string' || Object.prototype.toString.call(val) === '[object String]';
+  };
+
+  var isNumber = function(val) {
+    return typeof val == 'number' || Object.prototype.toString.call(val) === '[object Number]';
+  };
+
+  var isBoolean = function(val) {
+    return val === true || val === false;
   };
 
   var decimalAdjust = function(type, value, exp) {
@@ -83,7 +99,7 @@
     var key, value;
     for (key in obj) if (obj.hasOwnProperty(key)) {
       value = obj[key];
-      if (Object.prototype.toString.call(value) === '[object String]') {
+      if (isString(value) || isNumber(value) || isBoolean(value)) {
         dest[key] = value;
       } else {
         if (dest[key] == null) dest[key] = {};
@@ -347,7 +363,6 @@
       if (!translations) {
         continue;
       }
-
       while (scopes.length) {
         translations = translations[scopes.shift()];
 
@@ -366,6 +381,75 @@
     }
   };
 
+  // lookup pluralization rule key into translations
+  I18n.pluralizationLookupWithoutFallback = function(count, locale, translations) {
+    var pluralizer = this.pluralization.get(locale)
+      , pluralizerKeys = pluralizer(count)
+      , pluralizerKey
+      , message;
+
+    if (isObject(translations)) {
+      while (pluralizerKeys.length) {
+        pluralizerKey = pluralizerKeys.shift();
+        if (this.isSet(translations[pluralizerKey])) {
+          message = translations[pluralizerKey];
+          break;
+        }
+      }
+    }
+
+    return message;
+  };
+
+  // Lookup dedicated to pluralization
+  I18n.pluralizationLookup = function(count, scope, options) {
+    options = this.prepareOptions(options);
+    var locales = this.locales.get(options.locale).slice()
+      , requestedLocale = locales[0]
+      , locale
+      , scopes
+      , translations
+      , message
+    ;
+    scope = this.getFullScope(scope, options);
+
+    while (locales.length) {
+      locale = locales.shift();
+      scopes = scope.split(this.defaultSeparator);
+      translations = this.translations[locale];
+
+      if (!translations) {
+        continue;
+      }
+
+      while (scopes.length) {
+        translations = translations[scopes.shift()];
+        if (!isObject(translations)) {
+          break;
+        }
+        if (scopes.length == 0) {
+          message = this.pluralizationLookupWithoutFallback(count, locale, translations);
+        }
+      }
+      if (message != null && message != undefined) {
+        break;
+      }
+    }
+
+    if (message == null || message == undefined) {
+      if (this.isSet(options.defaultValue)) {
+        if (isObject(options.defaultValue)) {
+          message = this.pluralizationLookupWithoutFallback(count, options.locale, options.defaultValue);
+        } else {
+          message = options.defaultValue;
+        }
+        translations = options.defaultValue;
+      }
+    }
+
+    return { message: message, translations: translations };
+  };
+
   // Rails changed the way the meridian is stored.
   // It started with `date.meridian` returning an array,
   // then it switched to `time.am` and `time.pm`.
@@ -445,6 +529,7 @@
   I18n.translate = function(scope, options) {
     options = this.prepareOptions(options);
 
+    var copiedOptions = this.prepareOptions(options);
     var translationOptions = this.createTranslationOptions(scope, options);
 
     var translation;
@@ -470,7 +555,7 @@
     if (typeof(translation) === "string") {
       translation = this.interpolate(translation, options);
     } else if (isObject(translation) && this.isSet(options.count)) {
-      translation = this.pluralize(options.count, translation, options);
+      translation = this.pluralize(options.count, scope, copiedOptions);
     }
 
     return translation;
@@ -516,32 +601,22 @@
   // which will be retrieved from `options`.
   I18n.pluralize = function(count, scope, options) {
     options = this.prepareOptions(options);
-    var translations, pluralizer, keys, key, message;
+    var pluralizer, message, result;
 
-    if (isObject(scope)) {
-      translations = scope;
-    } else {
-      translations = this.lookup(scope, options);
-    }
-
-    if (!translations) {
+    result = this.pluralizationLookup(count, scope, options);
+    if (result.translations == undefined || result.translations == null) {
       return this.missingTranslation(scope, options);
     }
 
-    pluralizer = this.pluralization.get(options.locale);
-    keys = pluralizer(count);
-
-    while (keys.length) {
-      key = keys.shift();
+    options.count = String(count);
 
-      if (this.isSet(translations[key])) {
-        message = translations[key];
-        break;
-      }
+    if (result.message != undefined && result.message != null) {
+      return this.interpolate(result.message, options);
+    }
+    else {
+      pluralizer = this.pluralization.get(options.locale);
+      return this.missingTranslation(scope + '.' + pluralizer(count)[0], options);
     }
-
-    options.count = String(count);
-    return this.interpolate(message, options);
   };
 
   // Return a missing translation message for the given parameters.

data/gemfiles/i18n_0_8.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "i18n", "~> 0.8.0"
+
+gemspec :path => "../"

data/i18n-js.gemspec

@@ -4,7 +4,7 @@ require "i18n/js/version"
 
 Gem::Specification.new do |s|
   s.name        = "i18n-js"
-  s.version     = I18n::JS::Version::STRING
+  s.version     = I18n::JS::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nando Vieira"]
   s.email       = ["fnando.vieira@gmail.com"]
@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "i18n", "~> 0.6", ">= 0.6.6"
+
   s.add_development_dependency "appraisal", "~> 2.0"
-  s.add_development_dependency "activesupport", ">= 3.2.22"
   s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", "~> 12.0"
   s.add_development_dependency "gem-release", ">= 0.7"
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.1.0"
 end

data/lib/i18n/js/engine.rb

@@ -32,8 +32,11 @@ module I18n
         #
         # For detail see Pull Request:
         # https://github.com/fnando/i18n-js/pull/371
+        #
+        # Not using -> for JRuby compatibility
+        # See https://github.com/fnando/i18n-js/issues/419
         initializer_args = case sprockets_version
-        when -> (v) { v2_only.match?("", v) || v3_plus.match?("", v) }
+        when lambda {|v| v2_only.match?("", v) || v3_plus.match?("", v) }
           { after: :engines_blank_point, before: :finisher_hook }
         else
           raise StandardError, "Sprockets version #{sprockets_version} is not supported"

data/lib/i18n/js/fallback_locales.rb

@@ -32,7 +32,6 @@ module I18n
                   end
 
         locales.map! { |locale| locale.to_sym }
-        ensure_valid_locales!(locales)
         locales
       end
 
@@ -66,16 +65,6 @@ module I18n
 
         fail ArgumentError, "If fallbacks is passed as Array, it must ony include Strings or Symbols. Given: #{fallbacks}"
       end
-
-      # Ensures that only valid locales are returned.
-      #
-      # @note
-      #   This ignores option `I18n.enforce_available_locales`
-      def ensure_valid_locales!(locales)
-        if locales.any? { |locale| !::I18n.available_locales.include?(locale) }
-          fail ArgumentError, "Valid locales: #{::I18n.available_locales.join(", ")} - Given Locales: #{locales.join(", ")}"
-        end
-      end
     end
   end
 end

data/lib/i18n/js/middleware.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module I18n
   module JS
     class Middleware
@@ -32,7 +34,13 @@ module I18n
       end
 
       def clear_cache
-        File.delete(cache_path) if File.exist?(cache_path)
+        # `File.delete` will raise error when "multiple worker"
+        # Are running at the same time, like in a parallel test
+        #
+        # `FileUtils.rm_f` is tested manually
+        #
+        # See https://github.com/fnando/i18n-js/issues/436
+        FileUtils.rm_f(cache_path) if File.exist?(cache_path)
       end
 
       def save_cache(new_cache)

data/lib/i18n/js/private/hash_with_symbol_keys.rb

@@ -0,0 +1,36 @@
+module I18n
+  module JS
+    # @api private
+    module Private
+      # Hash with string keys converted to symbol keys
+      # Used for handling values read on YAML
+      #
+      # @api private
+      class HashWithSymbolKeys < ::Hash
+        # An instance can only be created by passing in another hash
+        def initialize(hash)
+          raise TypeError unless hash.is_a?(::Hash)
+
+          hash.each_key do |key|
+            # Objects like `Integer` does not have `to_sym`
+            new_key = key.respond_to?(:to_sym) ? key.to_sym : key
+            self[new_key] = hash[key]
+          end
+
+          self.default = hash.default if hash.default
+          self.default_proc = hash.default_proc if hash.default_proc
+
+          freeze
+        end
+
+        # From AS Core extension
+        def slice(*keys)
+          hash = keys.each_with_object(Hash.new) do |k, hash|
+            hash[k] = self[k] if has_key?(k)
+          end
+          self.class.new(hash)
+        end
+      end
+    end
+  end
+end

data/lib/i18n/js/segment.rb

@@ -1,3 +1,5 @@
+require "i18n/js/private/hash_with_symbol_keys"
+
 module I18n
   module JS
 
@@ -10,7 +12,13 @@ module I18n
 
       def initialize(file, translations, options = {})
         @file         = file
-        @translations = translations
+        # `#slice` will be used
+        # But when activesupport is absent,
+        # the core extension from `i18n` gem will be used instead
+        # And it's causing errors (at least in test)
+        #
+        # So the input is wrapped by our class for better `#slice`
+        @translations = Private::HashWithSymbolKeys.new(translations)
         @namespace    = options[:namespace] || 'I18n'
         @pretty_print = !!options[:pretty_print]
         @js_extend    = options.key?(:js_extend) ? !!options[:js_extend] : true

data/lib/i18n/js/version.rb

@@ -1,10 +1,5 @@
 module I18n
   module JS
-    module Version
-      MAJOR = 3
-      MINOR = 0
-      PATCH = 0
-      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc14"
-    end
+    VERSION = "3.0.0"
   end
 end

data/lib/i18n/js.rb

@@ -1,7 +1,9 @@
 require "yaml"
-require "i18n"
 require "fileutils"
+require "i18n"
+
 require "i18n/js/utils"
+require "i18n/js/private/hash_with_symbol_keys"
 
 module I18n
   module JS
@@ -43,16 +45,23 @@ module I18n
     end
 
     def self.configured_segments
-      config[:translations].inject([]) do |segments, options|
-        file = options[:file]
-        only = options[:only] || '*'
-        exceptions = [options[:except] || []].flatten
+      config[:translations].inject([]) do |segments, options_hash|
+        options_hash_with_symbol_keys = Private::HashWithSymbolKeys.new(options_hash)
+        file = options_hash_with_symbol_keys[:file]
+        only = options_hash_with_symbol_keys[:only] || '*'
+        exceptions = [options_hash_with_symbol_keys[:except] || []].flatten
 
         result = segment_for_scope(only, exceptions)
 
         merge_with_fallbacks!(result) if fallbacks
 
-        segments << Segment.new(file, result, extract_segment_options(options)) unless result.empty?
+        unless result.empty?
+          segments << Segment.new(
+            file,
+            result,
+            extract_segment_options(options_hash_with_symbol_keys),
+          )
+        end
 
         segments
       end
@@ -91,11 +100,13 @@ module I18n
     # custom output directory
     def self.config
       if config?
-        erb = ERB.new(File.read(config_file_path)).result
-        (YAML.load(erb) || {}).with_indifferent_access
+        erb_result_from_yaml_file = ERB.new(File.read(config_file_path)).result
+        Private::HashWithSymbolKeys.new(
+          (::YAML.load(erb_result_from_yaml_file) || {})
+        )
       else
-        {}
-      end
+        Private::HashWithSymbolKeys.new({})
+      end.freeze
     end
 
     # Check if configuration file exist
@@ -151,7 +162,14 @@ module I18n
     def self.translations
       ::I18n.backend.instance_eval do
         init_translations unless initialized?
-        translations.slice(*::I18n.available_locales)
+        # When activesupport is absent,
+        # the core extension (`#slice`) from `i18n` gem will be used instead
+        # And it's causing errors (at least in test)
+        #
+        # So the input is wrapped by our class for better `#slice`
+        Private::HashWithSymbolKeys.new(translations).
+          slice(*::I18n.available_locales).
+          to_h
       end
     end
 
@@ -184,7 +202,10 @@ module I18n
     end
 
     def self.extract_segment_options(options)
-      segment_options = {js_extend: js_extend, sort_translation_keys: sort_translation_keys?}.with_indifferent_access
+      segment_options = Private::HashWithSymbolKeys.new({
+        js_extend: js_extend,
+        sort_translation_keys: sort_translation_keys?,
+      }).freeze
       segment_options.merge(options.slice(*Segment::OPTIONS))
     end
 

data/package.json

@@ -2,7 +2,7 @@
   "name": "i18n-js",
   "version": "0.0.0",
   "devDependencies": {
-    "jasmine-node": "*"
+    "jasmine-node": "^1.14.5"
   },
   "main": "app/assets/javascripts/i18n.js",
   "scripts": {

data/spec/js/extend.spec.js

@@ -58,5 +58,28 @@ describe("Extend", function () {
     }
 
     expect(I18n.extend(obj1, obj2)).toEqual(expected);
-  })
+  });
+
+  it("should correctly merge string, numberic and boolean values", function() {
+    var obj1 = {
+      test1: {
+        test2: false
+      }
+    }
+    , obj2 = {
+      test1: {
+        test3: 23,
+        test4: 'abc'
+      }
+    }
+    , expected = {
+      test1: {
+        test2: false
+        , test3: 23
+        , test4: 'abc'
+      }
+    }
+
+    expect(I18n.extend(obj1, obj2)).toEqual(expected);
+  });
 });

data/spec/js/interpolation.spec.js

@@ -46,6 +46,17 @@ describe("Interpolation", function(){
           expect(I18n.t(translation_key, {count: 5})).toEqual("Hello World!");
         });
       });
+      describe("and translation key does contain pluralization with null content", function() {
+        beforeEach(function() {
+          translation_key = "sent";
+        });
+
+        it("return empty string", function() {
+          expect(I18n.t(translation_key, {count: 0})).toEqual('[missing "en.sent.zero" translation]');
+          expect(I18n.t(translation_key, {count: 1})).toEqual('[missing "en.sent.one" translation]');
+          expect(I18n.t(translation_key, {count: 5})).toEqual('[missing "en.sent.other" translation]');
+        });
+      });
     });
 
     describe("when count is NOT passed in", function() {

data/spec/js/pluralization.spec.js

@@ -57,6 +57,16 @@ describe("Pluralization", function(){
     expect(I18n.p(0, "inbox")).toEqual("");
   });
 
+  it("returns missing message on null values", function(){
+    I18n.translations["en"]["sent"]["zero"]  = null;
+    I18n.translations["en"]["sent"]["one"]   = null;
+    I18n.translations["en"]["sent"]["other"] = null;
+
+    expect(I18n.p(0, "sent")).toEqual('[missing "en.sent.zero" translation]');
+    expect(I18n.p(1, "sent")).toEqual('[missing "en.sent.one" translation]');
+    expect(I18n.p(5, "sent")).toEqual('[missing "en.sent.other" translation]');
+  });
+
   it("pluralizes using custom rules", function() {
     I18n.locale = "custom";
 
@@ -103,4 +113,99 @@ describe("Pluralization", function(){
     expect(I18n.p(1, "inbox", options)).toEqual("You have 1 message");
     expect(I18n.p(5, "inbox", options)).toEqual("You have 5 messages");
   });
+
+  it("fallback to default locale when I18n.fallbacks is enabled", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["pt-BR"].inbox= {
+        one: null
+      , other: null
+      , zero: null
+    };
+    expect(I18n.p(0, "inbox", { count: 0 })).toEqual("You have no messages");
+    expect(I18n.p(1, "inbox", { count: 1 })).toEqual("You have 1 message");
+    expect(I18n.p(5, "inbox", { count: 5 })).toEqual("You have 5 messages");
+  });
+
+  it("fallback to default locale when I18n.fallbacks is enabled", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["pt-BR"].inbox= {
+        one: "Você tem uma mensagem"
+      , other: null
+      , zero: "Você não tem nenhuma mensagem"
+    };
+    expect(I18n.p(0, "inbox", { count: 0 })).toEqual("Você não tem nenhuma mensagem");
+    expect(I18n.p(1, "inbox", { count: 1 })).toEqual("Você tem uma mensagem");
+    expect(I18n.p(5, "inbox", { count: 5 })).toEqual('You have 5 messages');
+  });
+
+  it("fallback to 'other' scope", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["pt-BR"].inbox= {
+        one: "Você tem uma mensagem"
+      , other: "Você tem {{count}} mensagens"
+      , zero: null
+    }
+    expect(I18n.p(0, "inbox", { count: 0 })).toEqual("Você tem 0 mensagens");
+    expect(I18n.p(1, "inbox", { count: 1 })).toEqual("Você tem uma mensagem");
+    expect(I18n.p(5, "inbox", { count: 5 })).toEqual("Você tem 5 mensagens");
+  });
+
+  it("fallback to defaulValue when defaultValue is string", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["en"]["inbox"]["zero"]  = null;
+    I18n.translations["en"]["inbox"]["one"]   = null;
+    I18n.translations["en"]["inbox"]["other"] = null;
+    I18n.translations["pt-BR"].inbox= {
+        one: "Você tem uma mensagem"
+      , other: null
+      , zero: null
+    }
+    options = {
+      defaultValue: "default message"
+    };
+    expect(I18n.p(0, "inbox", options)).toEqual("default message");
+    expect(I18n.p(1, "inbox", options)).toEqual("Você tem uma mensagem");
+    expect(I18n.p(5, "inbox", options)).toEqual("default message");
+  });
+
+  it("fallback to defaulValue when defaultValue is an object", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["en"]["inbox"]["zero"]  = null;
+    I18n.translations["en"]["inbox"]["one"]   = null;
+    I18n.translations["en"]["inbox"]["other"] = null;
+    I18n.translations["pt-BR"].inbox= {
+        one: "Você tem uma mensagem"
+      , other: null
+      , zero: null
+    }
+    options = {
+      defaultValue: {
+        zero: "default message for no message"
+        , one: "default message for 1 message"
+        , other: "default message for {{count}} messages"
+      }
+    };
+    expect(I18n.p(0, "inbox", options)).toEqual("default message for no message");
+    expect(I18n.p(1, "inbox", options)).toEqual("Você tem uma mensagem");
+    expect(I18n.p(5, "inbox", options)).toEqual("default message for 5 messages");
+  });
+
+  it("fallback to default locale when I18n.fallbacks is enabled and no translations in sub scope", function() {
+    I18n.locale = "pt-BR";
+    I18n.fallbacks = true;
+    I18n.translations["en"]["mailbox"] = {
+      inbox: I18n.translations["en"].inbox
+    }
+
+    expect(I18n.translations["pt-BR"]["mailbox"]).toEqual(undefined);
+    expect(I18n.p(0, "mailbox.inbox", { count: 0 })).toEqual("You have no messages");
+    expect(I18n.p(1, "mailbox.inbox", { count: 1 })).toEqual("You have 1 message");
+    expect(I18n.p(5, "mailbox.inbox", { count: 5 })).toEqual("You have 5 messages");
+  });
+
 });

data/spec/js/translate.spec.js

@@ -152,6 +152,11 @@ describe("Translate", function(){
     expect(actual).toEqual("Warning!");
   });
 
+  it("uses default value for plural translation", function(){
+    actual = I18n.t("message", {defaultValue: { one: '%{count} message', other: '%{count} messages'}, count: 1});
+    expect(actual).toEqual("1 message");
+  });
+
   it("uses default value for unknown locale", function(){
     I18n.locale = "fr";
     actual = I18n.t("warning", {defaultValue: "Warning!"});

data/spec/js/translations.js

@@ -30,6 +30,12 @@ var DEBUG = false;
           , zero: "You have no messages"
         }
 
+      , sent: {
+            one: null
+          , other: null
+          , zero: null
+        }
+
       , unread: {
             one: "You have 1 new message ({{unread}} unread)"
           , other: "You have {{count}} new messages ({{unread}} unread)"

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

@@ -42,7 +42,7 @@ describe I18n::JS::FallbackLocales do
 
     context "when given a invalid locale as fallbacks" do
       let(:fallbacks) { :invalid_locale }
-      it { expect(fetching_locales).to raise_error(ArgumentError) }
+      it { should eq([:invalid_locale]) }
     end
 
     context "when given a invalid type as fallbacks" do
@@ -50,16 +50,6 @@ describe I18n::JS::FallbackLocales do
       it { expect(fetching_locales).to raise_error(ArgumentError) }
     end
 
-    context "when given an invalid Array as fallbacks" do
-      let(:fallbacks) { [:de, :en, :invalid_locale] }
-      it { expect(fetching_locales).to raise_error(ArgumentError) }
-    end
-
-    context "when given a invalid Hash as fallbacks" do
-      let(:fallbacks) do { :fr => [:de, :en, :invalid_locale] } end
-      it { expect(fetching_locales).to raise_error(ArgumentError) }
-    end
-
     # I18n::Backend::Fallbacks
     context "when I18n::Backend::Fallbacks is used" do
       let(:backend_with_fallbacks) { backend_class_with_fallbacks.new }

data/spec/ruby/i18n/js_spec.rb

@@ -405,7 +405,7 @@ EOS
     it "executes erb in config file" do
       set_config "erb.yml"
 
-      config_entry = I18n::JS.config["translations"].first
+      config_entry = I18n::JS.config[:translations].first
       config_entry["only"].should eq("*.date.formats")
     end
   end

data/spec/spec_helper.rb

@@ -1,14 +1,16 @@
 require "i18n"
 require "json"
 
-require "active_support/all"
 require "i18n/js"
 
 module Helpers
   # Set the configuration as the current one
   def set_config(path)
     config_file_path = File.dirname(__FILE__) + "/fixtures/#{path}"
-    I18n::JS.stub(:config? => true, :config_file_path => config_file_path)
+    allow(I18n::JS).to receive_messages(
+      :config? => true,
+      :config_file_path => config_file_path,
+    )
   end
 
   # Shortcut to I18n::JS.translations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc14
+  version: 3.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.22
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.22
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +106,7 @@ files:
 - app/assets/javascripts/i18n/translations.js
 - gemfiles/i18n_0_6.gemfile
 - gemfiles/i18n_0_7.gemfile
+- gemfiles/i18n_0_8.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
@@ -127,6 +114,7 @@ files:
 - lib/i18n/js/engine.rb
 - lib/i18n/js/fallback_locales.rb
 - lib/i18n/js/middleware.rb
+- lib/i18n/js/private/hash_with_symbol_keys.rb
 - lib/i18n/js/segment.rb
 - lib/i18n/js/utils.rb
 - lib/i18n/js/version.rb
@@ -200,15 +188,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -267,4 +255,3 @@ test_files:
 - spec/ruby/i18n/js/utils_spec.rb
 - spec/ruby/i18n/js_spec.rb
 - spec/spec_helper.rb
-has_rdoc: