padrino-gen 0.12.8.1 → 0.12.9

data/lib/padrino-gen/generators/templates/Gemfile.tt

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+# Padrino supports Ruby version 1.9 and later
+# ruby '<%= RUBY_VERSION.to_s %>'
+
 # Distribute your app as a gem
 <% unless options.gem? %># <% end %>gemspec
 
@@ -17,6 +20,15 @@ gem 'rake'
 
 # Test requirements
 
+<% if options.api? -%>
+<% if options.dev? -%>
+gem 'padrino-core', :path => '<%= Padrino::Generators::DEV_PATH %>/padrino-core'
+gem 'padrino-gen', :path => '<%= Padrino::Generators::DEV_PATH %>/padrino-gen'
+<% else -%>
+gem 'padrino-core', '<%= Padrino.version %>'
+gem 'padrino-gen', '<%= Padrino.version %>'
+<% end -%>
+<% else -%>
 # Padrino Stable Gem
 <% if options.dev? %># <% end %>gem 'padrino', '<%= Padrino.version %>'
 
@@ -27,3 +39,4 @@ gem 'rake'
 <% unless options.dev? %># <% end %>%w(core support gen helpers cache mailer admin).each do |g|
 <% unless options.dev? %># <% end %>  gem 'padrino-' + g, <% if options.dev? %>:path => '<%= Padrino::Generators::DEV_PATH %>/padrino-' + g<% else %>'<%= Padrino.version %>'<% end %>
 <% unless options.dev? %># <% end %>end
+<% end -%>

data/lib/padrino-gen/generators/templates/Rakefile.tt

@@ -6,3 +6,5 @@ PadrinoTasks.use(:database)
 PadrinoTasks.use(<%= options[:orm].to_sym.inspect %>)
 <%- end -%>
 PadrinoTasks.init
+
+task :default => :test

data/lib/padrino-gen/generators/templates/controller.rb.tt

@@ -12,7 +12,7 @@
   # end
 
   # get :foo, :with => :id do
-  #   'Maps to url '/foo/#{params[:id]}''
+  #   "Maps to url '/foo/#{params[:id]}'"
   # end
 
   # get '/example' do

data/lib/padrino-gen/generators/templates/project_bin.tt

@@ -3,7 +3,6 @@
 Dir.chdir(File.dirname(__FILE__)+'/..')
 
 # Start the app with Padrino::Server
-require 'rubygems'
 require 'bundler/setup'
 require 'padrino-core/cli/launcher'
 

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

@@ -11,7 +11,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
   namespace :ar do
     namespace :create do
       desc 'Create all the local databases defined in config/database.yml'
-      task :all => :environment do
+      task :all => :skeleton do
         ActiveRecord::Base.configurations.each_value do |config|
           # Skip entries that don't have a database key, such as the first entry here:
           #
@@ -32,8 +32,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     desc 'Create the database defined in config/database.yml for the current Padrino.env'
-    task :create => :environment do
-      create_database(ActiveRecord::Base.configurations[Padrino.env])
+    task :create => :skeleton do
+      create_database(ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env])
     end
 
     def create_database(config)
@@ -44,7 +44,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
           else
             begin
               # Create the SQLite database
-              Dir.mkdir File.dirname(config[:database]) unless File.exist?(File.dirname(config[:database]))
+              FileUtils.mkdir_p File.dirname(config[:database]) unless File.exist?(File.dirname(config[:database]))
               ActiveRecord::Base.establish_connection(config)
               ActiveRecord::Base.connection
             rescue StandardError => e
@@ -89,7 +89,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     namespace :drop do
       desc 'Drops all the local databases defined in config/database.yml'
-      task :all => :environment do
+      task :all => :skeleton do
         ActiveRecord::Base.configurations.each_value do |config|
           # Skip entries that don't have a database key
           next unless config[:database]
@@ -104,8 +104,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     desc 'Drops the database for the current Padrino.env'
-    task :drop => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || :development]
+    task :drop => :skeleton do
+      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
       begin
         drop_database(config)
       rescue StandardError => e
@@ -121,17 +121,17 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking ar:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-    task :migrate => :environment do
+    desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking ar:schema:dump. Target specific version with MIGRATION_VERSION=x. Turn off output with VERBOSE=false."
+    task :migrate => :skeleton do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      ActiveRecord::Migrator.migrate("db/migrate/", env_migration_version)
       Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
     namespace :migrate do
