padrino-gen 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2fa106970ea0dd40076b49b7cf090ddb8b29e488
-  data.tar.gz: aad0beed2605f8a8afb1b4b0114be340dfb2ecfb
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2ZmNDEwYTE1NmE2NGNjZjA5NmZhNTRmYjE0NTdiMjhjYTAyMmE2OA==
+  data.tar.gz: !binary |-
+    ODQ1NWVjOGU4MTE0MWI3MmI2NGQ3MTA1YzU3NDRiOTIzMzc0MmJkNQ==
 SHA512:
-  metadata.gz: b843036661f2da3d55596bb0a7a14e2cd83c25f011948855f599e522155a475dd5e2a21122a4442bef4ca469f6fcda6bb53e7445c1eb5f1b7517dfd01d986f57
-  data.tar.gz: b6087de11ecc4cf8abe35a73d1d18e0e1ede4619ccb05c446461de5d069a52833072fcf45d4cc1e2e89a29978bc60f1b719fddbb6d1040be68b0b4c1e114e55e
+  metadata.gz: !binary |-
+    OTI4MjIxMmNjNjI5ZDlmMjhkZmViYzM0Y2Q1YmEyNjAzOGM3N2VhOWVmZTdi
+    Mjg0YWE5OWMyMzE2MDExZjc4YTExMWU1OGQwMGE4YTQ5NDBhNzUyNDgyN2Q2
+    ZTBhYjQxYzUwZWNhOThiN2RjNTI1ZjMzMjA3ODgyY2MyZGE4NWQ=
+  data.tar.gz: !binary |-
+    NTNiMzQyNDQwZmI0NGE4ZjZmOTgwMWM1M2I5NmY4MGZiMTVlNDE3ZTYyYzYw
+    ZDkxMDAxODhlZjZlZmI3MmEwYmQyYmM5YjQ0Y2M0MDhjNWY2N2Y0NDlkOTY0
+    OGE1MjM1ODc4OTNjOWNhZTE1NGE4OTAyNDc4ZjRmZDA2MjE2Mjc=

data/Rakefile

@@ -1,4 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

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

@@ -308,7 +308,7 @@ WARNING
       #
       def require_dependencies(*gem_names)
         options = gem_names.extract_options!
-        gem_names.reverse.each { |lib| insert_into_gemfile(lib, options) }
+        gem_names.reverse_each { |lib| insert_into_gemfile(lib, options) }
       end
 
       ##
@@ -377,9 +377,9 @@ WARNING
       #
       def initializer(name, data=nil)
         @_init_name, @_init_data = name, data
-        register = data.present? ? "    register #{name.to_s.underscore.camelize}Initializer\n" : "    register #{name}\n"
+        register = data ? "    register #{name.to_s.underscore.camelize}Initializer\n" : "    register #{name}\n"
         inject_into_file destination_root("/app/app.rb"), register, :after => "Padrino::Application\n"
-        template "templates/initializer.rb.tt", destination_root("/lib/#{name}_initializer.rb") if data.present?
+        template "templates/initializer.rb.tt", destination_root("/config/initializers/#{name}.rb") if data
       end
 
       ##
@@ -520,12 +520,24 @@ WARNING
       #
       def valid_constant?(name)
         if name =~ /^\d/
-          raise ::NameError, "Project name #{name} cannot start with numbers"
+          fail ::NameError, "Constant name #{name} cannot start with numbers"
         elsif name =~ /^\W/
-          raise ::NameError, "Project name #{name} cannot start with non-word character"
+          fail ::NameError, "Constant name #{name} cannot start with non-word character"
         end
       end
 
+      ##
+      # Validates namespace name (controller name, etc.) or fails with an error.
+      #
+      # @example
+      #   validate_namespace 'Project_One1' #=> pass
+      #   validate_namespace 'Erroneous/name' #=> fail
+      #
+      def validate_namespace(name)
+        valid_constant? name
+        name.match(/^[[:alnum:]_]+$/) || fail(::NameError, "Namespace '#{name}' must consist only of alphanumeric characters or '_'")
+      end
+
       ##
       # Recognizes the path of application.
       #

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

@@ -1,8 +1,9 @@
 module <%= @project_name %>
   class <%= @app_name %> < Padrino::Application
+<% unless options.api? -%>
     register Padrino::Mailer
     register Padrino::Helpers
-
+<% end -%>
     enable :sessions
 
     ##
