ember-rails 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60a63f6567215c83896d987c2a2d6f23e2e36be
-  data.tar.gz: 1d7a76412bb6a2aff43f2c1d113a6eb2b591f1ff
+  metadata.gz: 3d46472d346a709f8580fb4050457cc583d25c02
+  data.tar.gz: 584df87b5a4286f252d6358856d11893af17caa0
 SHA512:
-  metadata.gz: 336a685840c73eb1ad6cd7ce70142e939ec39461930821725381c449e5b86e327bc5062b34c886d9bc7bfc769f9020aed1c634929e15367a8c0f4148d4773f7f
-  data.tar.gz: daa683afc9cf7da1f1f0c9f659df026d466d5f65f108e0365b03cdd60c0965287dbeaf7fe247fb082f81e0d7e7bdfc81f378dd35f662d590dd75d47279e46880
+  metadata.gz: ff21e550943f708355597fcc7ef9bc51661b5680199e0c1cdfbb7c497bcd062210194f301795ee438ec95a8dc0c74b1ffd0c378f8a298a88974c358a4285d98e
+  data.tar.gz: 77c10beb5d970e42b94cd6138a0860835182d9e01334e10d07c20e40148229aa5e8b65d747026c8d09b8c248a8b4b0ce5e81dc9c34fd9268d262b18ea2cb8c19

data/README.md