-      desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
-      task :redo => :environment do
-        if ENV["VERSION"]
+      desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with MIGRATION_VERSION=x.'
+      task :redo => :skeleton do
+        if env_migration_version
           Rake::Task["ar:migrate:down"].invoke
           Rake::Task["ar:migrate:up"].invoke
         else
@@ -143,25 +143,25 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       desc 'Resets your database using your migrations for the current environment'
       task :reset => ["ar:drop", "ar:create", "ar:migrate"]
 
-      desc 'Runs the "up" for a given migration VERSION.'
-      task(:up => :environment){ migrate_as(:up) }
+      desc 'Runs the "up" for a given MIGRATION_VERSION.'
+      task(:up => :skeleton){ migrate_as(:up) }
 
-      desc 'Runs the "down" for a given migration VERSION.'
-      task(:down => :environment){ migrate_as(:down) }
+      desc 'Runs the "down" for a given MIGRATION_VERSION.'
+      task(:down => :skeleton){ migrate_as(:down) }
     end
 
     desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
-    task(:rollback => :environment){ move_as(:rollback) }
+    task(:rollback => :skeleton){ move_as(:rollback) }
 
     desc 'Pushes the schema to the next version. Specify the number of steps with STEP=n'
-    task(:forward => :environment){ move_as(:forward) }
+    task(:forward => :skeleton){ move_as(:forward) }
 
     desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
     task :reset => [ 'ar:drop', 'ar:setup' ]
 
     desc "Retrieves the charset for the current environment's database"
-    task :charset => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || :development]
+    task :charset => :skeleton do
+      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
       case config[:adapter]
       when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
         ActiveRecord::Base.establish_connection(config)
@@ -175,8 +175,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     desc "Retrieves the collation for the current environment's database"
-    task :collation => :environment do
-      config = ActiveRecord::Base.configurations[Padrino.env || :development]
+    task :collation => :skeleton do
+      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
       case config[:adapter]
       when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
         ActiveRecord::Base.establish_connection(config)
@@ -187,12 +187,12 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     desc "Retrieves the current schema version number"
-    task :version => :environment do
+    task :version => :skeleton do
       puts "Current version: #{ActiveRecord::Migrator.current_version}"
     end
 
     desc "Raises an error if there are pending migrations"
-    task :abort_if_pending_migrations => :environment do
+    task :abort_if_pending_migrations => :skeleton do
       if defined? ActiveRecord
         pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
 
@@ -211,7 +211,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     namespace :schema do
       desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
-      task :dump => :environment do
+      task :dump => :skeleton do
         require 'active_record/schema_dumper'
         File.open(ENV['SCHEMA'] || Padrino.root("db", "schema.rb"), "w") do |file|
           ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
@@ -220,7 +220,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
 
       desc "Load a schema.rb file into the database"
-      task :load => :environment do
+      task :load => :skeleton do
         file = ENV['SCHEMA'] || Padrino.root("db", "schema.rb")
         if File.exist?(file)
           load(file)
@@ -232,9 +232,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     namespace :structure do
       desc "Dump the database structure to a SQL file"
-      task :dump => :environment do
-        abcs = ActiveRecord::Base.configurations
-        config = abcs[Padrino.env]
+      task :dump => :skeleton do
+        config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env]
         case config[:adapter]
         when "mysql", "mysql2", 'em_mysql2', "oci", "oracle", 'jdbcmysql'
           config = config.inject({}){|result, (key, value)| result[key.to_s] = value; result }
@@ -247,7 +246,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
           unless search_path.blank?
             search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
           end
-          `pg_dump -i -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
+          `pg_dump -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
           raise "Error dumping database" if $?.exitstatus == 1
         when "sqlite", "sqlite3"
           dbfile = config[:database] || config[:dbfile]
@@ -310,6 +309,12 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         puts
       end
     end
+
+    task :seed => :environment do
+      missing_model_features = Padrino.send(:default_dependency_paths) - Padrino.send(:dependency_paths)
+      Padrino.require_dependencies(missing_model_features)
+      Rake::Task['db:seed'].invoke
+    end
   end
 
   def drop_database(config)
@@ -350,8 +355,8 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
   end
 
   def migrate_as(type)
-    version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-    raise "VERSION is required" unless version
+    version = env_migration_version
+    fail "MIGRATION_VERSION is required" unless version
     ActiveRecord::Migrator.run(type, "db/migrate/", version)
     dump_schema
   end

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

@@ -24,14 +24,14 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
 
       desc "Migrate up using migrations"
       task :up, [:version] => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
+        version = args[:version] || env_migration_version
         migrate_up!(version)
         puts "<= dm:migrate:up #{version} executed"
       end
 
       desc "Migrate down using migrations"
       task :down, [:version] => :load do |t, args|
