ember-appkit-rails 0.2.2 → 0.3.0

data/lib/ember-appkit-rails.rb

@@ -1,10 +1 @@
-# 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/rails.rb

@@ -1,6 +1,18 @@
-module Ember::Appkit::Rails; end
+require 'ember/source'
+require 'es6_module_transpiler/rails'
+require 'active_model_serializers'
+require 'sprockets/railtie'
+require 'ember/source'
+require 'ember/data/source'
+require 'handlebars/source'
+
+module Ember
+  module Appkit
+    module Rails; end
+  end
+end
 
 require 'ember/appkit/rails/engine'
 require 'ember/appkit/rails/sprockets'
-
-Rails::WelcomeController.view_paths = File.expand_path('../rails/templates', __FILE__)
+require 'ember/appkit/rails/template'
+require 'ember/appkit/rails/active_support'

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

@@ -0,0 +1 @@
+require 'ember/appkit/rails/active_support/dependencies'

data/lib/ember/appkit/rails/active_support/dependencies.rb

@@ -0,0 +1,10 @@
+module ActiveSupport::Dependencies
+  def autoloadable_module?(path_suffix)
+    autoload_paths.each do |load_path|
+      path = File.join(load_path, path_suffix)
+      return load_path if File.directory?(path) && Dir.glob(File.join(path, '**/*.rb')).present?
+    end
+
+    return false
+  end
+end

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

@@ -1,31 +1,56 @@
-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 = ActiveSupport::OrderedOptions.new
+  config.ember.paths = ActiveSupport::OrderedOptions.new
+  config.ember.namespaces = ActiveSupport::OrderedOptions.new
+  config.ember.prefix_patterns = ActiveSupport::OrderedOptions.new
+
+  config.ember.paths.app = 'app'
+  config.ember.paths.config = 'config'
+  config.ember.namespaces.app = 'app'
+  config.ember.namespaces.config = 'config'
 
-  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.enable_logging = ::Rails.env.development?
+  config.ember.api_version = 1
 
-  config.ember.appkit.enable_logging = ::Rails.env.development?
+  generators do |app|
+    app.config.generators.helper false
+    app.config.generators.assets false
+    app.config.generators.template_engine false
+
+    ::Rails::Generators.configure!(app.config.generators)
+    ::Rails::Generators.hidden_namespaces.uniq!
+    require 'generators/ember/resource_override'
+    require 'generators/ember/scaffold_override'
+    require 'generators/ember/scaffold_controller_override'
+  end
 
   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))
+    config.ember.prefix_patterns.app ||= Regexp.new(File.join(::Rails.root, config.ember.namespaces.app))
+    config.ember.prefix_patterns.config ||= Regexp.new(File.join(::Rails.root, config.ember.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
+    ES6ModuleTranspiler.add_prefix_pattern config.ember.prefix_patterns.app, config.ember.namespaces.app
+    ES6ModuleTranspiler.add_prefix_pattern config.ember.prefix_patterns.config, config.ember.namespaces.config
     ES6ModuleTranspiler.transform = lambda { |name| name.split('/').map { |n| n.underscore.dasherize }.join('/') }
   end
 
   initializer :appkit_handlebars do
+    config.handlebars = ActiveSupport::OrderedOptions.new
+
+    config.handlebars.precompile = true
+    config.handlebars.output_type = :global
+    config.handlebars.templates_root = "templates"
+    config.handlebars.templates_path_separator = '/'
+
+    config.before_initialize do |app|
+      Sprockets::Engines # force autoloading
+      Sprockets.register_engine '.handlebars', Ember::Appkit::Rails::Template
+      Sprockets.register_engine '.hbs', Ember::Appkit::Rails::Template
+      Sprockets.register_engine '.hjs', Ember::Appkit::Rails::Template
+    end
+
     config.handlebars ||= ActiveSupport::OrderedOptions.new
     config.handlebars.output_type   = :amd
-    config.handlebars.amd_namespace = config.ember.appkit.namespaces.app
+    config.handlebars.amd_namespace = config.ember.namespaces.app
   end
 
   initializer :appkit_router do |app|
@@ -40,8 +65,13 @@ class Ember::Appkit::Rails::Engine < ::Rails::Engine
     assets_javascript = assets.paths.delete(::Rails.root.join('app','assets','javascripts').to_s)
 
     index_of_last_app_assets = assets.paths.rindex{|s| s.start_with?(::Rails.root.join('app').to_s) } + 1
-    assets.paths.insert(index_of_last_app_assets, assets_javascript) if assets_javascript
-    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.config))
-    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.app))
+    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.paths.app))
+    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.paths.config))
+  end
+
+  initializer :appkit_setup_vendor, after: :append_assets_path, :group => :all do |app|
+    app.config.assets.paths.append(File.dirname(::Ember::Source.bundled_path_for("ember.js")))
+    app.config.assets.paths.append(File.dirname(::Ember::Data::Source.bundled_path_for("ember-data.js")))
+    app.config.assets.paths.append(File.expand_path('../', ::Handlebars::Source.bundled_path))
   end
 end

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

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

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

@@ -0,0 +1,10 @@
+require 'sprockets/context'
+
+module Ember::Appkit::Rails::Sprockets::Context
+  def asset_requirable?(path)
+    return false if path.to_s.match File.join(::Rails.root, 'app/assets')
+    super
+  end
+end
+
+Sprockets::Context.send(:prepend, Ember::Appkit::Rails::Sprockets::Context)

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

@@ -16,7 +16,7 @@ module Ember::Appkit::Rails::Sprockets::ProcessedAsset
   private
 
   def _make_ember_application_template_stale(pathname)
-    if pathname.to_s =~ /ember-appkit-rails.+\/app\/assets\/javascripts\/templates\/application.hbs/
+    if pathname.to_s =~ /(ember-appkit-rails.+\/app\/assets\/javascripts\/templates\/application.hbs)|(.*\.erb)/
       def self.fresh?(environment)
         false
       end

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

@@ -0,0 +1,109 @@
+require 'sprockets'
+require 'sprockets/engines'
+require 'barber'
+
+class Ember::Appkit::Rails::Template < Tilt::Template
+  def self.default_mime_type
+    'application/javascript'
+  end
+
+  def prepare; end
+
+  def evaluate(scope, locals, &block)
+    raw = handlebars?(scope)
+
+    if raw
+      template = data
+    else
+      template = mustache_to_handlebars(scope, data)
+    end
+
+    if configuration.precompile
+      if raw
+        template = precompile_handlebars(template)
+      else
+        template = precompile_ember_handlebars(template)
+      end
+    else
+      if raw
+        template = compile_handlebars(data)
+      else
+        template = compile_ember_handlebars(template)
+      end
+    end
+
+    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
+
+  def handlebars?(scope)
+    scope.pathname.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
+  end
+
+  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
+
+  def compile_handlebars(string)
+    "Handlebars.compile(#{indent(string).inspect});"
+  end
+
+  def precompile_handlebars(string)
+    Barber::FilePrecompiler.call(string)
+  end
+
+  def compile_ember_handlebars(string)
+    "Ember.Handlebars.compile(#{indent(string).inspect});"
+  end
+
+  def precompile_ember_handlebars(string)
+    Barber::Ember::FilePrecompiler.call(string)
+  end
+
+  def mustache_to_handlebars(scope, template)
+    if scope.pathname.to_s =~ /\.mustache\.(handlebars|hjs|hbs)/
+      template.gsub(/\{\{(\w[^\}\}]+)\}\}/){ |x| "{{unbound #{$1}}}" }
+    else
+      template
+    end
+  end
+
+  def template_path(path)
+    root = configuration.templates_root
+
+    if root.kind_of? Array
+      root.each do |root|
+        path.sub!(/#{Regexp.quote(root)}\//, '')
+      end
+    else
+      unless root.empty?
+        path.sub!(/#{Regexp.quote(root)}\/?/, '')
+      end
+    end
+
+    path = path.split('/')
+
+    path.join(configuration.templates_path_separator)
+  end
+
+  def configuration
+    ::Rails.configuration.handlebars
+  end
+
+  def indent(string)
+    string.gsub(/$(.)/m, "\\1  ").strip
+  end
+end

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

@@ -1,7 +1,7 @@
 module Ember
   module Appkit
     module Rails
-      VERSION = '0.2.2'
+      VERSION = '0.3.0'
     end
   end
 end

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

@@ -0,0 +1,99 @@
+require 'ripper'
+
+class Walker
+  def initialize(resource, path, api_version)
+    @resource = resource
+    @file = File.open(path, 'r+')
+    content = @file.read
+    @ast = Ripper.sexp(content)
+    @lines = content.split("\n")
+    @api_version = api_version
+  end
+
+  def run
+    find_api_namespace(@ast)
+
+    output = nil
+    line_number = @lines.index { |line| line =~ /routes\.draw do/ }
+
+    if @write_to
+      if @write_to.first == :version
+        output = write_resource
+      else
+        output = write_version_namespace do
+          write_resource
+        end
+      end
+      line_number = @write_to.last - 1
+    else
+      output = write_api_namespace do
+        write_version_namespace do
+          write_resource
+        end
+      end
+    end
+
+    @lines.insert(line_number + 1, output)
+    @file.rewind
+    @file.write(@lines.join("\n"))
+    @file.close
+  end
+
+  def write_api_namespace
+    "  namespace :api do\n#{yield}\n  end"
+  end
+
+  def write_version_namespace
+    "    namespace :v#{@api_version} do\n#{yield}\n    end"
+  end
+
+  def write_resource
+    "      resources :#{@resource}, except: [:new, :edit]"
+  end
+
+  def find_api_namespace(ast)
+    find_namespace(ast, 'api') do |ast|
+      find_version_namespace(ast, @api_version)
+
+      if @write_to.nil?
+        @write_to = [:api, ast[1][1][2][0]]
+      end
+
+      # found the first instance of the namespace
+      # immediately short-circuit
+      return
+    end
+  end
+
+  def find_version_namespace(ast, version)
+    find_namespace(ast, "v#{version}") do |ast|
+      @write_to = [:version, ast[1][1][2][0]]
+
+      # found the first instance of the namespace
+      # immediately short-circuit
+      return
+    end
+
+    @write_to
+  end
+
+  def find_namespace(ast, name)
+    walk(ast) do |ast, node|
+      if node == :method_add_block
+        flat_ast = ast[1].flatten
+        if flat_ast.include?('namespace') && flat_ast.include?(name)
+          yield(ast)
+        end
+      end
+    end
+  end
+
+  def walk(ast, &block)
+    if ast.is_a?(Array)
+      ast.each do |node|
+        yield(ast, node)
+        walk(node, &block)
+      end
+    end
+  end
+end

data/lib/generators/ember/bootstrap_generator.rb

@@ -7,7 +7,7 @@ module Ember
 
       source_root File.expand_path("../../templates", __FILE__)
 
-      desc "Creates a default Ember.js folder layout in app/assets/javascripts"
+      desc "Creates a default Ember.js folder layout in app/ and config/"
 
       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"
@@ -20,10 +20,6 @@ module Ember
         end
       end
 
-      def remove_javascript_assets_directory
-        remove_dir "app/assets/javascripts"
-      end
-
       def create_router_file
         template "router.js.es6", "#{config_path}/router.js.es6"
       end
@@ -33,7 +29,7 @@ module Ember
       end
 
       def create_ember_adapter_file
-        template "adapter.js", "#{config_path}/adapter.js"
+        template "adapter.js.erb", "#{config_path}/adapter.js.erb"
       end
 
       def create_ember_environment_files
@@ -52,6 +48,10 @@ module Ember
         remove_turbolinks_from_layout
       end
 
+      def remove_jbuilder
+        remove_jbuilder_from_gemfile
+      end
+
       def add_custom_paths
         if app_path != configuration.paths.app
           insert_into_file 'config/application.rb', before: /\s\send\nend/ do
@@ -75,11 +75,19 @@ module Ember
         gsub_file path, /(?:, "data-turbolinks-track" => true)/, ''
       end
 
-      def remove_turbolinks_from_gemfile
+      def remove_gem_from_gemfile(gem)
         path = Pathname.new(destination_root).join('Gemfile')
         return unless path.exist?
 
-        gsub_file path, /(?:#.+$\n)?gem 'turbolinks'\n\n/, ''
+        gsub_file path, /(?:#.+$\n)?gem '#{gem}.*'\n\n/, ''
+      end
+
+      def remove_turbolinks_from_gemfile
+        remove_gem_from_gemfile(:turbolinks)
+      end
+
+      def remove_jbuilder_from_gemfile
+        remove_gem_from_gemfile(:jbuilder)
       end
     end
   end

data/lib/generators/ember/component_generator.rb

@@ -11,7 +11,7 @@ module Ember
 
       def create_component_files
         dashed_file_name = file_name.gsub(/_/, '-')
-        component_path = File.join(app_path, 'components', class_path, "#{dashed_file_name}_component.js.es6")
+        component_path = File.join(app_path, 'components', class_path, "#{dashed_file_name}.js.es6")
         template "component.js.es6", component_path
 
         template_path = File.join(app_path, 'templates/components', class_path, "#{dashed_file_name}.hbs")