ember-rails 0.16.4 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e193b56bc41d164725875def1d5d905c4ce8894b
-  data.tar.gz: d8235dd954452a5746f57be761093ec88e2afb01
+  metadata.gz: 7d4a9590ae4039949ea614394ca0caeb2abad7ca
+  data.tar.gz: 9d95fc4cd477131afa246207da35e9798015e9ef
 SHA512:
-  metadata.gz: e15248446b595919ad8b59715b11790fed1da3284b0767fef2cf9d879dcff0291fa5a0efb5272dc1e37aabba69fb06eabdd7878f3adbf6c076dd84de91fee639
-  data.tar.gz: 4c871faecfb02c5d2d77c3be8028a81bfb7f85e84e2350bf2a07342bc542ae95835fd4a2f5a6439361e910a8d4aa6ccdb2b4701f61f84a5ee1749013a24fde8b
+  metadata.gz: 25c951f6949cbac70a518294866198458f61226d0024f230999bb6ab3ffe4826630ef7620c9e517c6566be707119f25892dd88f66d97c9cf59584cb62544ee96
+  data.tar.gz: 114946b802515c50194646f4f3c474ae8279c06fd7b38ec2c6f0d49d682848fe27691e18013016813a241df4aaa1d703d575428784e9c78cf7007c377c7dab08

data/README.md

@@ -331,7 +331,7 @@ Rails [`protect_from_forgery`](http://api.rubyonrails.org/classes/ActionControll
 The CSRF token is normally found in `app/views/layouts/application.html.*` inserted with the rails helper: [`csrf_meta_tags`](http://api.rubyonrails.org/classes/ActionView/Helpers/CsrfHelper.html#method-i-csrf_meta_tags).
 
 When you use [jquery-ujs](https://github.com/rails/jquery-ujs),
-the CSRF token will be send to rails application on every XHR automatically.
+the CSRF token will be sent to the rails application on every XHR automatically.
 If not so, the following JavaScript is required in your code.
 
 ``` javascript

data/lib/ember/rails/version.rb

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

data/lib/ember_rails.rb

@@ -3,7 +3,13 @@ require 'ember/source'
 require 'ember/data/source'
 require 'ember/rails/version'
 require 'ember/rails/engine'
-require 'handlebars/source'
+
+# Use handlebars if it possible. Because it is an optional feature.
+begin
+  require 'handlebars/source'
+rescue LoadError => e
+  raise e unless e.message == 'cannot load such file -- handlebars/source'
+end
 
 module Ember
   module Rails
@@ -52,7 +58,7 @@ module Ember
       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))
+        app.assets.append_path(File.expand_path('../', ::Handlebars::Source.bundled_path)) if defined?(::Handlebars::Source)
       end
 
       initializer "ember_rails.es5_default", :group => :all do |app|

data/lib/generators/ember/component_generator.rb

@@ -18,8 +18,8 @@ module Ember
         comp_path = File.join(ember_path, 'components', class_path, "#{dashed_file_name}_component.#{engine_extension}")
         template "component.#{engine_extension}", comp_path
 
-        templ_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.handlebars")
-        template "component.template.handlebars", templ_path
+        templ_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")
+        template "component.template.hbs", templ_path
 
       end
 

data/lib/generators/ember/template_generator.rb

@@ -14,8 +14,8 @@ module Ember
 
 
       def create_template_files
-        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.handlebars")
-        template 'template.handlebars', file_path
+        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.hbs")
+        template 'template.hbs', file_path
       end
 
     end

data/lib/generators/templates/application.js

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require handlebars
+<%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 //= require ember
 //= require ember-data
 //= require_self

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

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require handlebars
+<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
 #= require_self

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

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require handlebars
+<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
 #= require_self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -97,26 +97,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: handlebars-source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-rails
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,7 +168,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.14.0
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,19 +196,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: handlebars-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '3'
 description: 
 email:
 - me@keithpitt.com
@@ -248,7 +248,7 @@ files:
 - lib/generators/templates/app.js
 - lib/generators/templates/app.js.coffee
 - lib/generators/templates/app.js.em
-- lib/generators/templates/application.handlebars
+- lib/generators/templates/application.hbs
 - lib/generators/templates/application.js
 - lib/generators/templates/application.js.coffee
 - lib/generators/templates/application.js.em
@@ -261,7 +261,7 @@ files:
 - lib/generators/templates/component.js
 - lib/generators/templates/component.js.coffee
 - lib/generators/templates/component.js.em
-- lib/generators/templates/component.template.handlebars
+- lib/generators/templates/component.template.hbs
 - lib/generators/templates/controller.js
 - lib/generators/templates/controller.js.coffee
 - lib/generators/templates/controller.js.em
@@ -277,7 +277,7 @@ files:
 - lib/generators/templates/router.js
 - lib/generators/templates/router.js.coffee
 - lib/generators/templates/router.js.em
-- lib/generators/templates/template.handlebars
+- lib/generators/templates/template.hbs
 - lib/generators/templates/view.js
 - lib/generators/templates/view.js.coffee
 - lib/generators/templates/view.js.em