@@ -1,20 +1,20 @@
-# ember-rails  [![Build Status](https://secure.travis-ci.org/emberjs/ember-rails.png?branch=master)](http://travis-ci.org/emberjs/ember-rails) [![Dependency Status](https://gemnasium.com/emberjs/ember-rails.png)](https://gemnasium.com/emberjs/ember-rails)
+# ember-rails  [![Build Status](https://secure.travis-ci.org/emberjs/ember-rails.svg?branch=master)](http://travis-ci.org/emberjs/ember-rails) [![Dependency Status](https://gemnasium.com/emberjs/ember-rails.png)](https://gemnasium.com/emberjs/ember-rails)
 
 ember-rails makes developing an [Ember.JS](http://emberjs.com/) application much easier in Rails 3.1+.
 
 The following functionalities are included in this gem:
 - Pre-compiling of your handlebars templates when building your asset pipeline.
-- Includes development and production copies of Ember, [Ember Data](https://github.com/emberjs/data) and [Handlebars](https://github.com/wycats/handlebars.js).
-- Includes [ActiveModel::Serializer](https://github.com/rails-api/active_model_serializers) for integration with Ember Data.
+- Inclusion of development and production copies of Ember, [Ember Data](https://github.com/emberjs/data) and [Handlebars](https://github.com/wycats/handlebars.js).
+- Inclusion of [ActiveModel::Serializer](https://github.com/rails-api/active_model_serializers) for integration with Ember Data.
 
-You can see an example of how to use the gem [here](https://github.com/keithpitt/ember-rails-example). There is also a great tutorial by [Dan Gebhardt](https://twitter.com/#!/dgeb) called "[Beginning Ember.js on Rails](http://www.cerebris.com/blog/2012/01/24/beginning-ember-js-on-rails-part-1/)" which is a great read if you're just starting out with Rails and Ember.js
+You can see an example of how to use the gem [here](https://github.com/keithpitt/ember-rails-example). There is also a great tutorial by [Dan Gebhardt](https://twitter.com/#!/dgeb) called "[Beginning Ember.js on Rails](http://www.cerebris.com/blog/2012/01/24/beginning-ember-js-on-rails-part-1/)" which is a great read if you're just starting out with Rails and Ember.js.
 
 ## Getting started
 * Add the gem to your application Gemfile:
 
 ```ruby
 gem 'ember-rails'
-gem 'ember-source', '1.5.0' # or the version you need
+gem 'ember-source', '~> 1.9.0' # or the version you need
 ```
 
 * Run `bundle install`
@@ -54,29 +54,28 @@ You'll probably need to clear out your cache after doing this with:
 rake tmp:clear
 ```
 
+Also, ember-rails include some flags for the bootstrap generator:
+
+```
+--ember-path or -d   # custom ember path
+--skip-git or -g     # skip git keeps
+--javascript-engine  # engine for javascript (js, coffee or em)
+--app-name or -n     # custom ember app name
+```
+
+
 ## For CoffeeScript support
 
-1. Add coffee-rails to the Gemfile
+Add coffee-rails to the Gemfile
 ```ruby
 gem 'coffee-rails'
 ```
 
-2. Run the bootstrap generator in step 4 with an extra flag instead:
+Run the bootstrap generator in step 4 with an extra flag instead:
 ```sh
 rails g ember:bootstrap -g --javascript-engine coffee
 ```
 
-Note:
-
-Ember-rails include some flags options for bootstrap generator:
-
-```
---ember-path or -d # custom ember path
---skip-git or -g # skip git keeps
---javascript-engine  # engine for javascript (js or coffee)
---app-name or -n # custom ember app name
-```
-
 ## For EmberScript support
 
 [EmberScript](http://www.emberscript.com) is a dialect of CoffeeScript
@@ -95,45 +94,87 @@ You can now use the flag `--javascript-engine=em` to specify EmberScript
 assets in your generators, but all of the generators will default to
 using an EmberScript variant first.
 
+Note:
+
+Ember-rails include some flags options for bootstrap generator:
+
+```
+--ember-path or -d # custom ember path
+--skip-git or -g # skip git keeps
+--javascript-engine  # engine for javascript (js, coffee or em)
+--app-name or -n # custom ember app name
+```
+
 ## Configuration Options
 
 The following options are available for configuration in your application or environment-level
 config files (`config/application.rb`, `config/environments/development.rb`, etc.):
 
-* `config.ember.variant` - Used to determine which Ember variant to use. Valid options: `:development`, `:production`.
-* `config.ember.app_name` - Used to specify a default application name for all generators.
-* `config.ember.ember_path` - Used to specify a default custom root path for all generators.
-* `config.handlebars.precompile` - Used to enable or disable precompilation. Default value: `true`.
-* `config.handlebars.templates_root` - Set the root path (under `app/assets/javascripts`) for templates
-  to be looked up in. Default value: `"templates"`.
-* `config.handlebars.templates_path_separator` - The path separator to use for templates. Default value: `'/'`.
-* `config.handlebars.output_type` - Configures the style of output (options are `:amd` and `:global`).
-  Default value: `:global`.
+| Configuration Option                         | Description                                                                                                         |
+|----------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
+| `config.ember.variant`                       | Determines which Ember variant to use. Valid options: `:development`, `:production`.                                |
+| `config.ember.app_name`                      | Specificies a default application name for all generators.                                                          |
+| `config.ember.ember_path`                    | Specifies a default custom root path for all generators.                                                            |
+| `config.handlebars.precompile`               | Enables or disables precompilation. Default value: `true`.                                                          |
+| `config.handlebars.templates_root`           | Sets the root path (under `app/assets/javascripts`) for templates to be looked up in. Default value: `"templates"`. |
+| `config.handlebars.templates_path_separator` | The path separator to use for templates. Default value: `'/'`.                                                      |
+| `config.handlebars.output_type`              | Configures the style of output (options are `:amd` and `:global`). Default value: `:global`.                        |
+
+Note:
+
+In a mountable engine, ember-rails will not recognize any configurations.
+Instead, use command line options.
+
+## Enabling Features with Feature Flags
+See [the guide](http://emberjs.com/guides/configuring-ember/feature-flags/#toc_flagging-details) and check [features.json](https://github.com/emberjs/ember.js/blob/master/features.json) for the version of Ember you're using.
+
+If a feature is set to false, you will need to compile ember from source yourself to include it.
+
+### Important note for projects that render JSON responses
+
+ember-rails includes [active_model_serializers](https://github.com/rails-api/active_model_serializers) which affects how ActiveModel and ActiveRecord objects get serialized to JSON, such as when using `render json:` or `respond_with`. By default active_model_serializers adds root elements to these responses (such as adding `{"posts": [...]}` for `render json: @posts`) which will affect the structure of your JSON responses.
+
+To disable this effect on your JSON responses, put this in an initializer:
+```Ruby
+# Stop active_model_serializers from adding root elements to JSON responses.
+ActiveModel::Serializer.root = false
+ActiveModel::ArraySerializer.root = false
+```
+
+See the [active_model_serializers](https://github.com/rails-api/active_model_serializers) documentation for a more complete understanding of other effects this dependency might have on your app.
 
 ## Architecture
 
 Ember does not require an organized file structure. However, ember-rails allows you
 to use `rails g ember:bootstrap` to create the following directory structure under `app/assets/javascripts`:
 
-    controllers/
-    helpers/
-    components/
-    models/
-    routes/
-    templates/
-    templates/components
-    views/
+```
+├── components
+├── controllers
+├── helpers
+├── mixins
+├── models
+├── practicality.js.coffee
+├── router.js.coffee
+├── routes
+├── store.js.coffee
+├── templates
+│   └── components
+└── views
+```
 
 Additionally, it will add the following lines to `app/assets/javascripts/application.js`.
 By default, it uses the Rails Application's name and creates an `rails_app_name.js`
 file to set up application namespace and initial requires:
 
-    //= require handlebars
-    //= require ember
-    //= require ember-data
-    //= require_self
-    //= require rails_app_name
-    RailsAppName = Ember.Application.create();
+```javascript
+//= require handlebars
+//= require ember
+//= require ember-data
+//= require_self
+//= require rails_app_name
+RailsAppName = Ember.Application.create();
+```
 
 *Example:*
 
@@ -165,8 +206,7 @@ and including the assets in your layout:
 
     <%= javascript_include_tag "templates/admin_panel" %>
 
-If you want to strip template root from template names, add `templates_root` option to your application configuration block.
-By default, `templates_root` is `'templates'`.
+If you want to avoid the `templates` prefix, set the `templates_root` option in your application configuration block:
 
     config.handlebars.templates_root = 'ember_templates'
 
@@ -191,7 +231,7 @@ Now a single line in the layout loads everything:
 
     <%= javascript_include_tag "templates/all" %>
 
-If you use Slim or Haml templates, you can use handlebars filter :
+If you use Slim or Haml templates, you can use the handlebars filter :
 
     handlebars:
         <button {{action anActionName}}>OK</button>
@@ -208,23 +248,29 @@ When necessary, ember-rails adheres to a conventional folder structure. To creat
 
 *Example*
 
-With the following folder structure:
+Given the following folder structure:
 
-    components/
-    controllers/
-    helpers/
-    models/
-    routes/
-    templates/
-      components/
-        my-component.handlebars
-    views/
+```
+├── components
+├── controllers
+├── helpers
+├── mixins
+├── models
+├── practicality.js.coffee
+├── router.js.coffee
+├── routes
+├── store.js.coffee
+├── templates
+│   └── components
+│       └── my-component.handlebars
+└── views
+```
 
-and a *my-component.handlebars* file with the following contents
+and a `my-component.handlebars` file with the following contents:
 
     <h1>My Component</h1>
 
-will produce the following handlebars output
+It will produce the following handlebars output:
 
     <script type="text/x-handlebars" id="components/my-component">
       <h1>My Component</h1>
@@ -260,7 +306,6 @@ RailsAppName.js.coffee
 
 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
@@ -272,7 +317,7 @@ To specify a different version that'll be used for both template
 precompilation and serving to the browser, you can specify the desired
 version of one of the above-linked gems in the Gemfile, e.g.:
 
-    gem 'ember-source', '1.0.0'
+    gem 'ember-source', '1.7.0'
 
 You can also specify versions of 'handlebars-source' and
 'ember-data-source', but note that an appropriate 'handlebars-source'

data/lib/ember/handlebars/template.rb

@@ -37,7 +37,7 @@ module Ember
         if configuration.output_type == :amd
           target = amd_template_target(scope)
 
-          "define('#{target}', ['exports'], function(__exports__){ __exports__.default = #{template} });"
+          "define('#{target}', ['exports'], function(__exports__){ __exports__['default'] = #{template} });"
         else
           target = global_template_target(scope)
 

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
   end
 end

data/lib/ember_rails.rb

@@ -26,10 +26,18 @@ module Ember
         # Copy over the desired ember, ember-data, and handlebars bundled in
         # ember-source, ember-data-source, and handlebars-source to a tmp folder.
         tmp_path = app.root.join("tmp/ember-rails")
-        ext = variant == :production ? ".prod.js" : ".js"
         FileUtils.mkdir_p(tmp_path)
-        FileUtils.cp(::Ember::Source.bundled_path_for("ember#{ext}"), tmp_path.join("ember.js"))
-        FileUtils.cp(::Ember::Data::Source.bundled_path_for("ember-data#{ext}"), tmp_path.join("ember-data.js"))
+
+        if variant == :production
+          ember_ext = ".prod.js"
+        else
+          ember_ext = ".debug.js"
+          ember_ext = ".js" unless File.exist?(::Ember::Source.bundled_path_for("ember#{ember_ext}")) # Ember.js 1.9.0 or earlier has no "ember.debug.js"
+        end
+        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"))
+
         app.assets.append_path(tmp_path)
 
         # Make the handlebars.js and handlebars.runtime.js bundled

data/lib/generators/ember/install_generator.rb

@@ -73,35 +73,40 @@ module Ember
 
     private
 
-
       def get_ember_data_for(environment)
         # temporarily using a variable here until a stable release of
         # ember-data is released so that installing with ember-data
         # *just works*.
-        chan = if channel == :release
+        chan = if channel.to_s == 'release'
           say_status("warning:", 'Ember Data is not available on the :release channel. Falling back to beta channel.' , :yellow)
           :beta
         else
           channel
         end
+
         create_file "vendor/assets/ember/#{environment}/ember-data.js" do
-          fetch "#{base_url}/#{chan}/#{file_name_for('ember-data', environment)}", "vendor/assets/ember/#{environment}/ember-data.js"
+          fetch url_for(chan, 'ember-data', environment), "vendor/assets/ember/#{environment}/ember-data.js"
         end
       end
 
       def get_ember_js_for(environment)
-
         create_file "vendor/assets/ember/#{environment}/ember.js" do
-          fetch "#{base_url}/#{channel}/#{file_name_for('ember', environment)}", "vendor/assets/ember/#{environment}/ember.js"
+          fetch url_for(channel, 'ember', environment), "vendor/assets/ember/#{environment}/ember.js"
         end
       end
 
-      def file_name_for(component,environment)
+      def url_for(channel, component, environment)
+        base = "#{base_url}/#{channel}/#{component}"
+
         case environment
         when :production
-          "#{component}.min.js"
+          "#{base}.min.js"
         when :development
-          "#{component}.js"
+          if resource_exist?("#{base}.debug.js")
+            "#{base}.debug.js" # Ember.js 1.10.0.beta.1 or later
+          else
+            "#{base}.js"
+          end
         end
       end
 
@@ -174,6 +179,12 @@ module Ember
         output.rewind
         content = output.read
       end
+
+      def resource_exist?(target)
+        uri = URI(target)
+        response = Net::HTTP.new(uri.host, uri.port).head(uri.path)
+        response.code == '200'
+      end
     end
   end
 end

data/lib/generators/ember/resource_override.rb

@@ -6,6 +6,12 @@ require "generators/ember/view_generator"
 module Rails
   module Generators
     ResourceGenerator.class_eval do
+
+      class_option :javascript_engine, :desc => "Engine for JavaScripts"
+      class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
+      class_option :with_template, :type => :boolean, :default => false, :desc => "Create template for this view"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
+
       def add_ember
         say_status :invoke, "ember:model", :white
         with_padding do
@@ -14,7 +20,7 @@ module Rails
 
         say_status :invoke, "ember controller and view (singular)", :white
         with_padding do
-          invoke "ember:view", [singular_name], :object => true
+          invoke "ember:view", [singular_name], options.merge(:object => true)
         end
 
         @_invocations[Ember::Generators::ControllerGenerator].delete "create_controller_files"
@@ -22,7 +28,7 @@ module Rails
 
         say_status :invoke, "ember controller and view (plural)", :white
         with_padding do
-          invoke "ember:view", [plural_name], :array => true
+          invoke "ember:view", [plural_name], options.merge(:array => true)
         end
       end
     end

data/lib/generators/templates/app.js

@@ -6,6 +6,6 @@
 //= require_tree ./helpers
 //= require_tree ./components
 //= require_tree ./templates
-//= require ./router
 //= require_tree ./routes
+//= require ./router
 //= require_self

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

@@ -1,4 +1,5 @@
 #= require ./store
+#= require_tree ./mixins
 #= require_tree ./models
 #= require_tree ./controllers
 #= require_tree ./views

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

@@ -1,8 +1,10 @@
 #= require ./store
+#= require_tree ./mixins
 #= require_tree ./models
 #= require_tree ./controllers
 #= require_tree ./views
 #= require_tree ./helpers
+#= require_tree ./components
 #= require_tree ./templates
 #= require_tree ./routes
 #= require ./router

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

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

data/lib/generators/templates/model.js

@@ -4,7 +4,7 @@
 <% attributes.each_with_index do |attribute, idx| -%>
   <%= attribute[:name].camelize(:lower) %>: <%=
   if %w(references belongs_to).member?(attribute[:type])
-    "DS.belongsTo('%s.%s')" % [application_name.camelize, attribute[:name].camelize]
+    "DS.belongsTo('%s')" % attribute[:name].camelize(:lower)
   else
     "DS.attr('%s')" % attribute[:type]
   end

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

@@ -4,7 +4,7 @@
 <% attributes.each do |attribute| -%>
   <%= attribute[:name].camelize(:lower) %>: <%=
   if %w(references belongs_to).member?(attribute[:type])
-    "DS.belongsTo '%s.%s'" % [application_name.camelize, attribute[:name].camelize]
+    "DS.belongsTo '%s'" % attribute[:name].camelize(:lower)
   else
     "DS.attr '%s'" % attribute[:type]
   end

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

@@ -4,7 +4,7 @@ class <%= application_name.camelize %>.<%= class_name %> extends DS.Model
 <% attributes.each do |attribute| -%>
   <%= attribute[:name].camelize(:lower) %>: <%=
   if %w(references belongs_to).member?(attribute[:type])
-    "DS.belongsTo '%s.%s'" % [application_name.camelize, attribute[:name].camelize]
+    "DS.belongsTo '%s'" % attribute[:name].camelize(:lower)
   else
     "DS.attr '%s'" % attribute[:type]
   end

data/lib/generators/templates/store.js

@@ -1,9 +1,16 @@
-<%= application_name.camelize %>.Store = DS.Store.extend({
-
-});
-
 // Override the default adapter with the `DS.ActiveModelAdapter` which
 // is built to work nicely with the ActiveModel::Serializers gem.
 <%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
 
 });
+
+
+// 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,12 +1,17 @@
 # http://emberjs.com/guides/models/#toc_store
 # http://emberjs.com/guides/models/pushing-records-into-the-store/
 
-<%= application_name.camelize %>.Store = DS.Store.extend({
-
-})
-
 # Override the default adapter with the `DS.ActiveModelAdapter` which
 # is built to work nicely with the ActiveModel::Serializers gem.
 <%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
 
 })
+
+# 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,5 +1,12 @@
-class <%= application_name.camelize %>.Store extends DS.Store
-
 # Override the default adapter with the `DS.ActiveModelAdapter` which
 # is built to work nicely with the ActiveModel::Serializers gem.
 class <%= application_name.camelize %>.ApplicationAdapter extends DS.ActiveModelAdapter
+
+# 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')
+)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -145,14 +145,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -290,9 +290,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+
 test_files: []
-has_rdoc: