i18n-js 3.0.0.rc6 → 3.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f6e669f9c581fd9b82bf2141dc6829b1a32d21
-  data.tar.gz: 5203d02a3ce1445054f036930c7cca0bf2103809
+  metadata.gz: 4377851d9bebcdaf860e76c466587f7486255752
+  data.tar.gz: 9b52dbf3c12aca86c6de92073323dcb5dbeb02f0
 SHA512:
-  metadata.gz: 65ee86cbca52f2b511e9f39511308ae0640d0c1fb3099f685687eabe9d2cad4b4f28e08a389fd1b8c70bd3f71c5b475f4d1d8fa28ca07e4a4820fdfc8a496bfb
-  data.tar.gz: a0f657c665ddc48f6c49b25321dd3ed15fa66407a9baa24ee91386604f98bd1fbf1bc40fdab23460f2c4246e12f8a63512ea6dd12b172c5f256651264a118aaf
+  metadata.gz: d33c4c88cdbcbeda6233f65a7455d5cfec3b958f3b4aa74f04cbe0ecd4896f7fdd9ee7a853deaae44c932ae9d127146128df24a00f6a2956c31c4f73f8474738
+  data.tar.gz: f8333679e32ad823e9c5946734c031f761609dc30ac8a15b143b030d2d85e6c68dbba0073192a020da39a4aaa1057ae1cad4e60f47459c86dd03b3d3d34dcce2

data/.travis.yml

@@ -1,10 +1,19 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
+  - ruby-head
 script: "bundle exec rake spec"
 before_install: # Need to install npm to test js
 - sudo apt-get update
 - sudo apt-get install npm
 - npm install jasmine-node@1.14.2
+gemfile:
+  - gemfiles/i18n_0_6.gemfile
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.2
+    - rvm: ruby-head

data/Appraisals

@@ -1,4 +1,4 @@
 
 appraise "i18n-0-6" do
