ember-rails 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d46472d346a709f8580fb4050457cc583d25c02
-  data.tar.gz: 584df87b5a4286f252d6358856d11893af17caa0
+  metadata.gz: 020f2f3771234456fc51419a375bfe4be3b01be3
+  data.tar.gz: 87e169fa757402db45e3935ee6c3d6068f8bd220
 SHA512:
-  metadata.gz: ff21e550943f708355597fcc7ef9bc51661b5680199e0c1cdfbb7c497bcd062210194f301795ee438ec95a8dc0c74b1ffd0c378f8a298a88974c358a4285d98e
-  data.tar.gz: 77c10beb5d970e42b94cd6138a0860835182d9e01334e10d07c20e40148229aa5e8b65d747026c8d09b8c248a8b4b0ce5e81dc9c34fd9268d262b18ea2cb8c19
+  metadata.gz: 175f30b8b6e3a0fbb49ab344efbdf72aa86c626525f08252c7c84e34f7b18ee056406d53a75c28500c94a9d07833abfbad722150472b5898f882692f2b5bd785
+  data.tar.gz: 95eb8fcc6923aab085c665650ab0f0dab20c7116f596bd631589127aaa56ec76b6a51fd7c3e24aa5c494b8610ba1384c1c784f8e8e8040aebceddd40ac08daf9

data/README.md

@@ -112,13 +112,14 @@ config files (`config/application.rb`, `config/environments/development.rb`, etc
 
 | Configuration Option                         | Description                                                                                                         |
 |----------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
-| `config.ember.variant`                       | Determines which Ember variant to use. Valid options: `:development`, `:production`.                                |
+| `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.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`.                        |
+| `config.handlebars.ember_template`           | Default which Ember template type to compile. Valid options: `'Handlebars', `HTMLBars`. Defaults to 'Handlebars`' when `Ember::VERSION` is under 1.10.0, `HTMLBars` when `Ember::VERSION` is over 1.10.0. |
 
 Note:
 
@@ -149,6 +150,7 @@ Ember does not require an organized file structure. However, ember-rails allows
 to use `rails g ember:bootstrap` to create the following directory structure under `app/assets/javascripts`:
 
 ```
+├── adapters
 ├── components
 ├── controllers
 ├── helpers
@@ -194,6 +196,10 @@ RailsAppName = Ember.Application.create();
       create  app/assets/javascripts/templates/.gitkeep
       create  app/assets/javascripts/templates/components
       create  app/assets/javascripts/templates/components/.gitkeep
+      create  app/assets/javascripts/mixins
+      create  app/assets/javascripts/mixins/.gitkeep
+      create  app/assets/javascripts/adapters
+      create  app/assets/javascripts/adapters/.gitkeep
       create  app/assets/javascripts/app.js
 
 If you want to avoid `.gitkeep` files, use the `skip git` option like
@@ -251,6 +257,7 @@ When necessary, ember-rails adheres to a conventional folder structure. To creat
 Given the following folder structure:
 
 ```
+├── adapters
 ├── components
 ├── controllers
 ├── helpers

data/lib/ember/handlebars/template.rb

@@ -24,13 +24,13 @@ module Ember
           if raw
             template = precompile_handlebars(template)
           else
-            template = precompile_ember_handlebars(template)
+            template = precompile_ember_handlebars(template, configuration.ember_template)
           end
         else
           if raw
             template = compile_handlebars(data)
           else
-            template = compile_ember_handlebars(template)
+            template = compile_ember_handlebars(template, configuration.ember_template)
           end
         end
 
@@ -64,15 +64,15 @@ module Ember
       end
 
       def precompile_handlebars(string)
-        Barber::FilePrecompiler.call(string)
+        "Handlebars.template(#{Barber::Precompiler.compile(string)});"
       end
 
-      def compile_ember_handlebars(string)
-        "Ember.Handlebars.compile(#{indent(string).inspect});"
+      def compile_ember_handlebars(string, ember_template = 'Handlebars')
+        "Ember.#{ember_template}.compile(#{indent(string).inspect});"
       end
 
-      def precompile_ember_handlebars(string)
-        Barber::Ember::FilePrecompiler.call(string)
+      def precompile_ember_handlebars(string, ember_template = 'Handlebars')
+        "Ember.#{ember_template}.template(#{Barber::Ember::Precompiler.compile(string)});"
       end
 
       def mustache_to_handlebars(scope, template)

data/lib/ember/rails/engine.rb

@@ -11,6 +11,7 @@ module Ember
       config.handlebars.templates_root = "templates"
       config.handlebars.templates_path_separator = '/'
       config.handlebars.output_type = :global
+      config.handlebars.ember_template = Ember::VERSION =~ /\A1.[0-9]\./ ? 'Handlebars' : 'HTMLBars'
 
       config.before_initialize do |app|
         Sprockets::Engines #force autoloading

data/lib/ember/rails/version.rb

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

data/lib/ember_rails.rb

@@ -1,8 +1,8 @@
 require 'rails'
-require 'ember/rails/version'
-require 'ember/rails/engine'
 require 'ember/source'
 require 'ember/data/source'
+require 'ember/rails/version'
+require 'ember/rails/engine'
 require 'handlebars/source'
 
 module Ember
@@ -23,8 +23,8 @@ module Ember
       initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
         variant = app.config.ember.variant || (::Rails.env.production? ? :production : :development)
 
-        # Copy over the desired ember, ember-data, and handlebars bundled in
-        # ember-source, ember-data-source, and handlebars-source to a tmp folder.
+        # Copy over the desired ember and ember-data bundled in
+        # ember-source and ember-data-source to a tmp folder.
         tmp_path = app.root.join("tmp/ember-rails")
         FileUtils.mkdir_p(tmp_path)
 

data/lib/generators/ember/adapter_generator.rb

@@ -0,0 +1,21 @@
+require 'generators/ember/generator_helpers'
+
+module Ember
+  module Generators
+    class AdapterGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates a new Ember.js adapter"
+      class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
+      class_option :javascript_engine, :desc => "Engine for JavaScripts"
+      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}")
+        template "adapter.#{engine_extension}", file_path
+      end
+    end
+  end
+end

