ember-rails 0.16.3 → 0.16.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 07a104a18fc466f392d503651efc841765ecd50d
4
- data.tar.gz: d48165694598684038a3a2bb11c421cfa184cbad
3
+ metadata.gz: e193b56bc41d164725875def1d5d905c4ce8894b
4
+ data.tar.gz: d8235dd954452a5746f57be761093ec88e2afb01
5
5
  SHA512:
6
- metadata.gz: e5e6605ef2988842f7c36f9eb690868bb59fd0081411892c20d1f1046e9d5bcbc2db8958dfb2fa012ec2fdcf9f3aa831e50f84b2be539c1afec2ca8e8f8e731b
7
- data.tar.gz: 5c27aa601860d40cd0f443706fd5965656240727d8083421328b1e1cc73a726fe1f918f7ad166264c41624e08b67ae6bd38f388733546cdeb3631827c7f77247
6
+ metadata.gz: e15248446b595919ad8b59715b11790fed1da3284b0767fef2cf9d879dcff0291fa5a0efb5272dc1e37aabba69fb06eabdd7878f3adbf6c076dd84de91fee639
7
+ data.tar.gz: 4c871faecfb02c5d2d77c3be8028a81bfb7f85e84e2350bf2a07342bc542ae95835fd4a2f5a6439361e910a8d4aa6ccdb2b4701f61f84a5ee1749013a24fde8b
@@ -1,5 +1,5 @@
1
1
  module Ember
2
2
  module Rails
3
- VERSION = '0.16.3'
3
+ VERSION = '0.16.4'
4
4
  end
5
5
  end
data/lib/ember_rails.rb CHANGED
@@ -20,7 +20,15 @@ module Ember
20
20
  require "generators/ember/resource_override"
21
21
  end
22
22
 
23
- initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
23
+ initializer "ember_rails.setup_vendor_on_locale", :after => "ember_rails.setup", :group => :all do |app|
24
+ variant = app.config.ember.variant || (::Rails.env.production? ? :production : :development)
25
+
26
+ # Allow a local variant override
27
+ ember_path = app.root.join("vendor/assets/ember/#{variant}")
28
+ app.assets.prepend_path(ember_path.to_s) if ember_path.exist?
29
+ end
30
+
31
+ initializer "ember_rails.copy_vendor_to_local", :after => "ember_rails.setup", :group => :all do |app|
24
32
  variant = app.config.ember.variant || (::Rails.env.production? ? :production : :development)
25
33
 
26
34
  # Copy over the desired ember and ember-data bundled in
@@ -38,20 +46,13 @@ module Ember
38
46
  ember_data_ext = variant == :production ? ".prod.js" : ".js"
39
47
  FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data#{ember_data_ext}"), tmp_path.join("ember-data.js"))
40
48
 
41
- # Copy ember-data source map to tmp folder.
42
- 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
43
- FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data.js.map"), tmp_path.join("ember-data.js.map"))
44
- end
45
-
46
49
  app.assets.append_path(tmp_path)
50
+ end
47
51
 
48
- # Make the handlebars.js and handlebars.runtime.js bundled
49
- # in handlebars-source available.
52
+ initializer "ember_rails.setup_vendor", :after => "ember_rails.copy_vendor_to_local", :group => :all do |app|
53
+ app.assets.append_path(::Ember::Source.bundled_path_for(nil))
54
+ app.assets.append_path(::Ember::Data::Source.bundled_path_for(nil))
50
55
  app.assets.append_path(File.expand_path('../', ::Handlebars::Source.bundled_path))
51
-
52
- # Allow a local variant override
53
- ember_path = app.root.join("vendor/assets/ember/#{variant}")
54
- app.assets.prepend_path(ember_path.to_s) if ember_path.exist?
55
56
  end
56
57
 
57
58
  initializer "ember_rails.es5_default", :group => :all do |app|
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.3
4
+ version: 0.16.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Keith Pitt
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-02-13 00:00:00.000000000 Z
14
+ date: 2015-02-17 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: execjs