ember-appkit-rails 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d3da970fefe831da5e6face8a979d9e8ba502c
-  data.tar.gz: 5edd87c207fedee58fbae5dd4416f2c49c818a59
+  metadata.gz: 0874dea93db3fa11015b47e4ee86d134b53f7cc1
+  data.tar.gz: 6ccbb73644b1fcb4186f2c8d76c5bb9d2573b2eb
 SHA512:
-  metadata.gz: 54fa1bfb857f043f8409c146d0e9220fedbb2b098aad721035474e1760f69327f6a2c24fc495c7e0acbcf8475f114149666e4415e90bc3e2a3ffdd6a86b6eed4
-  data.tar.gz: 61aea37e7950bd8c6534513db09a1046b5d496835ace1f77479cf8db9590941012c70e13162bbaebe65ba2486753595a4a656e1f444ba7eb03a555954bcfc0f9
+  metadata.gz: 10131da862cab1fd0244aa1867a51676b6f6f7adfd9adfefce09c28f77db5f69b94e894423b21922c4bfd18ac43f5c4e4e1681f10b4564465299028c9f255b75
+  data.tar.gz: f6c89b463d4cfbd0e5d2ede8978b0526b9dd4b653861d98db081164d39e747e9c290a3a89c94c854233171e9c52bc2c729e57851938544bf533691ed36fffd41

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 DockYard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'rdoc/task'
 require 'net/http'
 require 'uri'
@@ -16,16 +17,13 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
 desc "Update ember-resolver."
 task :update_resolver do
   uri = URI("https://raw.github.com/stefanpenner/ember-jj-abrams-resolver/master/dist/ember-resolver.js")
 
   output = StringIO.new
   output.puts "// Fetched from: " + uri.to_s
-  output.puts "// Fetched on: " + Time.now.utc.iso8601.to_s
+  output.puts "// Fetched on: " + Time.now.utc.strftime('%FT%T')
   output.puts Net::HTTP.get(uri).force_encoding("UTF-8")
   output.rewind
 
@@ -37,18 +35,45 @@ task :update_resolver_if_requested do
   Rake::Task['update_resolver'].invoke if ENV['UPDATE_RESOLVER'] == 'true'
 end
 
+desc "Setup dummy application."
+task :setup_dummy_app do
+  initial_path = Dir.pwd
+
+  require 'rails'
+  require 'rails/generators'
+  require 'rails/generators/rails/app/app_generator'
+
+  FileUtils.rm_rf 'test/dummy'
+
+  silence_stream(STDOUT) do
+    begin
+      Rails::Generators::AppGenerator.start ['test/dummy', '--skip-active-record', '--skip-bundle']
+    ensure
+      Dir.chdir initial_path
+    end
+  end
+
+  application_config_path = 'test/dummy/config/application.rb'
+  application_config = File.read(application_config_path)
+
+  File.write(application_config_path, application_config.sub('module Dummy', "require 'jquery-rails'\nrequire 'ember-appkit-rails'\nmodule Dummy"))
+
+  APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+  load 'rails/tasks/engine.rake'
+end
+
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:integration_test) do |t|
+Rake::TestTask.new(:integration_test => :setup_dummy_app) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/integration/**/*_test.rb'
   t.verbose = false
 end
 
-Rake::TestTask.new(:generators_test) do |t|
+Rake::TestTask.new(:generators_test => :setup_dummy_app) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/generators/**/*_test.rb'

data/app/assets/javascripts/templates/application.hbs

@@ -0,0 +1,7 @@
+<h1>Welcome to Ember!</h1>
+
+<div>
+  <p>Congratulations on building your first Ember application. That was easy, wasn't it?</p>
+  <p>Try some simple Ember magic: {{input value=someText name="sampleInput"}}</p>
+  <p>{{someText}}</p>
+</div>

data/app/controllers/landing_controller.rb

@@ -0,0 +1,5 @@
+class LandingController < ApplicationController
+  def index
+    render inline: '', layout: 'application'
+  end
+end