@@ -15,7 +16,7 @@ module <%= @project_name %>
     #
     # set :cache, Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
     # set :cache, Padrino::Cache.new(:Memcached) # Uses default server at localhost
-    # set :cache, Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
+    # set :cache, Padrino::Cache.new(:Memcached, :server => '127.0.0.1:11211', :exception_retry_limit => 1)
     # set :cache, Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
     # set :cache, Padrino::Cache.new(:Redis) # Uses default server at localhost
     # set :cache, Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)

data/lib/padrino-gen/generators/components/mocks/mocha.rb

@@ -4,7 +4,7 @@ def setup_mock
     when 'rspec'
       inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", :after => "RSpec.configure do |conf|\n"
     else
-      inject_into_file 'test/test_config.rb', "require 'mocha/api'", :after => "require File.expand_path(File.dirname(__FILE__) + \"/../config/boot\")\n"
+      inject_into_file 'test/test_config.rb', "require 'mocha/api'\n", :after => "require File.expand_path(File.dirname(__FILE__) + \"/../config/boot\")\n"
       insert_mocking_include "Mocha::API"
   end
 end

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

@@ -114,24 +114,24 @@ def setup_orm
   # We're now defaulting to mysql2 since mysql is deprecated
   case options[:adapter]
   when 'mysql-gem'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_test'")
+    ar.sub! /!DB_DEVELOPMENT!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_development'")
+    ar.sub! /!DB_PRODUCTION!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_production'")
+    ar.sub! /!DB_TEST!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_test'")
     require_dependencies 'mysql', :version => "~> 2.8.1"
   when 'mysql', 'mysql2'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_test'")
+    ar.sub! /!DB_DEVELOPMENT!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_development'")
+    ar.sub! /!DB_PRODUCTION!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_production'")
+    ar.sub! /!DB_TEST!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_test'")
     require_dependencies 'mysql2'
   when 'postgres'
-    ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_test'")
+    ar.sub! /!DB_DEVELOPMENT!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_development'")
+    ar.sub! /!DB_PRODUCTION!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_production'")
+    ar.sub! /!DB_TEST!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_test'")
     require_dependencies 'pg'
   else
-    ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
-    ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
-    ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
+    ar.sub! /!DB_DEVELOPMENT!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
+    ar.sub! /!DB_PRODUCTION!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
+    ar.sub! /!DB_TEST!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
     require_dependencies 'sqlite3'
   end
   require_dependencies 'activerecord', :require => 'active_record', :version => ">= 3.1"
@@ -148,7 +148,7 @@ MODEL
 # options => { :fields => ["title:string", "body:string"], :app => 'app' }
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
-  model_contents = AR_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  model_contents = AR_MODEL.sub(/!NAME!/, name.to_s.underscore.camelize)
   create_file(model_path, model_contents,:skip => true)
 end
 
@@ -168,7 +168,7 @@ MIGRATION
 AR_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/,'    ') unless defined?(AR_MODEL_UP_MG)
 create_table :!TABLE! do |t|
   !FIELDS!
-  t.timestamps
+  t.timestamps null: false
 end
 MIGRATION
 

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

@@ -41,6 +41,21 @@ case Padrino.env
 end
 DM
 
+IDENTITY_MAP_MIDDLEWARE = <<-MIDDLEWARE
+class IdentityMap
+  def initialize(app, name = :default)
+    @app = app
+    @name = name.to_sym
+  end
+
+  def call(env)
+    ::DataMapper.repository(@name) do
+      @app.call(env)
+    end
+  end
+end
+MIDDLEWARE
+
 def setup_orm
   dm = DM
   db = @project_name.underscore
@@ -73,6 +88,7 @@ def setup_orm
 
   create_file("config/database.rb", dm)
   insert_hook("DataMapper.finalize", :after_load)
+  middleware :identity_map, IDENTITY_MAP_MIDDLEWARE
 end
 
 DM_MODEL = (<<-MODEL) unless defined?(DM_MODEL)

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

@@ -1,31 +1,4 @@
 MONGOID = (<<-MONGO) unless defined?(MONGOID)
