ember-rails 0.12.0 → 0.13.0

data/README.md

@@ -7,26 +7,45 @@ The gem will also pre-compile your handlebars templates when building your asset
 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
+1. Add the gem to your application Gemfile:
+```ruby
+gem 'ember-rails'
+gem 'ember-source', '1.0.0.rc5' # or the version you need
+gem 'handlebars-source', '1.0.0.rc4' # or the version you need
+```
 
-Add the gem to your application Gemfile:
+2. Run `bundle install`
 
-    gem "ember-rails"
-    gem "ember-source", "1.0.0rc3.2" # or whatever release of
-                                     # ember-source you desire
+3. [Optional] Configure the ember variant in your environment files (i.e. development.rb, production.rb). If you don't configure this, the version of Ember used defaults to development when the Rails environment is development, and similarly for production.
+```ruby
+  config.ember.variant = :development # or :production
+```
 
-Run `bundle install` and use the ember-rails generator to add the necessary dependencies.
+4. Next, generate the application structure:
+```shell
+rails generate ember:bootstrap
+```
 
-Ember-rails will use the production build of Ember.js when Rails is running in
-production mode, and the development build otherwise.
+5. Restart your server (if it's running)
 
-## Setting Ember Variant
 
-After running `bundle install` make sure you set the ember variant for your enviroments in their respected files with.
+Notes:
 
-    config.ember.variant = :development # or :production
+To install the latest builds of ember and ember-data:
+```shell
+rails generate ember:install --head
+```
 
-Not doing so will result in Sprockets not being able to resolve Ember's dependencies.
+## For CoffeeScript support
+1. Add coffee-rails to the Gemfile
+```ruby
+gem 'coffee-rails'
+```
 
+2. Run the bootstrap generator in step 4 with an extra flag instead:
+```sh
+rails g ember:bootstrap -g --javascript-engine coffee
+```
 
 ## Architecture
 
@@ -70,8 +89,6 @@ file to setup application namespace and initial requires:
 If you want to avoid `.gitkeep` files, use the `skip git` option like
 this: `rails g ember:bootstrap -g`.
 
-_(CoffeeScript support: just make sure you have `gem 'coffee-rails'` in your application Gemfile.)_
-
 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`)
@@ -108,19 +125,20 @@ Now a single line in the layout loads everything:
 If you use Slim or Haml templates, you can use handlebars filter :
 
     handlebars:
-        {{#view Ember.Button}}OK{{/view}}
+        <button {{action anActionName}}>OK</button>
 
 It will be translated as :
 
     <script type="text/x-handlebars">
-        {{#view Ember.Button}}OK{{/view}}
+        <button {{action anActionName}}>OK</button>
     </script>
 
 ## Specifying Different Versions of Ember/Handlebars/Ember-Data
 
+![Ember Data Warning](ember-data-in-progress.png)
 By default, ember-rails ships with the latest version of
-[Ember](https://rubygems.org/gems/ember-source/versions) (rc1),
-[Handlebars](https://rubygems.org/gems/handlebars-source/versions) (rc3),
+[Ember](https://rubygems.org/gems/ember-source/versions),
+[Handlebars](https://rubygems.org/gems/handlebars-source/versions),
 and [Ember-Data](https://rubygems.org/gems/ember-data-source/versions).
 
 To specify a different version that'll be used for both template
@@ -149,7 +167,7 @@ If at any point you need to update Ember.js from master, you can do that with
 
     rails generate ember:install --head
 
-This will clone both Ember.js and Ember Data from GitHub, build it and copy to the right directory.
+This will fetch both Ember.js and Ember Data from [http://builds.emberjs.com/](http://builds.emberjs.com/) and copy to the right directory.
 
 ## Note on Patches/Pull Requests
 

data/lib/ember/rails/engine.rb

@@ -10,16 +10,11 @@ module Ember
       config.handlebars.templates_root = "templates"
       config.handlebars.templates_path_separator = '/'
 
-      initializer "ember_rails.setup", :after => :append_assets_path, :group => :all do |app|
-        sprockets = if ::Rails::VERSION::MAJOR == 4
-          Sprockets.respond_to?('register_engine') ? Sprockets : app.assets
-        else
-          app.assets
-        end
-
-        sprockets.register_engine '.handlebars', Ember::Handlebars::Template
-        sprockets.register_engine '.hbs', Ember::Handlebars::Template
-        sprockets.register_engine '.hjs', Ember::Handlebars::Template
+      config.before_initialize do |app|
+        Sprockets::Engines #force autoloading
+        Sprockets.register_engine '.handlebars', Ember::Handlebars::Template
+        Sprockets.register_engine '.hbs', Ember::Handlebars::Template
+        Sprockets.register_engine '.hjs', Ember::Handlebars::Template
       end
     end
   end

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.12.0'
+    VERSION = '0.13.0'
   end
 end

data/lib/ember_rails.rb

@@ -1,6 +1,5 @@
 require 'rails'
 require 'ember/rails/version'
-require 'ember/version'
 require 'ember/rails/engine'
 require 'ember/source'
 require 'ember/data/source'
@@ -22,7 +21,9 @@ module Ember
       end
 
       initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
-        if variant = app.config.ember.variant
+        if variant = app.config.ember.variant || ::Rails.env.test?
+          # test environments should default to development
+          variant ||= :development
           # 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")

data/lib/generators/ember/bootstrap_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -13,6 +12,7 @@ module Ember
       class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
       class_option :skip_git, :type => :boolean, :aliases => "-g", :default => false, :desc => "Skip Git keeps"
       class_option :javascript_engine, :desc => "Engine for JavaScripts"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def inject_ember
         begin

data/lib/generators/ember/controller_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -14,6 +13,7 @@ module Ember
       class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
       class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
       class_option :object, :type => :boolean, :default => false, :desc => "Create an Ember.ObjectController to represent a single object"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
 
       def create_controller_files

data/lib/generators/ember/generator_helpers.rb

@@ -7,10 +7,12 @@ module Ember
       end
 
       def application_name
-        if defined?(::Rails) && ::Rails.application
+        if options[:app_name]
+          options[:app_name]
+        elsif defined?(::Rails) && ::Rails.application
           ::Rails.application.class.name.split('::').first
         else
-          "app"
+          "App"
         end
       end
 

data/lib/generators/ember/install_generator.rb

@@ -1,95 +1,42 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
+require 'net/http'
+require 'uri'
+require 'fileutils'
 
 module Ember
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       desc "Install Ember.js into your vendor folder"
-      class_option :head, :type => :boolean, :default => false, :desc => "Download latest Ember.js from GitHub and copy it into your project"
+      class_option :head, :type => :boolean, :default => false, :desc => "Download latest Ember.js from GitHub and fetch it into your project"
 
-      def copy_ember
+      def fetch_ember
         if options.head?
-
-          git_root = File.expand_path "~/.ember"
-          gem_file = File.join git_root, "Gemfile"
-
-          # If it doesn't exist yet
-          unless File.exist?(git_root)
-            command = %{git clone git://github.com/emberjs/ember.js.git "#{git_root}"}
-            say_status("downloading", command, :green)
-
-            cmd command
-          else
-            Dir.chdir git_root do
-              command = "git fetch origin && git reset origin/master --hard"
-              say_status("updating", command, :green)
-
-              cmd command
-            end
-          end
-
-          Dir.chdir git_root do
-            say_status("building", "bundle && bundle exec rake clean dist", :green)
-            Bundler.with_clean_env do
-              cmd "bundle --gemfile #{gem_file}"
-              cmd %{BUNDLE_GEMFILE="#{gem_file}" bundle exec rake clean dist}
-            end
-          end
-
-          source_paths << File.join(git_root, "dist")
-
-          copy_file "ember.js", "vendor/assets/ember/development/ember.js"
-          copy_file "ember.min.js", "vendor/assets/ember/production/ember.js"
+          fetch 'http://builds.emberjs.com/ember-latest.js', 'vendor/assets/ember/development/ember.js'
+          fetch 'http://builds.emberjs.com/ember-latest.min.js', 'vendor/assets/ember/production/ember.js'
         end
       end
 
-      def copy_ember_data
+      def fetch_ember_data
         if options.head?
-
-          git_root = File.expand_path "~/.ember-data"
-          gem_file = File.join git_root, "Gemfile"
-
-          # If it doesn't exist yet
-          unless File.exist?(git_root)
-            command = %{git clone git://github.com/emberjs/data.git "#{git_root}"}
-            say_status("downloading", command, :green)
-
-            cmd command
-          else
-            Dir.chdir git_root do
-              command = "git fetch origin && git reset origin/master --hard"
-              say_status("updating", command, :green)
-
-              cmd command
-            end
-          end
-
-          Dir.chdir git_root do
-            say_status("building", "bundle && bundle exec rake clean dist", :green)
-            Bundler.with_clean_env do
-              cmd "bundle --gemfile #{gem_file}"
-              cmd %{BUNDLE_GEMFILE="#{gem_file}" bundle exec rake clean dist}
-            end
-          end
-
-          source_paths << File.join(git_root, "dist")
-
-          copy_file "ember-data.js", "vendor/assets/ember/development/ember-data.js"
-          copy_file "ember-data.min.js", "vendor/assets/ember/production/ember-data.js"
+          fetch 'http://builds.emberjs.com/ember-data-latest.js', 'vendor/assets/ember/development/ember-data.js'
+          fetch 'http://builds.emberjs.com/ember-data-latest.min.js', 'vendor/assets/ember/production/ember-data.js'
         end
       end
 
-      private
+    private
+
+      def fetch(from, to)
+        message = "#{from} -> #{to}"
+        say_status("downloading:", message , :green)
 
-      def cmd(command)
-        out = `#{command}`
+        uri = URI(from)
 
-        if $?.exitstatus != 0
-          raise "Command error: command `#{command}` in directory #{Dir.pwd} has failed."
+        FileUtils.mkdir_p File.dirname(to)
+
+        open(to, 'w+') do |output|
+          output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
         end
-        out
       end
-
     end
   end
 end

data/lib/generators/ember/model_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -11,6 +10,7 @@ module Ember
       argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
       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 :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}")