data/lib/ember-appkit-rails.rb

@@ -1 +1,10 @@
+# This is necessary because the generators live in `lib/generators`
+# this path is on the Rubygems load path and the first wins. We need
+# to ensure the ember-appkit-rails is always on the load path *before*
+# ember-rails
+
+$:.delete(File.expand_path('..', __FILE__))
+$:.unshift(File.expand_path('..', __FILE__))
+
+require 'ember/appkit'
 require 'ember/appkit/rails'

data/lib/ember/appkit.rb

@@ -0,0 +1,5 @@
+require 'ember-rails'
+require 'ember/source'
+require 'es6_module_transpiler/rails'
+
+module Ember::Appkit; end

data/lib/ember/appkit/rails.rb

@@ -1,6 +1,6 @@
-require 'ember-rails'
-require 'ember/source'
+module Ember::Appkit::Rails; end
+
 require 'ember/appkit/rails/engine'
-require 'es6_module_transpiler/rails'
+require 'ember/appkit/rails/sprockets'
 
-ES6ModuleTranspiler.prefix_pattern = [/^(controllers|models|views|helpers|routes|router|store)/, 'appkit']
+Rails::WelcomeController.view_paths = File.expand_path('../rails/templates', __FILE__)

data/lib/ember/appkit/rails/engine.rb

@@ -1,12 +1,40 @@
-module Ember
-  module Appkit
-    module Rails
-      class Engine < ::Rails::Engine
-        config.handlebars ||= ActiveSupport::OrderedOptions.new
-
-        config.handlebars.output_type = :amd
-        config.handlebars.amd_namespace = 'appkit'
-      end
+require 'ember-rails'
+
+class Ember::Appkit::Rails::Engine < ::Rails::Engine
+  config.ember.appkit = ActiveSupport::OrderedOptions.new
+  config.ember.appkit.paths = ActiveSupport::OrderedOptions.new
+  config.ember.appkit.namespaces = ActiveSupport::OrderedOptions.new
+  config.ember.appkit.prefix_patterns = ActiveSupport::OrderedOptions.new
+
+  config.ember.appkit.paths.app = 'app'
+  config.ember.appkit.paths.config = 'config'
+  config.ember.appkit.namespaces.app = 'app'
+  config.ember.appkit.namespaces.config = 'config'
+
+  config.ember.appkit.enable_logging = ::Rails.env.development?
+
+  initializer :appkit_transpiler do
+    config.ember.appkit.prefix_patterns.app ||= Regexp.new(File.join(::Rails.root, config.ember.appkit.namespaces.app))
+    config.ember.appkit.prefix_patterns.config ||= Regexp.new(File.join(::Rails.root, config.ember.appkit.namespaces.config))
+
+    ES6ModuleTranspiler.add_prefix_pattern config.ember.appkit.prefix_patterns.app, config.ember.appkit.namespaces.app
+    ES6ModuleTranspiler.add_prefix_pattern config.ember.appkit.prefix_patterns.config, config.ember.appkit.namespaces.config
+  end
+
+  initializer :appkit_handlebars do
+    config.handlebars ||= ActiveSupport::OrderedOptions.new
+    config.handlebars.output_type   = :amd
+    config.handlebars.amd_namespace = config.ember.appkit.namespaces.app
+  end
+
+  initializer :appkit_router do |app|
+    app.routes.append do
+      get '/' => "landing#index"
     end
   end
+
+  initializer :appkit_sprockets do
+    Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.config))
+    Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.app))
+  end
 end

data/lib/ember/appkit/rails/resource_override.rb

@@ -0,0 +1,14 @@
+require 'generators/ember/resource_override'
+
+module Ember::Appkit::Rails::ResourceOverride
+  def add_ember
+    if options.ember
+      super
+    end
+  end
+end
+
+Rails::Generators::ResourceGenerator.class_eval do
+  prepend Ember::Appkit::Rails::ResourceOverride
+  class_option :ember, aliases: '-e', desc: 'force ember resource to generate', optional: true, type: 'boolean', default: false, banner: '--ember'
+end

