padrino-gen 0.9.25 → 0.9.26

data/lib/padrino-gen/generators/actions.rb

@@ -51,6 +51,7 @@ module Padrino
         config      = retrieve_component_config(path)
         config[key] = value
         create_file(path, :force => true) { config.to_yaml }
+        value
       end
 
       # Loads the component config back into a hash

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -2,7 +2,7 @@ class <%= @app_name %> < Padrino::Application
   register Padrino::Mailer
   register Padrino::Helpers
 
-  set :session_secret, "<%= '%x' % rand(2**255) %>"
+  set :session_secret, "<%= @session_secret %>"
   set :sessions, true
 
   ##

data/lib/padrino-gen/generators/app.rb

@@ -31,6 +31,7 @@ module Padrino
         @app_name = name.gsub(/\W/, "_").underscore.camelize
         if in_app_root?
           self.behavior = :revoke if options[:destroy]
+          @session_secret = fetch_component_choice(:session_secret)
           app_skeleton(@app_name.downcase, options[:tiny])
           empty_directory destination_root("public/#{@app_name.downcase}")
           append_file destination_root("config/apps.rb"),  "\nPadrino.mount(\"#{@app_name}\").to(\"/#{@app_name.downcase}\")"

data/lib/padrino-gen/generators/components/orms/mongomatic.rb

@@ -49,9 +49,9 @@ class !NAME! < Mongomatic::Base
   # end
 
   # def create_indexes
-  #   self.mapion.create_index('name', :unique => true)
-  #   self.mapion.create_index('email', :unique => true)
-  #   self.mapion.create_index('age')
+  #   self.collection.create_index('name', :unique => true)
+  #   self.collection.create_index('email', :unique => true)
+  #   self.collection.create_index('age')
   # end
   def validate
     expectations do
@@ -82,4 +82,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

data/lib/padrino-gen/generators/components/tests/bacon.rb

@@ -15,7 +15,7 @@ end
 TEST
 
 BACON_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 describe "!NAME!Controller" do
   it 'returns text at root' do
@@ -28,14 +28,21 @@ TEST
 BACON_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_RAKE)
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |test|
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
 end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 describe "!NAME! Model" do
   it 'can be created' do
@@ -55,11 +62,13 @@ end
 
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
-  bacon_contents = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("test/controllers/","#{name.to_s.underscore}_controller_test.rb"), bacon_contents, :skip => true
+  bacon_contents       = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), bacon_contents, :skip => true
 end
 
 def generate_model_test(name)
-  bacon_contents = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), bacon_contents, :skip => true
-end
+  bacon_contents  = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), bacon_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -36,7 +36,7 @@ end
 TEST
 
 RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 context "!NAME!Controller" do
   context "description here" do
@@ -52,14 +52,21 @@ TEST
 RIOT_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_RAKE)
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |test|
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
 end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 context "!NAME! Model" do
   context 'can be created' do
@@ -82,10 +89,12 @@ end
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
   riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("test/controllers/#{name.to_s.underscore}_controller_test.rb"), riot_contents, :skip => true
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), riot_contents, :skip => true
 end
 
 def generate_model_test(name)
   riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), riot_contents, :skip => true
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), riot_contents, :skip => true
 end

data/lib/padrino-gen/generators/components/tests/rspec.rb

@@ -31,10 +31,17 @@ TEST
 RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = "./spec/**/*_spec.rb"
-  t.rspec_opts = %w(-fs --color)
+spec_tasks = Dir['spec/*/'].map { |d| File.basename(d) }
+
+spec_tasks.each do |folder|
+  RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
+    t.pattern = "./spec/\#{folder}/**/*_spec.rb"
+    t.rspec_opts = %w(-fs --color)
+  end
 end
+
+desc "Run complete application spec suite"
+task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
 TEST
 
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
@@ -58,10 +65,12 @@ end
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
   rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("spec/controllers/#{name.to_s.underscore}_controller_spec.rb"), rspec_contents, :skip => true