-# Connection.new takes host and port
-host = 'localhost'
-port = Mongo::Connection::DEFAULT_PORT
-
-database_name = case Padrino.env
-  when :development then '!NAME!_development'
-  when :production  then '!NAME!_production'
-  when :test        then '!NAME!_test'
-end
-
-Mongoid.database = Mongo::Connection.new(host, port).db(database_name)
-
-# You can also configure Mongoid this way:
-# Mongoid.configure do |config|
-#   name = @settings["database"]
-#   host = @settings["host"]
-#   config.master = Mongo::Connection.new.db(name)
-#   config.slaves = [
-#     Mongo::Connection.new(host, @settings["slave_one"]["port"], :slave_ok => true).db(name),
-#     Mongo::Connection.new(host, @settings["slave_two"]["port"], :slave_ok => true).db(name)
-#   ]
-# end
-#
-# More installation and setup notes are on http://mongoid.org/.
-MONGO
-
-MONGOID3 = (<<-MONGO) unless defined?(MONGOID3)
 # Connection.new takes host and port.
 
 host = 'localhost'
@@ -38,12 +11,18 @@ database_name = case Padrino.env
 end
 
 # Use MONGO_URI if it's set as an environmental variable.
-Mongoid::Config.sessions =
-  if ENV['MONGO_URI']
-    {default: {uri: ENV['MONGO_URI'] }}
-  else
-    {default: {hosts: ["#\{host\}:#\{port\}"], database: database_name}}
-  end
+database_settings = if ENV['MONGO_URI']
+  {default: {uri: ENV['MONGO_URI'] }}
+else
+  {default: {hosts: ["#\{host\}:#\{port\}"], database: database_name}}
+end
+
+case Mongoid::VERSION
+when /^(3|4)/
+  Mongoid::Config.sessions = database_settings
+else
+  Mongoid::Config.load_configuration :clients => database_settings
+end
 
 # If you want to use a YML file for config, use this instead:
 #
@@ -51,31 +30,33 @@ Mongoid::Config.sessions =
 #
 # And add a config/database.yml file like this:
 #   development:
-#     sessions:
+#     clients: #Replace clients with sessions to work with Mongoid version 3.x or 4.x
 #       default:
 #         database: !NAME!_development
 #         hosts:
 #           - localhost:27017
+#
 #   production:
-#     sessions:
+#     clients: #Replace clients with sessions to work with Mongoid version 3.x or 4.x
 #       default:
 #         database: !NAME!_production
 #         hosts:
 #           - localhost:27017
+#
 #   test:
-#     sessions:
+#     clients: #Replace clients with sessions to work with Mongoid version 3.x or 4.x
 #       default:
 #         database: !NAME!_test
 #         hosts:
 #           - localhost:27017
 #
 #
-# More installation and setup notes are on http://mongoid.org/en/mongoid/docs/installation.html#configuration
+# More installation and setup notes are on https://docs.mongodb.org/ecosystem/tutorial/mongoid-installation/
 MONGO
 
 def setup_orm
-  require_dependencies 'mongoid', :version => '~>3.0.0'
-  create_file('config/database.rb', MONGOID3.gsub(/!NAME!/, @project_name.underscore))
+  require_dependencies 'mongoid', :version => '>= 3.0.0'
+  create_file('config/database.rb', MONGOID.gsub(/!NAME!/, @project_name.underscore))
 end
 
 MONGOID_MODEL = (<<-MODEL) unless defined?(MONGOID_MODEL)

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

@@ -11,6 +11,7 @@ MONGO
 def setup_orm
   require_dependencies 'mongo_mapper'
   require_dependencies 'bson_ext', :require => 'mongo'
+  require_dependencies 'activemodel', :version => '< 5'
   create_file("config/database.rb", MONGO.gsub(/!NAME!/, @project_name.underscore))
 end
 

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

@@ -32,9 +32,9 @@ def setup_orm
     require_dependencies 'pg'
     'pg'
   else
-    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_development.db\")")
-    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_production.db\")")
-    sequel.gsub!(/!DB_TEST!/,"\"sqlite:///\" + Padrino.root('db', \"#{db}_test.db\")")
+    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://db/#{db}_development.db\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"sqlite://db/#{db}_production.db\"")
+    sequel.gsub!(/!DB_TEST!/,       "\"sqlite://db/#{db}_test.db\"")
     require_dependencies 'sqlite3'
     'sqlite3'
   end

data/lib/padrino-gen/generators/components/stylesheets/compass.rb

@@ -1,10 +1,7 @@
 COMPASS_INIT = <<-COMPASS unless defined?(COMPASS_INIT)
-# Enables support for Compass, a stylesheet authoring framework based on SASS.
-# See http://compass-style.org/ for more details.
-# Store Compass/SASS files (by default) within 'app/stylesheets'.
-
-module CompassInitializer
-  def self.registered(app)
+    # Enables support for Compass, a stylesheet authoring framework based on SASS.
+    # See http://compass-style.org/ for more details.
+    # Store Compass/SASS files (by default) within 'app/stylesheets'.
     require 'sass/plugin/rack'
 
     Compass.configuration do |config|
@@ -22,18 +19,10 @@ module CompassInitializer
     Compass.handle_configuration_change!
 
     app.use Sass::Plugin::Rack
-  end
-end
 COMPASS
 
-COMPASS_REGISTER = <<-COMPASSR unless defined?(COMPASS_REGISTER)
-    register CompassInitializer\n
-COMPASSR
-
 def setup_stylesheet
-  require_dependencies 'compass'
-  create_file destination_root('/lib/compass_plugin.rb'), COMPASS_INIT
-  inject_into_file destination_root('/app/app.rb'), COMPASS_REGISTER, :after => "register Padrino::Helpers\n"
-
+  require_dependencies 'compass-blueprint'
+  initializer :compass, COMPASS_INIT.chomp
   directory "components/stylesheets/compass/", destination_root('/app/stylesheets')
 end

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

@@ -47,6 +47,8 @@ end
 
 desc "Run application test suite"
 task 'test' => test_tasks.map { |f| "test:\#{f}" }
+
+task :default => :test
 TEST
 
 BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_MODEL_TEST)

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

@@ -36,6 +36,8 @@ end
 
 desc "Run application test suite"
 task 'test' => test_tasks.map { |f| "test:\#{f}" }
+
+task :default => :test
 TEST
 
 MINITEST_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(MINITEST_CONTROLLER_TEST)

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

@@ -59,6 +59,8 @@ end
 
 desc "Run application test suite"
 task 'test' => test_tasks.map { |f| "test:\#{f}" }
+
+task :default => :test
 TEST
 
 RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_MODEL_TEST)

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

@@ -57,8 +57,12 @@ begin
   desc "Run complete application spec suite"
   task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
 rescue LoadError
-  puts "RSpec is not part of this bundle, skip specs."
+  task :spec do
+    puts "RSpec is not part of this bundle, skip specs."
+  end
 end
+
+task :default => :spec
 TEST
 
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)

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

@@ -54,6 +54,8 @@ end
 
 desc "Run application test suite"
 task 'test' => test_tasks.map { |f| "test:\#{f}" }
+
+task :default => :test
 TEST
 
 SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_MODEL_TEST)
@@ -89,6 +91,7 @@ TEST
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'shoulda', :group => 'test'
+  require_dependencies 'test-unit', :group => 'test'
   insert_test_suite_setup SHOULDA_SETUP
   create_file destination_root("test/test.rake"), SHOULDA_RAKE
 end

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

@@ -60,6 +60,8 @@ end
 
 desc "Run complete application spec suite"
 task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
+
+task :default => :spec
 TEST
 
 STEAK_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_MODEL_TEST)

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

@@ -0,0 +1,112 @@
+TESTUNIT_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_SETUP)
+RACK_ENV = 'test' unless defined?(RACK_ENV)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
+
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil, &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
+  end
+end
+TEST
+
+TESTUNIT_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_RAKE)
+require 'rake/testtask'
+
+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}" }
+
+task :default => :test
+TEST
+
+TESTUNIT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_CONTROLLER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+
+class !NAME!ControllerTest < Test::Unit::TestCase
+  def setup
+    get "/"
+  end
+
+  def test_returns_hello_world_text
+    assert_equal "Hello World", last_response.body
+  end
+end
+TEST
+
+TESTUNIT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_MODEL_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def test_constructs_a_new_instance
+    @!DNAME! = !NAME!.new
+    refute_nil @!DNAME!
+  end
+end
+TEST
+
+TESTUNIT_HELPER_TEST = (<<-TEST) unless defined?(TESTUNIT_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def self.setup
+    @helpers = Class.new
+    @helpers.extend !CONSTANT_NAME!
+  end
+
+  def helpers
+    @helpers
+  end
+
+  def test_foo_helper
+    assert_equal nil, helpers.foo
+  end
+end
+TEST
+
+def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
+  require_dependencies 'test-unit', :require => 'test/unit', :group => 'test'
+  insert_test_suite_setup TESTUNIT_SETUP
+  create_file destination_root("test/test.rake"), TESTUNIT_RAKE
+end
+
+def generate_controller_test(name, path)
+  test_unit_contents = TESTUNIT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), test_unit_contents, :skip => true
+end
+
+def generate_model_test(name)
+  test_unit_contents = TESTUNIT_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), test_unit_contents, :skip => true
+end
+
+def generate_helper_test(name, project_name, app_name)
+  test_unit_contents = TESTUNIT_HELPER_TEST.gsub(/!NAME!/, name).gsub(/!CONSTANT_NAME!/, "#{project_name}::#{app_name}::#{name}")
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), test_unit_contents, :skip => true
+end

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

@@ -36,6 +36,7 @@ module Padrino
       # Execute controller generation
       #
       def create_controller
+        validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
           app = options[:app]

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

@@ -30,6 +30,7 @@ module Padrino
       # Execute helper generation
       #
       def create_helper
+        validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
           app = options[:app]

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

@@ -30,6 +30,7 @@ module Padrino
       # Execute mailer generation.
       #
       def create_mailer
+        validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
           app = options[:app]

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

@@ -25,6 +25,7 @@ module Padrino
 
       # Creates the migration file within a Padrino project.
       def create_migration
+        validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
           self.behavior = :revoke if options[:destroy]

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

@@ -55,7 +55,7 @@ module Padrino
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           http.start do
             http.request_get(uri.path) do |res|
-              plugins = res.body.scan(%r{/plugins/(\w+)_plugin.rb}).uniq
+              plugins = res.body.scan(%r{/plugins/(\w+-\w+)_plugin.rb}).uniq
             end
           end
           say "Available plugins:", :green

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

@@ -1,9 +1,8 @@
 # Defines our constants
-RACK_ENV = ENV['RACK_ENV'] ||= 'development'  unless defined?(RACK_ENV)
+RACK_ENV = ENV['RACK_ENV'] ||= 'development' unless defined?(RACK_ENV)
 PADRINO_ROOT = File.expand_path('../..', __FILE__) unless defined?(PADRINO_ROOT)
 
 # Load our dependencies
-require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
 Bundler.require(:default, RACK_ENV)
 
@@ -13,6 +12,14 @@ Bundler.require(:default, RACK_ENV)
 # Padrino::Logger::Config[:development][:log_level]  = :devel
 # Padrino::Logger::Config[:development][:log_static] = true
 #
+# ## Configure Ruby to allow requiring features from your lib folder
+#
+# $LOAD_PATH.unshift Padrino.root('lib')
+#
+# ## Enable logging of source location
+#
+# Padrino::Logger::Config[:development][:source_location] = true
+#
 # ## Configure your I18n
 #
 # I18n.default_locale = :en
@@ -31,8 +38,15 @@ Bundler.require(:default, RACK_ENV)
 #   include Padrino::Helpers::TranslationHelpers
 # end
 
+##
+# Require initializers before all other dependencies.
+# Dependencies from 'config' folder are NOT re-required on reload.
+#
+Padrino.dependency_paths.unshift Padrino.root('config/initializers/*.rb')
+
 ##
 # Add your before (RE)load hooks here
+# These hooks are run before any dependencies are required.
 #
 Padrino.before_load do
 end

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

@@ -27,10 +27,11 @@ module Padrino
       class_option :dev,              :desc => 'Use padrino from a git checkout',                                                    :default => false,       :type => :boolean
       class_option :tiny,             :desc => 'Generate tiny app skeleton',                                       :aliases => '-i', :default => false,       :type => :boolean
       class_option :lean,             :desc => 'Generate lean project without apps',                               :aliases => '-l', :default => false,       :type => :boolean
-      class_option :adapter,          :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite',    :type => :string
+      class_option :api,              :desc => 'Generate minimal project for APIs',                                                  :default => false,       :type => :boolean
       class_option :template,         :desc => 'Generate project from template',                                   :aliases => '-p', :default => nil,         :type => :string
       class_option :gem,              :desc => 'Generate project as a gem',                                        :aliases => '-g', :default => false,       :type => :boolean
       class_option :migration_format, :desc => 'Filename format for migrations (number, timestamp)',                                 :default => 'number',    :type => :string
+      class_option :adapter,          :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite',    :type => :string
 
       # Definitions for the available customizable components.
       defines_component_options

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

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open-uri'
 
 module Padrino
   module Generators

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

@@ -26,6 +26,7 @@ module Padrino
       require_arguments!
 
       def create_task
+        validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
           app        = options[:app]