ember-appkit-rails 0.3.2 → 0.4.0

data/lib/generators/templates/scaffold/template/form.hbs

@@ -5,5 +5,5 @@
 </div>
 <% end -%>
 
-<button type="submit" {{action save}}>Save</button>
-<button type="submit" {{action cancel}}>Cancel</button>
+<button type="submit" {{action save this}}>Save</button>
+<button type="submit" {{action cancel this}}>Cancel</button>

data/lib/generators/templates/scaffold/template/show.hbs

@@ -1,6 +1,6 @@
 <h3>{{id}}</h3>
 
-<p>{{link-to 'Edit' '<%= file_name.pluralize -%>.edit' this}} <button {{action destroyRecord}}>Destroy</button></p>
+<p>{{link-to 'Edit' '<%= file_name.pluralize -%>.edit' this}} <button {{action destroyRecord this}}>Destroy</button></p>
 
 <ul>
 <% attributes.each do |attribute| -%>

data/lib/generators/templates/scaffold_controller/controller.rb

@@ -1,15 +1,16 @@
 <% api_version = Rails.application.config.ember.api_version -%>
 class Api::V<%= api_version %>::<%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+  respond_to :json
 
   # GET <%= route_url %>
   def index
-    render json: <%= orm_class.all(class_name) %>
+    respond_with <%= orm_class.all(class_name) %>
   end
 
   # GET <%= route_url %>/1
   def show
-    render json: <%= "@#{singular_table_name}" %>
+    respond_with <%= "@#{singular_table_name}" %>
   end
 
   # POST <%= route_url %>
@@ -17,7 +18,7 @@ class Api::V<%= api_version %>::<%= controller_class_name %>Controller < Applica
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      render json: <%= "@#{singular_table_name}" %>, status: :created, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
+      respond_with <%= "@#{singular_table_name}" %>, status: :created, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
     else
       render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
     end
@@ -26,7 +27,7 @@ class Api::V<%= api_version %>::<%= controller_class_name %>Controller < Applica
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      render json: <%= "@#{singular_table_name}" %>, status: :ok, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
+      respond_with <%= "@#{singular_table_name}" %>, status: :ok, location: [:api, :v<%= api_version %>, <%= "@#{singular_table_name}" %>]
     else
       render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
     end

data/test/dummy/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.1'
+gem 'rails', '4.0.2'
 
 
 # Use SCSS for stylesheets

data/test/dummy/config/{adapter.js.erb → adapters/application.js.es6.erb}

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

data/test/dummy/config/application.js

@@ -2,7 +2,7 @@
 //= require environment
 //= require ember-appkit
 //= require_self
-//= require adapter
+//= require_tree ./adapters
 //= require router
 //= require_tree ../app
 //= require_tree ./initializers

data/test/dummy/config/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/test/dummy/config/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/test/dummy/config/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/{lib/generators/templates/environments/development.js → test/dummy/config/environments/test.js.erb}

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

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = '98d2b076984423a47e4eeb592556c70d6f011cbd95e7df244fda23040f1f5afd00655bb3cd8400392e08b7c16ce663e155493257ca891c1d0569d001afa64f0e'
+Dummy::Application.config.secret_key_base = 'd20399e714b77996a5e66f97d4b2ab403a360272f5e17b7e6a7672745e00601faac711f88db3b0d0297ecf9986526068388b4ee6e9fe3017c2f442a0bb75721b'

data/test/dummy/config/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/test/dummy/config/routes.rb

@@ -53,4 +53,7 @@ Dummy::Application.routes.draw do
   #     # (app/controllers/admin/products_controller.rb)
   #     resources :products
   #   end
+
+  # Uncomment when using 'history' as the location in Ember's router
+  # get '*foo', :to => 'landing#index'
 end

data/test/dummy/log/test.log

@@ -1,3 +1,6 @@
+-----------------------------------------------------------------------------------
+BootstrapGeneratorTest: test_Adds_commented_out_greedy_matcher_to_Rails_routes_file
+-----------------------------------------------------------------------------------
 -----------------------------------------------------------------------------------------
 BootstrapGeneratorTest: test_Assert_folder_layout_and_.gitkeep_files_are_properly_created
 -----------------------------------------------------------------------------------------
@@ -133,6 +136,12 @@ ScaffoldOverrideTest: test_creates_properly_namespaced_api_routes_when_api_and_v
 ---------------------------------------------------------------------------------------------------
 ScaffoldOverrideTest: test_creates_properly_namespaced_api_routes_when_api_namespace_already_exists
 ---------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------
+ScaffoldOverrideTest: test_destroy_does_not_remove_any_non-matching_resources_or_namespaces
+-------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------
+ScaffoldOverrideTest: test_destroy_removes_matching_resources_and_namespaces
+----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 ScaffoldOverrideTest: test_does_not_create_non-essential_files_for_ember_apps
 -----------------------------------------------------------------------------
@@ -166,18 +175,37 @@ AutoloadModulesTest: test_does_create_modules_for_directories_that_have_ruby_fil
 --------------------------------------------------------------------------------------------------
 AutoloadModulesTest: test_does_not_auto_create_modules_for_directories_that_do_not_have_ruby_files
 --------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------
+EngineTest: test_app/assets/javascripts_is_not_in_asset_load_path
+-----------------------------------------------------------------
+----------------------------------------------
+EngineTest: test_app_is_in_the_asset_load_path
+----------------------------------------------
+-------------------------------------------------
+EngineTest: test_config_is_in_the_asset_load_path
+-------------------------------------------------
+-------------------------------------------------------------------------
+EngineTest: test_ember_source_assets_come_after_vendor/assets/javascripts
+-------------------------------------------------------------------------
+---------------------------------------------------------------------
+EngineTest: test_lib/assets/javascripts_is_not_in_the_asset_load_path
+---------------------------------------------------------------------
+----------------------------------------------
+EngineTest: test_lib_is_in_the_asset_load_path
+----------------------------------------------
 ----------------------------------------------------
 NavigationTest: test_can_render_default_landing_page
 ----------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2014-01-14 14:20:37 -0500
+Started GET "/" for 127.0.0.1 at 2014-01-18 16:53:20 -0500
 Processing by LandingController#index as HTML
-Completed 200 OK in 438ms (Views: 437.7ms)
-Started GET "/assets/application.css" for 127.0.0.1 at 2014-01-14 14:20:38 -0500
-Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-14 14:20:38 -0500
+Completed 200 OK in 454ms (Views: 454.1ms)
+Started GET "/assets/application.css" for 127.0.0.1 at 2014-01-18 16:53:21 -0500
+Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-18 16:53:21 -0500
 ---------------------------------------------------
 NavigationTest: test_can_using_simple_"ember_magic"
 ---------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2014-01-14 14:20:38 -0500
+Started GET "/" for 127.0.0.1 at 2014-01-18 16:53:21 -0500
 Processing by LandingController#index as HTML
-Completed 200 OK in 1ms (Views: 1.1ms)
-Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-14 14:20:38 -0500
+Completed 200 OK in 1ms (Views: 1.2ms)
+Started GET "/assets/application.css" for 127.0.0.1 at 2014-01-18 16:53:21 -0500
+Started GET "/assets/application.js" for 127.0.0.1 at 2014-01-18 16:53:21 -0500

data/test/fixtures/routes_with_api_version_namespaces_and_route.rb

@@ -0,0 +1,12 @@
+Dummy::Application.routes.draw do
+  namespace :api do
+    namespace :v1 do
+      resource :dogs, except: [:new, :edit]
+    end
+
+  end
+
+  namespace :dogs do
+
+  end
+end

data/test/fixtures/walker.rb

@@ -0,0 +1,76 @@
+require 'parser/current'
+require 'byebug'
+
+file = File.read('routes_with_api_version_namespaces_and_route.rb')
+
+ast = Parser::CurrentRuby.parse(file)
+
+class RouteProcessor < AST::Processor
+  attr_accessor :delete_nodes
+
+  def initialize(*)
+    @delete_nodes = []
+    super
+  end
+
+  def handler_missing(node)
+    walk(node)
+  end
+
+  def on_block(node)
+    if is_namespace?(node)
+      if is_namespace_type?(node, :api)
+        walk_namespace(node)
+      elsif is_namespace_type?(node, :v1)
+        walk_namespace(node)
+      end
+    else
+      walk(node)
+    end
+  end
+
+  def on_send(node)
+    if is_resource?(node, :dogs)
+      delete_nodes << node
+    end
+  end
+
+  private
+
+  def is_resource?(node, type)
+    node.children[1] == :resource && node.children[2].children.first == type.to_sym
+  end
+
+  def is_namespace?(node)
+    node.children.first.children[1] == :namespace
+  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 node.children[2].children == delete_nodes.last.to_a
+      delete_nodes << node
+    end
+  end
+
+  def walk(node)
+    node.children.each do |child|
+      process(child) if child.respond_to?(:to_ast)
+    end
+  end
+end
+
+processor = RouteProcessor.new
+processor.process(ast)
+if processor.delete_nodes.last.loc.expression
+  begin_pos = processor.delete_nodes.last.loc.expression.begin_pos
+  end_pos = processor.delete_nodes.last.loc.expression.end_pos
+else
+  begin_pos = processor.delete_nodes.last.loc.begin.begin_pos
+  end_pos = processor.delete_nodes.last.loc.end.end_pos
+end
+begin_pos = begin_pos - file[0..begin_pos].reverse.index("\n")
+puts file.sub(file[begin_pos...end_pos], '')

