ember-rails 0.18.5 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff97dd7b40a93758ef542f4a1743c0c6d5a00b7
-  data.tar.gz: ed0d46f1dd9ea3a6b8796db07dc8f5a3fd030863
+  metadata.gz: 60c79a29e21a0b32dbb561a606d5602c533efcc9
+  data.tar.gz: ce7e2f43d907b00438b87cd9f5d536dd768b91c8
 SHA512:
-  metadata.gz: 9a98d995f779563de591541ed3b138400630d00cbd9535e1a7dbb23f3d61ce7fda0038448b10d606d071d23540541a1211e92bc2df8fd33c18440011424e89cd
-  data.tar.gz: 7dc095c8c6c2b879ae5b68df12fd3d2ae33e76fe86e2784c88ed5193b4e86b064b41b67d54015894658e61fc6a9ba14e59c621caa73eefaf688eb5647262243f
+  metadata.gz: d0446ade896e01ee3da2d8aa38f6cee79ff89f2574b109b9b6a3f6fd20df572cc0b653c81eb789b9b3e65f80ab9792ee3aa937949ec30f457986289dd97f36a8
+  data.tar.gz: c2d86f6c6af314dd0febb294acdbb1fd81ab9974e2b95285e8e149a6b807aeb86799d8ea46879b15efb1188a55da9c920b07e2ab46d39a8f2f788a16593c4619

data/lib/ember/rails/engine.rb

@@ -17,8 +17,9 @@ module Ember
 
       config.before_initialize do |app|
         Sprockets::Engines #force autoloading
-
-        Ember::Handlebars::Template.setup Sprockets
+        Sprockets.register_engine '.handlebars', Ember::Handlebars::Template
+        Sprockets.register_engine '.hbs', Ember::Handlebars::Template
+        Sprockets.register_engine '.hjs', Ember::Handlebars::Template
       end
     end
   end

data/lib/ember/rails/version.rb

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

data/lib/ember_rails.rb

@@ -3,6 +3,7 @@ require 'ember/source'
 require 'ember/data/source'
 require 'ember/rails/version'
 require 'ember/rails/engine'
+require 'ember/data/active_model/adapter/source'
 
 # Use handlebars if it possible. Because it is an optional feature.
 begin
@@ -26,27 +27,12 @@ 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}")
-
-        configure_assets app do |env|
-          env.prepend_path(ember_path.to_s) if ember_path.exist?
-        end
+        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|
@@ -66,24 +52,20 @@ module Ember
         FileUtils.cp(::Ember::Source.bundled_path_for("ember#{ember_ext}"), tmp_path.join("ember.js"))
         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"))
+        FileUtils.cp(::Ember::Data::ActiveModel::Adapter::Source.bundled_path_for("active-model-adapter.js"), tmp_path.join("active-model-adapter.js"))
 
-        configure_assets app do |env|
-          env.append_path tmp_path
-        end
+        app.assets.append_path(tmp_path)
       end
 
       initializer "ember_rails.setup_vendor", :after => "ember_rails.copy_vendor_to_local", :group => :all do |app|
-        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
+        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)
       end
 
       initializer "ember_rails.setup_ember_template_compiler", :after => "ember_rails.setup_vendor", :group => :all do |app|
-        configure_assets app do |env|
-          Ember::Handlebars::Template.setup_ember_template_compiler(env.resolve('ember-template-compiler.js'))
-        end
+        Ember::Handlebars::Template.setup_ember_template_compiler(app.assets.resolve('ember-template-compiler.js'))
       end
 
       initializer "ember_rails.es5_default", :group => :all do |app|

data/lib/generators/templates/application.js

@@ -3,6 +3,7 @@
 <%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 //= require ember
 //= require ember-data
+//= require active-model-adapter
 //= require_self
 //= require ./<%= application_name.underscore %>
 

data/lib/generators/templates/application.js.coffee

@@ -3,6 +3,7 @@
 <%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
+#= require active-model-adapter
 #= require_self
 #= require <%= application_name.underscore %>
 

data/lib/generators/templates/application.js.em

@@ -3,6 +3,7 @@
 <%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
+#= require active-model-adapter
 #= require_self
 #= require <%= application_name.underscore %>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.19.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -61,28 +61,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.5
+        version: 1.13.0
+- !ruby/object:Gem::Dependency
+  name: active-model-adapter-source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: ember-handlebars-template
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+