ember-rails 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a104a18fc466f392d503651efc841765ecd50d
-  data.tar.gz: d48165694598684038a3a2bb11c421cfa184cbad
+  metadata.gz: e193b56bc41d164725875def1d5d905c4ce8894b
+  data.tar.gz: d8235dd954452a5746f57be761093ec88e2afb01
 SHA512:
-  metadata.gz: e5e6605ef2988842f7c36f9eb690868bb59fd0081411892c20d1f1046e9d5bcbc2db8958dfb2fa012ec2fdcf9f3aa831e50f84b2be539c1afec2ca8e8f8e731b
-  data.tar.gz: 5c27aa601860d40cd0f443706fd5965656240727d8083421328b1e1cc73a726fe1f918f7ad166264c41624e08b67ae6bd38f388733546cdeb3631827c7f77247
+  metadata.gz: e15248446b595919ad8b59715b11790fed1da3284b0767fef2cf9d879dcff0291fa5a0efb5272dc1e37aabba69fb06eabdd7878f3adbf6c076dd84de91fee639
+  data.tar.gz: 4c871faecfb02c5d2d77c3be8028a81bfb7f85e84e2350bf2a07342bc542ae95835fd4a2f5a6439361e910a8d4aa6ccdb2b4701f61f84a5ee1749013a24fde8b

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.16.3'
+    VERSION = '0.16.4'
   end
 end

data/lib/ember_rails.rb

@@ -20,7 +20,15 @@ module Ember
         require "generators/ember/resource_override"
       end
 
-      initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
+      initializer "ember_rails.setup_vendor_on_locale", :after => "ember_rails.setup", :group => :all do |app|
+        variant = app.config.ember.variant || (::Rails.env.production? ? :production : :development)
+
+        # Allow a local variant override
+        ember_path = app.root.join("vendor/assets/ember/#{variant}")
+        app.assets.prepend_path(ember_path.to_s) if ember_path.exist?
+      end
+
+      initializer "ember_rails.copy_vendor_to_local", :after => "ember_rails.setup", :group => :all do |app|
         variant = app.config.ember.variant || (::Rails.env.production? ? :production : :development)
 
         # Copy over the desired ember and ember-data bundled in
@@ -38,20 +46,13 @@ module Ember
         ember_data_ext = variant == :production ? ".prod.js" : ".js"
         FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data#{ember_data_ext}"), tmp_path.join("ember-data.js"))
 
-        # Copy ember-data source map to tmp folder.
-        if File.exist?(::Ember::Data::Source.bundled_path_for("ember-data.js.map")) # Source maps are present in ember-data-source gem, starting from version 1.0.0-beta.14.1
-          FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data.js.map"), tmp_path.join("ember-data.js.map"))
-        end
-        
         app.assets.append_path(tmp_path)
+      end
 
-        # Make the handlebars.js and handlebars.runtime.js bundled
-        # in handlebars-source available.
+      initializer "ember_rails.setup_vendor", :after => "ember_rails.copy_vendor_to_local", :group => :all do |app|
+        app.assets.append_path(::Ember::Source.bundled_path_for(nil))
+        app.assets.append_path(::Ember::Data::Source.bundled_path_for(nil))
         app.assets.append_path(File.expand_path('../', ::Handlebars::Source.bundled_path))
-
-        # Allow a local variant override
-        ember_path = app.root.join("vendor/assets/ember/#{variant}")
-        app.assets.prepend_path(ember_path.to_s) if ember_path.exist?
       end
 
       initializer "ember_rails.es5_default", :group => :all do |app|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs