ember-rails 0.14.0 → 0.18.0

data/lib/generators/ember/adapter_generator.rb

@@ -0,0 +1,21 @@
+require 'generators/ember/generator_helpers'
+
+module Ember
+  module Generators
+    class AdapterGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates a new Ember.js adapter"
+      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_adapter_files
+        file_path = File.join(ember_path, 'adapters', class_path, "#{file_name}_adapter.#{engine_extension}")
+        template "adapter.#{engine_extension}", file_path
+      end
+    end
+  end
+end

data/lib/generators/ember/bootstrap_generator.rb

@@ -24,7 +24,7 @@ module Ember
 
 
       def create_dir_layout
-        %W{models controllers views routes helpers components templates templates/components mixins}.each do |dir|
+        %W{models controllers views routes helpers components templates templates/components mixins adapters}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
           create_file "#{ember_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
@@ -38,8 +38,8 @@ module Ember
         template "router.#{engine_extension}", "#{ember_path}/router.#{engine_extension}"
       end
 
-      def create_store_file
-        template "store.#{engine_extension}", "#{ember_path}/store.#{engine_extension}"
+      def create_adapter_file
+        template "application_adapter.#{engine_extension}", "#{ember_path}/adapters/application_adapter.#{engine_extension}"
       end
 
       private
@@ -54,6 +54,9 @@ module Ember
                                 {:before => regex}
                               elsif contents =~ regex = /^\s*$/
                                 {:before => regex}
+                              else
+                                regex = /\z/
+                                {:after => regex}
                               end
 
           inject_into_file(full_path.to_s, injection_options) do

data/lib/generators/ember/component_generator.rb

@@ -18,8 +18,8 @@ module Ember
         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
+        templ_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")
+        template "component.template.hbs", templ_path
 
       end
 

data/lib/generators/ember/generator_helpers.rb

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

data/lib/generators/ember/install_generator.rb

@@ -10,37 +10,35 @@ module Ember
 
       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, 
+        :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, 
+      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", 
+        :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"
+        :required => false,
+        :desc => "Download tagged 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)
@@ -73,32 +71,53 @@ module Ember
 
     private
 
-
       def get_ember_data_for(environment)
+        # temporarily using a variable here until a stable release of
+        # ember-data is released so that installing with ember-data
+        # *just works*.
+        chan = if channel.to_s == 'release'
+          say_status("warning:", 'Ember Data is not available on the :release channel. Falling back to beta channel.' , :yellow)
+          :beta
+        else
+          channel
+        end
+
         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"
+          fetch url_for(chan, 'ember-data', environment), "vendor/assets/ember/#{environment}/ember-data.js"
+        end
+
+        sourcemap_url = "#{base_url}/#{chan}/ember-data.js.map"
+        if resource_exist?(sourcemap_url)
+          create_file "vendor/assets/ember/#{environment}/ember-data.js.map" do
+            fetch sourcemap_url, "vendor/assets/ember/#{environment}/ember-data.js.map", false
+          end
         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"
+          fetch url_for(channel, 'ember', environment), "vendor/assets/ember/#{environment}/ember.js"
         end
       end
 
-      def file_name_for(component,environment)
+      def url_for(channel, component, environment)
+        base = "#{base_url}/#{channel}/#{component}"
+
         case environment
         when :production
-          "#{component}.min.js"
+          "#{base}.min.js"
         when :development
-          "#{component}.js"
+          if resource_exist?("#{base}.debug.js")
+            "#{base}.debug.js" # Ember.js 1.10.0.beta.1 or later
+          else
+            "#{base}.js"
+          end
         end
       end
 
       def check_options
-        if options.head? 
-          say('WARNING: --head option is deprecated in favor of --channel=cannary' , :yellow)
+        if options.head?
+          say('WARNING: --head option is deprecated in favor of --channel=canary' , :yellow)
         end
         if options.head? && options.channel?
           say 'ERROR: conflicting options. --head and --channel. Use either --head or --channel=<channel>', :red
@@ -123,7 +142,7 @@ module Ember
       end
 
       def process_options
-        if options.head? 
+        if options.head?
           @channel = :canary
         end
         if options.tag?
@@ -143,23 +162,36 @@ module Ember
         end
       end
 
-
-      def fetch(from, to)
+      def fetch(from, to, prepend_verbose = true)
         message = "#{from} -> #{to}"
         say_status("downloading:", message , :green)
 
         uri = URI(from)
         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")
+        if prepend_verbose
+          output.puts "// Fetched from channel: #{channel}, with url " + uri.to_s
+          output.puts "// Fetched on: " + Time.now.utc.iso8601.to_s
+        end
+
+        response = Net::HTTP.get_response(uri)
+        case response.code
+        when '404'
+          say "ERROR: Error reading the content from the channel with url #{from}. File not found" , :red
+          raise Thor::Error
+        when '200'
+          output.puts response.body.force_encoding("UTF-8")
+        else
+          say "ERROR: Unexpected error with status #{response.code} reading the content from the channel with url #{from}." , :red
+          raise Thor::Error
+        end
         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
