ember-rails 0.5.0 → 0.6.0

data/README.md

@@ -52,7 +52,7 @@ file to setup application namespace and initial requires:
       create  app/assets/javascripts/helpers/.gitkeep
       create  app/assets/javascripts/templates
       create  app/assets/javascripts/templates/.gitkeep
-      create  app/assets/javascripts/app.js.coffee
+      create  app/assets/javascripts/app.js
 
 If you want to avoid `.gitkeep` files, use the `skip git` option like
 this: `rails g ember:bootstrap -g`.

data/lib/ember/handlebars/assets/ember-precompiler.js

@@ -1,22 +1,23 @@
 // DOM
-var Element = {}
-Element.firstChild = function () { return Element };
-Element.innerHTML = function () { return Element };
+var Element = {};
+Element.firstChild = function () { return Element; };
+Element.innerHTML = function () { return Element; };
 
-var document = { createRange: false, createElement: function() { return Element } };
+var document = { createRange: false, createElement: function() { return Element; } };
 var window = this;
 this.document = document;
 
-// Console
-var console = window.console = {};
-console.log = console.info = console.warn = console.error = function(){};
+// null out console.log and console.warn to avoid unexpected output
+if (window.console) {
+  window.console.warn = function() {};
+  window.console.log = function() {};
+}
 
-// jQuery
-var jQuery = window.jQuery = function() { return jQuery };
-jQuery.ready = function() { return jQuery };
-jQuery.inArray = function() { return jQuery };
+//// jQuery
+var jQuery = window.jQuery = function() { return jQuery; };
+jQuery.ready = function() { return jQuery; };
+jQuery.inArray = function() { return jQuery; };
 jQuery.jquery = "1.7.2";