-  gem 'i18n', '0.6.9'
+  gem 'i18n', '0.6.11'
 end

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+
+## Unreleased
+
+### enhancements
+
+- The Rails Engine initializer is now named as `i18n-js.register_preprocessor` (https://github.com/fnando/i18n-js/pull/261)
+- Rename `I18n::JS.config_file` to `I18n::JS.config_file_path` and make it configurable  
+  Expected a `String`, default is still `config/i18n-js.yml`
+- When running `rake i18n:js:export`, the `i18n.js` will also be exported to `I18n::JS.export_i18n_js_dir_path` by default
+- Add `I18n::JS.export_i18n_js_dir_path`  
+  Expected a `String`, default is `public/javascripts`  
+  Set to `nil` will disable exporting `i18n.js`
+
+### bug fixes
+
+- Prevent toString() call on `undefined` when there is a missing interpolation value
+- Added support for Rails instances without Sprockets object (https://github.com/fnando/i18n-js/pull/241)
+- Fix `DEFAULT_OPTIONS` in `i18n.js` which contained an excessive comma
+- Fix `nil` values are exported into JS files which causes strange translation error
+- Fix pattern to replace all escaped $ in I18n.translate
+- Fix JS `I18n.lookup` modifies existing locales accidentally
+
 ## 3.0.0.rc6
 
 ### enhancements

data/README.md

@@ -32,37 +32,42 @@ If you're using the [asset pipeline](http://guides.rubyonrails.org/asset_pipelin
 then you must add the following line to your `app/assets/javascripts/application.js`.
 
 ```javascript
+//
+// This is optional (in case you have `I18n is not defined` error)
+// If you want to put this line, you must put it BEFORE `i18n/translations`
+//= require i18n
+//
+// This is a must
 //= require i18n/translations
 ```
 
 #### Rails app without [Asset Pipeline](http://guides.rubyonrails.org/asset_pipeline.html)
 
-If you're not using the asset pipeline, download the JavaScript file at
-<https://github.com/fnando/i18n-js/tree/master/lib/i18n.js> and load it on your page.
-Also load the `translations.js` file.
 
+First, put this in your `application.html` (layout file).
+Then get the JS files following the instructions below.
 ```erb
-<%= javascript_include_tag "i18n", "translations" %>
+<%# This is just an example, you can put `i18n.js` and `translations.js` anywhere you like %>
+<%# Unlike the Asset Pipeline example, you need to require both **in order** %>
+<%= javascript_include_tag "i18n" %>
+<%= javascript_include_tag "translations" %>
 ```
 
-This `translations.js` file can be automatically generated by the `I18n::JS::Middleware`.
-Just add it to your `config/application.rb` file.
-Don't add this middleware if you are using [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)!
+**There are two ways to get `translations.js`.**
 
-    config.middleware.use I18n::JS::Middleware
+1. This `translations.js` file can be automatically generated by the `I18n::JS::Middleware`.  
+  Just add `config.middleware.use I18n::JS::Middleware` to your `config/application.rb` file.  
+  Notice: Don't add this middleware if you are using [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)!
+2. If you can't or prefer not to generate this file,
+  you can move the middleware line to your `config/environments/development.rb` file
+  and run `rake i18n:js:export` before deploying.
+  This will export all translation files, including the custom scopes 
+  you may have defined on `config/i18n-js.yml`.  
+  If `I18n.available_locales` is set (e.g. in your Rails `config/application.rb` file) 
+  then only the specified locales will be exported.  
+  Current version of `i18n.js` will also be exported to avoid version mismatching by downloading.
 
-If you can't generate this file in production (Heroku anyone?), you can "precompile"
-it by running the following command. Move the middleware line to your
-`config/environments/development.rb` file and run the following command before
-deploying.
-
-    $ rake i18n:js:export
-
-This will export all translation files, including the custom scopes you may have
-defined on `config/i18n-js.yml`. If `I18n.available_locales` is set (e.g. in your
-Rails `config/application.rb` file) then only the specified locales will be exported.
-
-#### Export Configuration
+#### 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.
 
@@ -102,6 +107,18 @@ translations:
 <% end %>
 ```
 
+#### Export Configuration (For other things)
+- `I18n::JS.config_file_path`  
+  Expected Type: `String`  
+  Default: `config/i18n-js.yml`  
+  Behaviour: Try to read the config file from that location  
+- `I18n::JS.export_i18n_js_dir_path`  
+  Expected Type: `String`  
+  Default: `public/javascripts`  
+  Behaviour:  
+  - Any `String`: considered as a relative path for a folder to `Rails.root` and export `i18n.js` to that folder for `rake i18n:js:export`
+  - `nil`: Disable `i18n.js` exporting
+
 To find more examples on how to use the configuration file please refer to the tests.
 
 #### Vanilla JavaScript
@@ -213,7 +230,8 @@ The sample above expects the following translation:
 If you need special rules just define them for your language, for example Russian, just add a new pluralizer:
 
     I18n.pluralization["ru"] = function (count) {
-      return count % 10 == 1 && count % 100 != 11 ? "one" : [2, 3, 4].indexOf(count % 10) >= 0 && [12, 13, 14].indexOf(count % 100) < 0 ? "few" : count % 10 == 0 || [5, 6, 7, 8, 9].indexOf(count % 10) >= 0 || [11, 12, 13, 14].indexOf(count % 100) >= 0 ? "many" : "other";
+      var key = count % 10 == 1 && count % 100 != 11 ? "one" : [2, 3, 4].indexOf(count % 10) >= 0 && [12, 13, 14].indexOf(count % 100) < 0 ? "few" : count % 10 == 0 || [5, 6, 7, 8, 9].indexOf(count % 10) >= 0 || [11, 12, 13, 14].indexOf(count % 100) >= 0 ? "many" : "other";
+      return [key];
     };
 
 You can find all rules on <http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html>.
@@ -349,6 +367,32 @@ The only requirement is that you need to set the `translations` attribute like f
       message: "Uma mensagem especial para você"
     }
 
+## Known Issues
+
+### Missing translations in precompiled file(s) after adding any new locale file
+
+Due to the design of `sprockets`:
+- `depend_on` only takes file paths, not directory paths
+- registered `preprocessors` are only run when fingerprint of any asset file, including `.erb` files, is changed
+
+New locale files won't be picked up unless any existing locale file content is changed.  
+You can workaround it manually by running
+```bash
+$ rake assets:clobber
+```
+to clear the asset cache.  
+**Or**  
+Change something in existing locale file.  
+**Or**  
+Change `config.assets.version`  
+
+**Note:** `rake assets:clobber` will also remove all fingerprinted assets.  
+If you are precompiling assets on target machine(s),
+old assets might be removed and cannot be served in cached pages.
+
+Please see issue #213 for detail & related discussion.
+
+
 ## Maintainer
 
 - Nando Vieira - <http://nandovieira.com.br>

data/app/assets/javascripts/i18n.js

@@ -65,7 +65,7 @@
     defaultSeparator: ".",
     placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm,
     fallbacks: false,
-    translations: {},
+    translations: {}
   };
 
   I18n.reset = function() {
@@ -228,7 +228,7 @@
   I18n.lookup = function(scope, options) {
     options = this.prepareOptions(options);
 
-    var locales = this.locales.get(options.locale)
+    var locales = this.locales.get(options.locale).slice()
       , requestedLocale = locales[0]
       , locale
       , scopes
@@ -399,12 +399,15 @@
       return message;
     }
 
+    var value;
+
     while (matches.length) {
       placeholder = matches.shift();
       name = placeholder.replace(this.placeholder, "$1");
-      value = options[name].toString().replace(/\$/gm, "_#$#_");
 
-      if (!this.isSet(options[name])) {
+      if (this.isSet(options[name])) {
+        value = options[name].toString().replace(/\$/gm, "_#$#_");
+      } else {
         value = this.missingPlaceholder(placeholder, message);
       }
 
@@ -412,7 +415,7 @@
       message = message.replace(regex, value);
     }
 
-    return message.replace("_#$#_", "$");
+    return message.replace(/_#\$#_/g, "$");
   };
 
   // Pluralize the given scope using the `count` value.

data/gemfiles/i18n_0_6.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "i18n", "0.6.9"
+gem "i18n", "0.6.11"
 
 gemspec :path => "../"

data/i18n-js.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://rubygems.org/gems/i18n-js"
   s.summary     = "It's a small library to provide the Rails I18n translations on the Javascript."
   s.description = s.summary
+  s.license       = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -24,4 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "pry-meta"
   s.add_development_dependency "gem-release", ">= 0.7"
+
+  s.required_ruby_version = ">= 1.9.3"
 end

data/lib/i18n/js.rb

@@ -1,6 +1,8 @@
 require "i18n"
 require "fileutils"
 
+require "i18n/js/utils"
+
 module I18n
   module JS
     require "i18n/js/dependencies"
@@ -9,20 +11,23 @@ module I18n
       require "i18n/js/engine"
     end
 
-    # 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
-    end
+    DEFAULT_CONFIG_PATH = "config/i18n-js.yml"
+    DEFAULT_EXPORT_DIR_PATH = "public/javascripts"
 
     # The configuration file. This defaults to the `config/i18n-js.yml` file.
     #
-    def self.config_file
-      @config_file ||= "config/i18n-js.yml"
+    def self.config_file_path
+      @config_file_path ||= DEFAULT_CONFIG_PATH
+    end
+    def self.config_file_path=(new_path)
+      @config_file_path = new_path
     end
 
     # Export translations to JavaScript, considering settings
     # from configuration file
     def self.export
+      export_i18n_js
+
       translation_segments.each do |filename, translations|
         save(translations, filename)
       end
@@ -59,14 +64,10 @@ module I18n
       end
     end
 
-    def self.export_dir
-      "public/javascripts"
-    end
-
     def self.filtered_translations
       {}.tap do |result|
         translation_segments.each do |filename, translations|
-          deep_merge!(result, translations)
+          Utils.deep_merge!(result, translations)
         end
       end
     end
@@ -75,7 +76,7 @@ module I18n
       if config? && config[:translations]
         configured_segments
       else
-        {"#{export_dir}/translations.js" => translations}
+        {"#{DEFAULT_EXPORT_DIR_PATH}/translations.js" => translations}
       end
     end
 
@@ -83,7 +84,7 @@ module I18n
     # custom output directory
     def self.config
       if config?
-        erb = ERB.new(File.read(config_file)).result
+        erb = ERB.new(File.read(config_file_path)).result
         (YAML.load(erb) || {}).with_indifferent_access
       else
         {}
@@ -92,7 +93,7 @@ module I18n
 
     # Check if configuration file exist
     def self.config?
-      File.file? config_file
+      File.file? config_file_path
     end
 
     # Convert translations to JSON string and save file.
@@ -101,7 +102,7 @@ module I18n
 
       File.open(file, "w+") do |f|
         f << %(I18n.translations || (I18n.translations = {});\n)
-        translations.each do |locale, translations_for_locale|
+        Utils.strip_keys_with_nil_values(translations).each do |locale, translations_for_locale|
           f << %(I18n.translations["#{locale}"] = #{translations_for_locale.to_json};\n);
         end
       end
@@ -111,7 +112,7 @@ module I18n
       result = {}
 
       [scopes].flatten.each do |scope|
-        deep_merge! result, filter(translations, scope)
+        Utils.deep_merge! result, filter(translations, scope)
       end
 
       result
@@ -144,12 +145,27 @@ module I18n
       end
     end
 
-    def self.deep_merge(target, hash) # :nodoc:
-      target.merge(hash, &MERGER)
-    end
 
-    def self.deep_merge!(target, hash) # :nodoc:
-      target.merge!(hash, &MERGER)
+    ### Export i18n.js
+    begin
+      # Copy i18n.js
+      def self.export_i18n_js
+        return if export_i18n_js_dir_path.nil?
+
+        FileUtils.mkdir_p(export_i18n_js_dir_path)
+
+        i18n_js_path = File.expand_path('../../../app/assets/javascripts/i18n.js', __FILE__)
+        FileUtils.cp(i18n_js_path, export_i18n_js_dir_path)
+      end
+      def self.export_i18n_js_dir_path
+        return @export_i18n_js_dir_path if defined?(@export_i18n_js_dir_path)
+
+        @export_i18n_js_dir_path = DEFAULT_EXPORT_DIR_PATH
+      end
+      # Setting this to nil would disable i18n.js exporting
+      def self.export_i18n_js_dir_path=(new_path)
+        @export_i18n_js_dir_path = new_path
+      end
     end
   end
 end

data/lib/i18n/js/dependencies.rb

@@ -10,6 +10,10 @@ module I18n
           safe_gem_check("rails", "~> 4") && running_rails4?
         end
 
+        def sprockets_supports_register_preprocessor?
+          defined?(Sprockets) && Sprockets.respond_to?(:register_preprocessor)
+        end
+
         def rails?
           rails_available? && running_rails?
         end

data/lib/i18n/js/engine.rb

@@ -3,8 +3,9 @@ require "i18n/js"
 module I18n
   module JS
     class Engine < ::Rails::Engine
-      initializer :after => "sprockets.environment" do
+      initializer "i18n-js.register_preprocessor", :after => "sprockets.environment" do
         next unless JS::Dependencies.using_asset_pipeline?
+        next unless JS::Dependencies.sprockets_supports_register_preprocessor?
         next unless Rails.configuration.assets.compile
 
         Rails.application.assets.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|

data/lib/i18n/js/utils.rb

@@ -0,0 +1,26 @@
+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
+      end
+      HASH_NIL_VALUE_CLEANER_PROC = proc do |k, v|
+         v.kind_of?(Hash) ? (v.delete_if(&HASH_NIL_VALUE_CLEANER_PROC); false) : v.nil?
+      end
+
+
+      def self.strip_keys_with_nil_values(hash)
+        hash.dup.delete_if(&HASH_NIL_VALUE_CLEANER_PROC)
+      end
+
+      def self.deep_merge(target_hash, hash) # :nodoc:
+        target_hash.merge(hash, &MERGER)
+      end
+
+      def self.deep_merge!(target_hash, hash) # :nodoc:
+        target_hash.merge!(hash, &MERGER)
+      end
+    end
+  end
+end

data/lib/i18n/js/version.rb

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

data/spec/i18n_js_spec.rb

@@ -1,9 +1,25 @@
 require "spec_helper"
 
 describe I18n::JS do
+  describe '.config_file_path' do
+    let(:default_path) { I18n::JS::DEFAULT_CONFIG_PATH }
+    let(:new_path) { File.join("tmp", default_path) }
+
+    subject { described_class.config_file_path }
+
+    context "when it is not set" do
+      it { should eq default_path }
+    end
+    context "when it is set already" do
+      before { described_class.config_file_path = new_path }
+
+      it { should eq new_path }
+    end
+  end
+
   context "exporting" do
     before do
-      I18n::JS.stub :export_dir => temp_path
+      stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
     end
 
     it "exports messages to default path when configuration file doesn't exist" do
@@ -65,6 +81,12 @@ describe I18n::JS do
         result["tmp/i18n-js/bits.#{lang}.js"][lang.to_sym].keys.sort.should eql([:date, :number])
       end
     end
+
+    it "calls .export_i18n_js" do
+      allow(described_class).to receive(:export_i18n_js)
+      I18n::JS.export
+      expect(described_class).to have_received(:export_i18n_js).once
+    end
   end
 
   context "filters" do
@@ -133,7 +155,7 @@ describe I18n::JS do
 
   context "general" do
     it "sets export directory" do
-      I18n::JS.export_dir.should eql("public/javascripts")
+      I18n::JS::DEFAULT_EXPORT_DIR_PATH.should eql("public/javascripts")
     end
 
     it "sets empty hash as configuration when no file is found" do
@@ -149,19 +171,148 @@ describe I18n::JS do
     end
   end
 
+
+  describe "i18n.js exporting" do
+    describe ".export_i18n_js" do
+      before do
+        allow(FileUtils).to receive(:mkdir_p).and_call_original
+        allow(FileUtils).to receive(:cp).and_call_original
+
+        described_class.stub(:export_i18n_js_dir_path).and_return(export_i18n_js_dir_path)
+        I18n::JS.export_i18n_js
+      end
+
+      context 'when .export_i18n_js_dir_path returns something' do
+        let(:export_i18n_js_dir_path) { temp_path }
+
+        it "does create the folder before copying" do
+          expect(FileUtils).to have_received(:mkdir_p).with(export_i18n_js_dir_path).once
+        end
+        it "does copy the file with FileUtils.cp" do
+          expect(FileUtils).to have_received(:cp).once
+        end
+        it "exports the file" do
+          File.should be_file(File.join(I18n::JS.export_i18n_js_dir_path, "i18n.js"))
+        end
+      end
+
+      context 'when .export_i18n_js_dir_path is set to nil' do
+        let(:export_i18n_js_dir_path) { nil }
+
+        it "does NOT create the folder before copying" do
+          expect(FileUtils).to_not have_received(:mkdir_p)
+        end
+        it "does NOT copy the file with FileUtils.cp" do
+          expect(FileUtils).to_not have_received(:cp)
+        end
+      end
+    end
+
+
+    describe '.export_i18n_js_dir_path' do
+      let(:default_path) { I18n::JS::DEFAULT_EXPORT_DIR_PATH }
+      let(:new_path) { File.join("tmp", default_path) }
+      before { described_class.send(:remove_instance_variable, :@export_i18n_js_dir_path) }
+
+      subject { described_class.export_i18n_js_dir_path }
+
+      context "when it is not set" do
+        it { should eq default_path }
+      end
+      context "when it is set to another path already" do
+        before { described_class.export_i18n_js_dir_path = new_path }
+
+        it { should eq new_path }
+      end
+      context "when it is set to nil already" do
+        before { described_class.export_i18n_js_dir_path = nil }
+
+        it { should be_nil }
+      end
+    end
+  end
+end
+
+describe I18n::JS::Dependencies, ".sprockets_supports_register_preprocessor?" do
+
+  subject { described_class.sprockets_supports_register_preprocessor? }
+
+  context 'when Sprockets is available to register preprocessors' do
+    let!(:sprockets_double) do
+      class_double('Sprockets').as_stubbed_const(register_processor: true).tap do |double|
+        allow(double).to receive(:respond_to?).with(:register_preprocessor).and_return(true)
+      end
+    end
+
+    it { is_expected.to be_truthy }
+    it 'calls respond_to? with register_preprocessor on Sprockets' do
+      expect(sprockets_double).to receive(:respond_to?).with(:register_preprocessor).and_return(true)
+      subject
+    end
+  end
+
+  context 'when Sprockets is NOT available to register preprocessors' do
+    let!(:sprockets_double) do
+      class_double('Sprockets').as_stubbed_const(register_processor: true).tap do |double|
+        allow(double).to receive(:respond_to?).with(:register_preprocessor).and_return(false)
+      end
+    end
+
+    it { is_expected.to be_falsy }
+    it 'calls respond_to? with register_preprocessor on Sprockets' do
+      expect(sprockets_double).to receive(:respond_to?).with(:register_preprocessor).and_return(false)
+      subject
+    end
+  end
+
+  context 'when Sprockets is missing' do
+    before do
+      hide_const('Sprockets')
+      expect { Sprockets }.to raise_error(NameError)
+    end
+
+    it { is_expected.to be_falsy }
+  end
+
+end
+
+describe I18n::JS::Utils do
+
+  describe ".strip_keys_with_nil_values" do
+    subject { described_class.strip_keys_with_nil_values(input_hash) }
+
+    context 'when input_hash does NOT contain nil value' do
+      let(:input_hash) { {a: 1, b: { c: 2 }} }
+      let(:expected_hash) { input_hash }
+
+      it 'returns the original input' do
+        is_expected.to eq expected_hash
+      end
+    end
+    context 'when input_hash does contain nil value' do
+      let(:input_hash) { {a: 1, b: { c: 2, d: nil }, e: { f: nil }} }
+      let(:expected_hash) { {a: 1, b: { c: 2 }, e: {}} }
+
+      it 'returns the original input with nil values removed' do
+        is_expected.to eq expected_hash
+      end
+    end
+  end
+
   context "hash merging" do
     it "performs a deep merge" do
       target = {:a => {:b => 1}}
-      result = I18n::JS.deep_merge(target, {:a => {:c => 2}})
+      result = described_class.deep_merge(target, {:a => {:c => 2}})
 
       result[:a].should eql({:b => 1, :c => 2})
     end
 
     it "performs a banged deep merge" do
       target = {:a => {:b => 1}}
-      I18n::JS.deep_merge!(target, {:a => {:c => 2}})
+      described_class.deep_merge!(target, {:a => {:c => 2}})
 
       target[:a].should eql({:b => 1, :c => 2})
     end
   end
+
 end

data/spec/js/interpolation.spec.js

@@ -25,4 +25,9 @@ describe("Interpolation", function(){
     expect(I18n.t("inbox", {count: 1})).toEqual("You have 1 message");
     expect(I18n.t("inbox", {count: 5})).toEqual("You have 5 messages");
   });
+
+  it("outputs missing placeholder message if interpolation value is missing", function(){
+    actual = I18n.t("greetings.name");
+    expect(actual).toEqual("Hello [missing {{name}} value]!");
+  })
 });

data/spec/js/specs.html

@@ -36,6 +36,7 @@
         <script type="text/javascript" src="pluralization.spec.js"></script>
         <script type="text/javascript" src="prepare_options.spec.js"></script>
         <script type="text/javascript" src="translate.spec.js"></script>
+        <script type="text/javascript" src="utility_functions.spec.js"></script>
 
         <!-- run specs -->
         <script type="text/javascript">

data/spec/js/translate.spec.js

@@ -163,6 +163,15 @@ describe("Translate", function(){
     expect(I18n.t("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
   });
 
+  it("replaces all occurrences of escaped $", function(){
+    I18n.locale = "en";
+
+    expect(I18n.t("paid_with_vat", {
+      price: "$0.12",
+      vat: "$0.02"}
+    )).toEqual("You were paid $0.12 (incl. VAT $0.02)");
+  });
+
   it("sets default scope", function(){
     var options = {scope: "greetings"};
     expect(I18n.t("stranger", options)).toEqual("Hello stranger!");

data/spec/js/translations.js

@@ -8,6 +8,8 @@ var DEBUG = false;
         hello: "Hello World!"
       , paid: "You were paid %{price}"
 
+      , paid_with_vat: "You were paid %{price} (incl. VAT %{vat})"
+
       , booleans: {
           yes: true,
           no: false

data/spec/js/utility_functions.spec.js

@@ -0,0 +1,20 @@
+var I18n = require("../../app/assets/javascripts/i18n");
+
+describe("Utility Functions", function(){
+  beforeEach(function(){
+    I18n.reset();
+  });
+
+  describe("I18n.lookup", function() {
+    it("does not change locale on failed lookup", function(){
+      var fallback_locales = ['fallback1', 'fallback2'];
+
+      I18n.locales['lang'] = fallback_locales.slice();
+      expect(I18n.locales.lang).toEqual(fallback_locales);
+
+      I18n.lookup('anything', {locale: 'lang'})
+      expect(I18n.locales.lang).toEqual(fallback_locales);
+    });
+
+  })
+});

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ require "i18n/js"
 module Helpers
   # Set the configuration as the current one
   def set_config(path)
-    config_file = File.dirname(__FILE__) + "/fixtures/#{path}"
-    I18n::JS.stub(:config? => true, :config_file => config_file)
+    config_file_path = File.dirname(__FILE__) + "/fixtures/#{path}"
+    I18n::JS.stub(:config? => true, :config_file_path => config_file_path)
   end
 
   # Shortcut to I18n::JS.translations
@@ -17,7 +17,7 @@ module Helpers
   end
 
   def file_should_exist(name)
-    file_path = File.join(I18n::JS.export_dir, name)
+    file_path = File.join(I18n::JS::DEFAULT_EXPORT_DIR_PATH, name)
     File.should be_file(file_path)
   end
 

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc6
+  version: 3.0.0.rc7
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 description: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -133,6 +133,7 @@ files:
 - lib/i18n/js/dependencies.rb
 - lib/i18n/js/engine.rb
 - lib/i18n/js/middleware.rb
+- lib/i18n/js/utils.rb
 - lib/i18n/js/version.rb
 - lib/rails/generators/i18n/js/config/config_generator.rb
 - lib/rails/generators/i18n/js/config/templates/i18n-js.yml
@@ -168,9 +169,11 @@ files:
 - spec/js/specs.html
 - spec/js/translate.spec.js
 - spec/js/translations.js
+- spec/js/utility_functions.spec.js
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/i18n-js
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -178,12 +181,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -223,5 +226,6 @@ test_files:
 - spec/js/specs.html
 - spec/js/translate.spec.js
 - spec/js/translations.js
+- spec/js/utility_functions.spec.js
 - spec/spec_helper.rb
 has_rdoc: