i18n-js-pika 3.0.0.rc6 → 3.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2f195e7dd4f8ea76f020bb8046f68e557808c8
-  data.tar.gz: c3c36611fd1fc1d428bab5f849e68588cbe6de6d
+  metadata.gz: bebb8d813e23d8ce58aa317620c27f9e2764cf71
+  data.tar.gz: 9a737f462dd976bbc7599d94c3c6aa9349244ae6
 SHA512:
-  metadata.gz: cc97a5c29ca24a1e3acfa8b681f0f52f6407cb8ceb3e90e434d25b89877726ff49815f7fb7f3a7ca2f0793e5e1bbd180d1e7d62f0cfd6182b706c48e2f64404d
-  data.tar.gz: 25086f2c7ca230f0c7a77a37efd39c384a782595ca87c9af276f9031c83a6c181ecdd87ed58e6fae82223f63b156b877f1d43641837a2ed93d22bcb740e874a0
+  metadata.gz: 7b37f5722ba6e411ca52921a265f979444441448d9e0751eaf8cf0f1d5555c9ba6029351d2db9cf567bc48964e74fb06f7a880c158e9f715b76e7108f214bd9c
+  data.tar.gz: f39fb56b11a64ea6c8e7df203fcc6ac00bbd4dfefb94d7b796db7d8d5f2515db83f4215f3c0efb2ca54290af337d79e222e32b827bde1d21520adf6e15e232ae

data/.gitignore

@@ -1,2 +1,6 @@
+doc
+coverage
 pkg
-node_modules
+spec/tmp
+.DS_Store
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+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
+

data/README.md

@@ -11,6 +11,10 @@ Features:
 - Asset pipeline support
 - Lots more! :)
 
+[![Build Status](https://travis-ci.org/PikachuEXE/i18n-js.png?branch=master)](https://travis-ci.org/PikachuEXE/i18n-js)
+[![Gem Version](https://badge.fury.io/rb/i18n-js-pika.png)](http://badge.fury.io/rb/i18n-js-pika)
+[![Dependency Status](https://gemnasium.com/PikachuEXE/i18n-js.png)](https://gemnasium.com/PikachuEXE/i18n-js)
+
 ## Usage
 
 ### Installation
@@ -18,10 +22,9 @@ Features:
 #### Rails app
 
 Add the gem to your Gemfile.
-
-    source :rubygems
-    gem "rails", "3.2.3"
-    gem "i18n-js"
+```ruby
+gem "i18n-js-pika", require: "i18n-js"
+```
 
 If you're using the [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html),
 then you must add the following line to your `app/assets/javascripts/application.js`.

data/Rakefile

@@ -11,3 +11,7 @@ end
 
 desc "Run all specs"
 task :spec => ["spec:ruby", "spec:js"]
+
+task :default do
+  Rake::Task[:spec].invoke
+end

data/app/assets/javascripts/i18n.js

@@ -60,28 +60,60 @@
   // Set meridian.
   var MERIDIAN = ["AM", "PM"];
 
+  // Other default options
+  var DEFAULT_OPTIONS = {
+    defaultLocale: "en",
+    locale: "en",
+    defaultSeparator: ".",
+    placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm,
+    fallbacks: false,
+    translations: {},
+  }
+
   I18n.reset = function() {
     // Set default locale. This locale will be used when fallback is enabled and
     // the translation doesn't exist in a particular locale.
-    this.defaultLocale = "en";
+    this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
 
     // Set the current locale to `en`.
-    this.locale = "en";
+    this.locale = DEFAULT_OPTIONS.locale;
 
     // Set the translation key separator.
-    this.defaultSeparator = ".";
+    this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
 
     // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
-    this.placeholder = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm;
+    this.placeholder = DEFAULT_OPTIONS.placeholder;
 
     // Set if engine should fallback to the default locale when a translation
     // is missing.
-    this.fallbacks = false;
+    this.fallbacks = DEFAULT_OPTIONS.fallbacks;
 
     // Set the default translation object.
-    this.translations = {};
+    this.translations = DEFAULT_OPTIONS.translations;
   };
 
+  // Much like `reset`, but only assign options if not already assigned
+  I18n.initializeOptions = function() {
+    if (typeof(this.defaultLocale) === "undefined" && this.defaultLocale !== null)
+      this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
+
+    if (typeof(this.locale) === "undefined" && this.locale !== null)
+      this.locale = DEFAULT_OPTIONS.locale;
+
+    if (typeof(this.defaultSeparator) === "undefined" && this.defaultSeparator !== null)
+      this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
+
+    if (typeof(this.placeholder) === "undefined" && this.placeholder !== null)
+      this.placeholder = DEFAULT_OPTIONS.placeholder;
+
+    if (typeof(this.fallbacks) === "undefined" && this.fallbacks !== null)
+      this.fallbacks = DEFAULT_OPTIONS.fallbacks;
+
+    if (typeof(this.translations) === "undefined" && this.translations !== null)
+      this.translations = DEFAULT_OPTIONS.translations;
+  }
+  I18n.initializeOptions();
+
   // Return a list of all locales that must be tried before returning the
   // missing translation message. By default, this will consider the inline option,
   // current locale and fallback locale.
@@ -181,10 +213,6 @@
     }
   };
 
-  // Reset all default attributes. This is specially useful
-  // while running tests.
-  I18n.reset();
-
   // Return current locale. If no locale has been set, then
   // the current locale will be the default locale.
   I18n.currentLocale = function() {
@@ -687,4 +715,4 @@
   I18n.t = I18n.translate;
   I18n.l = I18n.localize;
   I18n.p = I18n.pluralize;
-})(typeof(exports) === "undefined" ? (this.I18n = {}) : exports);
+})(typeof(exports) === "undefined" ? (this.I18n || (this.I18n = {})) : exports);

data/i18n-js.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nando Vieira", "PikachuEXE"]
   s.email       = ["fnando.vieira@gmail.com", "pikachuexe@gmail.com"]
-  s.homepage    = "http://github.com/PikachuEXE/i18n-js-pika"
+  s.homepage    = "http://github.com/PikachuEXE/i18n-js"
   s.summary     = "Forked version of original i18n-js. It's a small library to provide the Rails I18n translations on the Javascript."
   s.description = "Forked version of original i18n-js. It contains some pull requests that are not pulled yet on the original repo. Switch back to the original one when it's ready."
 

data/lib/i18n/js/version.rb

@@ -5,7 +5,7 @@ module I18n
       MINOR = 0
       PATCH = 0
       # Set to nil for stable release
-      BUILD = 'rc6'.freeze
+      BUILD = 'rc7'.freeze
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end
   end

data/package.json

@@ -6,6 +6,6 @@
   },
 
   "scripts": {
-    "test": "./node_modules/.bin/jasmine-node spec/js"
+    "test": "jasmine-node spec/js"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js-pika
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc6
+  version: 3.0.0.rc7
 platform: ruby
 authors:
 - Nando Vieira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -92,9 +92,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/javascripts/i18n.js
@@ -138,7 +138,7 @@ files:
 - spec/js/translate.spec.js
 - spec/js/translations.js
 - spec/spec_helper.rb
-homepage: http://github.com/PikachuEXE/i18n-js-pika
+homepage: http://github.com/PikachuEXE/i18n-js
 licenses:
 - MIT
 metadata: {}

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