+  controller_spec_path = File.join('spec',options[:app],'controllers',"#{name.to_s.underscore}_controller_spec.rb")
+  create_file destination_root(controller_spec_path), rspec_contents, :skip => true
 end
 
 def generate_model_test(name)
   rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  create_file destination_root("spec/models/#{name.to_s.underscore}_spec.rb"), rspec_contents, :skip => true
-end
+  model_spec_path = File.join('spec',options[:app],'models',"#{name.to_s.underscore}_spec.rb")
+  create_file destination_root(model_spec_path), rspec_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/shoulda.rb

@@ -15,7 +15,7 @@ end
 TEST
 
 SHOULDA_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 class !NAME!ControllerTest < Test::Unit::TestCase
   context "!NAME!Controller" do
@@ -33,14 +33,21 @@ TEST
 SHOULDA_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_RAKE)
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |test|
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
 end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 class !NAME!Test < Test::Unit::TestCase
   context "!NAME! Model" do
@@ -65,10 +72,12 @@ end
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
   shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("test/controllers/#{name.to_s.underscore}_controller_test.rb"), shoulda_contents, :skip => true
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), shoulda_contents, :skip => true
 end
 
 def generate_model_test(name)
   shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), shoulda_contents, :skip => true
-end
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), shoulda_contents, :skip => true
+end

data/lib/padrino-gen/generators/components/tests/testspec.rb

@@ -15,7 +15,7 @@ end
 TEST
 
 TESTSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 context "!NAME!Controller" do
   setup { get('/') }
@@ -28,14 +28,21 @@ TEST
 TESTSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_RAKE)
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |test|
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
 end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
 
 context "!NAME! Model" do
   specify 'can be created' do
@@ -55,10 +62,12 @@ end
 # Generates a controller test given the controllers name
 def generate_controller_test(name)
   testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("test/controllers/#{name.to_s.underscore}_controller_test.rb"), testspec_contents, :skip => true
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), testspec_contents, :skip => true
 end
 
 def generate_model_test(name)
   tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), tests_contents, :skip => true
-end
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), tests_contents, :skip => true
+end

data/lib/padrino-gen/generators/project/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+log/**/*
+tmp/**/*
+bin/*
+vendor/gems/*
+!vendor/gems/cache/
+.sass-cache/*

data/lib/padrino-gen/generators/project.rb

@@ -53,8 +53,9 @@ module Padrino
           empty_directory destination_root("public/javascripts")
           empty_directory destination_root("public/stylesheets")
           empty_directory destination_root("tmp")
-          app_skeleton('app', options[:tiny])
           store_component_config('.components')
+          @session_secret = '%x' % rand(2**255)
+          app_skeleton('app', options[:tiny])
           template "templates/Gemfile.tt", destination_root("Gemfile")
         end
       end
@@ -68,6 +69,7 @@ module Padrino
           execute_component_setup(comp, choice)
         end
         store_component_config('.components')
+        store_component_choice(:session_secret, @session_secret)
       end
 
       # Bundle all required components using bundler and Gemfile

data/lib/padrino-gen/padrino-tasks/mongoid.rb

@@ -3,7 +3,7 @@ if defined?(Mongoid)
 
     desc 'Drops all the collections for the database for the current Padrino.env'
     task :drop => :environment do
-      Mongoid.master.mapions.select {|c| c.name !~ /system/ }.each(&:drop)
+      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
 
     # Helper to retrieve a list of models.
@@ -48,7 +48,7 @@ if defined?(Mongoid)
     end
 
     def collection_names
-      @collection_names ||= get_mongoid_models.map{ |d| d.mapion.name }.uniq
+      @collection_names ||= get_mongoid_models.map{ |d| d.collection.name }.uniq
     end
 
     desc "Convert string objectids in mongo database to ObjectID type"
@@ -57,7 +57,7 @@ if defined?(Mongoid)
         puts "Converting #{collection_name} to use ObjectIDs"
 
         # get old collection
-        collection = Mongoid.master.mapion(collection_name)
+        collection = Mongoid.master.collection(collection_name)
 
         # get new collection (a clean one)
         collection.db["#{collection_name}_new"].drop
@@ -76,7 +76,7 @@ if defined?(Mongoid)
 
       # no errors. great! now rename _new to collection_name
       collection_names.each do |collection_name|
-        collection = Mongoid.master.mapion(collection_name)
+        collection = Mongoid.master.collection(collection_name)
         new_collection = collection.db["#{collection_name}_new"]
 
         # swap collection to _old
@@ -107,9 +107,9 @@ if defined?(Mongoid)
     desc "Clean up old collections backed up by objectid_convert"
     task :cleanup_old_collections => :environment do
       collection_names.each do |collection_name|
-        collection = Mongoid.master.mapion(collection_name)
+        collection = Mongoid.master.collection(collection_name)
         collection.db["#{collection.name}_old"].drop
       end
     end
   end
-end
+end

data/padrino-gen.gemspec

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
@@ -8,15 +9,17 @@ Gem::Specification.new do |s|
   s.summary = "Generators for easily creating and building padrino applications"
   s.homepage = "http://www.padrinorb.com"
   s.description = "Generators for easily creating and building padrino applications from the console"
-  s.default_executable = "padrino-gen"
-  s.executables = ["padrino-gen"]
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+
   s.extra_rdoc_files = Dir["*.rdoc"]
-  s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-gen.gemspec) + Dir.glob("{bin,lib,test}/**/*")
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = "lib"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rdoc_options  = ["--charset=UTF-8"]
+
   s.add_dependency("padrino-core", Padrino.version)
   s.add_dependency("bundler", ">= 1.0.2")
   s.add_dependency("grit")

