ember-rails-lite 0.12.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

@@ -11,7 +11,8 @@ 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
         begin
@@ -23,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 adapters}.each do |dir|
           empty_directory "#{ember_path}/#{dir}"
           create_file "#{ember_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
@@ -37,17 +38,34 @@ 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
+
       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}
+                              else
+                                regex = /\z/
+                                {:after => 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}.hbs")
+        template "component.template.hbs", templ_path
+
+      end
+
+    end
+  end
+end

data/lib/generators/ember/controller_generator.rb

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

data/lib/generators/ember/generator_helpers.rb

@@ -3,29 +3,56 @@ module Ember
     module GeneratorHelpers
 
       def ember_path
-        options[:ember_path] || "app/assets/javascripts"
+        if options[:ember_path]
+          options[:ember_path]
+        elsif rails_engine?
+          "app/assets/javascripts/#{engine_name}"
+        elsif configuration.ember_path
+          configuration.ember_path
+        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 defined?(::Rails) && ::Rails.application
+        if options[:app_name]
+          options[: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
-          "app"
+          "App"
         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
+        if defined?(::Rails) && ::Rails.configuration
+          ::Rails.configuration.ember
+        end
+      end
     end
   end
 end

data/lib/generators/ember/install_generator.rb

@@ -3,39 +3,195 @@ 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 InsufficientOptions < ::Thor::Error; end
+
+      ::InvalidChannel = InvalidChannel
+      ::ConflictingOptions = ConflictingOptions
+      ::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 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)
+        check_options
+        process_options
+      end
+
+
+      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 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)
+        # 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 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 fetch_ember
+      def get_ember_js_for(environment)
+        create_file "vendor/assets/ember/#{environment}/ember.js" do
+          fetch url_for(channel, 'ember', environment), "vendor/assets/ember/#{environment}/ember.js"
+        end
+      end
+
+      def url_for(channel, component, environment)
+        base = "#{base_url}/#{channel}/#{component}"
+
+        case environment
+        when :production
+          "#{base}.min.js"
+        when :development
+          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?
-          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'
+          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
+          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 fetch_ember_data
+      def process_options
         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'
+          @channel = :canary
+        end
+        if options.tag?
+          @channel = "tags/#{options.tag}"
         end
       end
 
-    private
+      def base_url
+        'http://builds.emberjs.com'
+      end
 
-      def fetch(from, to)
+      def channel
+        if options.channel
+          @channel ||= options[:channel]
+        else
+          @channel ||= :release
+        end
+      end
+
+      def fetch(from, to, prepend_verbose = true)
         message = "#{from} -> #{to}"
         say_status("downloading:", message , :green)
 
         uri = URI(from)
+        output = StringIO.new
+        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
 
-        FileUtils.mkdir_p File.dirname(to)
-
-        open(to, 'w+') do |output|
-          output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
+        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
+      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/model_generator.rb

@@ -10,6 +10,7 @@ module Ember
       argument :attributes, :type => :array, :default => [], :banner => "field[:type] field[:type] ..."
       class_option :javascript_engine, :desc => "engine for javascripts"
       class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "custom ember app path"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_model_files
         file_path = File.join(ember_path, 'models', class_path, "#{file_name}.#{engine_extension}")

data/lib/generators/ember/resource_generator.rb

@@ -13,6 +13,7 @@ module Ember
       class_option :skip_route, :type => :boolean, :default => false, :desc => "Don't create route"
       class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
       class_option :object, :type => :boolean, :default => false, :desc => "Create an Ember.ObjectController to represent a single object"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
 
       def create_resource_files

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/route_generator.rb

@@ -10,6 +10,7 @@ module Ember
       desc "Creates a new Ember.js route"
       class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
       class_option :javascript_engine, :desc => "Engine for JavaScripts"
+      class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
       def create_route_files
         file_path = File.join(ember_path, 'routes', class_path, "#{file_name}_route.#{engine_extension}")