-        version = args[:version] || ENV['VERSION']
+        version = args[:version] || env_migration_version
         migrate_down!(version)
         puts "<= dm:migrate:down #{version} executed"
       end
@@ -86,6 +86,8 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
     task :setup => [:create, :migrate, :seed]
   end
 
+  task 'db:migrate:down' => 'dm:migrate:down'
+  task 'db:migrate:up' => 'dm:migrate:up'
   task 'db:migrate' => 'dm:migrate'
   task 'db:create'  => 'dm:create'
   task 'db:drop'    => 'dm:drop'

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

@@ -167,6 +167,48 @@ if PadrinoTasks.load?(:mongoid, defined?(Mongoid))
         mongoid_new_collection(collection, "#{collection.name}_old").drop
       end
     end
+
+    desc "Generates .yml files for I18n translations"
+    task :translate => :environment do
+      models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+
+      models.each do |m|
+        # Get the model class.
+        klass = m.camelize.constantize
+
+        # Avoid non Mongoid models.
+        next unless klass.ancestors.include?(Mongoid::Document)
+
+        # Init the processing.
+        print "Processing #{m.humanize}: "
+        FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
+        langs = Array(I18n.locale)
+
+        # Create models for it and en locales.
+        langs.each do |lang|
+          filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
+          columns    = klass.fields.values.map(&:name).reject { |name| name =~ /id/i }
+          # If the lang file already exist we need to check it.
+          if File.exist?(filename)
+            locale = File.open(filename).read
+            columns.each do |c|
+              locale += "\n        #{c}: #{c.humanize}" unless locale.include?("#{c}:")
+            end
+            print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
+          else
+            locale     = "#{lang}:" + "\n" +
+            "  models:" + "\n" +
+            "    #{m}:" + "\n" +
+            "      name: #{klass.name}" + "\n" +
+            "      attributes:" + "\n" +
+            columns.map { |c| "        #{c}: #{c.humanize}" }.join("\n")
+            print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
+          end
+          File.open(filename, "w") { |f| f.puts locale }
+        end
+        puts
+      end
+    end
   end
 
   task 'db:drop' => 'mi:drop'

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

@@ -9,11 +9,11 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
         puts "<= sq:migrate:auto executed"
       end
 
-      desc "Perform migration up/down to VERSION"
+      desc "Perform migration up/down to MIGRATION_VERSION"
       task :to, [:version] => :skeleton do |t, args|
-        version = (args[:version] || ENV['VERSION']).to_s.strip
+        version = (args[:version] || env_migration_version).to_s.strip
         ::Sequel.extension :migration
-        raise "No VERSION was provided" if version.empty?
+        fail "No MIGRATION_VERSION was provided" if version.empty?
         ::Sequel::Migrator.apply(Sequel::Model.db, "db/migrate", version.to_i)
         puts "<= sq:migrate:to[#{version}] executed"
       end
@@ -70,8 +70,17 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
       puts "<= sq:drop executed"
     end
 
+    desc 'Drop the database, migrate from scratch and initialize with the seed data'
+    task :reset => ['drop', 'create', 'migrate', 'seed']
+
+    task :seed => :environment do
+      missing_model_features = Padrino.send(:default_dependency_paths) - Padrino.send(:dependency_paths)
+      Padrino.require_dependencies(missing_model_features)
+      Rake::Task['db:seed'].invoke
+    end
   end
 
+  task 'db:create' => 'sq:create'
   task 'db:migrate' => 'sq:migrate'
-  task 'db:reset' => ['sq:drop', 'sq:create', 'sq:migrate', 'seed']
+  task 'db:reset' => 'sq:reset'
 end

data/test/helper.rb