data/test/test_app_generator.rb

@@ -33,6 +33,16 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/demo/app.rb"
     end
 
+    should "store and apply session_secret" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
+      assert_match_in_file(/session_secret:.+/, "#{@apptmp}/sample_project/.components")
+      session_secret = YAML.load_file("#{@apptmp}/sample_project/.components")[:session_secret]
+      assert_not_equal "", session_secret
+      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/app/app.rb")
+      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/demo/app.rb")
+    end
+
     should "generate tiny app skeleton" do
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
       assert_nothing_raised { silence_logger { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") } }

data/test/test_controller_generator.rb

@@ -5,7 +5,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
     @controller_path = "#{@apptmp}/sample_project/app/controllers/demo_items.rb"
-    @controller_test_path = "#{@apptmp}/sample_project/test/controllers/demo_items_controller_test.rb"
+    @controller_test_path = "#{@apptmp}/sample_project/test/app/controllers/demo_items_controller_test.rb"
   end
 
   def teardown
@@ -25,6 +25,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/SampleProject.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+      assert_file_exists(@controller_test_path)
     end
 
     should "generate controller within existing project with weird name" do
@@ -56,40 +57,46 @@ class TestControllerGenerator < Test::Unit::TestCase
 
     should "generate controller test for bacon" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path)
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
     should "generate controller test for riot" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
     should "generate controller test for testspec" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
     should "generate controller test for rspec" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/controllers/demo_items_controller_spec.rb")
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
     end
 
     should "generate controller test for shoulda" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
-      assert_match_in_file(expected_pattern, @controller_test_path)
-      assert_file_exists("#{@apptmp}/sample_project/test/controllers/demo_items_controller_test.rb")
+      assert_match_in_file(expected_pattern, @controller_test_path.gsub('app','subby'))
+      assert_file_exists("#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
     end
 
     should "generate controller test for cucumber" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/controllers/demo_items_controller_spec.rb")
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
@@ -99,7 +106,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
-      assert_file_exists("#{@apptmp}/sample_project/spec/controllers/demo_items_controller_spec.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
     end
 
     # Controller action generation
@@ -127,7 +134,17 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
-      assert_no_file_exists("#{@apptmp}/sample_project/spec/controllers/demo_items_controller_spec.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
+    end
+
+    should "destroy controller files in sub apps" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') }
+      assert_no_file_exists(@controller_path.gsub('app','subby'))
+      assert_no_file_exists(@controller_test_path.gsub('app','subby'))
+      assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
     end
   end
-end
+end