ember-rails 0.19.3 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9cd380daad038d670a1bd54406aa129db1bb0b
-  data.tar.gz: f71403b6eb29a3d90a6e862249a21ee33c2b9aa2
+  metadata.gz: d05c20bcd4934bca81626f572018511151505d17
+  data.tar.gz: ed8ade5165062be1d4f8ec0c37c2413163894752
 SHA512:
-  metadata.gz: 4c789c701b117ca187f858ae1823f8bd29fcbd2939681390d1ab4d71239520488bb1ebd2e3cd2049b59231e5258d876ff858467b3fbe3d4be61035631396f0e4
-  data.tar.gz: 44ee4e0b40f63b144fbacf0c4a88cd94c9af976c94663e4676c308b86c54d6013d6765a56c28750bcebaa87a5fbe96437d39de734f0b211bf2462c37df17661d
+  metadata.gz: d50b22c47d0ae55ad1a73d25ea7fff9cf083975cd047e28ac79ed2680ea01fb74d20ff23c68982a73aa8f37ab85e1363083a7d73e1c5b7afddaa9c920a1ec19f
+  data.tar.gz: bcc836b552105700948d7806bf83a8945eab9b8c3002bd79541341ef61b7b558bfb3b96d0037d1fb595fca6be4894024a63a3d30c73a5cfec4e221bc57999679

data/README.md

@@ -33,7 +33,7 @@ Rails supports the ability to build projects from a template source ruby file.
 To build an Ember centric Rails project you can simply type the following into your command line:
 
 ```
-rails new my_app -m http://emberjs.com/edge_template.rb
+rails new my-app -m http://emberjs.com/edge_template.rb
 ```
 
 Read more about [Rails application templates](http://edgeguides.rubyonrails.org/rails_application_templates.html) and take a look at the edge_template.rb [source code](https://github.com/emberjs/website/blob/master/source/edge_template.rb).
@@ -59,7 +59,7 @@ Also, ember-rails includes 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)
+--javascript-engine  # engine for javascript (js, coffee, em or es6)
 --app-name or -n     # custom ember app name
 ```
 
@@ -94,6 +94,84 @@ 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.
 
+## For ES6 support
+
+Ember.js recommends using ES6 syntax.
+It is supported by [Babel](https://babeljs.io/) via [ember-es6_template](https://github.com/tricknotes/ember-es6_template).
+
+Run the bootstrap generator with an extra flag:
+
+``` sh
+rails g ember:bootstrap --javascript-engine=es6
+```
+
+Note:
+
+To use ES6 module in your application, the following configuration is required:
+
+### Single Ember Application
+
+This is the case for single Ember application in `app/assets/javascripts` (not under the sub directiry).
+
+`my-app.es6`
+``` javascript
+import Application from 'ember-rails/application';
+
+const App = Application.extend({
+  // Configure your application.
+});
+
+App.create();
+```
+
+`import Application from 'ember-rails/application';` and `Application.extend()` is important.
+It provides customized Ember application to resolve dependencies from ES6 modules instead of `Ember.Application.extend()`.
+
+`application.js`
+``` javascript
+//= require jquery
+//= require ember
+//= require ember-data
+//= require ember-rails/application
+//= require ./my-app
+//= require_self
+
+require('my-app'); // Run your Ember.js application
+```
+
+### Multiple Ember Application
+
+This is the case for multiple Ember application in your Rails application.
+(Or your Ember application is placed in sub directories of `app/assets/javascripts`.)
+
+First, you should configure `config.ember.module_prefix` to `nil`.
+To disable prepending the module prefix to you modules.
+
+`config/application.rb`
+``` ruby
+config.ember.module_prefix = nil
+```
+
+Second, please specify `modulePrefix` to your Ember application.
+
+`my-app/application.module.es6`
+``` javascript
+import Application from 'ember-rails/application';
+import loadInitializers from 'ember/load-initializers';
+
+const App = Application.extend({
+  modulePrefix: 'my-app' // This value should be the same as directory name.
+});
+
+loadInitializers(App, 'my-app');
+
+App.create();
+```
+
+Last, add your endpoint to where you want to run your Ember application.
+``` javascript
+require('my-app'); // Run your Ember.js application
+```
 
 ## Configuration Options
 
@@ -105,6 +183,7 @@ config files (`config/application.rb`, `config/environments/development.rb`, etc
 | `config.ember.variant`                       | Determines which Ember variant to use. Valid options: `:development`, `:production`. Defaults to `:production` in production, and `:development` everywhere else.                               |
 | `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.ember.module_prefix`                 | Sets module prefix for es6 module. This option is used for only `es6` scripts. Default value: `ember-app`. |
 | `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: `'/'`.                                                      |