data/lib/generators/ember/resource_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -14,6 +13,7 @@ module Ember
       class_option :skip_route, :type => :boolean, :default => false, :desc => "Don't create route"
       class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
       class_option :object, :type => :boolean, :default => false, :desc => "Create an Ember.ObjectController to represent a single object"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
 
       def create_resource_files
@@ -24,7 +24,6 @@ module Ember
         invoke('ember:template', [ name ], options) 
       end
 
-
     end
   end
 end

data/lib/generators/ember/route_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -11,6 +10,7 @@ module Ember
       desc "Creates a new Ember.js route"
       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_route_files
         file_path = File.join(ember_path, 'routes', class_path, "#{file_name}_route.#{engine_extension}")

data/lib/generators/ember/template_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember

data/lib/generators/ember/view_generator.rb

@@ -1,4 +1,3 @@
-require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -12,6 +11,7 @@ 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"
       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 create_view_files
         file_path = File.join(ember_path, 'views', class_path, "#{file_name}_view.#{engine_extension}")

data/lib/generators/templates/application.js

@@ -3,5 +3,7 @@
 //= require ember-data
 //= require_self
 //= 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

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

data/lib/generators/templates/array_controller.js

@@ -1,3 +1,5 @@
+// for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.ArrayController.extend({
 
 });

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

