ember-rails 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2bc90c8745e6458bbbeaa2c88bef7ae3678297
-  data.tar.gz: 4e272c941dbfa2c4111e6c4fddcc9bf69a97901b
+  metadata.gz: 2c08a82296cfb9d04139a555ed9487758423621a
+  data.tar.gz: 3d026e9c756d4f975b57ae6b590a9a22e5db93d5
 SHA512:
-  metadata.gz: cf9f95ccc1519eac9725c9d5b762edc81903385f41229471ea7b441af87851f064bf3ff51fbdb9b981b3029613f1dfe344888519570dbc9be07e7a84c7ff00dd
-  data.tar.gz: 70173e03ac5ab815f0b845a2ae593141d34e48dd4fc83a12a51660a3e05bb1a59437773bd72eb189020fdb367f13ae8a017e4175a0cfe8f639279f897d242105
+  metadata.gz: 0b1b71f91f5f4467be49e88eebeb497e69bc9bfc2e87e97a7de45b35904e4a540dedc876f4f78b15d2898d305c85b83c5394deae91d5d50cc5b8bf79e0357a55
+  data.tar.gz: b60afeb995dc9f8a0cee2a61a9a2c4c902599acef5cc21718966a38e4d41b8ca95e397a51bfe88949b3d5983bae424d3d1e9397ef049ef88189de5fc3c97874f

data/README.md

@@ -276,32 +276,6 @@ You can reference your component inside your other handlebars template files by
 
      {{ my-component }}
 
-### A note about upgrading ember-rails and components
-The ember-rails project now includes generators for components. If you have an existing project and need
-to compile component files you will need to include the components folder as part of the asset pipeline.
-A typical project expects two folders for *components* related code:
-
-* `assets/javascripts/components/` to hold the component javascript source
-* `assets/javascripts/templates/components/` to hold the handlebars templates for your components
-
-Your asset pipeline require statements should include reference to both e.g.
-
-RailsAppName.js
-```
-//= require_tree ./templates
-//= require_tree ./components
-```
-
-or
-
-RailsAppName.js.coffee
-```
-#= require_tree ./templates
-#= require_tree ./components
-```
-
-These are automatically generated for you in new projects you when you run the `ember:bootstrap` generator.
-
 ## Specifying Different Versions of Ember/Handlebars/Ember-Data
 
 By default, ember-rails ships with the latest version of
@@ -351,6 +325,22 @@ or for ember-data
 
     rails generate ember:install --tag=v1.0.0-beta.2 --ember-data
 
+## CSRF Token
+
+Rails [`protect_from_forgery`](http://api.rubyonrails.org/classes/ActionController/RequestForgeryProtection/ClassMethods.html#method-i-protect_from_forgery) requires CSRF token for every XHR except GET.
+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.
+If not so, the following JavaScript is required in your code.
+
+``` javascript
+$.ajaxPrefilter(function(options, originalOptions, xhr) {
+  var token = $('meta[name="csrf-token"]').attr('content');
+  xhr.setRequestHeader('X-CSRF-Token', token);
+});
+```
+
 ## Note on Patches/Pull Requests
 
 1. Fork the project.

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.16.1'
+    VERSION = '0.16.2'
   end
 end

data/lib/generators/ember/bootstrap_generator.rb

@@ -38,10 +38,6 @@ module Ember
         template "router.#{engine_extension}", "#{ember_path}/router.#{engine_extension}"
       end
 
-      def create_store_file
-        template "store.#{engine_extension}", "#{ember_path}/store.#{engine_extension}"
-      end
-
       def create_adapter_file
         template "application_adapter.#{engine_extension}", "#{ember_path}/adapters/application_adapter.#{engine_extension}"
       end

data/lib/generators/templates/app.js

@@ -1,4 +1,3 @@
-//= require ./store
 //= require_tree ./adapters
 //= require_tree ./mixins
 //= require_tree ./models

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

@@ -1,4 +1,3 @@
-#= require ./store
 #= require_tree ./adapters
 #= require_tree ./mixins
 #= require_tree ./models

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

@@ -1,4 +1,3 @@
-#= require ./store
 #= require_tree ./adapters
 #= require_tree ./mixins
 #= require_tree ./models

data/lib/generators/templates/application.js

@@ -1,4 +1,5 @@
 //= require jquery
+//= require jquery_ujs
 //= require handlebars
 //= require ember
 //= require ember-data

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

@@ -1,4 +1,5 @@
 #= require jquery
+#= require jquery_ujs
 #= require handlebars
 #= require ember
 #= require ember-data

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

@@ -1,4 +1,5 @@
 #= require jquery
+#= require jquery_ujs
 #= require handlebars
 #= require ember
 #= require ember-data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -104,6 +104,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,6 +114,9 @@ dependencies:
     - - ">"
       - !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
@@ -271,9 +277,6 @@ files:
 - lib/generators/templates/router.js
 - lib/generators/templates/router.js.coffee
 - lib/generators/templates/router.js.em
-- lib/generators/templates/store.js
-- lib/generators/templates/store.js.coffee
-- lib/generators/templates/store.js.em
 - lib/generators/templates/template.handlebars
 - lib/generators/templates/view.js
 - lib/generators/templates/view.js.coffee

data/lib/generators/templates/store.js

@@ -1,9 +0,0 @@
-// Adds X-CSRF-Token to all REST requests.
-// Allows for the use of Rails protect_from_forgery
-// The CSRF Token is normally found in app/views/layouts/application.html.*
-// inserted with the rails helper: "csrf_meta_tags"
-DS.RESTAdapter.reopen({
-  headers: {
-    "X-CSRF-Token": $('meta[name="csrf-token"]').attr('content')
-  }
-});

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

@@ -1,8 +0,0 @@
-# Adds X-CSRF-Token to all REST requests.
-# Allows for the use of Rails protect_from_forgery
-# The CSRF Token is normally found in app/views/layouts/application.html.*
-# inserted with the rails helper: "csrf_meta_tags"
-DS.RESTAdapter.reopen(
-  headers:
-    "X-CSRF-Token": $('meta[name="csrf-token"]').attr('content')
-)

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

@@ -1,8 +0,0 @@
-# Adds X-CSRF-Token to all REST requests.
-# Allows for the use of Rails protect_from_forgery
-# The CSRF Token is normally found in app/views/layouts/application.html.*
-# inserted with the rails helper: "csrf_meta_tags"
-DS.RESTAdapter.reopen(
-  headers:
-    "X-CSRF-Token": $('meta[name="csrf-token"]').attr('content')
-)