@@ -147,10 +226,9 @@ to use `rails g ember:bootstrap` to create the following directory structure und
 ├── helpers
 ├── mixins
 ├── models
-├── practicality.js.coffee
-├── router.js.coffee
+├── practicality.coffee
+├── router.coffee
 ├── routes
-├── store.js.coffee
 ├── templates
 │   └── components
 └── views
@@ -161,7 +239,6 @@ By default, it uses the Rails Application's name and creates an `rails_app_name.
 file to set up application namespace and initial requires:
 
 ```javascript
-//= require handlebars
 //= require ember
 //= require ember-data
 //= require_self
@@ -197,8 +274,8 @@ If you want to avoid `.gitkeep` files, use the `skip git` option like
 this: `rails g ember:bootstrap -g`.
 
 Ask Rails to serve HandlebarsJS and pre-compile templates to Ember
-by putting each template in a dedicated ".js.hjs", ".hbs" or ".handlebars" file
-(e.g. `app/assets/javascripts/templates/admin_panel.handlebars`)
+by putting each template in a dedicated ".hbs", ".js.hjs" or ".handlebars" file
+(e.g. `app/assets/javascripts/templates/admin_panel.hbs`)
 and including the assets in your layout:
 
     <%= javascript_include_tag "templates/admin_panel" %>
@@ -207,7 +284,7 @@ If you want to avoid the `templates` prefix, set the `templates_root` option in
 
     config.handlebars.templates_root = 'ember_templates'
 
-If you store templates in a file like `app/assets/javascripts/ember_templates/admin_panel.handlebars` after setting the above config,
+If you store templates in a file like `app/assets/javascripts/ember_templates/admin_panel.hbs` after setting the above config,
 it will be made available to Ember as the `admin_panel` template.
 
 _(Note: you must clear the local sprockets cache after modifying `templates_root`, stored by default in `tmp/cache/assets`)_
@@ -243,17 +320,16 @@ Given the following folder structure:
 ├── helpers
 ├── mixins
 ├── models
-├── practicality.js.coffee
-├── router.js.coffee
+├── practicality.coffee
+├── router.coffee
 ├── routes
-├── store.js.coffee
 ├── templates
 │   └── components
-│       └── my-component.handlebars
+│       └── my-component.hbs
 └── views
 ```
 
-and a `my-component.handlebars` file with the following contents:
+and a `my-component.hbs` file with the following contents:
 
     <h1>My Component</h1>
 

data/app/assets/javascripts/ember-rails/application.module.es6

@@ -0,0 +1,20 @@
+//= require ember/loader
+//= require ember-rails/shims
+//= require ember/resolver
+//= require ember/load-initializers
+//
+//= require ember-rails/module_prefix
+
+import Ember from 'ember';
+import Resolver from 'ember/resolver';
+import loadInitializers from 'ember/load-initializers';
+import modulePrefix from 'ember-rails/module_prefix';
+
+let App = Ember.Application.extend({
+  modulePrefix: modulePrefix,
+  Resolver: Resolver
+});
+
+loadInitializers(App, modulePrefix);
+
+export default App;

data/app/assets/javascripts/ember-rails/module_prefix.module.es6.erb

@@ -0,0 +1 @@
+export default <%= Rails.application.config.ember.module_prefix.to_json %>;

data/app/assets/javascripts/ember-rails/shims.js

@@ -0,0 +1,11 @@
+define('ember', [], function() {
+  return {
+    'default': Ember
+  };
+});
+
+define('ember-data', [], function() {
+  return {
+    'default': DS
+  };
+});

data/lib/ember/rails/engine.rb

@@ -1,5 +1,8 @@
 require 'ember/handlebars/template'
 require 'active_model_serializers'
+require 'ember/es6_template'
+require 'ember/cli/assets'
+
 require 'sprockets/railtie'
 
 module Ember
@@ -17,8 +20,14 @@ module Ember
 
       config.before_initialize do |app|
         Sprockets::Engines #force autoloading
+      end
 