@@ -1,10 +1,7 @@
-require File.expand_path('../../../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
-require 'rack'
-require 'webrat'
 require 'fakeweb'
 require 'thor/group'
 require 'padrino-gen'
@@ -12,6 +9,8 @@ require 'padrino-core'
 require 'padrino-mailer'
 require 'padrino-helpers'
 
+require 'ext/minitest-spec'
+
 Padrino::Generators.load_components!
 
 # register fake URL to avoid downloading static files every time tests run
@@ -28,14 +27,6 @@ fake_uri_base = "https://raw.github.com/padrino/padrino-static/master/"
 end
 
 class MiniTest::Spec
-  include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-
-  Webrat.configure do |config|
-    config.mode = :rack
-  end
-
   def stop_time_for_test
     time = Time.now
     Time.stubs(:now).returns(time)
@@ -67,46 +58,6 @@ class MiniTest::Spec
     (Object.constants - constants).each{|constant| Object.instance_eval{ remove_const(constant) }}
   end
 
-  # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_tag(name, attributes = {})
-    html = yield if block_given?
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
-  end
-
-  # assert_has_no_tag, tag(:h1, :content => "yellow") { "<h1>green</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_no_tag(name, attributes = {})
-    html = yield if block_given?
-    attributes.merge!(:count => 0)
-    matcher = HaveSelector.new(name, attributes)
-    raise "Please specify a block!" if html.blank?
-    assert matcher.matches?(html), matcher.failure_message
-  end
-
-  # assert_file_exists('/tmp/app')
-  def assert_file_exists(file_path)
-    assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
-  end
-  alias :assert_dir_exists :assert_file_exists
-
-  # assert_no_file_exists('/tmp/app')
-  def assert_no_file_exists(file_path)
-    assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
-  end
-  alias :assert_no_dir_exists :assert_no_file_exists
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
-  end
-
-  def assert_no_match_in_file(pattern, file)
-    File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
-  end
-
   # expects_generated :model, "post title:string body:text"
   def expects_generated(generator, params="")
     Padrino.expects(:bin_gen).with(generator, *params.split(' ')).returns(true)
@@ -133,7 +84,7 @@ class MiniTest::Spec
   # expects_initializer :test, "# Example"
   def expects_initializer(name, body,options={})
     #options.reverse_merge!(:root => "/tmp/sample_project")
-    path = File.join(options[:root],'lib',"#{name}_initializer.rb")
+    path = File.join(options[:root],'config/initializers',"#{name}.rb")
     instance = mock
     instance.expects(:invoke!).at_least_once
     include_text = "    register #{name.to_s.camelize}Initializer\n"
@@ -147,11 +98,3 @@ class MiniTest::Spec
     Padrino.expects(:bin).with("rake", command, "-c=#{options[:root]}").returns(true)
   end
 end
-
-module Webrat
-  module Logging
-    def logger # # @private
-      @logger = nil
-    end
-  end
-end

data/test/test_app_generator.rb

@@ -20,13 +20,13 @@ describe "AppGenerator" do
     it 'should create correctly a new padrino application' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project")
-      assert_file_exists("#{@apptmp}/sample_project/demo")
+      assert_dir_exists("#{@apptmp}/sample_project")
+      assert_dir_exists("#{@apptmp}/sample_project/demo")
       assert_file_exists("#{@apptmp}/sample_project/demo/app.rb")
-      assert_file_exists("#{@apptmp}/sample_project/demo/controllers")
-      assert_file_exists("#{@apptmp}/sample_project/demo/helpers")
-      assert_file_exists("#{@apptmp}/sample_project/demo/views")
-      assert_file_exists("#{@apptmp}/sample_project/demo/views/layouts")
+      assert_dir_exists("#{@apptmp}/sample_project/demo/controllers")
+      assert_dir_exists("#{@apptmp}/sample_project/demo/helpers")
+      assert_dir_exists("#{@apptmp}/sample_project/demo/views")
+      assert_dir_exists("#{@apptmp}/sample_project/demo/views/layouts")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo")
       assert_match_in_file("Padrino.mount('SampleProject::Demo', :app_file => Padrino.root('demo/app.rb')).to('/demo')", "#{@apptmp}/sample_project/config/apps.rb")
       assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo/app.rb")
@@ -38,13 +38,13 @@ describe "AppGenerator" do
     it 'should create correctly a new padrino application with an underscore name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project")
-      assert_file_exists("#{@apptmp}/sample_project/demo_app")
+      assert_dir_exists("#{@apptmp}/sample_project")
+      assert_dir_exists("#{@apptmp}/sample_project/demo_app")
       assert_file_exists("#{@apptmp}/sample_project/demo_app/app.rb")
-      assert_file_exists("#{@apptmp}/sample_project/demo_app/controllers")
-      assert_file_exists("#{@apptmp}/sample_project/demo_app/helpers")
-      assert_file_exists("#{@apptmp}/sample_project/demo_app/views")
-      assert_file_exists("#{@apptmp}/sample_project/demo_app/views/layouts")
+      assert_dir_exists("#{@apptmp}/sample_project/demo_app/controllers")
+      assert_dir_exists("#{@apptmp}/sample_project/demo_app/helpers")
+      assert_dir_exists("#{@apptmp}/sample_project/demo_app/views")
+      assert_dir_exists("#{@apptmp}/sample_project/demo_app/views/layouts")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo_app")
       assert_match_in_file("Padrino.mount('SampleProject::DemoApp', :app_file => Padrino.root('demo_app/app.rb')).to('/demo_app')", "#{@apptmp}/sample_project/config/apps.rb")
       assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo_app/app.rb")
@@ -56,8 +56,8 @@ describe "AppGenerator" do
     it 'should generate tiny app skeleton' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project")
-      assert_file_exists("#{@apptmp}/sample_project/demo")
+      assert_dir_exists("#{@apptmp}/sample_project")
+      assert_dir_exists("#{@apptmp}/sample_project/demo")
       assert_file_exists("#{@apptmp}/sample_project/demo/helpers.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/controllers.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/mailers.rb")
@@ -75,7 +75,7 @@ describe "AppGenerator" do
       capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') }
       assert_match_in_file(/SampleProject::Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb")
       assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
-      assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items")
+      assert_dir_exists("#{@apptmp}/sample_project/demo/views/demo_items")
     end
 
     it 'should correctly create a new mailer inside a padrino application' do

data/test/test_controller_generator.rb

@@ -22,12 +22,17 @@ describe "ControllerGenerator" do
       assert_no_file_exists("#{@apptmp}/app/controllers/demo.rb")
     end
 
+    it 'should fail with NameError if given invalid namespace names' do
+      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:controller, "wrong/name", "--root=#{@apptmp}/sample") } }
+    end
+
     it 'should generate controller within existing project' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/helpers DemoItemsHelper/, @helper_path)
