padrino-gen 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd35b1d91f0fae811dc120c23aaa1e79e95895a
-  data.tar.gz: 145252cb719e477feb79942d12557d853653c6a8
+  metadata.gz: 1f8ab7a90610830c747530e9eac64e54a8448461
+  data.tar.gz: f312d806fb6dc5a75457005f929afa3573e62c22
 SHA512:
-  metadata.gz: e9f450584438e351b0d5210a4f009b00971aefffdbe6c3a2dd6088384ae6358713f35e246e60e230780b98cd9cac23c0d7df170b0f9c1c3a171de59bfae55479
-  data.tar.gz: 44e0973081ea1543b52045ee2765fceb90aa4e96f1077d4090555a9b7bf7d97614190182095db7757a5e3a45ffc3924fbb53a8b7a14cc7ad4330a27d66377f84
+  metadata.gz: 04cc205b2b510cd07a67c4390864ac27a727f5dceb5657a4985bad59c91a6708f7279198ce5c2c68448d8462b22de1363da5082faa4f75e718138f159abe3d69
+  data.tar.gz: 5658e955f42db155d572f671686d8c75e35790ff4c5ed840346125ad4d2d5b6f6f8acb4bb57f56ee01c3d784e5082706b4ff1e14330ed69c8dc7cae35191ebbd

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

@@ -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
 
     ##

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

@@ -144,7 +144,7 @@ module Padrino
         #   => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @app_name), :after => "set :environment, :test")
         #
         def insert_test_suite_setup(suite_text, options={})
-          options.reverse_merge!(:path => "test/test_config.rb")
+          options = { :path => "test/test_config.rb" }.update(options)
           create_file(options[:path], suite_text.gsub(/CLASS_NAME/, "#{@project_name}::#{@app_name}"))
         end
 
@@ -161,7 +161,7 @@ module Padrino
         #   => inject_into_file("test/test_config.rb", "  include Mocha::API\n", :after => /class.*?\n/)
         #
         def insert_mocking_include(library_name, options={})
-          options.reverse_merge!(:indent => 2, :after => /class.*?\n/, :path => "test/test_config.rb")
+          options = { :indent => 2, :after => /class.*?\n/, :path => "test/test_config.rb" }.update(options)
           return unless File.exist?(destination_root(options[:path]))
           include_text = indent_spaces(2) + "include #{library_name}\n"
           inject_into_file(options[:path], include_text, :after => options[:after])

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

@@ -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/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))
+  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/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-blueprint'
-  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"
-
+  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

@@ -61,6 +61,8 @@ rescue LoadError
     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)

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

@@ -36,6 +36,8 @@ 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)

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

@@ -34,8 +34,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/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]

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

@@ -20,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 %>'
 
@@ -30,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/padrino-tasks/activerecord.rb

@@ -309,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)

data/test/helper.rb

@@ -14,6 +14,19 @@ require 'ext/minitest-spec'
 
 Padrino::Generators.load_components!
 
+# register fake URL to avoid downloading static files every time tests run
+fake_uri_base = "https://raw.github.com/padrino/padrino-static/master/"
+%W[
+  js/dojo.js ujs/dojo.js
+  js/ext.js ujs/ext.js
+  js/jquery.js ujs/jquery.js
+  js/mootools.js ujs/mootools.js
+  js/right.js ujs/right.js
+  js/protopak.js js/lowpro.js ujs/prototype.js
+].each do |suffix|
+  FakeWeb.register_uri(:get, fake_uri_base + suffix, :body => '')
+end
+
 class MiniTest::Spec
   include Webrat::Methods
   include Webrat::Matchers
@@ -79,7 +92,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"

data/test/test_controller_generator.rb

@@ -22,6 +22,11 @@ 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") }

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") }

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") } }

data/test/test_model_generator.rb

@@ -79,14 +79,14 @@ describe "ModelGenerator" do
     it 'should generate a default type value for fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      capture_io { generate(:model, 'person', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") }