-        Ember::Handlebars::Template.setup Sprockets
+      config.before_initialize do |app|
+        Ember::ES6Template.configure do |ember_config|
+          ember_config.module_prefix = config.ember.module_prefix
+          ember_config.prefix_files = config.ember.prefix_files
+          ember_config.prefix_dirs = config.ember.prefix_dirs
+        end
       end
     end
   end

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.19.3'
+    VERSION = '0.20.0'
   end
 end

data/lib/ember_rails.rb

@@ -16,10 +16,11 @@ module Ember
   module Rails
     class Railtie < ::Rails::Railtie
       config.ember = ActiveSupport::OrderedOptions.new
+      config.ember.module_prefix = 'ember-app'
+      config.ember.prefix_files = %w(store router)
+      config.ember.prefix_dirs = %w(models controllers views routes components helpers mixins serializers adapters)
 
       generators do |app|
-        app ||= ::Rails.application # Rails 3.0.x does not yield `app`
-
         app.config.generators.assets = false
 
         ::Rails::Generators.configure!(app.config.generators)
@@ -89,6 +90,24 @@ module Ember
         end
       end
 
+      initializer "ember_rails.setup_ember_cli_assets", :after => "ember_rails.setup_vendor", :group => :all do |app|
+        configure_assets app do |env|
+          env.append_path Ember::CLI::Assets.root
+        end
+      end
+
+      initializer "ember_rails.setup_ember_handlebars_template", :after => "ember_rails.setup_vendor", :group => :all do |app|
+        configure_assets app do |env|
+          Ember::Handlebars::Template.setup env
+        end
+      end
+
+      initializer "ember_rails.setup_ember_es6_template", :after => "ember_rails.setup_vendor", :group => :all do |app|
+        configure_assets app do |env|
+          Ember::ES6Template.setup env
+        end
+      end
+
       initializer "ember_rails.es5_default", :group => :all do |app|
         if defined?(Closure::Compiler) && app.config.assets.js_compressor == :closure
           Closure::Compiler::DEFAULT_OPTIONS[:language_in] = 'ECMASCRIPT5'

data/lib/generators/ember/adapter_generator.rb

@@ -13,7 +13,7 @@ module Ember
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_adapter_files
-        file_path = File.join(ember_path, 'adapters', class_path, "#{file_name}_adapter.#{engine_extension}")
+        file_path = File.join(ember_path, 'adapters', class_path, "#{file_name}.#{engine_extension}")
         template "adapter.#{engine_extension}", file_path
       end
     end

data/lib/generators/ember/bootstrap_generator.rb

@@ -16,13 +16,16 @@ module Ember
 
       def inject_ember
         begin
-          inject_into_application_file(engine_extension)
+          if javascript_engine == 'es6'
+            inject_into_application_file('es6') # Don't use `.module.es6`.
+          else
+            inject_into_application_file(engine_extension)
+          end
         rescue Exception => e
           inject_into_application_file('js')
         end
       end
 
-
       def create_dir_layout
         %W{models controllers views routes helpers components templates templates/components mixins adapters}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
@@ -31,7 +34,7 @@ module Ember
       end
 
       def create_app_file
-        template "app.#{engine_extension}", "#{ember_path}/#{application_name.underscore}.#{engine_extension}"
+        template "app.#{engine_extension}", "#{ember_path}/#{application_name.underscore.dasherize}.#{engine_extension}"
       end
 
       def create_router_file
@@ -39,7 +42,11 @@ module Ember
       end
 
       def create_adapter_file
-        template "application_adapter.#{engine_extension}", "#{ember_path}/adapters/application_adapter.#{engine_extension}"
+        template "application_adapter.#{engine_extension}", "#{ember_path}/adapters/application.#{engine_extension}"
+      end
+
+      def create_env_file
+        template "environment.#{engine_extension}", "#{ember_path}/environment.#{engine_extension}"
       end
 
       private

data/lib/generators/ember/component_generator.rb

@@ -14,8 +14,8 @@ module Ember
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_component_files
-        dashed_file_name = file_name.gsub(/_/, '-')
-        comp_path = File.join(ember_path, 'components', class_path, "#{dashed_file_name}_component.#{engine_extension}")
+        dashed_file_name = file_name.dasherize
+        comp_path = File.join(ember_path, 'components', class_path, "#{dashed_file_name}.#{engine_extension}")
         template "component.#{engine_extension}", comp_path
 
         templ_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")

