i18n-js 3.0.0.rc5 → 3.0.0.rc6

data/spec/js/specs.html

@@ -12,7 +12,7 @@
         <script type="text/javascript" src="jasmine/jasmine-html.js"></script>
 
         <!-- load your javascript files -->
-        <script type="text/javascript" src="../../lib/i18n.js"></script>
+        <script type="text/javascript" src="../../app/assets/javascripts/i18n.js"></script>
         <script type="text/javascript">
           function require(path) {
             if (path.match(/i18n/)) {

data/spec/js/translate.spec.js

@@ -82,6 +82,44 @@ describe("Translate", function(){
     expect(I18n.t("hello")).toEqual("Hei Verden!");
   });
 
+  describe("when provided default valutes", function() {
+    it("uses scope provided in defaults if scope doesn't exist", function() {
+      actual = I18n.t("Hello!", {defaults: [{scope: "greetings.stranger"}]});
+      expect(actual).toEqual("Hello stranger!");
+    });
+
+    it("continues to fallback until a scope is found", function() {
+      var defaults = [{scope: "foo"}, {scope: "hello"}];
+
+      actual = I18n.t("foo", {defaults: defaults});
+      expect(actual).toEqual("Hello World!");
+    });
+
+    it("uses message if specified as a default", function() {
+      var defaults = [{message: "Hello all!"}];
+      actual = I18n.t("foo", {defaults: defaults});
+      expect(actual).toEqual("Hello all!");
+    });
+
+    it("uses the first message if no scopes are found", function() {
+      var defaults = [
+          {scope: "bar"}
+        , {message: "Hello all!"}
+        , {scope: "hello"}];
+      actual = I18n.t("foo", {defaults: defaults});
+      expect(actual).toEqual("Hello all!");
+    });
+
+    it("uses default value if no scope is found", function() {
+      var options = {
+          defaults: [{scope: "bar"}]
+        , defaultValue: "Hello all!"
+      };
+      actual = I18n.t("foo", options);
+      expect(actual).toEqual("Hello all!");
+    });
+  });
+
   it("uses default value for simple translation", function(){
     actual = I18n.t("warning", {defaultValue: "Warning!"});
     expect(actual).toEqual("Warning!");
@@ -117,4 +155,24 @@ describe("Translate", function(){
     expect(I18n.t("booleans.yes")).toEqual(true);
     expect(I18n.t("booleans.no")).toEqual(false);
   });
+
+  it("escapes $ when doing substitution (IE)", function(){
+    I18n.locale = "en";
+
+    expect(I18n.t("paid", {price: "$0.12"})).toEqual("You were paid $0.12");
+    expect(I18n.t("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
+  });
+
+  it("sets default scope", function(){
+    var options = {scope: "greetings"};
+    expect(I18n.t("stranger", options)).toEqual("Hello stranger!");
+  });
+
+  it("accepts the scope as an array", function(){
+    expect(I18n.t(["greetings", "stranger"])).toEqual("Hello stranger!");
+  });
+
+  it("accepts the scope as an array using a base scope", function(){
+    expect(I18n.t(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
+  });
 });

data/spec/js/translations.js

@@ -1,9 +1,12 @@
+var DEBUG = false;
+
 ;(function(){
   var generator = function() {
     var Translations = {};
 
     Translations.en = {
         hello: "Hello World!"
+      , paid: "You were paid %{price}"
 
       , booleans: {
           yes: true,
@@ -102,7 +105,15 @@
     };
 
     Translations["de"] = {
-      hello: "Hallo Welt!"
+        hello: "Hallo Welt!"
+      , date: {
+          day_names: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"]
+        }
+
+      , time: {
+            am: "de:AM"
+          , pm: "de:PM"
+        }
     };
 
     Translations["nb"] = {

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 = HashWithIndifferentAccess.new(YAML.load_file(File.dirname(__FILE__) + "/fixtures/#{path}"))
-    I18n::JS.stub(:config? => true, :config => config)
+    config_file = File.dirname(__FILE__) + "/fixtures/#{path}"
+    I18n::JS.stub(:config? => true, :config_file => config_file)
   end
 
   # Shortcut to I18n::JS.translations
@@ -37,5 +37,13 @@ RSpec.configure do |config|
   end
 
   config.include Helpers
+
+  # Remove deprecation warnings
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end
 

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc6
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        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: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - '>='
       - !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.
 email:
 - fnando.vieira@gmail.com
@@ -88,25 +116,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Appraisals
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/javascripts/i18n.js
+- app/assets/javascripts/i18n/filtered.js.erb
 - app/assets/javascripts/i18n/shims.js
-- app/assets/javascripts/i18n/translations.js.erb
+- app/assets/javascripts/i18n/translations.js
+- gemfiles/i18n_0_6.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
+- lib/i18n/js/dependencies.rb
 - lib/i18n/js/engine.rb
 - lib/i18n/js/middleware.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
+- lib/tasks/export.rake
 - package.json
 - spec/fixtures/custom_path.yml
 - spec/fixtures/default.yml
+- spec/fixtures/erb.yml
 - spec/fixtures/js_file_per_locale.yml
 - spec/fixtures/locales.yml
 - spec/fixtures/multiple_conditions.yml
+- spec/fixtures/multiple_conditions_per_locale.yml
 - spec/fixtures/multiple_files.yml
 - spec/fixtures/no_config.yml
 - spec/fixtures/no_scope.yml
@@ -150,8 +188,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
-test_files: []
+test_files:
+- spec/fixtures/custom_path.yml
+- spec/fixtures/default.yml
+- spec/fixtures/erb.yml
+- spec/fixtures/js_file_per_locale.yml
+- spec/fixtures/locales.yml
+- spec/fixtures/multiple_conditions.yml
+- spec/fixtures/multiple_conditions_per_locale.yml
+- spec/fixtures/multiple_files.yml
+- spec/fixtures/no_config.yml
+- spec/fixtures/no_scope.yml
+- spec/fixtures/simple_scope.yml
+- spec/i18n_js_spec.rb
+- spec/js/currency.spec.js
+- spec/js/current_locale.spec.js
+- spec/js/dates.spec.js
+- spec/js/defaults.spec.js
+- spec/js/interpolation.spec.js
+- spec/js/jasmine/MIT.LICENSE
+- spec/js/jasmine/jasmine-html.js
+- spec/js/jasmine/jasmine.css
+- spec/js/jasmine/jasmine.js
+- spec/js/jasmine/jasmine_favicon.png
+- spec/js/localization.spec.js
+- spec/js/numbers.spec.js
+- spec/js/placeholder.spec.js
+- spec/js/pluralization.spec.js
+- spec/js/prepare_options.spec.js
+- spec/js/specs.html
+- spec/js/translate.spec.js
+- spec/js/translations.js
+- spec/spec_helper.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,52 +0,0 @@
-PATH
-  remote: .
-  specs:
-    i18n-js (3.0.0.rc5)
-      i18n
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    awesome_print (1.1.0)
-    coderay (1.0.9)
-    diff-lcs (1.2.1)
-    i18n (0.6.4)
-    method_source (0.8.1)
-    multi_json (1.6.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-meta (0.0.5)
-      awesome_print
-      pry
-      pry-nav
-      pry-remote
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-remote (0.1.7)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (10.0.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    slop (3.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  i18n-js!
-  pry-meta
-  rake
-  rspec