ember-rails 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf471e302779ef5b339f0ec11f3203c87175618
-  data.tar.gz: caacf1625d1b51543d5a6a3bb9d48e6b11574a91
+  metadata.gz: b60a63f6567215c83896d987c2a2d6f23e2e36be
+  data.tar.gz: 1d7a76412bb6a2aff43f2c1d113a6eb2b591f1ff
 SHA512:
-  metadata.gz: bc8dbdc727b58571d73433c900faa99bd84987f0445e6db9a7850e31db9a17efd8d2aa2c2550f01cb7643be22e131794c842a156278b753aeb03535e0134102c
-  data.tar.gz: bf42e6518eaf4028fe9656b977fd96103bae9f7ab450942edef13f9ac64d12c7ca65784d84cbce2b27fab34fb65a9a61510bbe2dd2217f7880c39db8cd8fb5eb
+  metadata.gz: 336a685840c73eb1ad6cd7ce70142e939ec39461930821725381c449e5b86e327bc5062b34c886d9bc7bfc769f9020aed1c634929e15367a8c0f4148d4773f7f
+  data.tar.gz: daa683afc9cf7da1f1f0c9f659df026d466d5f65f108e0365b03cdd60c0965287dbeaf7fe247fb082f81e0d7e7bdfc81f378dd35f662d590dd75d47279e46880

data/README.md

@@ -14,7 +14,7 @@ You can see an example of how to use the gem [here](https://github.com/keithpitt
 
 ```ruby
 gem 'ember-rails'
-gem 'ember-source', '1.2.0' # or the version you need
+gem 'ember-source', '1.5.0' # or the version you need
 ```
 
 * Run `bundle install`
@@ -26,9 +26,19 @@ rails generate ember:bootstrap
 
 * Restart your server (if it's running)
 
+## Building a new project from scratch
 
-Notes:
+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
+```
+
+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).
+
+Notes:
 
 To install the latest builds of ember and ember-data. It should be noted that the
 examples in the [getting started guide](http://emberjs.com/guides/getting-started/)
@@ -38,7 +48,7 @@ have been designed to use the released version of ember:
 rails generate ember:install
 ```
 
-You'll probably need to clear out your cache after doing this with
+You'll probably need to clear out your cache after doing this with:
 
 ```shell
 rake tmp:clear
@@ -87,7 +97,7 @@ using an EmberScript variant first.
 
 ## Configuration Options
 
-The following options are availabe for configuration in your application or environment level
+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`.
@@ -116,7 +126,7 @@ to use `rails g ember:bootstrap` to create the following directory structure und
 
 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 setup application namespace and initial requires:
+file to set up application namespace and initial requires:
 
     //= require handlebars
     //= require ember
@@ -225,7 +235,7 @@ 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 exisitng project and need
+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:
 

data/lib/ember/rails/version.rb

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

data/lib/generators/ember/bootstrap_generator.rb

@@ -54,6 +54,9 @@ module Ember
                                 {:before => regex}
                               elsif contents =~ regex = /^\s*$/
                                 {:before => regex}
+                              else
+                                regex = /\z/
+                                {:after => regex}
                               end
 
           inject_into_file(full_path.to_s, injection_options) do

data/lib/generators/ember/generator_helpers.rb

@@ -5,10 +5,10 @@ module Ember
       def ember_path
         if options[:ember_path]
           options[:ember_path]
-        elsif configuration.ember_path
-          configuration.ember_path
         elsif rails_engine?
           "app/assets/javascripts/#{engine_name}"
+        elsif configuration.ember_path
+          configuration.ember_path
         else
           "app/assets/javascripts"
         end
@@ -25,10 +25,10 @@ module Ember
       def application_name
         if options[:app_name]
           options[:app_name]
-        elsif configuration.app_name
-          configuration.app_name
         elsif rails_engine?
           engine_name
+        elsif configuration.app_name
+          configuration.app_name
         elsif defined?(::Rails) && ::Rails.application
           ::Rails.application.class.name.split('::').first
         else

data/lib/generators/templates/application.js

@@ -3,7 +3,7 @@
 //= require ember
 //= require ember-data
 //= require_self
-//= require <%= application_name.underscore %>
+//= require ./<%= application_name.underscore %>
 
 // for more details see: http://emberjs.com/guides/application/
 <%= application_name.camelize %> = Ember.Application.create();

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

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

data/lib/generators/templates/array_controller.js

@@ -1,4 +1,4 @@
-// for more details see: http://emberjs.com/guides/controllers/
+// for more details see: http://emberjs.com/guides/controllers/representing-multiple-models-with-arraycontroller/
 
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.ArrayController.extend({
 

data/lib/generators/templates/store.js

@@ -1,7 +1,9 @@
-// http://emberjs.com/guides/models/using-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.
-  adapter: '_ams'
+
+});
+
+// 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/store.js.coffee

@@ -1,6 +1,12 @@
-# http://emberjs.com/guides/models/using-the-store/
+# 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.
-  adapter: '_ams'
+<%= 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({
+
+})

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

@@ -1,7 +1,5 @@
-# http://emberjs.com/guides/models/using-the-store/
-
 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.
-  adapter: '_ams'
 
+# 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -11,230 +11,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: barber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: ember-source
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.17
 - !ruby/object:Gem::Dependency
-  name: handlebars-source
+  name: ember-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: ember-data-source
+  name: handlebars-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.0.beta.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ember-source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: handlebars-source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   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
 description: 
@@ -245,12 +217,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
+- lib/ember-rails.rb
 - lib/ember/handlebars/template.rb
 - lib/ember/rails/engine.rb
 - lib/ember/rails/version.rb
-- lib/ember-rails.rb
 - lib/ember_rails.rb
 - lib/generators/ember/bootstrap_generator.rb
 - lib/generators/ember/component_generator.rb
@@ -308,17 +280,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ember for Rails 3.1+