-      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
-      assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path)
-      assert_match_in_file(/    create_table :people/m, migration_file_path)
+      capture_io { generate(:model, 'friend', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") }
+      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb"
+      assert_match_in_file(/class CreateFriends < ActiveRecord::Migration/m, migration_file_path)
+      assert_match_in_file(/    create_table :friends/m, migration_file_path)
       assert_match_in_file(/      t.string :name/m,   migration_file_path)
       assert_match_in_file(/      t.integer :age/m,   migration_file_path)
       assert_match_in_file(/      t.string :email/m,  migration_file_path)
-      assert_match_in_file(/    drop_table :people/m, migration_file_path)
+      assert_match_in_file(/    drop_table :friends/m, migration_file_path)
     end
 
     it 'should abort if model name already exists' do
@@ -149,14 +149,14 @@ describe "ModelGenerator" do
     it 'should generate migration file with given fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
-      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
-      assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path)
-      assert_match_in_file(/    create_table :people/m, migration_file_path)
+      capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
+      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb"
+      assert_match_in_file(/class CreateFriends < ActiveRecord::Migration/m, migration_file_path)
+      assert_match_in_file(/    create_table :friends/m, migration_file_path)
       assert_match_in_file(/      t.string :name/m,   migration_file_path)
       assert_match_in_file(/      t.integer :age/m,   migration_file_path)
       assert_match_in_file(/      t.string :email/m,  migration_file_path)
-      assert_match_in_file(/    drop_table :people/m, migration_file_path)
+      assert_match_in_file(/    drop_table :friends/m, migration_file_path)
     end
   end
 
@@ -239,12 +239,12 @@ describe "ModelGenerator" do
     it 'should properly generate version numbers' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
-      capture_io { generate(:model, 'person', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:model, 'friend', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'account', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_match_in_file(/migration 1, :create_users do/m, "#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
-      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb")
-      assert_match_in_file(/migration 2, :create_people do/m, "#{@apptmp}/sample_project/db/migrate/002_create_people.rb")
+      assert_match_in_file(/class Friend\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/friend.rb")
+      assert_match_in_file(/migration 2, :create_friends do/m, "#{@apptmp}/sample_project/db/migrate/002_create_friends.rb")
       assert_match_in_file(/class Account\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/account.rb")
       assert_match_in_file(/migration 3, :create_accounts do/m, "#{@apptmp}/sample_project/db/migrate/003_create_accounts.rb")
     end
@@ -252,15 +252,15 @@ describe "ModelGenerator" do
     it 'should generate migration with given fields' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
-      capture_io { generate(:model, 'person', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb")
-      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
-      assert_match_in_file(/migration 1, :create_people do/m, migration_file_path)
-      assert_match_in_file(/create_table :people do/m, migration_file_path)
+      capture_io { generate(:model, 'friend', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class Friend\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/friend.rb")
+      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb"
+      assert_match_in_file(/migration 1, :create_friends do/m, migration_file_path)
+      assert_match_in_file(/create_table :friends do/m, migration_file_path)
       assert_match_in_file(/column :name, DataMapper::Property::String/m, migration_file_path)
       assert_match_in_file(/column :created_at, DataMapper::Property::DateTime/m, migration_file_path)
       assert_match_in_file(/column :email, DataMapper::Property::String/m, migration_file_path)
-      assert_match_in_file(/drop_table :people/m, migration_file_path)
+      assert_match_in_file(/drop_table :friends/m, migration_file_path)
     end
   end
 
@@ -282,15 +282,15 @@ describe "ModelGenerator" do
     it 'should generate migration file with given properties' do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
-      capture_io { generate(:model, 'person', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
-      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
-      assert_match_in_file(/class Person < Sequel::Model/m, "#{@apptmp}/sample_project/models/person.rb")
+      capture_io { generate(:model, 'friend', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
+      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb"
+      assert_match_in_file(/class Friend < Sequel::Model/m, "#{@apptmp}/sample_project/models/friend.rb")
       assert_match_in_file(/Sequel\.migration do/m, migration_file_path)
-      assert_match_in_file(/create_table :people/m, migration_file_path)
+      assert_match_in_file(/create_table :friends/m, migration_file_path)
       assert_match_in_file(/String :name/m,   migration_file_path)
       assert_match_in_file(/Integer :age/m,   migration_file_path)
       assert_match_in_file(/DateTime :created/m,  migration_file_path)
-      assert_match_in_file(/drop_table :people/m, migration_file_path)
+      assert_match_in_file(/drop_table :friends/m, migration_file_path)
     end
   end
 

data/test/test_plugin_generator.rb

@@ -54,6 +54,7 @@ describe "PluginGenerator" do
 
     it 'should resolve generic url properly' do
       template_file = 'http://www.example.com/test.rb'
+      FakeWeb.register_uri :get, template_file, :body => ''
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(template_file).returns(true).once
       capture_io { project_gen.invoke_all }
@@ -71,6 +72,7 @@ describe "PluginGenerator" do
     it 'should resolve official template' do
       template_file = 'sampleblog'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/templates/sampleblog_template.rb"
+      FakeWeb.register_uri :get, resolved_path, :body => template_file
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(resolved_path).returns(true).once
       capture_io { project_gen.invoke_all }
@@ -86,6 +88,7 @@ describe "PluginGenerator" do
     it 'should resolve official plugin' do
       template_file = 'hoptoad'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hoptoad_plugin.rb"
+      FakeWeb.register_uri :get, resolved_path, :body => template_file
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       plugin_gen.expects(:apply).with(resolved_path).returns(true).once
@@ -95,6 +98,7 @@ describe "PluginGenerator" do
     it 'should print a warning if template cannot be found' do
       template_file  = 'hwat'
       resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hwat_plugin.rb"
+      FakeWeb.register_uri :get, resolved_path, :status => 404
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       plugin_gen.expects(:say).with("The template at #{resolved_path} could not be found!", :red).returns(true).once

data/test/test_project_generator.rb

@@ -648,7 +648,7 @@ describe "ProjectGenerator" do
     it 'should properly generate for sass' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=sass') }
       assert_match_in_file(/gem 'sass'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/sass_initializer.rb")
+      assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/sass.rb")
       assert_match_in_file(/register SassInitializer/m, "#{@apptmp}/sample_project/app/app.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
@@ -656,7 +656,7 @@ describe "ProjectGenerator" do
     it 'should properly generate for less' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=less') }
       assert_match_in_file(/gem 'rack-less'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/module LessInitializer.*Rack::Less/m, "#{@apptmp}/sample_project/lib/less_initializer.rb")
+      assert_match_in_file(/module LessInitializer.*Rack::Less/m, "#{@apptmp}/sample_project/config/initializers/less.rb")
       assert_match_in_file(/register LessInitializer/m, "#{@apptmp}/sample_project/app/app.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
@@ -664,8 +664,8 @@ describe "ProjectGenerator" do
     it 'should properly generate for compass' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=compass') }
       assert_match_in_file(/gem 'compass-blueprint'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/Compass.configure_sass_plugin\!/, "#{@apptmp}/sample_project/lib/compass_plugin.rb")
-      assert_match_in_file(/module CompassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/compass_plugin.rb")
+      assert_match_in_file(/Compass.configure_sass_plugin\!/, "#{@apptmp}/sample_project/config/initializers/compass.rb")
+      assert_match_in_file(/module CompassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/compass.rb")
       assert_match_in_file(/register CompassInitializer/m, "#{@apptmp}/sample_project/app/app.rb")
 
       assert_file_exists("#{@apptmp}/sample_project/app/stylesheets/application.scss")
@@ -675,8 +675,8 @@ describe "ProjectGenerator" do
     it 'should properly generate for scss' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=scss') }
       assert_match_in_file(/gem 'haml'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/module ScssInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/scss_initializer.rb")
-      assert_match_in_file(/Sass::Plugin.options\[:syntax\] = :scss/m, "#{@apptmp}/sample_project/lib/scss_initializer.rb")
+      assert_match_in_file(/module ScssInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/scss.rb")
+      assert_match_in_file(/Sass::Plugin.options\[:syntax\] = :scss/m, "#{@apptmp}/sample_project/config/initializers/scss.rb")
       assert_match_in_file(/register ScssInitializer/m, "#{@apptmp}/sample_project/app/app.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end

data/test/test_task_generator.rb

@@ -17,6 +17,11 @@ describe "TaskGenerator" do
       assert_no_file_exists('/tmp/tasks/foo.rake')
     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(:task, "wrong/name", "--root=#{@apptmp}/sample") } }
+    end
+
     it 'should generate filename properly' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:task, 'DemoTask', "--namespace=Sample", "--description='This is a sample'", "-r=#{@apptmp}/sample_project") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,26 +19,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -78,9 +78,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -203,17 +203,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []