ember-appkit-rails 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c00cb8b4bf5a5676056c1414d85abbc139990e
-  data.tar.gz: 6a4f86f3b9e63cd0069e89106282294cd1eba4ff
+  metadata.gz: 87955b857b074b7c1732bfdf4083590744543d9b
+  data.tar.gz: 9e28182f503839a37b534dba4632ec4d84042c7f
 SHA512:
-  metadata.gz: bbf9cd60c132af6c20878d57d7108ac0003fa90a688b85b9c9768dbaa2f3981663a5e486e1f30ab4512be68d2b1c7ca00ab7b060c77cf670f57a07fef7f61a01
-  data.tar.gz: ea6ba8853c361e2d10adf416fdaa5333ae478e448b747f54edba0628dac5333f9f51de3a75956f299600f07630393402c4866f1e44ad3874ea20b31dc705dbcb
+  metadata.gz: 586f71fdfb2e89ad5bead93d2e25ae464989d6a1583058c3f442abbfcd2f217b90eeba2276518f4bdf47ed8e49f3a88818b123563c0c7f13a7133530693a7590
+  data.tar.gz: a372fab61645c6a64aba60450edaa6a8b05ade49e4fe0d6d2cfcda2d9b9730145b3c7717fc9823b5ebc3f45e767f5b1e7a1ea521839f0caf85a417191ca527cd

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

@@ -550,16 +550,16 @@
         Hello {{name}},
 
         <ol>
-          <li>
-            <h2>Use <code>rails generate ember:scaffold</code> to get your application started.</h2>
-          </li>
-
           <li>
             <h2>Add your own application template to replace this page.</h2>
             <p>You are seeing this page because you haven&rsquo;t set an application template yet.</p>
             <p>Add a new <code>app/templates/application.hbs</code> file.</p>
           </li>
 
+          <li>
+            <h2>Use <code>rails generate ember:scaffold</code> to get your application started.</h2>
+          </li>
+
           <li>
           <h2>Your Rails controllers should be nested under <code>app/controllers/api/v1</code>.</h2>
           </li>

data/lib/ember/appkit/rails.rb

@@ -1,3 +1,4 @@
+require 'jquery-rails'
 require 'ember/source'
 require 'es6_module_transpiler/rails'
 require 'active_model_serializers'

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

@@ -8,8 +8,6 @@ class Ember::Appkit::Rails::Engine < ::Rails::Engine
   config.ember.paths.config = 'config'
   config.ember.namespaces.app = 'app'
   config.ember.namespaces.config = 'config'
-
-  config.ember.enable_logging = ::Rails.env.development?
   config.ember.api_version = 1
 
   generators do |app|
@@ -62,9 +60,14 @@ class Ember::Appkit::Rails::Engine < ::Rails::Engine
   initializer :appkit_sprockets do
     assets = Sprockets::Railtie.config.assets
 
+    precompile_index = config.assets.precompile.index { |i| i =~ File.join(Rails.root, 'app/assets/javascripts/application.js') }
+    config.assets.precompile[precompile_index] = /(?<!assets\/javascripts)(?:\/|\\|\A)application\.(css|js)$/
+
     assets_javascript = assets.paths.delete(::Rails.root.join('app','assets','javascripts').to_s)
+    assets.paths.delete(::Rails.root.join('lib', 'assets','javascript').to_s)
 
-    index_of_last_app_assets = assets.paths.rindex{|s| s.start_with?(::Rails.root.join('app').to_s) } + 1
+    index_of_last_app_assets = assets.paths.rindex { |path| path.to_s.start_with?(::Rails.root.join('app').to_s) } + 1
+    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, 'lib'))
     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

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

@@ -2,7 +2,7 @@ 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/javascripts')
+    return false if path.to_s.match(File.join(::Rails.root, 'app/assets/javascripts')) || path.to_s.match(File.join(::Rails.root, 'lib/assets/javascripts'))
     super
   end
 end

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

@@ -1,7 +1,7 @@
 module Ember
   module Appkit
     module Rails
-      VERSION = '0.3.2'
+      VERSION = '0.4.0'
     end
   end
 end

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

@@ -1,42 +1,42 @@
-require 'ripper'
+require 'parser/current'
+
+class Walker < AST::Processor
+  attr_accessor :found_nodes, :namespace_type
 
-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")
+    @content = @file.read
+    @ast = Parser::CurrentRuby.parse(@content)
     @api_version = api_version
+    @found_nodes = []
   end
 
-  def run
-    find_api_namespace(@ast)
-
-    output = nil
-    line_number = @lines.index { |line| line =~ /routes\.draw do/ }
+  def handler_missing(node)
+    walk(node)
+  end
 
-    if @write_to
-      if @write_to.first == :version
-        output = write_resource
-      else
-        output = write_version_namespace do
-          write_resource
-        end
+  def on_block(node)
+    if is_namespace?(node)
+      if is_namespace_type?(node, :api)
+        found_nodes << node
+        self.namespace_type = :api
+        walk_namespace(node)
+      elsif is_namespace_type?(node, "v#{@api_version}".to_sym)
+        found_nodes << node
+        self.namespace_type = :version
+        walk_namespace(node)
       end
-      line_number = @write_to.last - 1
     else
-      output = write_api_namespace do
-        write_version_namespace do
-          write_resource
-        end
-      end
+      walk(node)
     end
+  end
 
-    @lines.insert(line_number + 1, output)
-    @file.rewind
-    @file.write(@lines.join("\n"))
-    @file.close
+  def on_send(node)
+    if is_resource?(node, @resource.to_sym)
+      @found_resource = true
+      found_nodes << node
+    end
   end
 
   def write_api_namespace
@@ -51,49 +51,78 @@ class Walker
     "      resources :#{@resource}, except: [:new, :edit]"
   end
 
-  def find_api_namespace(ast)
-    find_namespace(ast, 'api') do |ast|
-      find_version_namespace(ast, @api_version)
+  def invoke!
+    process(@ast)
+    if found_nodes.empty?
+      found_nodes << @ast
+    end
+    node = found_nodes.last
+    begin_pos = node.loc.begin.end_pos
 
-      if @write_to.nil?
-        @write_to = [:api, ast[1][1][2][0]]
+    output = ''
+
+    if namespace_type
+      if namespace_type == :version
+        output = write_resource
+      else
+        output = write_version_namespace do
+          write_resource
+        end
       end
+    else
+      output = write_api_namespace do
+        write_version_namespace do
+          write_resource
+        end
+      end
+    end
+
+    @file.rewind
+    @file.write(@content.insert(begin_pos + 1, output + "\n"))
+    @file.close
+  end
 
-      # found the first instance of the namespace
-      # immediately short-circuit
-      return
+  def revoke!
+    @revoke = true
+    process(@ast)
+    return if found_nodes.empty? || @found_resource.nil?
+    if found_nodes.last.loc.expression
+      begin_pos = found_nodes.last.loc.expression.begin_pos
+      end_pos = found_nodes.last.loc.expression.end_pos
+    else
+      begin_pos = found_nodes.last.loc.begin.begin_pos
+      end_pos = found_nodes.last.loc.end.end_pos
     end
+    begin_pos = begin_pos - @content[0..begin_pos].reverse.index("\n")
+    @file.rewind
+    @file.write @content.sub(@content[begin_pos...end_pos], '')
+    @file.close
   end
 
-  def find_version_namespace(ast, version)
-    find_namespace(ast, "v#{version}") do |ast|
-      @write_to = [:version, ast[1][1][2][0]]
+  private
 
-      # found the first instance of the namespace
-      # immediately short-circuit
-      return
-    end
+  def is_resource?(node, type)
+    node.children[1] == :resource && node.children[2].children.first == type.to_sym
+  end
 
-    @write_to
+  def is_namespace?(node)
+    node.children.first.children[1] == :namespace
   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
+  def is_namespace_type?(node, type)
+    node.children.first.children[2].children.first == type.to_sym
+  end
+
+  def walk_namespace(node)
+    process(node.children[2])
+    if @revoke && node.children[2] && node.children[2].children == found_nodes.last.to_a
+      found_nodes << node
     end
   end
 
-  def walk(ast, &block)
-    if ast.is_a?(Array)
-      ast.each do |node|
-        yield(ast, node)
-        walk(node, &block)
-      end
+  def walk(node)
+    node.children.each do |child|
+      process(child) if child.respond_to?(:to_ast)
     end
   end
 end

data/lib/generators/ember/bootstrap_generator.rb

@@ -29,14 +29,14 @@ module Ember
       end
 
       def create_ember_adapter_file
-        template "adapter.js.erb", "#{config_path}/adapter.js.erb"
+        template "adapter.js.erb", "#{config_path}/adapters/application.js.es6.erb"
       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"
+        copy_file "environment.js.erb", "#{config_path}/environment.js.erb"
+        copy_file "environments/development.js.erb", "#{config_path}/environments/development.js.erb"
+        copy_file "environments/production.js.erb", "#{config_path}/environments/production.js.erb"
+        copy_file "environments/test.js.erb", "#{config_path}/environments/test.js.erb"
       end
 
       def create_utils_csrf_file
@@ -52,6 +52,14 @@ module Ember
         remove_jbuilder_from_gemfile
       end
 
+      def add_greedy_rails_route
+        insert_into_file 'config/routes.rb', before: /^end$/ do
+          "\n" +
+          "  # Uncomment when using 'history' as the location in Ember's router\n" +
+          "  # get '*foo', :to => 'landing#index'\n"
+        end
+      end
+
       def add_custom_paths
         if app_path != configuration.paths.app
           insert_into_file 'config/application.rb', before: /\s\send\nend/ do
@@ -79,7 +87,7 @@ module Ember
         path = Pathname.new(destination_root).join('Gemfile')
         return unless path.exist?
 
-        gsub_file path, /(?:#.+$\n)?gem '#{gem}.*'\n\n/, ''
+        gsub_file path, /(?:#.+$\n)?gem ['|"]#{gem}.*['|"].*\n\n?/, ''
       end
 
       def remove_turbolinks_from_gemfile

data/lib/generators/ember/scaffold_controller_override.rb

@@ -6,9 +6,9 @@ module Rails
     class ScaffoldControllerGenerator
       source_root File.expand_path('../../templates/scaffold_controller', __FILE__)
 
-    def create_controller_files
-      template "controller.rb", File.join("app/controllers/api/v#{::Rails.application.config.ember.api_version}", class_path, "#{controller_file_name}_controller.rb")
-    end
+      def create_controller_files
+        template "controller.rb", File.join("app/controllers/api/v#{::Rails.application.config.ember.api_version}", class_path, "#{controller_file_name}_controller.rb")
+      end
     end
   end
 end

data/lib/generators/ember/scaffold_override.rb

@@ -18,7 +18,7 @@ module Rails
       end
 
       def write_resource
-        Walker.new(file_path.pluralize, File.join(destination_root, 'config/routes.rb'), ::Rails.application.config.ember.api_version).run
+        action Walker.new(file_path.pluralize, File.join(destination_root, 'config/routes.rb'), ::Rails.application.config.ember.api_version)
       end
     end
   end

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

@@ -1,3 +1,3 @@
-window.<%= application_name.camelize %>.ApplicationAdapter = DS.ActiveModelAdapter.extend({
+export default DS.ActiveModelAdapter.extend({
   namespace: 'api/v<%%= Rails.application.config.ember.api_version %>'
 });

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

@@ -2,7 +2,7 @@
 //= require environment
 //= require ember-appkit
 //= require_self
-//= require adapter
+//= require_tree ./adapters
 //= require router
 //= require_tree ../<%= app_path %>
 //= require_tree ./initializers

data/lib/generators/templates/environment.js.erb

@@ -0,0 +1,19 @@
+//= require_self
+//= require_environment_from ./environments
+/*
+ This is useful when using canary versions of Ember to enable
+ feature flags before Ember itself is loaded.
+
+ See the feature flags guide for details:
+
+ http://emberjs.com/guides/configuring-ember/feature-flags/
+*/
+
+window.config = {};
+
+<% config = Rails.application.config.ember %>
+
+config.modulePrefix     = '<%= config.namespaces.app %>';
+config.routerPrefix     = '<%= config.namespaces.config %>';
+config.adapterPrefix    = '<%= config.namespaces.config %>';
+config.serializerPrefix = '<%= config.namespaces.config %>';

data/lib/generators/templates/environments/development.js.erb

@@ -0,0 +1,9 @@
+//= require handlebars
+//= require ember
+//= require ember-data
+
+config.LOG_ACTIVE_GENERATION = true
+config.LOG_MODULE_RESOLVER = true
+config.LOG_TRANSITIONS = true
+config.LOG_TRANSITIONS_INTERNAL = true
+config.LOG_VIEW_LOOKUPS = true

data/lib/generators/templates/environments/production.js.erb

@@ -0,0 +1,14 @@
+//= require handlebars.runtime
+//= require ember.prod
+//= require ember-data.prod
+
+// For some configuration settings such as API keys,
+// you should read them from the environment rather
+// than checking them into version control. See also
+// the Figaro gem. 
+// Keep in mind that API keys in js are visible to
+// someone poking in the browser, so never expose
+// a truly private API key in javascript.
+// my_api_key = <%= ENV['MY_API_KEY'] %>
+
+Ember.LOG_VERSION = false

data/{test/dummy/config/environments/development.js → lib/generators/templates/environments/test.js.erb}

@@ -1,3 +1,5 @@
 //= require handlebars
 //= require ember
 //= require ember-data
+
+Ember.LOG_VERSION = false

data/lib/generators/templates/router.js.es6

@@ -1,4 +1,12 @@
-var Router = Ember.Router.extend();
+var Router = Ember.Router.extend({
+  // Uncomment to change Ember's router to use the 
+  // HTML5 History API
+  // Please note that not all browsers support this!
+  // You will also need to uncomment the greedy route matcher
+  // in config/routes.rb
+
+  // location: 'history'
+});
 
 Router.map(function() {
 });

data/lib/generators/templates/scaffold/route/edit.js.es6

@@ -7,15 +7,13 @@ export default Ember.Route.extend({
     model.rollback();
   },
   actions: {
-    save: function() {
-      var model = this.get('controller.model');
+    save: function(model) {
       var _this = this;
       model.save().then(function() {
         _this.transitionTo('<%= file_name.pluralize -%>.show', model);
       });
     },
-    cancel: function() {
-      var model = this.get('controller.model');
+    cancel: function(model) {
       this.transitionTo('<%= file_name.pluralize -%>.show', model);
     }
   }

data/lib/generators/templates/scaffold/route/new.js.es6

@@ -9,8 +9,7 @@ export default Ember.Route.extend({
     }
   },
   actions: {
-    save: function() {
-      var model = this.get('controller.model');
+    save: function(model) {
       var _this = this;
       model.save().then(function() {
         _this.transitionTo('<%= file_name.pluralize -%>.show', model);

data/lib/generators/templates/scaffold/route/show.js.es6

@@ -3,8 +3,7 @@ export default Ember.Route.extend({
     return this.store.find('<%= file_name.singularize -%>', params.<%= file_name.singularize -%>_id);
   },
   actions: {
-    destroyRecord: function() {
-      var model = this.get('controller.model');
+    destroyRecord: function(model) {
       var _this = this;
       model.destroyRecord().then(function() {
         _this.transitionTo('<%= file_name.pluralize -%>.index');