data/test/generators/bootstrap_generator_test.rb

@@ -7,7 +7,7 @@ class BootstrapGeneratorTest < Rails::Generators::TestCase
   tests Ember::Generators::BootstrapGenerator
   destination File.join(Rails.root, "tmp", "generator_test_output")
 
-  setup :prepare_destination, :copy_application
+  setup :prepare_destination, :copy_application, :copy_routes
 
   test "Assert folder layout and .gitkeep files are properly created" do
     run_generator []
@@ -84,16 +84,24 @@ class BootstrapGeneratorTest < Rails::Generators::TestCase
     run_generator
   end
 
+  test "Adds commented out greedy matcher to Rails routes file" do
+    run_generator
+
+    assert_file 'config/routes.rb' do |content|
+      assert_match(/^  # get '\*foo', :to => 'landing#index'$/, content)
+    end
+  end
+
   private
 
   def assert_files(app_path = app_path, config_path = config_path)
-    assert_file "#{config_path}/environment.js"
-    assert_file "#{config_path}/environments/development.js"
-    assert_file "#{config_path}/environments/production.js"
-    assert_file "#{config_path}/environments/test.js"
+    assert_file "#{config_path}/environment.js.erb"
+    assert_file "#{config_path}/environments/development.js.erb"
+    assert_file "#{config_path}/environments/production.js.erb"
+    assert_file "#{config_path}/environments/test.js.erb"
     assert_file "#{config_path}/application.js"
     assert_file "#{config_path}/router.js.es6"
-    assert_file "#{config_path}/adapter.js.erb"
+    assert_file "#{config_path}/adapters/application.js.es6.erb"
     assert_file "#{config_path}/initializers/csrf.js"
   end
 

data/test/generators/resource_override_test.rb

@@ -23,13 +23,4 @@ class ResourceOverrideTest < Rails::Generators::TestCase
     assert_no_file "#{app_path}/helpers/posts_helper.rb"
     assert_no_directory "#{app_path}/views/posts"
   end
-
-  private
-
-  def copy_routes
-    routes = File.expand_path("../../dummy/config/routes.rb", __FILE__)
-    destination = File.expand_path('../../dummy/tmp/config', __FILE__)
-    FileUtils.mkdir_p(destination)
-    FileUtils.cp routes, destination
-  end
 end

data/test/generators/scaffold_override_test.rb

@@ -67,16 +67,32 @@ class ScaffoldOverrideTest < Rails::Generators::TestCase
     end
   end
 
+  test 'destroy does not remove any non-matching resources or namespaces' do
+    copy_routes_with_api_version_namespaces_and_route
+    config_content = File.read(File.expand_path('config/routes.rb', destination_root))
+    run_generator ['post'], behavior: :revoke
+
+    assert_file 'config/routes.rb' do |content|
+      assert_equal config_content, content
+    end
+  end
+
+  test 'destroy removes matching resources and namespaces' do
+    copy_routes_with_api_version_namespaces_and_route
+    config_content = File.read(File.expand_path('config/routes.rb', destination_root))
+    run_generator ['dogs'], behavior: :revoke
+
+    assert_file 'config/routes.rb' do |content|
+      refute_match(/  namespace :api do\n    namespace :v1 do\n      resource :dogs, except: \[:new, :edit\]\n    end\n  end/, content)
+    end
+  end
+
   private
 
   def reset_api_version
     ::Rails.application.config.ember.api_version = 1
   end
 
-  def copy_routes
-    copy_routes_file("../../dummy/config/routes.rb")
-  end
-
   def copy_routes_with_api_namespace
     copy_routes_file("../../fixtures/routes_with_api_namespace.rb")
   end
@@ -85,10 +101,7 @@ class ScaffoldOverrideTest < Rails::Generators::TestCase
     copy_routes_file("../../fixtures/routes_with_api_and_version_namespaces.rb")
   end
 
-  def copy_routes_file(routes_destination)
-    routes = File.expand_path(routes_destination, __FILE__)
-    destination = File.expand_path('../../dummy/tmp/config', __FILE__)
-    FileUtils.mkdir_p(destination)
-    FileUtils.cp routes, File.join(destination, 'routes.rb')
+  def copy_routes_with_api_version_namespaces_and_route
+    copy_routes_file("../../fixtures/routes_with_api_version_namespaces_and_route.rb")
   end
 end