ember-rails-lite 0.9.2 → 0.11.1

data/README.md

@@ -12,9 +12,7 @@ Add the gem to your application Gemfile:
 
     gem "ember-rails"
 
-Run `bundle install` and add the following line to `app/assets/javascripts/application.js`:
-
-    //= require ember
+Run `bundle install` and use the ember-rails generator to add the necessary dependencies.
 
 Ember-rails will use the production build of Ember.js when Rails is running in
 production mode, and the development build otherwise.
@@ -35,8 +33,12 @@ Additionally, it will add the following lines to `app/assets/javascripts/applica
 By default, it uses the Rails Application's name and creates an `rails_app_name.js` 
 file to setup application namespace and initial requires:
 
+    //= require handlebars
     //= require ember
-    //= require ember/app
+    //= require ember-data
+    //= require_self
+    //= require rails_app_name
+    RailsAppName = Ember.Application.create();
 
 *Example:*
 
@@ -64,26 +66,22 @@ 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 :
-
-    config.handlebars.templates_root = 'templates'
-
-The result will be like this :
+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'`.
 
-    Ember.TEMPLATES['admin_panel'] = "...";
+    config.handlebars.templates_root = 'ember_templates'
 
-If you want a different path separator in template names add `templates_path_separator` option to your application configuration block :
+If you store templates in a file like `app/assets/javascripts/ember_templates/admin_panel.handlebars` after setting the above config,
+it will be made available to Ember as the `admin_panel` template.
 
-    config.handlebars.templates_path_separator = '-'
+_(Note: you must clear the local sprockets cache after modifying `templates_root`, stored by default in `tmp/cache/assets`)_
 
-The result will be like this :
-
-    Ember.TEMPLATES['templates-admin_panel'] = "...";
-
-Default behavior for ember-rails is to precompile handlebars templates only in production environment.
-If you don't want this behavior you can turn it off in your application configuration block :
+Default behavior for ember-rails is to precompile handlebars templates.
+If you don't want this behavior you can turn it off in your application configuration (or per environment in: `config/environments/development.rb`) block:
 
     config.handlebars.precompile = false
+    
+_(Note: you must clear the local sprockets cache if you disable precompilation, stored by default in `tmp/cache/assets`)_
 
 Bundle all templates together thanks to Sprockets,
 e.g create `app/assets/javascripts/templates/all.js` with:
@@ -105,6 +103,33 @@ It will be translated as :
         {{#view Ember.Button}}OK{{/view}}
     </script>
 
+## Specifying Different Versions of Ember/Handlebars/Ember-Data
+
+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), 
+and [Ember-Data](https://rubygems.org/gems/ember-data-source/versions). 
+
+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.pre4.2'
+
+You can also specify versions of 'handlebars-source' and
+'ember-data-source', but note that an appropriate 'handlebars-source'
+will be automatically chosen depending on the version of 'ember-source'
+that's specified. 
+
+You can also override the specific ember.js, handlebars.js, and
+ember-data.js files that'll be `require`d by the Asset pipeline by
+placing these files in `vendor/assets/ember/development` and
+`vendor/assets/ember/production`, depending on the `config.ember.variant`
+you've specified in your app's configuration, e.g.:
+
+    config.ember.variant = :production
+    #config.ember.variant = :development
+
 ## Note on Patches/Pull Requests
 
 1. Fork the project.

data/lib/ember-rails.rb

@@ -0,0 +1 @@
+require 'ember_rails'

data/lib/ember/handlebars/template.rb

@@ -77,11 +77,11 @@ module Ember
 
         if root.kind_of? Array
           root.each do |root|
-            path.gsub!(/^#{Regexp.quote(root)}\//, '')
+            path.sub!(/#{Regexp.quote(root)}\//, '')
           end
         else
           unless root.empty?
-            path.gsub!(/^#{Regexp.quote(root)}\/?/, '')
+            path.sub!(/#{Regexp.quote(root)}\/?/, '')
           end
         end
 

data/lib/ember/handlebars/version.rb

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

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.9.2'
+    VERSION = '0.11.1'
   end
 end

data/lib/ember/version.rb

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

data/lib/ember_rails.rb

@@ -1,8 +1,10 @@
 require 'rails'
 require 'ember/rails/version'
 require 'ember/version'
-require 'ember/handlebars/version'
 require 'ember/rails/engine'
+require 'ember/source'
+require 'ember/data/source'
+require 'handlebars/source'
 
 module Ember
   module Rails
@@ -21,13 +23,23 @@ module Ember
 
       initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
         if variant = app.config.ember.variant
-          # Add the gem's vendored ember to the end of the asset search path
-          ember_path = File.expand_path("../../vendor/ember/#{variant}", __FILE__)
-          app.config.assets.paths.push(ember_path.to_s)
+          # 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"))
+          app.assets.append_path(tmp_path)
+
+          # Make the handlebars.js and handlebars.runtime.js bundled
+          # in handlebars-source available.
+          app.assets.append_path(File.expand_path('../', ::Handlebars::Source.bundled_path))
 
           # Allow a local variant override
           ember_path = app.root.join("vendor/assets/ember/#{variant}")
-          app.config.assets.paths.unshift(ember_path.to_s) if ember_path.exist?
+          app.assets.prepend_path(ember_path.to_s) if ember_path.exist?
+
         else
           warn "No ember.js variant was specified in your config environment."
           warn "You can set a specific variant in your application config in "
@@ -39,24 +51,11 @@ module Ember
         end
       end
 
-      initializer "ember_rails.find_ember", :after => "ember_rails.setup_vendor", :group => :all do |app|
-        config.ember.ember_location ||= location_for(app, "ember.js")
-        config.ember.handlebars_location ||= location_for(app, "handlebars.js")
-      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'
         end
       end
-
-      def location_for(app, file)
-        path = app.config.assets.paths.find do |dir|
-          Pathname.new(dir).join(file).exist?
-        end
-
-        File.join(path, file) if path
-      end
     end
   end
 end

data/lib/generators/ember/bootstrap_generator.rb

@@ -1,3 +1,4 @@
+require 'ember/version'
 require 'generators/ember/generator_helpers'
 
 module Ember
@@ -7,9 +8,11 @@ module Ember
 
       source_root File.expand_path("../../templates", __FILE__)
 
-      desc "Creates a default Ember.js folder layout in app/assets/javascripts/ember"
+      desc "Creates a default Ember.js folder layout in app/assets/javascripts"
 
+      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 :skip_ams, :type => :boolean, :aliases => "-a", :default => false, :desc => "Skip ActiveModelSerializers"
 
       def inject_ember
         application_file = "app/assets/javascripts/application.js"
@@ -29,6 +32,16 @@ module Ember
         end
       end
 
+      def inject_ams
+        return if options[:skip_ams]
+        gem_file = ENV['BUNDLE_GEMFILE'] || 'Gemfile'
+        append_to_file(gem_file, "\n" + [
+          '# Learn how to build an Ember-compatible Rails API at',
+          '# https://github.com/rails-api/active_model_serializers',
+          'gem "active_model_serializers"'
+        ].join("\n"))
+      end
+
       def create_dir_layout
         %W{models controllers views routes helpers templates}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
@@ -49,7 +62,7 @@ module Ember
       end
 
       def create_app_stubs
-        generate "ember:view", "application"
+        invoke "ember:view", ["application", "-d #{ember_path}"]
       end
     end
   end

data/lib/generators/ember/controller_generator.rb

@@ -1,16 +1,20 @@
 require 'ember/version'
+require 'generators/ember/generator_helpers'
 
 module Ember
   module Generators
     class ControllerGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
       source_root File.expand_path("../../templates", __FILE__)
 
       desc "Creates a new Ember.js controller"
       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"
 
       def create_controller_files
-        file_path = File.join('app/assets/javascripts/controllers', class_path, "#{file_name}_controller.js")
+        file_path = File.join(ember_path, 'controllers', class_path, "#{file_name}_controller.js")
         if options.array?
           template 'array_controller.js', file_path
         elsif options.object?

data/lib/generators/ember/generator_helpers.rb

@@ -3,7 +3,7 @@ module Ember
     module GeneratorHelpers
 
       def ember_path
-        "app/assets/javascripts"
+        options[:ember_path] || "app/assets/javascripts"
       end
 
       def application_name

data/lib/generators/ember/install_generator.rb

@@ -1,4 +1,5 @@
 require 'ember/version'
+require 'generators/ember/generator_helpers'
 
 module Ember
   module Generators
@@ -28,10 +29,10 @@ module Ember
           end
 
           Dir.chdir git_root do
-            say_status("building", "bundle && bundle exec rake dist", :green)
+            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 dist}
+              cmd %{BUNDLE_GEMFILE="#{gem_file}" bundle exec rake clean dist}
             end
           end
 
@@ -64,10 +65,10 @@ module Ember
           end
 
           Dir.chdir git_root do
-            say_status("building", "bundle && bundle exec rake", :green)
+            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}
+              cmd %{BUNDLE_GEMFILE="#{gem_file}" bundle exec rake clean dist}
             end
           end
 

data/lib/generators/ember/model_generator.rb

@@ -1,33 +1,37 @@
 require 'ember/version'
+require 'generators/ember/generator_helpers'
 
 module Ember
   module Generators
     class ModelGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
       source_root File.expand_path("../../templates", __FILE__)
       argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
 
       desc "Creates a new Ember.js model"
+      class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
 
       def create_model_files
-        template 'model.js', File.join('app/assets/javascripts/models', class_path, "#{file_name}.js")
+        template 'model.js', File.join(ember_path, 'models', class_path, "#{file_name}.js")
       end
 
     private
       EMBER_TYPE_LOOKUP = {
         nil       => 'string',
 
-        binary:      'string',
-        string:      'string',
-        text:        'string',
-        boolean:     'boolean',
-        date:        'date',
-        datetime:    'date',
-        time:        'date',
-        timestamp:   'date',
-        decimal:     'number',
-        float:       'number',
-        integer:     'number',
-        primary_key: 'number'
+        :binary      => 'string',
+        :string      => 'string',
+        :text        => 'string',
+        :boolean     => 'boolean',
+        :date        => 'date',
+        :datetime    => 'date',
+        :time        => 'date',
+        :timestamp   => 'date',
+        :decimal     => 'number',
+        :float       => 'number',
+        :integer     => 'number',
+        :primary_key => 'number'
       }
 
       def parse_attributes!
@@ -36,7 +40,7 @@ module Ember
           key = type.try(:to_sym)
           ember_type = EMBER_TYPE_LOOKUP[key] || type
 
-          { name: name, type: ember_type }
+          { :name => name, :type => ember_type }
         end
       end
     end

data/lib/generators/ember/route_generator.rb

@@ -1,14 +1,18 @@
 require 'ember/version'
+require 'generators/ember/generator_helpers'
 
 module Ember
   module Generators
     class RouteGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
       source_root File.expand_path("../../templates", __FILE__)
 
       desc "Creates a new Ember.js route"
+      class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
 
       def create_route_files
-        file_path = File.join('app/assets/javascripts/routes', class_path, "#{file_name}_route.js")
+        file_path = File.join(ember_path, 'routes', class_path, "#{file_name}_route.js")
         template 'route.js', file_path
       end
     end

data/lib/generators/ember/view_generator.rb

@@ -1,17 +1,21 @@
 require 'ember/version'
+require 'generators/ember/generator_helpers'
 
 module Ember
   module Generators
     class ViewGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
       source_root File.expand_path("../../templates", __FILE__)
 
       desc "Creates a new Ember.js view and associated Handlebars template"
       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"
 
       def create_view_files
-        template 'view.js', File.join('app/assets/javascripts/views', class_path, "#{file_name}_view.js")
-        template 'view.handlebars', File.join('app/assets/javascripts/templates', class_path, "#{file_name}.handlebars")
+        template 'view.js', File.join(ember_path, 'views', class_path, "#{file_name}_view.js")
+        template 'view.handlebars', File.join(ember_path, 'templates', class_path, "#{file_name}.handlebars")
         invoke('ember:controller', [ file_name ], options)
         invoke('ember:route', [ file_name ], options)
       end

data/lib/generators/templates/model.js

@@ -1,5 +1,11 @@
 <%= application_name.camelize %>.<%= class_name %> = DS.Model.extend({
-<% attributes.each_index do |idx| -%>
-  <%= attributes[idx][:name].camelize(:lower) %>: DS.attr('<%= attributes[idx][:type] %>')<% if (idx < attributes.length-1) %>,<% end %>
+<% 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]
+  else
+    "DS.attr('%s')" % attribute[:type]
+  end
+  %><% if (idx < attributes.length-1) %>,<% end %>
 <% end -%>
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails-lite
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -48,6 +48,38 @@ dependencies:
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: barber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: ember-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
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ember-data-source
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -126,6 +158,7 @@ files:
 - lib/ember/rails/version.rb
 - lib/ember/version.rb
 - lib/ember-rails-lite.rb
+- lib/ember-rails.rb
 - lib/ember_rails.rb
 - lib/generators/ember/bootstrap_generator.rb
 - lib/generators/ember/controller_generator.rb
@@ -146,17 +179,16 @@ files:
 - lib/generators/templates/store.js
 - lib/generators/templates/view.handlebars
 - lib/generators/templates/view.js
-- vendor/ember/development/ember-data.js
-- vendor/ember/development/ember.js
-- vendor/ember/development/handlebars-runtime.js
-- vendor/ember/development/handlebars.js
-- vendor/ember/production/ember-data.js
-- vendor/ember/production/ember.js
-- vendor/ember/production/handlebars-runtime.js
-- vendor/ember/production/handlebars.js
 homepage: https://github.com/emberjs/ember-rails
 licenses: []
-post_install_message: 
+post_install_message: ! "# Ember-Rails Release Notes #\n\nIf you're upgrading from
+  ember-rails 0.11.1 or earlier, please be aware of the\nActiveModelSerializers changes
+  that are part of this update:\n\nActiveModelSerializers will no longer be a hard
+  dependency of ember-rails and\nwill not be require'd automatically.  Please add
+  the following line to your\nGemfile to continue using ActiveModelSerializers with
+  ember-rails:\n\n    gem \"active_model_serializers\"\n\nIn new applications, running
+  the bootstrap generator will append this\ndependency statement to your Gemfile for
+  you:\n\n    rails g ember:bootstrap\n\nRead more about using ember-rails at https://github.com/emberjs/ember-rails\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -177,5 +209,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Ember for Rails 3.1+ without ActiveModelSerializers
+summary: Ember for Rails 3.1+
 test_files: []