data/lib/generators/ember/bootstrap_generator.rb

@@ -24,7 +24,7 @@ module Ember
 
 
       def create_dir_layout
-        %W{models controllers views routes helpers components templates templates/components mixins}.each do |dir|
+        %W{models controllers views routes helpers components templates templates/components mixins adapters}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
           create_file "#{ember_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
@@ -42,6 +42,10 @@ module Ember
         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
+
       private
 
       def inject_into_application_file(safe_extension)

data/lib/generators/ember/install_generator.rb

@@ -10,12 +10,10 @@ module Ember
 
       class InvalidChannel < ::Thor::Error; end
       class ConflictingOptions < ::Thor::Error; end
-      class Deprecated < ::Thor::Error; end
       class InsufficientOptions < ::Thor::Error; end
 
       ::InvalidChannel = InvalidChannel
       ::ConflictingOptions = ConflictingOptions
-      ::Deprecated = Deprecated
       ::InsufficientOptions = InsufficientOptions
 
       desc "Install Ember.js into your vendor folder"

data/lib/generators/templates/adapter.js

@@ -0,0 +1,5 @@
+// For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+<%= application_name.camelize %>.<%= class_name.camelize %>Adapter = DS.ActiveModelAdapter.extend({
+
+});

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

@@ -0,0 +1,5 @@
+# For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+<%= application_name.camelize %>.<%= class_name.camelize %>Adapter = DS.ActiveModelAdapter.extend({
+
+})

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

@@ -0,0 +1,3 @@
+# For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+class <%= application_name.camelize %>.<%= class_name.camelize %>Adapter extends DS.ActiveModelAdapter

data/lib/generators/templates/app.js

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

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

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

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

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

data/lib/generators/templates/application_adapter.js

@@ -0,0 +1,5 @@
+// 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.js.coffee

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

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

@@ -0,0 +1,3 @@
+# 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

data/lib/generators/templates/store.js

@@ -1,10 +1,3 @@
-// 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.*

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

@@ -1,12 +1,3 @@
-# http://emberjs.com/guides/models/#toc_store
-# http://emberjs.com/guides/models/pushing-records-into-the-store/
-
-# 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.*

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

@@ -1,7 +1,3 @@
-# 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.*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,7 @@ files:
 - lib/ember/rails/engine.rb
 - lib/ember/rails/version.rb
 - lib/ember_rails.rb
+- lib/generators/ember/adapter_generator.rb
 - lib/generators/ember/bootstrap_generator.rb
 - lib/generators/ember/component_generator.rb
 - lib/generators/ember/controller_generator.rb
@@ -235,6 +236,9 @@ files:
 - lib/generators/ember/route_generator.rb
 - lib/generators/ember/template_generator.rb
 - lib/generators/ember/view_generator.rb
+- lib/generators/templates/adapter.js
+- lib/generators/templates/adapter.js.coffee
+- lib/generators/templates/adapter.js.em
 - lib/generators/templates/app.js
 - lib/generators/templates/app.js.coffee
 - lib/generators/templates/app.js.em
@@ -242,6 +246,9 @@ files:
 - lib/generators/templates/application.js
 - lib/generators/templates/application.js.coffee
 - lib/generators/templates/application.js.em
+- lib/generators/templates/application_adapter.js
+- lib/generators/templates/application_adapter.js.coffee
+- lib/generators/templates/application_adapter.js.em
 - lib/generators/templates/array_controller.js
 - lib/generators/templates/array_controller.js.coffee
 - lib/generators/templates/array_controller.js.em
@@ -290,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+