-      assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+      assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_file_exists(@controller_test_path)
     end
 
@@ -47,7 +52,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
       assert_match_in_file(/Warepedia::App.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
       assert_match_in_file(/helpers DemoItemsHelper/, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
-      assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items")
+      assert_dir_exists("#{@apptmp}/warepedia/app/views/demo_items")
     end
 
     it 'should generate controller in specified app' do
@@ -56,7 +61,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
       assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
-      assert_file_exists("#{@apptmp}/sample_project/subby/views/demo_items")
+      assert_dir_exists("#{@apptmp}/sample_project/subby/views/demo_items")
       assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby'))
     end
@@ -104,7 +109,7 @@ describe "ControllerGenerator" do
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
-      assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+      assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end
 
@@ -200,10 +205,18 @@ describe "ControllerGenerator" do
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
+    it "should generate controller test for testunit" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testunit') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class DemoItemsControllerTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
+    end
+
+
     it 'should correctly generate file names' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+      assert_dir_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/app/controllers/demo_items_controller_spec.rb")
@@ -222,7 +235,7 @@ describe "ControllerGenerator" do
       it 'should not generate helper within existing project' do
         capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
         capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '--no-helper') }
-        assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+        assert_dir_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/spec/app/controllers/demo_items_controller_spec.rb")
         assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")

data/test/test_helper_generator.rb

@@ -19,6 +19,11 @@ describe "HelperGenerator" do
       assert_no_file_exists("#{@apptmp}/app/helpers/demo_helper.rb")
     end
 
+    it 'should fail with NameError if given invalid namespace names' do
+      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:helper, "wrong/name", "--root=#{@apptmp}/sample") } }
+    end
+
     it 'should generate helper within existing project' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") }
@@ -95,6 +100,14 @@ describe "HelperGenerator" do
       assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb")
     end
 
+    it "should generate helper test for testunit" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class DemoItemsHelperTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
+      assert_match_in_file(/@helpers\.extend SampleProject::Subby::DemoItemsHelper/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
+    end
+
     it 'should correctly generate file names' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") }

data/test/test_mailer_generator.rb

@@ -17,6 +17,11 @@ describe "MailerGenerator" do
       assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
+    it 'should fail with NameError if given invalid namespace names' do
+      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:mailer, "wrong/name", "--root=#{@apptmp}/sample") } }
+    end
+
     it 'should generate mailer in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }

data/test/test_migration_generator.rb

@@ -17,6 +17,11 @@ describe "MigrationGenerator" do
       assert_no_file_exists("#{@apptmp}/db/migrate")
     end
 
+    it 'should fail with NameError if given invalid namespace names' do
+      capture_io { generate(:project, "sample", "--root=#{@apptmp}") }
+      assert_raises(::NameError) { capture_io { generate(:migration, "wrong/name", "--root=#{@apptmp}/sample") } }
+    end
+
     it 'should fail if we do not use an adapter' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       assert_raises(SystemExit) { capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") } }