data/lib/generators/ember/controller_generator.rb

@@ -17,7 +17,7 @@ module Ember
 
 
       def create_controller_files
-        file_path = File.join(ember_path, 'controllers', class_path, "#{file_name}_controller.#{engine_extension}")
+        file_path = File.join(ember_path, 'controllers', class_path, "#{file_name.dasherize}.#{engine_extension}")
 
         if options.array?
           template "array_controller.#{engine_extension}", file_path

data/lib/generators/ember/generator_helpers.rb

@@ -45,7 +45,24 @@ module Ember
       end
 
       def engine_extension
-        @engine_extension ||= "js.#{options[:javascript_engine]}".sub('js.js','js')
+        @engine_extension ||= begin
+          extension_table = {
+            'js' => 'js',
+            'coffee' => 'coffee',
+            'em' => 'em',
+            'es6' => 'module.es6'
+          }
+
+          extension = extension_table[javascript_engine]
+
+          raise "Unsupported javascript engine: `#{javascript_engine}` (Supported engines are: [#{extension_table.keys.join(', ')}])" if extension.nil?
+
+          extension
+        end
+      end
+
+      def javascript_engine
+        options[:javascript_engine].to_s
       end
 
       def configuration

data/lib/generators/ember/model_generator.rb

@@ -13,7 +13,7 @@ module Ember
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_model_files
-        file_path = File.join(ember_path, 'models', class_path, "#{file_name}.#{engine_extension}")
+        file_path = File.join(ember_path, 'models', class_path, "#{file_name.dasherize}.#{engine_extension}")
         template "model.#{engine_extension}", file_path
       end
 

data/lib/generators/ember/resource_generator.rb

@@ -17,11 +17,10 @@ module Ember
 
 
       def create_resource_files
-
         invoke('ember:route', [ name ], options) unless options[:skip_route]
         invoke('ember:controller', [ name ], options)
         invoke('ember:view', [ name ], options)
-        invoke('ember:template', [ name ], options) 
+        invoke('ember:template', [ name ], options)
       end
 
     end

data/lib/generators/ember/route_generator.rb

@@ -13,7 +13,7 @@ module Ember
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_route_files
-        file_path = File.join(ember_path, 'routes', class_path, "#{file_name}_route.#{engine_extension}")
+        file_path = File.join(ember_path, 'routes', class_path, "#{file_name.dasherize}.#{engine_extension}")
         template "route.#{engine_extension}", file_path
       end
     end

data/lib/generators/ember/template_generator.rb

@@ -11,10 +11,8 @@ module Ember
       class_option :javascript_engine, :desc => "Engine for JavaScripts"
       class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
 
-
-
       def create_template_files
-        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.hbs")
+        file_path = File.join(ember_path, 'templates', class_path, "#{file_name.dasherize}.hbs")
         template 'template.hbs', file_path
       end
 

data/lib/generators/ember/view_generator.rb

@@ -14,7 +14,7 @@ module Ember
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_view_files
-        file_path = File.join(ember_path, 'views', class_path, "#{file_name}_view.#{engine_extension}")
+        file_path = File.join(ember_path, 'views', class_path, "#{file_name.dasherize}.#{engine_extension}")
         template "view.#{engine_extension}", file_path
         invoke('ember:template', [ name ], options) if options[:with_template]
       end

data/lib/generators/templates/app.module.es6

@@ -0,0 +1,17 @@
+//= require_tree ./adapters
+//= 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
+//
+//= require_self
+
+import Application from 'ember-rails/application';
+
+// for more details see: http://emberjs.com/guides/application/
+export default Application;

data/lib/generators/templates/{application.js.coffee → application.coffee}

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

data/lib/generators/templates/{application.js.em → application.em}

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

data/lib/generators/templates/application.es6

@@ -0,0 +1,15 @@
+//= require jquery
+//= require jquery_ujs
+<%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
+//= require ./environment
+//= require ember
+//= require ember-data
+//= require ember-rails/application
+//
+//= require ./<%= application_name.underscore.dasherize %>
+//= require_self
+
+import <%= application_name.camelize %> from '<%= application_name.underscore.dasherize %>';
+// import config from 'environment'; // You can use `config` for application specific variables such as API key, etc.
+
+<%= application_name.camelize %>.create();

data/lib/generators/templates/application.js

@@ -1,12 +1,22 @@
 //= require jquery
 //= require jquery_ujs
 <%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
