ember-rails 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a7986f4cd12960e3cbb3445d330fc5ddf6c38e
-  data.tar.gz: 46767096b9505dc1fb97b3258d7004600c4c1745
+  metadata.gz: 8c948ea4422f22666b4648a0c243e3cb19924855
+  data.tar.gz: df5bea12b6c5ea2ea320548339de4e9ce23eac8a
 SHA512:
-  metadata.gz: 9c3f70baf838f821551c509d076167c806e145cd5a2b1ec5e319f6f491d312129f11b1099c15519eac2ae2214e31e4ab94f9e05c5c1f8f7c8726731ff8f165bf
-  data.tar.gz: bc1b568fd6e5c7bf4194e146e8fc42947f49eeea40c54826d4b4afe144c4e405df4f3ba3dcb6aca969c8683ea4b4753bea92bc3a293cd23f08d4aa66644e0e75
+  metadata.gz: 27d7000e1b108835f90830b11d3a59a905e0edaec3e29922d5bb58ee7d7b8348df0e8c508b521c0cb82071b8740447dc3bbf1ed2d3c966588607eeda2a5e873d
+  data.tar.gz: 4073b92a377cdd6c639d2ecbe7674fbd0e96d5117a9e2222a9cbd7bd5c0b892ea7e7ea85e47a6ea21ae48642c937f15375324b61f90848e4c269efd2d2b9be27

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.19.1'
+    VERSION = '0.19.2'
   end
 end

data/lib/ember_rails.rb

@@ -27,12 +27,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|
@@ -54,18 +69,24 @@ module Ember
         FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data#{ember_data_ext}"), tmp_path.join("ember-data.js"))
         FileUtils.cp(::Ember::Data::ActiveModel::Adapter::Source.bundled_path_for("active-model-adapter.js"), tmp_path.join("active-model-adapter.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(::Ember::Data::ActiveModel::Adapter::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 ::Ember::Data::ActiveModel::Adapter::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.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -334,7 +334,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+