@@ -1,3 +1,5 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.ArrayController.extend({
 
 })

data/lib/generators/templates/controller.js

@@ -1,3 +1,5 @@
+// for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.Controller.extend({
 
 });

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

@@ -1,3 +1,5 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.Controller.extend({
 
 })

data/lib/generators/templates/model.js

@@ -1,3 +1,5 @@
+// for more details see: http://emberjs.com/guides/models/defining-models/
+
 <%= application_name.camelize %>.<%= class_name %> = DS.Model.extend({
 <% attributes.each_with_index do |attribute, idx| -%>
   <%= attribute[:name].camelize(:lower) %>: <%=
@@ -8,4 +10,4 @@
   end
   %><% if (idx < attributes.length-1) %>,<% end %>
 <% end -%>
-});
+});

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

@@ -1,4 +1,12 @@
+# for more details see: http://emberjs.com/guides/models/defining-models/
+
 <%= application_name.camelize %>.<%= class_name %> = DS.Model.extend<%= "()" if attributes.length == 0 %>
-<% attributes.each_index do |idx| -%>
-  <%= attributes[idx][:name].camelize(:lower) %>: DS.attr('<%= attributes[idx][:type] %>')
+<% 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]
+  else
+    "DS.attr '%s'" % attribute[:type]
+  end
+  %>
 <% end -%>

