i18n-js 3.0.0.rc14 → 3.0.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a07ab318e610dfc7102d3d88015d8a55c42a76
-  data.tar.gz: 21fa8daa428b711f6d592c3b14bad7183e5af2f8
+  metadata.gz: 3cb04a52e869d4da0331db74c65512cae5c19abc
+  data.tar.gz: 6522e5f84e73ca868c2054a2d67946c3d798a672
 SHA512:
-  metadata.gz: cef3f6f68e7ca327e96902093069c47df6897074d35db121700076e3e7137d1ae68a9222e76ded1bea5e8d3145597cc0f37c9651d12a3b62ccbf766ce8374186
-  data.tar.gz: 6940d5acc297f6482cb74caa56f64c85b2be20065a069fd26267956ee157ce139b2f92b425c9e2e55ce983c285bd66dcdae861454bc4371aa4e478687613da4d
+  metadata.gz: a500c069fd37898516080b518c313f8cb3cc7e0d3acc8cf9cd0a0f0b82f6f2c5f751ea777868d6de14f88fda66797f60e37246aedfbfc73942558ca648149dad
+  data.tar.gz: ce0941d24100dd6c414f4699de4db0fac4725c2f995129cc19cec35847e7693503570e5ca8262aa7cda7da93e8ac5712bdd94c82db58271fcbc5687c3d89128a

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,34 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [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 +217,8 @@ 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.rc15...HEAD
+[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

@@ -742,6 +742,7 @@ I18n.translations["pt-BR"] = {
 }
 ```
 
+
 ## Known Issues
 
 ### Missing translations in precompiled file(s) after adding any new locale file
@@ -774,6 +775,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.js

@@ -53,11 +53,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 +95,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 +359,6 @@
       if (!translations) {
         continue;
       }
-
       while (scopes.length) {
         translations = translations[scopes.shift()];
 
@@ -366,6 +377,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`.
@@ -470,7 +550,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, options);
     }
 
     return translation;
@@ -516,32 +596,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/i18n-js.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   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 "gem-release", ">= 0.7"

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/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

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

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/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.rc15
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-12-07 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
@@ -127,6 +113,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
@@ -208,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.