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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bebb8d813e23d8ce58aa317620c27f9e2764cf71
-  data.tar.gz: 9a737f462dd976bbc7599d94c3c6aa9349244ae6
+  metadata.gz: b21ed07eefec40e50743b457da773fb86f45d3ec
+  data.tar.gz: 3db4c9f1b5a99d9e4c10426105cb5743e236a136
 SHA512:
-  metadata.gz: 7b37f5722ba6e411ca52921a265f979444441448d9e0751eaf8cf0f1d5555c9ba6029351d2db9cf567bc48964e74fb06f7a880c158e9f715b76e7108f214bd9c
-  data.tar.gz: f39fb56b11a64ea6c8e7df203fcc6ac00bbd4dfefb94d7b796db7d8d5f2515db83f4215f3c0efb2ca54290af337d79e222e32b827bde1d21520adf6e15e232ae
+  metadata.gz: d31f4436c68595dfe7547499b7761fbdb83fb4a8cf15a6eca112c77ced270b798b9780b47dd3f98e26110e1cdf31e8492b739f913ccca9f118167bedbfd18bc5
+  data.tar.gz: dab5552f33f48382b205849dd7d35db26f385ef5be6d1b6b8dc16062b8e0fba8a062f278847709709e1fd74824ea6fed3ae61c8c1b6be31af63c630afc0f3123

data/CHANGELOG.md

@@ -3,6 +3,16 @@ Changelog
 
 Major changes to I18n.js for each release. Please see the Git log for complete list of changes.
 
+3.0.0.rc8 (2014-01-09)
+-------------------
+
+* Fix local reload regression in development
+
+3.0.0.rc7 (2013-12-23)
+-------------------
+
+* If loaded in browser (which is not in jasmine spec) and I18n object is defined and has some options set (e.g. locale, defaultLocale), they will be kept
+
 3.0.0.rc6 (2013-12-13)
 -------------------
 

data/README.md

@@ -62,13 +62,21 @@ by hand or using your favorite programming language. More info below.
 You **don't** need to set up a thing. The default settings will work just okay. But if you want to split translations into several files or specify specific contexts, you can follow the rest of this setting up section.
 
 Set your locale is easy as
+```javascript
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
+I18n.currentLocale();
+// pt-BR
+```
 
-    I18n.defaultLocale = "pt-BR";
-    I18n.locale = "pt-BR";
-    I18n.currentLocale();
-    // pt-BR
-
-**NOTE:** Just make sure you apply your configuration **after i18n.js** is loaded. Otherwise, your settings will be ignored.
+**NOTE:** Since `3.0.0.rc7`, you can apply your configuration **before I18n** is loaded like this:
+```javascript
+I18n = {} // You must define this object in top namespace, which should be `window`
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
+I18n.currentLocale();
+// pt-BR
+```
 
 In practice, you'll have something like the following in your `application.html.erb`:
 

data/lib/i18n/js.rb

@@ -3,7 +3,8 @@ require "FileUtils" unless defined?(FileUtils)
 
 module I18n
   module JS
-    if defined?(Rails)
+    require "i18n/js/dependencies"
+    if JS::Dependencies.rails?
       require "i18n/js/middleware"
       require "i18n/js/engine"
     end
@@ -13,12 +14,6 @@ module I18n
       Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2
     end
 
-    # Detect if Rails app has asset pipeline support.
-    #
-    def self.has_asset_pipeline?
-      Rails.configuration.respond_to?(:assets) && Rails.configuration.assets.enabled
-    end
-
     # The configuration file. This defaults to the `config/i18n-js.yml` file.
     #
     def self.config_file

data/lib/i18n/js/dependencies.rb

@@ -0,0 +1,55 @@
+module I18n
+  module JS
+    module Dependencies
+      class << self
+        def rails3?
+          safe_gem_check("rails", "~> 3") && running_rails3?
+        end
+
+        def rails4?
+          safe_gem_check("rails", "~> 4.0") && running_rails4?
+        end
+
+        def rails?
+          rails_available? && running_rails?
+        end
+
+        def rails_available?
+          safe_gem_check("rails", '>= 3')
+        end
+
+        def using_asset_pipeline?
+          assets_pipeline_available = (rails3? || rails4?) && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets)
+          rails3_assets_enabled = rails3? && assets_pipeline_available && Rails.application.config.assets.enabled != false
+          # Might need to check if gem `sprocket-rails` exists if someone does not use it on rails 4 (rare case)
+          assets_pipeline_available && (rails4? || rails3_assets_enabled)
+        end
+
+        private
+
+        def running_rails3?
+          running_rails? && Rails.version.to_i == 3
+        end
+
+        def running_rails4?
+          running_rails? && Rails.version.to_i == 4
+        end
+
+        def running_rails?
+          defined?(Rails) && Rails.respond_to?(:version)
+        end
+
+        def safe_gem_check(gem_name, version_string)
+          if Gem::Specification.respond_to?(:find_by_name)
+            Gem::Specification.find_by_name(gem_name, version_string)
+          elsif Gem.respond_to?(:available?)
+            Gem.available?(gem_name, version_string)
+          end
+        rescue Gem::LoadError
+          false
+        end
+
+      end
+    end
+  end
+end

data/lib/i18n/js/engine.rb

@@ -5,14 +5,14 @@ module I18n
     class Engine < ::Rails::Engine
       initializer :after => "sprockets.environment" do
         ActiveSupport.on_load(:after_initialize, :yield => true) do
-          next unless JS.has_asset_pipeline?
+          next unless JS::Dependencies.using_asset_pipeline?
           next unless Rails.configuration.assets.compile
 
-          registry = Sprockets.respond_to?("register_preprocessor") ? Sprockets : Rails.application.assets
+          Rails.application.assets.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|
+            if context.logical_path == "i18n/filtered"
+              ::I18n.load_path.each {|path| context.depend_on(File.expand_path(path))}
+            end
 
-          registry.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|
-            next source unless context.logical_path == "i18n/filtered"
-            ::I18n.load_path.each {|path| context.depend_on(File.expand_path(path))}
             source
           end
         end

data/lib/i18n/js/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js-pika
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc7
+  version: 3.0.0.rc8
 platform: ruby
 authors:
 - Nando Vieira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -104,6 +104,7 @@ files:
 - 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
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Forked version of original i18n-js. It's a small library to provide the Rails