data/lib/ember/appkit/rails/sprockets.rb

@@ -0,0 +1,4 @@
+module Ember::Appkit::Rails::Sprockets; end
+
+require 'ember/appkit/rails/sprockets/processed_asset'
+require 'ember/appkit/rails/sprockets/directive_processor'

data/lib/ember/appkit/rails/sprockets/directive_processor.rb

@@ -0,0 +1,9 @@
+require 'sprockets/directive_processor'
+
+module Ember::Appkit::Rails::Sprockets::DirectiveProcessor
+  def process_require_environment_from_directive(path)
+    context.require_asset(File.join(path, ::Rails.env))
+  end
+end
+
+Sprockets::DirectiveProcessor.send(:include, Ember::Appkit::Rails::Sprockets::DirectiveProcessor)

data/lib/ember/appkit/rails/sprockets/processed_asset.rb

@@ -0,0 +1,27 @@
+require 'sprockets/processed_asset'
+
+module Ember::Appkit::Rails::Sprockets::ProcessedAsset
+  def initialize(environment, logical_path, pathname)
+    super
+
+    _make_ember_application_template_stale(pathname)
+  end
+
+  def init_with(environment, coder)
+    super
+
+    _make_ember_application_template_stale(coder['pathname'])
+  end
+
+  private
+
+  def _make_ember_application_template_stale(pathname)
+    if pathname.to_s =~ /ember-appkit-rails.+\/app\/assets\/javascripts\/templates\/application.hbs/
+      def self.fresh?(environment)
+        false
+      end
+    end
+  end
+end
+
+Sprockets::ProcessedAsset.send(:prepend, Ember::Appkit::Rails::Sprockets::ProcessedAsset)

data/lib/ember/appkit/rails/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module Appkit
     module Rails
-      VERSION = '0.1.2'
+      VERSION = '0.2.0'
     end
   end
 end

data/lib/generators/ember/bootstrap_generator.rb

@@ -9,39 +9,78 @@ module Ember
 
       desc "Creates a default Ember.js folder layout in app/assets/javascripts"
 
-      class_option :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
+      class_option :app_path, :type => :string, :aliases => "-a", :default => false, :desc => "Custom ember app path"
+      class_option :config_path, :type => :string, :aliases => "-c", :default => false, :desc => "Custom ember config path"
       class_option :app_name, :type => :string, :aliases => "-n", :default => false, :desc => "Custom ember app name"
 
-      def inject_ember
-        inject_into_application_file
-      end
-
-
       def create_dir_layout
-        %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]
+        %W{routes components templates templates/components mixins}.each do |dir|
+          empty_directory "#{app_path}/#{dir}"
+          create_file "#{app_path}/#{dir}/.gitkeep" unless options[:skip_git]
         end
       end
 
+      def remove_javascript_assets_directory
+        remove_dir "app/assets/javascripts"
+      end
+
       def create_router_file
-        template "router.js.es6", "#{ember_path}/router.js.es6"
+        template "router.js.es6", "#{config_path}/router.js.es6"
       end
 
-      def create_ember_app_file
-        template "ember-app.js.es6", "#{ember_path}/ember-app.js.es6"
+      def create_application_file
+        template "application.js.erb", "#{config_path}/application.js"
       end
 
-      private
+      def create_ember_adapter_file
+        template "adapter.js", "#{config_path}/adapter.js"
+      end
+
+      def create_ember_environment_files
+        template "environment.js", "#{config_path}/environment.js"
+        template "environments/development.js", "#{config_path}/environments/development.js"
+        template "environments/production.js", "#{config_path}/environments/production.js"
+        template "environments/test.js", "#{config_path}/environments/test.js"
+      end
 