+//= require ./environment
 //= require ember
 //= require ember-data
 //= require active-model-adapter
+<%- if engine_extension == 'module.es6' -%>
+//= require ember-rails/application
+//
+//= require ./<%= application_name.underscore.dasherize %>
 //= require_self
-//= require ./<%= application_name.underscore %>
+
+require('<%= application_name.underscore.dasherize %>');
+<%- else -%>
+
+//= require_self
+//= require ./<%= application_name.underscore.dasherize %>
+<%- end -%>
 
 // for more details see: http://emberjs.com/guides/application/
 <%= application_name.camelize %> = Ember.Application.create();
-

data/lib/generators/templates/{application_adapter.js.coffee → application_adapter.coffee}

@@ -1,5 +1,4 @@
 # Override the default adapter with the `DS.ActiveModelAdapter` which
 
 <%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
-
 })

data/lib/generators/templates/application_adapter.js

@@ -1,5 +1,4 @@
 // 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({
-
 });

data/lib/generators/templates/application_adapter.module.es6

@@ -0,0 +1,4 @@
+// Override the default adapter with the `DS.ActiveModelAdapter` which
+// is built to work nicely with the ActiveModel::Serializers gem.
+export default DS.ActiveModelAdapter.extend({
+});

data/lib/generators/templates/array_controller.module.es6

@@ -0,0 +1,7 @@
+// for more details see: http://emberjs.com/guides/controllers/representing-multiple-models-with-arraycontroller/
+
+import Ember from 'ember';
+
+export default Ember.ArrayController.extend({
+
+});

data/lib/generators/templates/component.module.es6

@@ -0,0 +1,7 @@
+// for more details see: http://emberjs.com/guides/components/
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+});

data/lib/generators/templates/controller.module.es6

@@ -0,0 +1,7 @@
+// for more details see: http://emberjs.com/guides/controllers/
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+
+});

data/lib/generators/templates/environment.coffee

@@ -0,0 +1,7 @@
+wondow.EmberENV = {
+  # FEATURES: {},
+  # EXTEND_PROTOTYPES: {
+  #    Function: false,
+  #    Array: true
+  # }
+}

data/lib/generators/templates/environment.em

@@ -0,0 +1,7 @@
+wondow.EmberENV = {
+  # FEATURES: {},
+  # EXTEND_PROTOTYPES: {
+  #    Function: false,
+  #    Array: true
+  # }
+}

data/lib/generators/templates/environment.js

@@ -0,0 +1,7 @@
+window.EmberENV = {
+  // FEATURES: {},
+  // EXTEND_PROTOTYPES: {
+  //    Function: false,
+  //    Array: true
+  // }
+};

data/lib/generators/templates/environment.module.es6

@@ -0,0 +1,9 @@
+export default {
+  EmberENV: {
+    // FEATURES: {},
+    // EXTEND_PROTOTYPES: {
+    //    Function: false,
+    //    Array: true
+    // }
+  }
+};

data/lib/generators/templates/model.module.es6

@@ -0,0 +1,15 @@
+// for more details see: http://emberjs.com/guides/models/defining-models/
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+<% attributes.each_with_index do |attribute, idx| -%>
+  <%= attribute[:name].camelize(:lower) %>: <%=
+  if %w(references belongs_to).member?(attribute[:type])
+    "DS.belongsTo('%s')" % attribute[:name].camelize(:lower)
+  else
+    "DS.attr('%s')" % attribute[:type]
+  end
+  %><% if (idx < attributes.length-1) %>,<% end %>
+<% end -%>
+});

data/lib/generators/templates/object_controller.module.es6

@@ -0,0 +1,7 @@
+// for more details see: http://emberjs.com/guides/controllers/
+
+import Ember from 'ember';
+
+export default Ember.ObjectController.extend({
+
+});

data/lib/generators/templates/route.module.es6

@@ -0,0 +1,7 @@
+// For more information see: http://emberjs.com/guides/routing/
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+
+});

data/lib/generators/templates/router.module.es6

@@ -0,0 +1,13 @@
+// For more information see: http://emberjs.com/guides/routing/
+
+import Ember from 'ember';
+
+var Router = Ember.Router.extend({
+  // location: 'history'
+});
+
+Router.map(function() {
+  // this.resource('posts');
+});
+
+export default Router;

data/lib/generators/templates/view.module.es6

