ember-rails 0.13.0 → 0.14.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 916d617e38b6defe34e9a4fda6e864399d699a44
+  data.tar.gz: f4cf0a357c14a700944c601a5ef20b433a471b46
+SHA512:
+  metadata.gz: 3f1dd4bc588c9fe62bd10e04d19424cab5a28ed601e890d965f2be2b5a18b010113601e1f2058d688e71c49e20cd56b21ec302c6965040fb2ce01687b73fa9b6
+  data.tar.gz: d9614b02448d13537139e0f2bcbaec40dc7f7857252a6181ddcdd2cc40993a1e38a215f1fd66458c3a8c33e352a0466842501fb705fd92ca45cfb83dc58d95de

data/README.md

@@ -1,42 +1,54 @@
 # ember-rails  [![Build Status](https://secure.travis-ci.org/emberjs/ember-rails.png?branch=master)](http://travis-ci.org/emberjs/ember-rails) [![Dependency Status](https://gemnasium.com/emberjs/ember-rails.png)](https://gemnasium.com/emberjs/ember-rails)
 
-ember-rails allows you to include [Ember.JS](http://emberjs.com/) into your Rails 3.1+ application.
+ember-rails makes developing an [Ember.JS](http://emberjs.com/) application much easier in Rails 3.1+.
 
-The gem will also pre-compile your handlebars templates when building your asset pipeline. It includes development and production copies of Ember.
+The following functionalities are included in this gem:
+- Pre-compiling of your handlebars templates when building your asset pipeline.
+- Includes development and production copies of Ember, [Ember Data](https://github.com/emberjs/data) and [Handlebars](https://github.com/wycats/handlebars.js).
+- Includes [ActiveModel::Serializer](https://github.com/rails-api/active_model_serializers) for integration with Ember Data.
 
 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:
+* 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
-```
+gem 'ember-source', '1.1.2' # or the version you need
 
-2. Run `bundle install`
-
-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
+# optional since Handlebars 1.0.0 was released
+#gem 'handlebars-source', '~> 1.0.12' # or the version you need
 ```
 
-4. Next, generate the application structure:
+* Run `bundle install`
+* Next, generate the application structure:
+
 ```shell
 rails generate ember:bootstrap
 ```
 
-5. Restart your server (if it's running)
+* Restart your server (if it's running)
 
 
 Notes:
 
-To install the latest builds of ember and ember-data:
+
+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/)
+have been designed to use the released version of ember:
+
+```shell
+rails generate ember:install
+```
+
+You'll probably need to clear out your cache after doing this with
+
 ```shell
-rails generate ember:install --head
+rake tmp:clear
 ```
 
 ## For CoffeeScript support
+
 1. Add coffee-rails to the Gemfile
 ```ruby
 gem 'coffee-rails'
@@ -47,6 +59,50 @@ gem 'coffee-rails'
 rails g ember:bootstrap -g --javascript-engine coffee
 ```
 
+Note:
+
+Ember-rails include some flags options for bootstrap generator:
+
+```
+--ember-path or -d # custom ember path
+--skip-git or -g # skip git keeps
+--javascript-engine  # engine for javascript (js or coffee)
+--app-name or -n # custom ember app name
+```
+
+## For EmberScript support
+
+[EmberScript](http://www.emberscript.com) is a dialect of CoffeeScript
+with extra support for computed properties (which do not have to be
+explicitly declared), the `class` / `extends` syntax, and extra syntax
+to support observers and mixins.
+
+To get EmberScript support, make sure you have the following in your
+Gemfile:
+
+```ruby
+gem 'ember_script-rails', :github => 'ghempton/ember-script-rails'
+```
+
+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.
+
+## Configuration Options
+
+The following options are availabe 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`.
+* `config.ember.app_name` - Used to specify a default application name for all generators.
+* `config.ember.ember_path` - Used to specify a default custom root path for all generators.
+* `config.handlebars.precompile` - Used to enable or disable precompilation. Default value: `true`.
+* `config.handlebars.templates_root` - Set 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`.
+
 ## Architecture
 
 Ember does not require an organized file structure. However, ember-rails allows you
@@ -54,9 +110,11 @@ to use `rails g ember:bootstrap` to create the following directory structure und
 
     controllers/
     helpers/
+    components/
     models/
     routes/
     templates/
+    templates/components
     views/
 
 Additionally, it will add the following lines to `app/assets/javascripts/application.js`.
@@ -82,8 +140,12 @@ file to setup application namespace and initial requires:
       create  app/assets/javascripts/views/.gitkeep
       create  app/assets/javascripts/helpers
       create  app/assets/javascripts/helpers/.gitkeep
+      create  app/assets/javascripts/components
+      create  app/assets/javascripts/components/.gitkeep
       create  app/assets/javascripts/templates
       create  app/assets/javascripts/templates/.gitkeep
+      create  app/assets/javascripts/templates/components
+      create  app/assets/javascripts/templates/components/.gitkeep
       create  app/assets/javascripts/app.js
 
 If you want to avoid `.gitkeep` files, use the `skip git` option like
@@ -133,9 +195,67 @@ It will be translated as :
         <button {{action anActionName}}>OK</button>
     </script>
 
+### Note about ember components
+
+When necessary, ember-rails adheres to a conventional folder structure. To create an ember component you must define the handlebars file *inside* the *components* folder under the templates folder of your project to properly register your handlebars component file.
+
+*Example*
+
+With the following folder structure:
+
+    components/
+    controllers/
+    helpers/
+    models/
+    routes/
+    templates/
+      components/
+        my-component.handlebars
+    views/
+
+and a *my-component.handlebars* file with the following contents
+
+    <h1>My Component</h1>
+
+will produce the following handlebars output
+
+    <script type="text/x-handlebars" id="components/my-component">
+      <h1>My Component</h1>
+    </script>
+
+You can reference your component inside your other handlebars template files by the handlebars file name:
+
+     {{ 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
+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:
+
+* `assets/javascripts/components/` to hold the component javascript source
+* `assets/javascripts/templates/components/` to hold the handlebars templates for your components
+
+Your asset pipeline require statements should include reference to both e.g.
+
+RailsAppName.js
+```
+//= require_tree ./templates
+//= require_tree ./components
+```
+
+or
+
+RailsAppName.js.coffee
+```
+#= require_tree ./templates
+#= require_tree ./components
+```
+
+These are automatically generated for you in new projects you when you run the `ember:bootstrap` generator.
+
+
 ## 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),
 [Handlebars](https://rubygems.org/gems/handlebars-source/versions),
@@ -145,7 +265,7 @@ 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'
+    gem 'ember-source', '1.0.0'
 
 You can also specify versions of 'handlebars-source' and
 'ember-data-source', but note that an appropriate 'handlebars-source'
@@ -163,11 +283,25 @@ you've specified in your app's configuration, e.g.:
 
 ## Updating Ember
 
-If at any point you need to update Ember.js from master, you can do that with
+If at any point you need to update Ember.js from any of the release channels, you can do that with
+
+    rails generate ember:install --channel=<channel>
+
+This will fetch both Ember.js and Ember Data from [http://builds.emberjs.com/](http://builds.emberjs.com/) and copy to the right directory. You can choose between the following channels:
+* canary - This references the 'master' branch and is not recommended for production use.
+* beta - This references the 'beta' branch, and will ultimately become the next stable version. It is not recommended for production use.
+* release - This references the 'stable' branch, and is recommended for production use.
+
+When you don't specify a channel, the release channel is used.
+
+It is also possible to download a specific tagged release. To do this, use the following syntax:
+
+
+    rails generate ember:install --tag=v1.2.0-beta.2 --ember
 
-    rails generate ember:install --head
+or for ember-data
 
-This will fetch both Ember.js and Ember Data from [http://builds.emberjs.com/](http://builds.emberjs.com/) and copy to the right directory.
+    rails generate ember:install --tag=v1.0.0-beta.2 --ember-data
 
 ## Note on Patches/Pull Requests
 

data/lib/ember/handlebars/template.rb

@@ -12,7 +12,6 @@ module Ember
       def prepare; end
 
       def evaluate(scope, locals, &block)
-        target = template_target(scope)
         raw = handlebars?(scope)
 
         if raw
@@ -35,7 +34,15 @@ module Ember
           end
         end
 
-        "#{target} = #{template}\n"
+        if configuration.output_type == :amd
+          target = amd_template_target(scope)
+
+          "define('#{target}', ['exports'], function(__exports__){ __exports__.default = #{template} });"
+        else
+          target = global_template_target(scope)
+
+          "#{target} = #{template}\n"
+        end
       end
 
       private
@@ -44,7 +51,11 @@ module Ember
         scope.pathname.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
       end
 
-      def template_target(scope)
+      def amd_template_target(scope)
+        "#{configuration.amd_namespace}/#{scope.logical_path.split(".").first}"
+      end
+
+      def global_template_target(scope)
         "Ember.TEMPLATES[#{template_path(scope.logical_path).inspect}]"
       end
 

data/lib/ember/rails/engine.rb

@@ -1,5 +1,6 @@
 require 'ember/handlebars/template'
 require 'active_model_serializers'
+require 'sprockets/railtie'
 
 module Ember
   module Rails
@@ -9,6 +10,7 @@ module Ember
       config.handlebars.precompile = true
       config.handlebars.templates_root = "templates"
       config.handlebars.templates_path_separator = '/'
+      config.handlebars.output_type = :global
 
       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.13.0'
+    VERSION = '0.14.0'
   end
 end

data/lib/ember_rails.rb

@@ -21,35 +21,24 @@ module Ember
       end
 
       initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
-        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")
-          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.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 "
-          warn "order for sprockets to locate ember's assets:"
-          warn ""
-          warn "    config.ember.variant = :development"
-          warn ""
-          warn "Valid values are :development and :production"
-        end
+        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.
+        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.assets.prepend_path(ember_path.to_s) if ember_path.exist?
       end
 
       initializer "ember_rails.es5_default", :group => :all do |app|

data/lib/generators/ember/bootstrap_generator.rb

@@ -11,7 +11,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 :javascript_engine, :desc => "Engine for JavaScripts (js for JavaScript, coffee for CoffeeScript, etc)"
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def inject_ember
@@ -24,7 +24,7 @@ module Ember
 
 
       def create_dir_layout
-        %W{models controllers views routes helpers templates}.each do |dir|
+        %W{models controllers views routes helpers components templates templates/components mixins}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
           create_file "#{ember_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
@@ -43,12 +43,26 @@ module Ember
       end
 
       private
+
       def inject_into_application_file(safe_extension)
-        application_file = "#{ember_path}/application.#{safe_extension}"
-        inject_into_file( application_file, :before => /^.*require_tree.*$/) do
-          context = instance_eval('binding')
-          source  = File.expand_path(find_in_source_paths("application.#{safe_extension}"))
-          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+        application_file = "application.#{safe_extension}"
+        full_path = Pathname.new(destination_root).join(ember_path, application_file)
+
+        if full_path.exist?
+          contents = full_path.read
+          injection_options = if contents =~ regex = /^.*require_tree.*$/
+                                {:before => regex}
+                              elsif contents =~ regex = /^\s*$/
+                                {:before => regex}
+                              end
+
+          inject_into_file(full_path.to_s, injection_options) do
+            context = instance_eval('binding')
+            source  = File.expand_path(find_in_source_paths(application_file))
+            ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+          end
+        else
+          template application_file, full_path
         end
       end
     end

data/lib/generators/ember/component_generator.rb

@@ -0,0 +1,28 @@
+require 'generators/ember/generator_helpers'
+
+module Ember
+  module Generators
+    class ComponentGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates a new Ember.js component and component template\nCustom Ember Components require at least two descriptive names separated by a dash. Use CamelCase or dash-case to name your component.\n\nExample,\n\trails generate ember:component PostChart [options]\n\trails generate ember:component post-chart [options]"
+
+      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_component_files
+        dashed_file_name = file_name.gsub(/_/, '-')
+        comp_path = File.join(ember_path, 'components', class_path, "#{dashed_file_name}_component.#{engine_extension}")
+        template "component.#{engine_extension}", comp_path
+
+        templ_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.handlebars")
+        template "component.template.handlebars", templ_path
+
+      end
+
+    end
+  end
+end

data/lib/generators/ember/generator_helpers.rb

@@ -3,12 +3,32 @@ module Ember
     module GeneratorHelpers
 
       def ember_path
-        options[:ember_path] || "app/assets/javascripts"
+        if options[:ember_path]
+          options[:ember_path]
+        elsif configuration.ember_path
+          configuration.ember_path
+        elsif rails_engine?
+          "app/assets/javascripts/#{engine_name}"
+        else
+          "app/assets/javascripts"
+        end
+      end
+
+      def rails_engine?
+        defined?(ENGINE_PATH)
+      end
+
+      def engine_name
+        ENGINE_PATH.split('/')[-2]
       end
 
       def application_name
         if options[:app_name]
           options[:app_name]
+        elsif configuration.app_name
+          configuration.app_name
+        elsif rails_engine?
+          engine_name
         elsif defined?(::Rails) && ::Rails.application
           ::Rails.application.class.name.split('::').first
         else
@@ -16,18 +36,21 @@ module Ember
         end
       end
 
-
       def class_name
         (class_path + [file_name]).map!{ |m| m.camelize }.join()
       end
 
       def handlebars_template_path
-        File.join(class_path, file_name).gsub(/^\//, '') 
+        File.join(class_path, file_name).gsub(/^\//, '')
       end
 
       def engine_extension
         @engine_extension ||= "js.#{options[:javascript_engine]}".sub('js.js','js')
       end
+
+      def configuration
+        ::Rails.configuration.ember
+      end
     end
   end
 end

data/lib/generators/ember/install_generator.rb

@@ -3,39 +3,163 @@ require 'net/http'
 require 'uri'
 require 'fileutils'
 
+
 module Ember
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
+
+      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"
-      class_option :head, :type => :boolean, :default => false, :desc => "Download latest Ember.js from GitHub and fetch it into your project"
+      class_option :head,
+        :type => :boolean, 
+        :default => false, 
+        :desc => "Download Ember.js & Ember data from canary channel. This is deprecated. Use channel instead."
+      class_option :channel,
+        :type => :string,
+        :required => false,
+        :desc => "Ember release channel Choose between 'release', 'beta' or 'canary'"
+      class_option :ember_only, 
+        :type => :boolean, 
+        :required => false, 
+        :desc => "Only download Ember.",
+        :aliases => '--ember'
+      class_option :ember_data_only,
+        :type => :boolean, 
+        :required => false, 
+        :desc => "Only download ember-data", 
+        :aliases => '--ember-data'
+      class_option :tag,
+        :type => :string,
+        :required => false, 
+        :desc => "Download taged release use syntax v1.0.0-beta.3/ember-data & v1.0.0-rc.8/ember"
+
+      def initialize(args = [], options = {}, config = {})
+        super(args, options, config)
+        check_options
+        process_options
+      end
+
 
-      def fetch_ember
-        if options.head?
-          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'
+      def ember
+        begin
+          unless options.ember_data_only?
+            get_ember_js_for(:development)
+            get_ember_js_for(:production)
+          end
+        rescue Thor::Error
+          say('WARNING: no ember files on this channel or tag' , :yellow)
         end
       end
 
-      def fetch_ember_data
-        if options.head?
-          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'
+      def ember_data
+        begin
+          unless options.ember_only?
+            get_ember_data_for(:development)
+            get_ember_data_for(:production)
+          end
+        rescue Thor::Error
+          say('WARNING: no ember-data files on this channel or tag' , :yellow)
         end
       end
 
     private
 
+
+      def get_ember_data_for(environment)
+        create_file "vendor/assets/ember/#{environment}/ember-data.js" do
+          fetch "#{base_url}/#{channel}/#{file_name_for('ember-data', environment)}", "vendor/assets/ember/#{environment}/ember-data.js"
+        end
+      end
+
+      def get_ember_js_for(environment)
+
+        create_file "vendor/assets/ember/#{environment}/ember.js" do
+          fetch "#{base_url}/#{channel}/#{file_name_for('ember', environment)}", "vendor/assets/ember/#{environment}/ember.js"
+        end
+      end
+
+      def file_name_for(component,environment)
+        case environment
+        when :production
+          "#{component}.min.js"
+        when :development
+          "#{component}.js"
+        end
+      end
+
+      def check_options
+        if options.head? 
+          say('WARNING: --head option is deprecated in favor of --channel=cannary' , :yellow)
+        end
+        if options.head? && options.channel?
+          say 'ERROR: conflicting options. --head and --channel. Use either --head or --channel=<channel>', :red
+          raise ConflictingOptions
+        end
+        if options.channel? && !%w(release beta canary).include?(options[:channel])
+          say 'ERROR: channel can either be release, beta or canary', :red
+          raise InvalidChannel
+        end
+        if options.channel? && options.tag?
+          say 'ERROR: conflicting options. --tag and --channel. --tag is incompatible with other options', :red
+          raise ConflictingOptions
+        end
+        if options.head? && options.tag?
+          say 'ERROR: conflicting options. --tag and --head. --tag is incompatible with other options', :red
+          raise ConflictingOptions
+        end
+        if options.tag? && !(options.ember_only? || options.ember_data_only?)
+          say 'ERROR: insufficient options. --tag needs to be combined with eithe --ember or --ember-data', :red
+          raise InsufficientOptions
+        end
+      end
+
+      def process_options
+        if options.head? 
+          @channel = :canary
+        end
+        if options.tag?
+          @channel = "tags/#{options.tag}"
+        end
+      end
+
+      def base_url
+        'http://builds.emberjs.com'
+      end
+
+      def channel
+        if options.channel
+          @channel ||= options[:channel]
+        else
+          @channel ||= :release
+        end
+      end
+
+
       def fetch(from, to)
         message = "#{from} -> #{to}"
         say_status("downloading:", message , :green)
 
         uri = URI(from)
-
-        FileUtils.mkdir_p File.dirname(to)
-
-        open(to, 'w+') do |output|
-          output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
+        output = StringIO.new
+        output.puts "// Fetched from: " + uri.to_s
+        output.puts "// Fetched on: " + Time.now.utc.iso8601.to_s
+        output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
+        output.rewind
+        content = output.read
+        if content.include?('404')
+          say "ERROR: Error reading the content from the channel with url #{from}." , :red
+          raise raise Thor::Error
         end
+        content
       end
     end
   end

data/lib/generators/ember/template_generator.rb

@@ -9,10 +9,13 @@ module Ember
 
       desc "Creates a new Ember.js template"
       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
-        template 'template.handlebars', File.join('app/assets/javascripts/templates', class_path, "#{file_name}.handlebars")
+        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.handlebars")
+        template 'template.handlebars', file_path
       end
 
     end

data/lib/generators/templates/app.js

@@ -1,8 +1,10 @@
 //= require ./store
+//= require_tree ./mixins
 //= require_tree ./models
 //= require_tree ./controllers
 //= require_tree ./views
 //= require_tree ./helpers
+//= require_tree ./components
 //= require_tree ./templates
 //= require ./router
 //= require_tree ./routes

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

@@ -3,6 +3,7 @@
 #= require_tree ./controllers
 #= require_tree ./views
 #= require_tree ./helpers
+#= require_tree ./components
 #= require_tree ./templates
 #= require_tree ./routes
 #= require ./router

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

@@ -0,0 +1,9 @@
+#= require ./store
+#= require_tree ./models
+#= require_tree ./controllers
+#= require_tree ./views
+#= require_tree ./helpers
+#= require_tree ./templates
+#= require_tree ./routes
+#= require ./router
+#= require_self

data/lib/generators/templates/application.js

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

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

@@ -0,0 +1,8 @@
+#= require handlebars
+#= require ember
+#= 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.em

@@ -0,0 +1,3 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
+class <%= application_name.camelize %>.<%= class_name %>Controller extends Ember.ArrayController

data/lib/generators/templates/component.js

@@ -0,0 +1,4 @@
+// for more details see: http://emberjs.com/guides/components/
+
+<%= application_name.camelize %>.<%= class_name %>Component = Ember.Component.extend({
+});

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

@@ -0,0 +1,6 @@
+# for more details see: http://emberjs.com/guides/components/
+
+<%= application_name.camelize %>.<%= class_name %>Component = Ember.Component.extend({
+
+})
+

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

@@ -0,0 +1,6 @@
+# for more details see: http://emberjs.com/guides/components/
+
+<%= application_name.camelize %>.<%= class_name %>Component = Ember.Component.extend({
+
+})
+

data/lib/generators/templates/component.template.handlebars

@@ -0,0 +1,2 @@
+<div>
+</div>

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

@@ -0,0 +1,3 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
+class <%= application_name.camelize %>.<%= class_name %>Controller extends Ember.Controller

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

@@ -0,0 +1,12 @@
+# for more details see: http://emberjs.com/guides/models/defining-models/
+
+class <%= application_name.camelize %>.<%= class_name %> extends DS.Model
+<% 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.em

@@ -0,0 +1,3 @@
+# for more details see: http://emberjs.com/guides/controllers/
+
+class <%= application_name.camelize %>.<%= class_name %>Controller extends Ember.ObjectController

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

@@ -0,0 +1,3 @@
+# For more information see: http://emberjs.com/guides/routing/
+
+class <%= application_name.camelize %>.<%= class_name.camelize %>Route extends Ember.Route

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

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

data/lib/generators/templates/store.js

@@ -1,6 +1,7 @@
-// http://emberjs.com/guides/models/defining-a-store/
+// http://emberjs.com/guides/models/using-the-store/
 
 <%= application_name.camelize %>.Store = DS.Store.extend({
-  revision: 11,
-  adapter: DS.RESTAdapter.create()
+  // Override the default adapter with the `DS.ActiveModelAdapter` which
+  // is built to work nicely with the ActiveModel::Serializers gem.
+  adapter: '_ams'
 });

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

@@ -1,6 +1,6 @@
-# http://emberjs.com/guides/models/defining-a-store/
+# http://emberjs.com/guides/models/using-the-store/
 
 <%= application_name.camelize %>.Store = DS.Store.extend
-  revision: 11
-  adapter: DS.RESTAdapter.create()
-
+  # Override the default adapter with the `DS.ActiveModelAdapter` which
+  # is built to work nicely with the ActiveModel::Serializers gem.
+  adapter: '_ams'

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

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

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

@@ -0,0 +1,4 @@
+# for more details see: http://emberjs.com/guides/views/
+
+class <%= application_name.camelize %>.<%= class_name.camelize %>View extends Ember.View
+  templateName: '<%= handlebars_template_path %>'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
-  prerelease: 
+  version: 0.14.0
 platform: ruby
 authors:
 - Keith Pitt
@@ -12,200 +11,232 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   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: 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: 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
-    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:
-    - - ! '>='
+    - - '>='
       - !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: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !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
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc6
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: handlebars-source
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !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.0.0.rc4
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc4
+        version: 1.14.0
 description: 
 email:
 - me@keithpitt.com
@@ -222,6 +253,7 @@ files:
 - lib/ember-rails.rb
 - lib/ember_rails.rb
 - lib/generators/ember/bootstrap_generator.rb
+- lib/generators/ember/component_generator.rb
 - lib/generators/ember/controller_generator.rb
 - lib/generators/ember/generator_helpers.rb
 - lib/generators/ember/install_generator.rb
@@ -233,48 +265,61 @@ files:
 - lib/generators/ember/view_generator.rb
 - lib/generators/templates/app.js
 - lib/generators/templates/app.js.coffee
+- lib/generators/templates/app.js.em
 - lib/generators/templates/application.handlebars
 - lib/generators/templates/application.js
 - lib/generators/templates/application.js.coffee
+- lib/generators/templates/application.js.em
 - lib/generators/templates/array_controller.js
 - lib/generators/templates/array_controller.js.coffee
+- lib/generators/templates/array_controller.js.em
+- lib/generators/templates/component.js
+- lib/generators/templates/component.js.coffee
+- lib/generators/templates/component.js.em
+- lib/generators/templates/component.template.handlebars
 - lib/generators/templates/controller.js
 - lib/generators/templates/controller.js.coffee
+- lib/generators/templates/controller.js.em
 - lib/generators/templates/model.js
 - lib/generators/templates/model.js.coffee
+- lib/generators/templates/model.js.em
 - lib/generators/templates/object_controller.js
 - lib/generators/templates/object_controller.js.coffee
+- lib/generators/templates/object_controller.js.em
 - lib/generators/templates/route.js
 - lib/generators/templates/route.js.coffee
+- lib/generators/templates/route.js.em
 - lib/generators/templates/router.js
 - lib/generators/templates/router.js.coffee
+- lib/generators/templates/router.js.em
 - lib/generators/templates/store.js
 - lib/generators/templates/store.js.coffee
+- lib/generators/templates/store.js.em
 - lib/generators/templates/template.handlebars
 - lib/generators/templates/view.js
 - lib/generators/templates/view.js.coffee
+- lib/generators/templates/view.js.em
 homepage: https://github.com/emberjs/ember-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ember for Rails 3.1+
 test_files: []