data/lib/generators/templates/object_controller.js

@@ -1,3 +1,5 @@
+// for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.ObjectController.extend({
 
 });

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

@@ -1,3 +1,5 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
 <%= application_name.camelize %>.<%= class_name %>Controller = Ember.ObjectController.extend({
 
 })

data/lib/generators/templates/route.js

@@ -1,3 +1,5 @@
+// For more information see: http://emberjs.com/guides/routing/
+
 <%= application_name.camelize %>.<%= class_name.camelize %>Route = Ember.Route.extend({
 
 });

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

@@ -1,3 +1,5 @@
+# For more information see: http://emberjs.com/guides/routing/
+
 <%= application_name.camelize %>.<%= class_name.camelize %>Route = Ember.Route.extend({
 
 })

data/lib/generators/templates/router.js

@@ -1,3 +1,5 @@
-<%= application_name.camelize %>.Router.map(function() {
+// For more information see: http://emberjs.com/guides/routing/
 
+<%= application_name.camelize %>.Router.map(function() {
+  // this.resource('posts');
 });

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

@@ -1,3 +1,5 @@
-<%= application_name.camelize %>.Router.map (match)->
-  # match('/').to('index')
+# For more information see: http://emberjs.com/guides/routing/
+
+<%= application_name.camelize %>.Router.map ()->
+  # @resource('posts')
 

data/lib/generators/templates/store.js

@@ -1,3 +1,6 @@
+// http://emberjs.com/guides/models/defining-a-store/
+
 <%= application_name.camelize %>.Store = DS.Store.extend({
-  revision: 11
+  revision: 11,
+  adapter: DS.RESTAdapter.create()
 });

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

@@ -1,4 +1,6 @@
+# http://emberjs.com/guides/models/defining-a-store/
+
 <%= application_name.camelize %>.Store = DS.Store.extend
-  revision: 4
+  revision: 11
   adapter: DS.RESTAdapter.create()
 

data/lib/generators/templates/view.js

@@ -1,3 +1,5 @@
+// for more details see: http://emberjs.com/guides/views/
+
 <%= application_name.camelize %>.<%= class_name.camelize %>View = Ember.View.extend({
   templateName: '<%= handlebars_template_path %>'
 });

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

@@ -1,2 +1,4 @@
+# for more details see: http://emberjs.com/guides/views/
+
 <%= application_name.camelize %>.<%= class_name.camelize %>View = 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.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -85,7 +85,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2.2
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: handlebars-source
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,7 +109,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +174,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ember-source
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc6
+- !ruby/object:Gem::Dependency
+  name: handlebars-source
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc4
 description: 
 email:
 - me@keithpitt.com
@@ -169,10 +217,8 @@ files:
 - README.md
 - LICENSE
 - lib/ember/handlebars/template.rb
-- lib/ember/handlebars/version.rb
 - lib/ember/rails/engine.rb
 - lib/ember/rails/version.rb
-- lib/ember/version.rb
 - lib/ember-rails.rb
 - lib/ember_rails.rb
 - lib/generators/ember/bootstrap_generator.rb
@@ -219,21 +265,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4189479251687179927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4189479251687179927
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ember for Rails 3.1+

data/lib/ember/handlebars/version.rb

@@ -1,5 +0,0 @@
-module Ember
-  module Handlebars
-    VERSION = "1.0.rc.3"
-  end
-end

data/lib/ember/version.rb

@@ -1,3 +0,0 @@
-module Ember
-  VERSION = "1.0.0-rc.1"
-end