-var $ = jQuery;
 
 // Precompiler
 var EmberRails = {

data/lib/ember/handlebars/source.rb

@@ -21,7 +21,14 @@ module Ember
         end
 
         def contents
-          @contents ||= [File.read(precompiler_path), File.read(path)].join("\n")
+          @contents ||= begin
+            config = ::Rails.application.config.ember
+            handlebars = File.read(config.handlebars_location)
+            ember = File.read(config.ember_location)
+            precompiler = File.read(precompiler_path)
+
+            [precompiler, handlebars, ember].join("\n")
+          end
         end
 
         def handlebars_version
@@ -40,7 +47,6 @@ module Ember
 
     class << self
       def compile(template)
-        template = template.read if template.respond_to?(:read)
         Source.context.call('EmberRails.precompile', template)
       end
     end

data/lib/ember/handlebars/version.rb

@@ -2,6 +2,6 @@ require 'ember/handlebars/source'
 
 module Ember
   module Handlebars
-    VERSION = Ember::Handlebars::Source.handlebars_version
+    VERSION = "1.0.rc.1"
   end
 end

data/lib/ember/rails/engine.rb

@@ -5,7 +5,8 @@ module Ember
   module Rails
     class Engine < ::Rails::Engine
       config.handlebars = ActiveSupport::OrderedOptions.new
-      config.handlebars.precompile = ::Rails.env.production?
+
+      config.handlebars.precompile = true
       config.handlebars.templates_root = "templates"
       config.handlebars.templates_path_separator = '/'
 
@@ -18,7 +19,14 @@ module Ember
         app.assets.register_engine '.hjs', Ember::Handlebars::Template
 
         # Add the gem's vendored ember to the end of the asset search path
-        app.config.assets.paths << Ember::Rails.ember_path
+        variant = app.config.ember.variant
+
+        if variant.nil?
+          warn "[EMBER-RAILS] `ember.variant` was not found in your current environment"
+        end
+
+        ember_path = File.expand_path("../../../../vendor/ember/#{variant}", __FILE__)
+        app.config.assets.paths.unshift ember_path
       end
     end
   end

data/lib/ember/rails/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Rails
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/ember/version.rb

@@ -1,5 +1,5 @@
 require 'ember/handlebars/source'
 
 module Ember
-  VERSION = Ember::Handlebars::Source.ember_version
+  VERSION = "1.0.beta"
 end

data/lib/ember_rails.rb

@@ -5,33 +5,37 @@ require 'ember/rails/engine'
 
 module Ember
   module Rails
-    # Create a map from Rails environments to versions of Ember.
-    mattr_accessor :map
-
-    # By default, production and test will both use minified Ember.
-    # Add mappings in your environment files like so:
-    #   Ember::Rails.map["staging"] = "production"
-    # To use ember-spade, map development to spade:
-    #   Ember::Rails.map["development"] = "spade"
-    self.map ||= {"test" => "production"}
-
-    # Returns the asset path containing Ember for the current Rails
-    # environment. Defaults to development if no other version is found.
-    def self.ember_path
-      @ember_path ||= begin
-        # Check for an enviroment mapping
-        mapped_dir = Ember::Rails.map[::Rails.env]
-
-        # Get the location, either mapped or based on Rails.env
-        ember_root = File.expand_path("../../vendor/ember", __FILE__)
-        ember_path = File.join(ember_root, mapped_dir || ::Rails.env)
-
-        # Fall back on development if we couldn't find another version
-        unless File.exist?(ember_path)
-          ember_path = File.join(ember_root, "development")
+    class Railtie < ::Rails::Railtie
+      config.ember = ActiveSupport::OrderedOptions.new
+
+      generators do |app|
+        app ||= ::Rails.application # Rails 3.0.x does not yield `app`
+
+        app.config.generators.assets = false
+
+        ::Rails::Generators.configure!(app.config.generators)
+        ::Rails::Generators.hidden_namespaces.uniq!
+        require "generators/ember/resource_override"
+      end
+
+      initializer "ember_rails.setup_vendor", :after => "ember_rails.setup", :group => :all do |app|
+        # Add the gem's vendored ember to the end of the asset search path
+        variant = app.config.ember.variant
+        ember_path = app.root.join("vendor/assets/ember/#{variant}")
+        app.config.assets.paths.unshift(ember_path.to_s) if ember_path.exist?
+      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
+
+      def location_for(app, file)
+        path = app.config.assets.paths.find do |dir|
+          Pathname.new(dir).join(file).exist?
         end
 
-        ember_path
+        File.join(path, file) if path
       end
     end
   end

data/lib/generators/ember/bootstrap_generator.rb

@@ -16,6 +16,9 @@ module Ember
 
         inject_into_file(application_file, :before => "//= require_tree") do
           dependencies = [
+            # this should eventually become handlebars-runtime when we remove
+            # the runtime dependency on compilation
+            "//= require handlebars",
             "//= require ember",
             "//= require ember-data",
             "//= require_self",
@@ -27,7 +30,7 @@ module Ember
       end
 
       def create_dir_layout
-        %W{models controllers views states helpers templates}.each do |dir|
+        %W{models controllers views routes helpers templates}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
           create_file "#{ember_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
@@ -37,8 +40,30 @@ module Ember
         template "app.js", "#{ember_path}/#{application_name.underscore}.js"
       end
 
-      def create_state_manager_file
-        template "states.js", "#{ember_path}/states/app_states.js"
+      def create_router_file
+        template "router.js", "#{ember_path}/routes/app_router.js"
+      end
+
+      def create_store_file
+        template "store.js", "#{ember_path}/store.js"
+      end
+
+      def create_app_stubs
+        generate "ember:view", "application"
+      end
+
+      def inject_proper_ember_version
+        environment <<-RUBY.strip_heredoc, :env => :development
+          config.ember.variant = :development
+        RUBY
+
+        environment <<-RUBY.strip_heredoc, :env => :test
+          config.ember.variant = :development
+        RUBY
+
+        environment <<-RUBY.strip_heredoc, :env => :production
+          config.ember.variant = :production
+        RUBY
       end
     end
   end

data/lib/generators/ember/install_generator.rb

@@ -3,21 +3,8 @@ require 'ember/version'
 module Ember
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-
-      EMBER_FILES = [ "ember.js", "ember-dev.js" ]
-      RUNTIME_FILES = [ "ember-runtime.js", "ember-runtime-dev.js" ]
-      ALL_FILES = [ *EMBER_FILES, *RUNTIME_FILES ]
-
       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 :runtime, :type => :boolean, :default => false, :desc => "Include the Ember.js runtime only"
-
-      def remove_ember
-        ALL_FILES.each do |name|
-          file = "vendor/assets/javascripts/#{name}"
-          remove_file file if File.exist?(file)
-        end
-      end
 
       def copy_ember
         if options.head?
@@ -33,7 +20,7 @@ module Ember
             cmd command
           else
             Dir.chdir git_root do
-              command = "git fetch --force --quiet --tags && git reset HEAD --hard"
+              command = "git fetch --force --quiet --tags && git reset origin/master --hard"
               say_status("updating", command, :green)
 
               cmd command
@@ -50,34 +37,13 @@ module Ember
 
           self.class.source_root File.join(git_root, "dist")
 
-          ember_files.each do |name|
-            source_file = if name.match /-dev/
-              name.gsub /-dev/, '.debug'
-            else
-              name.gsub /.js/, '.prod.js'
-            end
-
-            copy_file source_file, "vendor/assets/javascripts/#{name}"
-          end
-
-        else
-
-          self.class.source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
-          say_status("copying", "Ember.js (#{Ember::VERSION})", :green)
-
-          ember_files.each do |name|
-            copy_file name, "vendor/assets/javascripts/#{name}"
-          end
-
+          copy_file "ember.js", "vendor/assets/ember/development/ember.js"
+          copy_file "ember.min.js", "vendor/assets/ember/production/ember.js"
         end
       end
 
       private
 
-      def ember_files
-        options.runtime? ? RUNTIME_FILES : EMBER_FILES
-      end
-
       def cmd(command)
         out = `#{command}`
 

data/lib/generators/ember/model_generator.rb

@@ -5,22 +5,22 @@ module Ember
     class ModelGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("../../templates", __FILE__)
       argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
-      
+
       desc "Creates a new Ember.js model"
-      
+
       def create_model_files
         template 'model.js', File.join('app/assets/javascripts/models', class_path, "#{file_name}.js")
       end
-      
-      private 
-      
+
+    private
+
       def parse_attributes!
         self.attributes = (attributes || []).map do |attr|
-          attr = attr.split(':')
-          { name: attr[0], type: attr[1] }
+          name, type = attr.split(':')
+          type = 'string' if type == 'text'
+          { name: name, type: type }
         end
       end
-      
     end
   end
 end

data/lib/generators/ember/resource_override.rb

@@ -0,0 +1,32 @@
+require "rails/generators"
+require "rails/generators/rails/resource/resource_generator"
+require "generators/ember/controller_generator"
+require "generators/ember/view_generator"
+
+module Rails
+  module Generators
+    ResourceGenerator.class_eval do
+      def add_ember
+        say_status :invoke, "ember:model", :white
+        with_padding do
+          invoke "ember:model"
+        end
+
+        say_status :invoke, "ember controller and view (singular)", :white
+        with_padding do
+          invoke "ember:view"
+        end
+
+        @_invocations[Ember::Generators::ControllerGenerator].delete "create_controller_files"
+        @_invocations[Ember::Generators::ViewGenerator].delete "create_view_files"
+
+        say_status :invoke, "ember controller and view (plural)", :white
+        with_padding do
+          invoke "ember:view", [plural_name], :array => true
+        end
+      end
+    end
+  end
+end
+
+

data/lib/generators/ember/view_generator.rb

@@ -4,15 +4,16 @@ module Ember
   module Generators
     class ViewGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("../../templates", __FILE__)
-      argument :controller_name, :type => :string, :required => true, :desc => "The controller name for this view"
-      
+
       desc "Creates a new Ember.js view and associated Handlebars template"
-      
-      def create_model_files
-        template 'view.js', File.join('app/assets/javascripts/views/' + controller_name, class_path, "#{file_name}_view.js")
-        template 'view.handlebars', File.join('app/assets/javascripts/templates/' + controller_name, class_path, "#{file_name}.handlebars")
+      class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
+
+      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")
+        invoke('ember:controller', [ file_name ], options)
       end
-      
+
     end
   end
 end

data/lib/generators/templates/app.js

@@ -1,17 +1,15 @@
+//= require ./store
 //= require_tree ./models
 //= require_tree ./controllers
 //= require_tree ./views
 //= require_tree ./helpers
 //= require_tree ./templates
-//= require_tree ./states
+//= require_tree ./routes
 //= require_self
 
-// <%= application_name.camelize %>.stateManager is useful for debugging,
-// but don't use it directly in application code.
-var stateManager = <%= application_name.camelize %>.stateManager = <%= application_name.camelize %>.StateManager.create();
-<%= application_name.camelize %>.initialize(stateManager);
-
-jQuery(function() {
-  stateManager.send('ready');
+var router = <%= application_name.camelize %>.router = <%= application_name.camelize %>.Router.create({
+  location: 'hash'
 });
 
+<%= application_name.camelize %>.initialize(router);
+

data/lib/generators/templates/application.handlebars

@@ -0,0 +1,3 @@
+<h1><%= application_name %></h1>
+
+{{outlet}}

data/lib/generators/templates/array_controller.js

@@ -2,6 +2,6 @@
   // Implement your controller here.
   //
   // An ArrayController has a `content` property, which you should
-  // set up in your state manager.
+  // set up in your router.
 });
 

data/lib/generators/templates/controller.js

@@ -1,4 +1,4 @@
-<%= application_name.camelize %>.<%= class_name %>Controller = Ember.Object.extend({
+<%= application_name.camelize %>.<%= class_name %>Controller = Ember.ObjectController.extend({
   // Implement your controller here.
 });
 

data/lib/generators/templates/router.js

@@ -0,0 +1,15 @@
+<%= application_name.camelize %>.Router = Ember.Router.extend({
+  root: Ember.State.extend({
+    index: Ember.State.extend({
+      route: '/'
+
+      // You'll likely want to connect a view here.
+      // connectOutlets: function(router) {
+      //   router.get('applicationController').connectOutlet(App.MainView);
+      // }
+
+      // Layout your routes here...
+    })
+  })
+});
+