+
+      def resource_exist?(target)
+        uri = URI(target)
+        response = Net::HTTP.new(uri.host, uri.port).head(uri.path)
+        response.code == '200'
       end
     end
   end

data/lib/generators/ember/resource_override.rb

@@ -6,6 +6,12 @@ require "generators/ember/view_generator"
 module Rails
   module Generators
     ResourceGenerator.class_eval do
+
+      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 add_ember
         say_status :invoke, "ember:model", :white
         with_padding do
@@ -14,7 +20,7 @@ module Rails
 
         say_status :invoke, "ember controller and view (singular)", :white
         with_padding do
-          invoke "ember:view", [singular_name], :object => true
+          invoke "ember:view", [singular_name], options.merge(:object => true)
         end
 
         @_invocations[Ember::Generators::ControllerGenerator].delete "create_controller_files"
@@ -22,7 +28,7 @@ module Rails
 
         say_status :invoke, "ember controller and view (plural)", :white
         with_padding do
-          invoke "ember:view", [plural_name], :array => true
+          invoke "ember:view", [plural_name], options.merge(:array => true)
         end
       end
     end

data/lib/generators/ember/template_generator.rb

@@ -14,8 +14,8 @@ module Ember
 
 
       def create_template_files
-        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.handlebars")
-        template 'template.handlebars', file_path
+        file_path = File.join(ember_path, 'templates', class_path, "#{file_name}.hbs")
+        template 'template.hbs', file_path
       end
 
     end

data/lib/generators/templates/adapter.js

@@ -0,0 +1,5 @@
+// For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+<%= application_name.camelize %>.<%= class_name.camelize %>Adapter = DS.ActiveModelAdapter.extend({
+
+});

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

@@ -0,0 +1,5 @@
+# For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+<%= application_name.camelize %>.<%= class_name.camelize %>Adapter = DS.ActiveModelAdapter.extend({
+
+})

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

@@ -0,0 +1,3 @@
+# For more information see: http://emberjs.com/guides/models/customizing-adapters/
+
+class <%= application_name.camelize %>.<%= class_name.camelize %>Adapter extends DS.ActiveModelAdapter

data/lib/generators/templates/app.js

@@ -1,4 +1,4 @@
-//= require ./store
+//= require_tree ./adapters
 //= require_tree ./mixins
 //= require_tree ./models
 //= require_tree ./controllers
@@ -6,6 +6,6 @@
 //= require_tree ./helpers
 //= require_tree ./components
 //= require_tree ./templates
-//= require ./router
 //= require_tree ./routes
+//= require ./router
 //= require_self

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

@@ -1,4 +1,5 @@
-#= require ./store
+#= require_tree ./adapters
+#= require_tree ./mixins
 #= require_tree ./models
 #= require_tree ./controllers
 #= require_tree ./views

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

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

data/lib/generators/templates/application.js

@@ -1,9 +1,10 @@
 //= require jquery
-//= require handlebars
+//= require jquery_ujs
+<%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 //= require ember
 //= require ember-data
 //= require_self
-//= require <%= application_name.underscore %>
+//= require ./<%= application_name.underscore %>
 
 // for more details see: http://emberjs.com/guides/application/
 <%= application_name.camelize %> = Ember.Application.create();

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

@@ -1,4 +1,6 @@
-#= require handlebars
+#= require jquery
+#= require jquery_ujs
+<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
 #= require_self

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

@@ -1,4 +1,6 @@
-#= require handlebars
+#= require jquery
+#= require jquery_ujs
+<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
 #= require ember
 #= require ember-data
 #= require_self

data/lib/generators/templates/application_adapter.js

@@ -0,0 +1,5 @@
+// Override the default adapter with the `DS.ActiveModelAdapter` which
+// is built to work nicely with the ActiveModel::Serializers gem.
+<%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
+
+});

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

@@ -0,0 +1,5 @@
+# Override the default adapter with the `DS.ActiveModelAdapter` which
+
+<%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
+
+})

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

@@ -0,0 +1,3 @@
+# Override the default adapter with the `DS.ActiveModelAdapter` which
+# is built to work nicely with the ActiveModel::Serializers gem.
+class <%= application_name.camelize %>.ApplicationAdapter extends DS.ActiveModelAdapter

data/lib/generators/templates/array_controller.js

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

data/lib/generators/templates/model.js

@@ -4,7 +4,7 @@
 <% 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]
+    "DS.belongsTo('%s')" % attribute[:name].camelize(:lower)
   else
     "DS.attr('%s')" % attribute[:type]
   end

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

@@ -4,7 +4,7 @@
 <% 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]
+    "DS.belongsTo '%s'" % attribute[:name].camelize(:lower)
   else
     "DS.attr '%s'" % attribute[:type]
   end

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

@@ -4,7 +4,7 @@ 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]
+    "DS.belongsTo '%s'" % attribute[:name].camelize(:lower)
   else
     "DS.attr '%s'" % attribute[:type]
   end