-      def inject_into_application_file
-        application_file = "#{ember_path}/application.js"
-        inject_into_file( application_file, :before => /^.*require_tree.*$/) do
-          context = instance_eval('binding')
-          source  = File.expand_path(find_in_source_paths("application.js"))
-          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+      def create_utils_csrf_file
+        template "csrf.js", "#{config_path}/initializers/csrf.js"
+      end
+
+      def remove_turbolinks
+        remove_turbolinks_from_gemfile
+        remove_turbolinks_from_layout
+      end
+
+      def add_custom_paths
+        if app_path != configuration.paths.app
+          insert_into_file 'config/application.rb', before: /\s\send\nend/ do
+            "    config.ember.appkit.paths.app = '#{app_path}'\n"
+          end
+        end
+
+        if config_path != configuration.paths.config
+          insert_into_file 'config/application.rb', before: /\s\send\nend/ do
+            "    config.ember.appkit.paths.config = '#{config_path}'\n"
+          end
         end
       end
+
+      private
+
+      def remove_turbolinks_from_layout
+        path = Pathname.new(destination_root).join('app','views','layouts','application.html.erb')
+        return unless path.exist?
+
+        gsub_file path, /(?:, "data-turbolinks-track" => true)/, ''
+      end
+
+      def remove_turbolinks_from_gemfile
+        path = Pathname.new(destination_root).join('Gemfile')
+        return unless path.exist?
+
+        gsub_file path, /(?:#.+$\n)?gem 'turbolinks'\n\n/, ''
+      end
     end
   end
 end

data/lib/generators/ember/component_generator.rb

@@ -9,14 +9,12 @@ module Ember
 
       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 :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path"
-
       def create_component_files
         dashed_file_name = file_name.gsub(/_/, '-')
-        component_path = File.join(ember_path, 'components', class_path, "#{dashed_file_name}_component.js.es6")
+        component_path = File.join(app_path, 'components', class_path, "#{dashed_file_name}_component.js.es6")
         template "component.js.es6", component_path
 
-        template_path = File.join(ember_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")
+        template_path = File.join(app_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")
         template "component.template.hbs", template_path
       end
     end

data/lib/generators/ember/controller_generator.rb

@@ -11,11 +11,9 @@ module Ember
 
       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 :ember_path, :type => :string, :aliases => "-d", :default => false, :desc => "Custom ember app path."
-
 
       def create_controller_files
-        file_path = File.join(ember_path, 'controllers', class_path, "#{file_name}.js.es6")
+        file_path = File.join(app_path, 'controllers', class_path, "#{file_name}.js.es6")
 
         if options.array?
           template "array_controller.js.es6", file_path

data/lib/generators/ember/generator_helpers.rb

@@ -4,15 +4,19 @@ module Ember
   module Generators
     module GeneratorHelpers
 
-      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}"
+      def app_path
+        if options[:app_path]
+          options[:app_path]
         else
-          "app/assets/javascripts"
+          configuration.paths.app
+        end
+      end
+
+      def config_path
+        if options[:config_path]
+          options[:config_path]
+        else
+          configuration.paths.config
         end
       end
 
@@ -32,7 +36,7 @@ module Ember
         elsif rails_engine?
           engine_name
         else
-          "App"
+          'App'
         end
       end
 
@@ -44,8 +48,12 @@ module Ember
         File.join(class_path, file_name).gsub(/^\//, '')
       end
 
+      def javascript_assets_path
+        File.join(::Rails.root, 'app/assets/javascripts')
+      end
+
       def configuration
-        ::Rails.configuration.ember
+        ::Rails.configuration.ember.appkit
       end
     end
   end

data/lib/generators/ember/helper_generator.rb

@@ -0,0 +1,17 @@
+require 'generators/ember/generator_helpers'
+
+module Ember
+  module Generators
+    class HelperGenerator < ::Rails::Generators::NamedBase
+      include Ember::Generators::GeneratorHelpers
+
+      source_root File.expand_path("../../templates", __FILE__)
+      argument :name, :type => :string, :desc => 'Create an Ember.Handlebars.helper'
+
+      def create_helper_files
+        file_path = File.join(app_path, 'helpers', class_path, "#{file_name}.js")
+        template 'helper.js', file_path
+      end
+    end
+  end
+end