ember-rails 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9799668878e4b56fcaba55c32546fb35fd748a17
-  data.tar.gz: 33cb45199dcbcd0da57ec5a734381f020bceec62
+  metadata.gz: 7ff97dd7b40a93758ef542f4a1743c0c6d5a00b7
+  data.tar.gz: ed0d46f1dd9ea3a6b8796db07dc8f5a3fd030863
 SHA512:
-  metadata.gz: c19cf4ab1339a2460d91f1ef3e15654eaa61937b1fbbe1de8b433be124e44369db96c6394f363c0bf2e8c563e639548d7e68a4045abded752ec915ec242779e2
-  data.tar.gz: d5e2e4e055a6616e230aac87d4bb777c2948f4c27993bbb3ec33183c0e1a23b75b06a15e1d43e177f28d4e12aacb253731f36a2685c16bc52bf9d519e234122e
+  metadata.gz: 9a98d995f779563de591541ed3b138400630d00cbd9535e1a7dbb23f3d61ce7fda0038448b10d606d071d23540541a1211e92bc2df8fd33c18440011424e89cd
+  data.tar.gz: 7dc095c8c6c2b879ae5b68df12fd3d2ae33e76fe86e2784c88ed5193b4e86b064b41b67d54015894658e61fc6a9ba14e59c621caa73eefaf688eb5647262243f

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.18.4'
+    VERSION = '0.18.5'
   end
 end

data/lib/ember_rails.rb

@@ -26,12 +26,27 @@ module Ember
         require "generators/ember/resource_override"
       end
 
+      def configure_assets(app)
+        if config.respond_to?(:assets) && config.assets.respond_to?(:configure)
+          # Rails 4.x
+          config.assets.configure do |env|
+            yield env
+          end
+        else
+          # Rails 3.2
+          yield app.assets
+        end
+      end
+
       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?
+
+        configure_assets app do |env|
+          env.prepend_path(ember_path.to_s) if ember_path.exist?
+        end
       end
 
       initializer "ember_rails.copy_vendor_to_local", :after => "ember_rails.setup", :group => :all do |app|
@@ -52,17 +67,23 @@ 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"))
 
-        app.assets.append_path(tmp_path)
+        configure_assets app do |env|
+          env.append_path tmp_path
+        end
       end
 
       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)) if defined?(::Handlebars::Source)
+        configure_assets app do |env|
+          env.append_path ::Ember::Source.bundled_path_for(nil)
+          env.append_path ::Ember::Data::Source.bundled_path_for(nil)
+          env.append_path File.expand_path('../', ::Handlebars::Source.bundled_path) if defined?(::Handlebars::Source)
+        end
       end
 
       initializer "ember_rails.setup_ember_template_compiler", :after => "ember_rails.setup_vendor", :group => :all do |app|
-        Ember::Handlebars::Template.setup_ember_template_compiler(app.assets.resolve('ember-template-compiler.js'))
+        configure_assets app do |env|
+          Ember::Handlebars::Template.setup_ember_template_compiler(env.resolve('ember-template-compiler.js'))
+        end
       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.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+