@@ -0,0 +1,7 @@
+// for more details see: http://emberjs.com/guides/views/
+
+import Ember from 'ember';
+
+export default Ember.View.extend({
+  templateName: '<%= handlebars_template_path %>'
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -118,33 +118,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ember-es6_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: ember-cli-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +273,9 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- app/assets/javascripts/ember-rails/application.module.es6
+- app/assets/javascripts/ember-rails/module_prefix.module.es6.erb
+- app/assets/javascripts/ember-rails/shims.js
 - lib/ember-rails.rb
 - lib/ember/rails/engine.rb
 - lib/ember/rails/version.rb
@@ -275,45 +292,60 @@ files:
 - lib/generators/ember/route_generator.rb
 - lib/generators/ember/template_generator.rb
 - lib/generators/ember/view_generator.rb
+- lib/generators/templates/adapter.coffee
+- lib/generators/templates/adapter.em
 - lib/generators/templates/adapter.js
-- lib/generators/templates/adapter.js.coffee
-- lib/generators/templates/adapter.js.em
+- lib/generators/templates/app.coffee
+- lib/generators/templates/app.em
 - lib/generators/templates/app.js
-- lib/generators/templates/app.js.coffee
-- lib/generators/templates/app.js.em
+- lib/generators/templates/app.module.es6
+- lib/generators/templates/application.coffee
+- lib/generators/templates/application.em
+- lib/generators/templates/application.es6
 - lib/generators/templates/application.hbs
 - lib/generators/templates/application.js
-- lib/generators/templates/application.js.coffee
-- lib/generators/templates/application.js.em
+- lib/generators/templates/application_adapter.coffee
+- lib/generators/templates/application_adapter.em
 - lib/generators/templates/application_adapter.js
-- lib/generators/templates/application_adapter.js.coffee
-- lib/generators/templates/application_adapter.js.em
+- lib/generators/templates/application_adapter.module.es6
+- lib/generators/templates/array_controller.coffee
+- lib/generators/templates/array_controller.em
 - lib/generators/templates/array_controller.js
-- lib/generators/templates/array_controller.js.coffee
-- lib/generators/templates/array_controller.js.em
+- lib/generators/templates/array_controller.module.es6
+- lib/generators/templates/component.coffee
+- lib/generators/templates/component.em
 - lib/generators/templates/component.js
-- lib/generators/templates/component.js.coffee
-- lib/generators/templates/component.js.em
+- lib/generators/templates/component.module.es6
 - lib/generators/templates/component.template.hbs
+- lib/generators/templates/controller.coffee
+- lib/generators/templates/controller.em
 - lib/generators/templates/controller.js
-- lib/generators/templates/controller.js.coffee
-- lib/generators/templates/controller.js.em
+- lib/generators/templates/controller.module.es6
+- lib/generators/templates/environment.coffee
+- lib/generators/templates/environment.em
+- lib/generators/templates/environment.js
+- lib/generators/templates/environment.module.es6
+- lib/generators/templates/model.coffee
+- lib/generators/templates/model.em
 - lib/generators/templates/model.js
-- lib/generators/templates/model.js.coffee
-- lib/generators/templates/model.js.em
+- lib/generators/templates/model.module.es6
+- lib/generators/templates/object_controller.coffee
+- lib/generators/templates/object_controller.em
 - lib/generators/templates/object_controller.js
-- lib/generators/templates/object_controller.js.coffee
-- lib/generators/templates/object_controller.js.em
+- lib/generators/templates/object_controller.module.es6
+- lib/generators/templates/route.coffee
+- lib/generators/templates/route.em
 - lib/generators/templates/route.js
-- lib/generators/templates/route.js.coffee
-- lib/generators/templates/route.js.em
+- lib/generators/templates/route.module.es6
+- lib/generators/templates/router.coffee
+- lib/generators/templates/router.em
 - lib/generators/templates/router.js
-- lib/generators/templates/router.js.coffee
-- lib/generators/templates/router.js.em
+- lib/generators/templates/router.module.es6
 - lib/generators/templates/template.hbs
+- lib/generators/templates/view.coffee
+- lib/generators/templates/view.em
 - lib/generators/templates/view.js
-- lib/generators/templates/view.js.coffee
-- lib/generators/templates/view.js.em
+- lib/generators/templates/view.module.es6
 homepage: https://github.com/emberjs/ember-rails
 licenses:
 - MIT
@@ -334,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+