padrino-gen 0.2.0 → 0.2.1

data/README.rdoc

@@ -46,15 +46,15 @@ setup performed for the default components.
 
 You can also define specific components to be used:
 
-  $ padrino-gen demo_app . --test=rspec --renderer=haml --mock=rr --script=jquery --orm datamapper
+  $ padrino-gen demo_app . --test rspec --renderer haml --mock rr --script jquery --orm datamapper
   
 There is also support for aliases for each component within the command:
 
-  $ padrino-gen demo_app . -t=rspec -r=haml -m=rr -s=jquery -d=datamapper
+  $ padrino-gen demo_app . -t rspec -r haml -m rr -s jquery -d datamapper
   
 You can also instruct the generator to skip a certain component to avoid using one at all (or to use your own):
 
-  $ padrino-gen demo_app . --test=none --renderer=none
+  $ padrino-gen demo_app . --test none --renderer none
   
 The available components and their default options are listed below:
 
@@ -142,11 +142,15 @@ Using the controller generator is as simple as:
   
 You can also specify desired actions to be added to your controller:
 
-  $ padrino-gen controller Admin :index [:admin, :index]
+  $ padrino-gen controller Admin get:index get:new post:create
   
 The controller generator will then construct the controller file within <tt>app/controllers/admin.rb</tt>
 and also a controller test file at <tt>test/controllers/admin_controller_test.rb</tt> according to the 
-test framework chosen during app generation.
+test framework chosen during app generation. A default route will also be generated mapping to name of the controller and the route name. For example:
+
+  $ padrino-gen controller User get:index
+  
+  will create a url route for :index mapping to "/user/index"
 
 === Mailer Generator ===
 
@@ -166,4 +170,4 @@ The mailer generator will then construct the mailer file within <tt>app/mailers/
 
 == Copyright
 
-Copyright (c) 2009 Padrino. See LICENSE for details.
+Copyright (c) 2009 Padrino. See LICENSE for details.

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"
+    gem.add_development_dependency "fakeweb",       ">= 1.2.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/padrino-gen

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + "/../lib/padrino-gen"
 generator_mappings = SupportLite::OrderedHash.new
 generator_mappings[:app]        = Padrino::Generators::Skeleton
 generator_mappings[:model]      = Padrino::Generators::Model
+generator_mappings[:migration]  = Padrino::Generators::Migration
 generator_mappings[:controller] = Padrino::Generators::Controller
 generator_mappings[:mailer]     = Padrino::Generators::Mailer
 

data/lib/generators/components/actions.rb

@@ -27,15 +27,62 @@ module Padrino
           inject_into_file('Gemfile', options[:content], :after => options[:after])
         end
 
+        # For orm database components
+        # Generates the model migration file created when generating a new model
+        # options => { :base => "....text...", :up => "..text...",
+        #             :down => "..text...", column_format => "t.column :#{field}, :#{kind}" }
+        def output_model_migration(filename, name, columns, options={})
+          model_name = name.to_s.pluralize
+          field_tuples = fields.collect { |value| value.split(":") }
+          field_tuples.collect! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
+          column_declarations = field_tuples.collect(&options[:column_format]).join("\n      ")
+          contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
+          contents = contents.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
+          contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
+          current_migration_number = Dir[app_root_path('db/migrate/*.rb')].map { |f| 
+            File.basename(f).match(/^(\d+)/)[0].to_i }.max.to_i || 0
+          contents = contents.gsub(/!FIELDS!/, column_declarations).gsub(/!VERSION!/, (current_migration_number + 1).to_s)
+          migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
+          create_file(app_root_path('db/migrate/', migration_filename), contents)
+        end
+
+        # For orm database components
+        # Generates a standalone migration file based on the given options and columns
+        # options => { :base "...text...", :change_format => "...text...",
+        #              :add => lambda { |field, kind| "add_column :#{table_name}, :#{field}, :#{kind}" },
+        #              :remove => lambda { |field, kind| "remove_column :#{table_name}, :#{field}" }
+        def output_migration_file(filename, name, columns, options={})
+          change_format = options[:change_format]
+          migration_scan = filename.camelize.scan(/(Add|Remove)(?:.*?)(?:To|From)(.*?)$/).flatten
+          direction, table_name = migration_scan[0].downcase, migration_scan[1].downcase.pluralize if migration_scan.any?
+          tuples = direction ? columns.collect { |value| value.split(":") } : []
+          tuples.collect! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
+          add_columns    = tuples.collect(&options[:add]).join("\n    ")
+          remove_columns = tuples.collect(&options[:remove]).join("\n    ")
+          forward_text = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, add_columns) if tuples.any?
+          back_text    = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, remove_columns) if tuples.any?
+          contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))
+          contents.gsub!(/\s{4}!DOWN!\n/m, (direction == 'add' ? back_text.to_s : forward_text.to_s))
+          contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.camelize)
+          current_migration_number = Dir[app_root_path('db/migrate/*.rb')].map { |f| 
+            File.basename(f).match(/^(\d+)/)[0].to_i }.max.to_i || 0
+         contents.gsub!(/!VERSION!/, (current_migration_number + 1).to_s)
+          migration_filename = "#{format("%03d", current_migration_number+1)}_#{filename.underscore}.rb"
+          # migration_filename = "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{filename.underscore}.rb"
+          create_file(app_root_path('db/migrate/', migration_filename), contents)
+        end
+
+        # For testing components
         # Injects the test class text into the test_config file for setting up the test gen
         # insert_test_suite_setup('...CLASS_NAME...')
-        # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test\n")
+        # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test")
         def insert_test_suite_setup(suite_text, options={})
           test_helper_text = [BASE_TEST_HELPER, suite_text.gsub(/CLASS_NAME/, @class_name)].join("\n")
           options.reverse_merge!(:path => "test/test_config.rb")
           create_file(options[:path], test_helper_text)
         end
 
+        # For mocking components
         # Injects the mock library include into the test class in test_config for setting up mock gen
         # insert_mock_library_include('Mocha::API')
         # => inject_into_file("test/test_config.rb", "  include Mocha::API\n", :after => /class.*?\n/)
@@ -51,6 +98,26 @@ module Padrino
         def indent_spaces(count)
           ' ' * count
         end
+        
+        # For Controller action generation
+        # Takes in fields for routes in the form of get:index post:test delete:yada and such
+        def controller_actions(fields)
+          field_tuples = fields.collect { |value| value.split(":") }
+          action_declarations = field_tuples.collect do |request, name| 
+            "#{request} :#{name} do\n  end\n"
+            end.join("\n  ")
+        end
+        
+        # For controller route generation
+        # Takes in the fields and maps out an appropriate default route.
+        # where controller is user and route is get:test, will add map(:test).to("/user/test")
+        def controller_routes(name,fields)
+          field_tuples = fields.collect { |value| value.split(":") }
+          routes = "\n" + field_tuples.collect do |request, route| 
+            "  map(:#{route}).to(\"/#{name}/#{route}\")"
+            end.join("\n") + "\n"
+        end
+        
       end
     end
   end

data/lib/generators/components/orms/activerecord_gen.rb

@@ -8,24 +8,25 @@ module Padrino
           AR = (<<-AR).gsub(/^ {10}/, '')
           module DatabaseSetup
             def self.registered(app)
+              app.configure { ActiveRecord::Base.logger = logger }
               app.configure :development do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => 'your_dev_db_here'
+                  :database => "your_dev_db_here"
                 )
               end
 
               app.configure :production do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => 'your_production_db_here'
+                  :database => "your_production_db_here"
                 )
               end
 
               app.configure :test do
                 ActiveRecord::Base.establish_connection(
                   :adapter => 'sqlite3',
-                  :database => 'your_test_db_here'
+                  :database => "your_test_db_here"
                 )
               end
             end
@@ -39,10 +40,11 @@ module Padrino
           namespace :db do
             desc "Migrate the database"
             task(:migrate) do
-              load 'config/boot.rb'
+              load File.dirname(__FILE__) + '/config/boot.rb'
+              APP_CLASS.new
               ActiveRecord::Base.logger = Logger.new(STDOUT)
               ActiveRecord::Migration.verbose = true
-              ActiveRecord::Migrator.migrate("db/migrate")
+              ActiveRecord::Migrator.migrate( File.dirname(__FILE__) + "/db/migrate")
             end
           end
           RAKE
@@ -51,7 +53,7 @@ module Padrino
           def setup_orm
             require_dependencies 'activerecord'
             create_file("config/database.rb", AR)
-            create_file("Rakefile", RAKE)
+            create_file("Rakefile", RAKE.gsub(/APP_CLASS/, @class_name))
             empty_directory('app/models')
           end
 
@@ -69,30 +71,47 @@ module Padrino
           end
 
           AR_MIGRATION = (<<-MIGRATION).gsub(/^ {10}/, '')
-          class !FILENAME! < ActiveRecord::Migration
+          class !FILECLASS! < ActiveRecord::Migration
             def self.up
-              create_table :!TABLE! do |t|
-                # t.column <name>, <type>
-                # t.column :age, :integer
-                !FIELDS!
-              end
+              !UP!
             end
 
             def self.down
-              drop_table :users
+              !DOWN!
             end
           end
           MIGRATION
 
-          def create_migration_file(filename, name, fields)
-            model_name = name.to_s.pluralize
-            field_tuples = fields.collect { |value| value.split(":") }
-            column_declarations = field_tuples.collect { |field, kind| "t.column :#{field}, :#{kind}" }.join("\n      ")
-            migration_contents = AR_MIGRATION.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
-            migration_contents.gsub!(/!FILENAME!/, filename.camelize)
-            migration_contents.gsub!(/!FIELDS!/, column_declarations)
-            migration_filename = "#{Time.now.to_i}_#{filename}.rb"
-            create_file(app_root_path('db/migrate/', migration_filename), migration_contents)
+          AR_MODEL_UP_MG = (<<-MIGRATION).gsub(/^ {6}/, '')
+          create_table :!TABLE! do |t|
+            # t.column <name>, <type>
+            # t.column :age, :integer
+            !FIELDS!
+          end
+          MIGRATION
+
+          AR_MODEL_DOWN_MG = (<<-MIGRATION).gsub(/^ {10}/, '')
+          drop_table :!TABLE!
+          MIGRATION
+
+          def create_model_migration(migration_name, name, columns)
+            output_model_migration(migration_name, name, columns,
+                 :base => AR_MIGRATION,
+                 :column_format => lambda { |field, kind| "t.column :#{field}, :#{kind.underscore.gsub(/_/, '')}"  },
+                 :up => AR_MODEL_UP_MG, :down => AR_MODEL_DOWN_MG)
+          end
+
+          AR_CHANGE_MG = (<<-MIGRATION).gsub(/^ {6}/, '')
+          change_table :!TABLE! do |t|
+            !COLUMNS!
+          end
+          MIGRATION
+
+          def create_migration_file(migration_name, name, columns)
+            output_migration_file(migration_name, name, columns,
+                :base => AR_MIGRATION, :change_format => AR_CHANGE_MG,
+                :add => lambda { |field, kind| "t.column :#{field}, :#{kind.underscore.gsub(/_/, '')}" },
+                :remove => lambda { |field, kind| "t.remove :#{field}" })
           end
 
         end

data/lib/generators/components/orms/couchrest_gen.rb

@@ -8,14 +8,13 @@ module Padrino
           COUCHREST = (<<-COUCHREST).gsub(/^ {10}/, '')
           module DatabaseSetup
             def self.registered(app)
-              app.configure(:development) { set :couchdb, CouchRest.database!('your_dev_db_here') }
-              app.configure(:production)  { set :couchdb, CouchRest.database!('your_production_db_here') }
-              app.configure(:test)        { set :couchdb, CouchRest.database!('your_test_db_here') }
+              app.configure(:development) { set :couchdb, CouchRest.database!("your_dev_db_here") }
+              app.configure(:production)  { set :couchdb, CouchRest.database!("your_production_db_here") }
+              app.configure(:test)        { set :couchdb, CouchRest.database!("your_test_db_here") }
             end
           end
           COUCHREST
 
-
           def setup_orm
             require_dependencies 'couchrest'
             create_file("config/database.rb", COUCHREST)
@@ -44,7 +43,11 @@ module Padrino
             create_file(model_path, model_contents)
           end
 
-          def create_migration_file(filename, name, fields)
+          def create_model_migration(filename, name, fields)
+            # NO MIGRATION NEEDED
+          end
+
+          def create_migration_file(migration_name, name, columns)
             # NO MIGRATION NEEDED
           end
         end

data/lib/generators/components/orms/datamapper_gen.rb

@@ -7,11 +7,12 @@ module Padrino
           DM = (<<-DM).gsub(/^ {10}/, '')
           module DatabaseSetup
             def self.registered(app)
-              app.configure(:development) { DataMapper.setup(:default, 'your_dev_db_here') }
-              app.configure(:production)  { DataMapper.setup(:default, 'your_production_db_here') }
-              app.configure(:test)        { DataMapper.setup(:default, 'your_test_db_here') }
+              app.configure               { DataMapper.logger = logger }
+              app.configure(:development) { DataMapper.setup(:default, "sqlite3://your_dev_db_here") }
+              app.configure(:production)  { DataMapper.setup(:default, "sqlite3://your_production_db_here") }
+              app.configure(:test)        { DataMapper.setup(:default, "sqlite3://your_test_db_here") }
             rescue ArgumentError => e
-              puts "Database options need to be configured within 'config/database.rb'!" if app.logging?
+              logger.error "Database options need to be configured within 'config/database.rb'!" if app.logging?
             end
           end
           DM
@@ -27,7 +28,7 @@ module Padrino
             include DataMapper::Resource
 
             # property <name>, <type>
-            # property :id,       Serial
+            property :id, Serial
             !FIELDS!
           end
           MODEL
@@ -37,35 +38,53 @@ module Padrino
             return false if File.exist?(model_path)
             model_contents = DM_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
             field_tuples = fields.collect { |value| value.split(":") }
+            field_tuples.collect! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] } # fix datetime
             column_declarations = field_tuples.collect { |field, kind|"property :#{field}, #{kind.camelize}" }.join("\n  ")
             model_contents.gsub!(/!FIELDS!/, column_declarations)
             create_file(model_path, model_contents)
           end
 
           DM_MIGRATION = (<<-MIGRATION).gsub(/^ {10}/, '')
-          migration NUM, :!FILENAME! do
+          migration !VERSION!, :!FILENAME! do
             up do
-              create_table(:!TABLE!) do
-                column(:id, Integer, :serial => true)
-                !FIELDS!
-              end
+              !UP!
             end
 
             down do
-              drop_table(:!TABLE!)
+              !DOWN!
             end
           end
           MIGRATION
 
-          def create_migration_file(filename, name, fields)
-            model_name = name.to_s.pluralize
-            field_tuples = fields.collect { |value| value.split(":") }
-            column_declarations = field_tuples.collect { |field, kind|"column(:#{field}, #{kind.camelize})" }.join("\n      ")
-            migration_contents = DM_MIGRATION.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
-            migration_contents.gsub!(/!FILENAME!/, filename)
-            migration_contents.gsub!(/!FIELDS!/, column_declarations)
-            migration_filename = "#{Time.now.to_i}_#{filename}.rb"
-            create_file(app_root_path('db/migrate/', migration_filename), migration_contents)
+          DM_MODEL_UP_MG =  (<<-MIGRATION).gsub(/^ {6}/, '')
+          create_table :!TABLE! do
+            column :id, Integer, :serial => true
+            !FIELDS!
+          end
+          MIGRATION
+
+          DM_MODEL_DOWN_MG =  (<<-MIGRATION).gsub(/^ {10}/, '')
+          drop_table :!TABLE!
+          MIGRATION
+
+          def create_model_migration(migration_name, name, columns)
+            output_model_migration(migration_name, name, columns,
+                 :column_format => lambda { |field, kind| "column :#{field}, #{kind.camelize}" },
+                 :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
+          end
+
+          DM_CHANGE_MG = (<<-MIGRATION).gsub(/^ {6}/, '')
+          modify_table :!TABLE! do
+            !COLUMNS!
+          end
+          MIGRATION
+
+          def create_migration_file(migration_name, name, columns)
+            output_migration_file(migration_name, name, columns,
+                :base => DM_MIGRATION, :change_format => DM_CHANGE_MG,
+                :add => lambda { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
+                :remove => lambda { |field, kind| "drop_column :#{field}" }
+                )
           end
         end
 

data/lib/generators/components/orms/mongomapper_gen.rb

@@ -11,17 +11,17 @@ module Padrino
           module DatabaseSetup
             def self.registered(app)
               app.configure :development do
-                MongoMapper.connection = Mongo::Connection.new('localhost')
+                MongoMapper.connection = Mongo::Connection.new('localhost', nil, :logger => logger)
                 MongoMapper.database = 'your_dev_db_here'
               end
 
               app.configure :production do
-                MongoMapper.connection = Mongo::Connection.new('localhost')
+                MongoMapper.connection = Mongo::Connection.new('localhost', nil, :logger => logger)
                 MongoMapper.database = 'your_production_db_here'
               end
 
               app.configure :test do
-                MongoMapper.connection = Mongo::Connection.new('localhost')
+                MongoMapper.connection = Mongo::Connection.new('localhost', nil, :logger => logger)
                 MongoMapper.database = 'your_test_db_here'
               end
             end
@@ -53,7 +53,11 @@ module Padrino
             create_file(model_path, model_contents)
           end
 
-          def create_migration_file(filename, name, fields)
+          def create_model_migration(filename, name, fields)
+            # NO MIGRATION NEEDED
+          end
+
+          def create_migration_file(migration_name, name, columns)
             # NO MIGRATION NEEDED
           end
         end

data/lib/generators/components/orms/sequel_gen.rb

@@ -9,9 +9,9 @@ module Padrino
           module DatabaseSetup
             def self.registered(app)
               Sequel::Model.plugin(:schema)
-              app.configure(:development) { Sequel.connect('your_dev_db_here') }
-              app.configure(:production)  { Sequel.connect('your_production_db_here') }
-              app.configure(:test)        { Sequel.connect('your_test_db_here') }
+              app.configure(:development) { Sequel.connect("sqlite://your_dev_db_here", :loggers => [logger]) }
+              app.configure(:production)  { Sequel.connect("sqlite://your_production_db_here", :loggers => [logger]) }
+              app.configure(:test)        { Sequel.connect("sqlite://your_test_db_here", :loggers => [logger]) }
             end
           end
           SEQUEL
@@ -36,30 +36,48 @@ module Padrino
           end
 
           SQ_MIGRATION = (<<-MIGRATION).gsub(/^ {10}/, '')
-          class !FILENAME! < Sequel::Migration
+          class !FILECLASS! < Sequel::Migration
             def up
-              create_table :!TABLE! do
-                primary_key :id
-                # <type> <name>
-                !FIELDS!
-              end
+              !UP!
             end
 
             def down
-              drop_table :!TABLE!
+              !DOWN!
             end
           end
           MIGRATION
 
-          def create_migration_file(filename, name, fields)
-            model_name = name.to_s.pluralize
-            field_tuples = fields.collect { |value| value.split(":") }
-            column_declarations = field_tuples.collect { |field, kind| "#{kind} :#{field}" }.join("\n      ")
-            migration_contents = SQ_MIGRATION.gsub(/!NAME!/, model_name.camelize).gsub(/!TABLE!/, model_name.underscore)
-            migration_contents.gsub!(/!FILENAME!/, filename.camelize)
-            migration_contents.gsub!(/!FIELDS!/, column_declarations)
-            migration_filename = "#{Time.now.to_i}_#{filename}.rb"
-            create_file(app_root_path('db/migrate/', migration_filename), migration_contents)
+
+          SQ_MODEL_UP_MG = (<<-MIGRATION).gsub(/^ {6}/, '')
+          create_table :!TABLE! do
+            primary_key :id
+            # <type> <name>
+            !FIELDS!
+          end
+          MIGRATION
+
+          SQ_MODEL_DOWN_MG = (<<-MIGRATION).gsub(/^ {10}/, '')
+          drop_table :!TABLE!
+          MIGRATION
+
+          def create_model_migration(migration_name, name, columns)
+            output_model_migration(migration_name, name, columns,
+                   :column_format => lambda { |field, kind| "#{kind.camelize} :#{field}" },
+                   :base => SQ_MIGRATION, :up => SQ_MODEL_UP_MG, :down => SQ_MODEL_DOWN_MG)
+          end
+
+          SQ_CHANGE_MG = (<<-MIGRATION).gsub(/^ {6}/, '')
+          alter_table :!TABLE! do
+            !COLUMNS!
+          end
+          MIGRATION
+
+          def create_migration_file(migration_name, name, columns)
+            output_migration_file(migration_name, name, columns,
+                  :base => SQ_MIGRATION, :change_format => SQ_CHANGE_MG,
+                  :add => lambda { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
+                  :remove => lambda { |field, kind| "drop_column :#{field}" }
+                  )
           end
         end
 

data/lib/generators/components/tests/bacon_test_gen.rb

@@ -50,7 +50,7 @@ module Padrino
 
           def generate_model_test(name)
             bacon_contents = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}.rb"), bacon_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents
           end
 
         end

data/lib/generators/components/tests/riot_test_gen.rb

@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}.rb"), riot_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), riot_contents
           end
 
         end

data/lib/generators/components/tests/rspec_test_gen.rb

@@ -51,7 +51,7 @@ module Padrino
 
           def generate_model_test(name)
             rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}.rb"), rspec_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents
           end
 
         end

data/lib/generators/components/tests/shoulda_test_gen.rb

@@ -56,7 +56,7 @@ module Padrino
 
           def generate_model_test(name)
             shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}.rb"), shoulda_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents
           end
 
         end

data/lib/generators/components/tests/testspec_test_gen.rb

@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}.rb"), tests_contents
+            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), tests_contents
           end
 
         end

data/lib/generators/controller.rb

@@ -16,12 +16,15 @@ module Padrino
       desc "Description:\n\n\tpadrino-gen controller generates a new Padrino controller"
 
       argument :name, :desc => "The name of your padrino controller"
+      argument :fields, :desc => "The fields for the controller", :type => :array, :default => []
       class_option :root, :aliases => '-r', :default => nil, :type => :string
 
       # Copies over the base sinatra starting project
       def create_controller
         if in_app_root?(options[:root])
           @app_name = fetch_app_name(options[:root])
+          @actions = controller_actions(fields)
+          inject_into_file app_root_path("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
           template "templates/controller.rb.tt", app_root_path("app/controllers", "#{name}.rb")
           template "templates/helper.rb.tt",     app_root_path("app/helpers", "#{name}_helper.rb")
           empty_directory app_root_path("app/views/#{name}")

data/lib/generators/migration.rb

@@ -0,0 +1,34 @@
+require 'thor'
+
+module Padrino
+  module Generators
+
+    class Migration < Thor::Group
+      # Define the source template root
+      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
+      def self.banner; "padrino-gen migration [name] [fields]"; end
+
+      # Include related modules
+      include Thor::Actions
+      include Padrino::Generators::Actions
+      include Padrino::Generators::Components::Actions
+
+      desc "Description:\n\n\tpadrino-gen migration generates a new migration file"
+
+      argument :name, :desc => "The name of your padrino migration"
+      argument :columns, :desc => "The columns for the migration", :type => :array, :default => []
+      class_option :root, :aliases => '-r', :default => nil, :type => :string
+
+      # Copies over the base sinatra starting project
+      def create_model
+        if in_app_root?(options[:root])
+          include_component_module_for(:orm, options[:root])
+          create_migration_file(name, name, columns)
+        else
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+        end
+      end
+    end
+
+  end
+end

data/lib/generators/model.rb

@@ -27,7 +27,7 @@ module Padrino
           migration_name = "create_#{name.pluralize.underscore}"
           model_success = create_model_file(name, fields)
           generate_model_test(name) if model_success
-          model_success ? create_migration_file(migration_name, name, fields) : 
+          model_success ? create_model_migration(migration_name, name, fields) : 
                           say("'#{name}' model has already been generated!")
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?

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

@@ -14,4 +14,6 @@
   # get "/example" do
   #   "Hello world!"
   # end
+  
+  <%= @actions %>
 end

data/lib/padrino-gen.rb

@@ -1,4 +1,4 @@
 require 'padrino-core/support_lite'
 Dir[File.dirname(__FILE__) + "/generators/{components}/**/*.rb"].each { |lib| require lib }
 require File.dirname(__FILE__) + "/generators/actions.rb"
-Dir[File.dirname(__FILE__) + "/generators/{skeleton,mailer,controller,model}.rb"].each { |lib| require lib }
+Dir[File.dirname(__FILE__) + "/generators/{skeleton,mailer,controller,model,migration}.rb"].each { |lib| require lib }

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-11-30}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{nesquena@gmail.com}
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/generators/components/tests/testspec_test_gen.rb",
      "lib/generators/controller.rb",
      "lib/generators/mailer.rb",
+     "lib/generators/migration.rb",
      "lib/generators/model.rb",
      "lib/generators/skeleton.rb",
      "lib/generators/skeleton/.gitignore",
@@ -65,7 +66,7 @@ Gem::Specification.new do |s|
      "lib/generators/skeleton/public/images/.empty_directory",
      "lib/generators/skeleton/public/javascripts/.empty_directory",
      "lib/generators/skeleton/public/stylesheets/.empty_directory",
-     "lib/generators/skeleton/tmp/.emptydirectory",
+     "lib/generators/skeleton/tmp/.empty_directory",
      "lib/generators/templates/controller.rb.tt",
      "lib/generators/templates/helper.rb.tt",
      "lib/generators/templates/mailer.rb.tt",
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<padrino-core>, [">= 0.1.1"])
@@ -109,6 +111,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2.3"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
@@ -120,6 +123,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<webrat>, [">= 0.5.1"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2.3"])
   end
 end
 

data/test/test_controller_generator.rb

@@ -5,6 +5,9 @@ class TestControllerGenerator < Test::Unit::TestCase
   def setup
     @skeleton = Padrino::Generators::Skeleton.dup
     @contgen = Padrino::Generators::Controller.dup
+    @controller_path = '/tmp/sample_app/app/controllers/demo_items.rb'
+    @controller_test_path = '/tmp/sample_app/test/controllers/demo_items_controller_test.rb'
+    @route_path = '/tmp/sample_app/config/urls.rb'
     `rm -rf /tmp/sample_app`
   end
 
@@ -18,7 +21,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     should "generate controller within existing application" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/SampleApp.controllers do/m, '/tmp/sample_app/app/controllers/demo_items.rb')
+      assert_match_in_file(/SampleApp.controllers do/m, @controller_path)
       assert_match_in_file(/SampleApp.helpers do/m, '/tmp/sample_app/app/helpers/demo_items_helper.rb')
       assert_file_exists('/tmp/sample_app/app/views/demo_items')
     end
@@ -26,19 +29,19 @@ class TestControllerGenerator < Test::Unit::TestCase
     should "generate controller test for bacon" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+      assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for riot" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=riot']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/context "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for testspec" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=testspec']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/context "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+      assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for rspec" do
@@ -51,7 +54,24 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
-      assert_match_in_file(expected_pattern, '/tmp/sample_app/test/controllers/demo_items_controller_test.rb')
+      assert_match_in_file(expected_pattern, @controller_test_path)
     end
+    
+    # Controller action generation
+        
+    should "generate actions for get:test post:yada" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @contgen.start(['demo_items', "get:test","post:yada",'-r=/tmp/sample_app']) }
+      assert_match_in_file(/get :test do\n  end\n/m,@controller_path)
+      assert_match_in_file(/post :yada do\n  end\n/m,@controller_path)
+    end
+        
+    should "generate url routes for get:yoda post:yada" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
+      assert_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
+      assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)      
+    end
+    
   end
 end

data/test/test_migration_generator.rb

@@ -4,14 +4,155 @@ require 'thor'
 class TestMigrationGenerator < Test::Unit::TestCase
   def setup
     @skeleton = Padrino::Generators::Skeleton.dup
-    # @mig_gen = Padrino::Generators::Migration.dup
+    @mig_gen  = Padrino::Generators::Migration.dup
     `rm -rf /tmp/sample_app`
   end
 
   context 'the migration generator' do
-    should "work" do
+    should "fail outside app root" do
+      output = silence_logger { @mig_gen.start(['add_email_to_users', '-r=/tmp']) }
+      assert_match(/not at the root/, output)
+      assert_no_file_exists('/tmp/db/migration')
+    end
+
+    should "generate migration inside app root" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      response_success = silence_logger { @mig_gen.start(['AddEmailToUsers', '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
+      assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
+    end
 
+    should "generate migration inside app root with lowercase migration argument" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      response_success = silence_logger { @mig_gen.start(['add_email_to_users', '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
+      assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
+    end
+
+    should "generate migration inside app root with singular table" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @mig_gen.start(['add_email_to_user', "email:string", '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_user.rb"
+      assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
+      assert_match_in_file(/t.column :email, :string/, migration_file_path)
+      assert_match_in_file(/t.remove :email/, migration_file_path)
+    end
+    should "properly calculate version number" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @mig_gen.start(['add_email_to_person', "email:string", '-r=/tmp/sample_app']) }
+      silence_logger { @mig_gen.start(['add_name_to_person', "email:string", '-r=/tmp/sample_app']) }
+      silence_logger { @mig_gen.start(['add_age_to_user', "email:string", '-r=/tmp/sample_app']) }
+      assert_match_in_file(/class AddEmailToPerson/m, "/tmp/sample_app/db/migrate/001_add_email_to_person.rb")
+      assert_match_in_file(/class AddNameToPerson/m, "/tmp/sample_app/db/migrate/002_add_name_to_person.rb")
+      assert_match_in_file(/class AddAgeToUser/m, "/tmp/sample_app/db/migrate/003_add_age_to_user.rb")
+    end
+  end
+
+  context 'the migration generator for activerecord' do
+    should "generate migration for generic needs" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
+      assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
+      assert_match_in_file(/def self\.up\s+end/m, migration_file_path)
+      assert_match_in_file(/def self\.down\s+end/m, migration_file_path)
+    end
+    should "generate migration for adding columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
+      assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.column :email, :string/m, migration_file_path)
+      assert_match_in_file(/t\.column :age, :integer/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.remove :email/m, migration_file_path)
+      assert_match_in_file(/t\.remove :age/m, migration_file_path)
+    end
+    should "generate migration for removing columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_remove_email_from_users.rb"
+      assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.remove :email/m, migration_file_path)
+      assert_match_in_file(/t\.remove :age/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.column :email, :string/m, migration_file_path)
+      assert_match_in_file(/t\.column :age, :integer/m, migration_file_path)
     end
   end
 
+  context 'the migration generator for datamapper' do
+    should "generate migration for generic needs" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
+      assert_match_in_file(/migration\s1.*?:modify_user_fields/m, migration_file_path)
+      assert_match_in_file(/up\sdo\s+end/m, migration_file_path)
+      assert_match_in_file(/down\sdo\s+end/m, migration_file_path)
+    end
+    should "generate migration for adding columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
+      assert_match_in_file(/migration\s1.*?:add_email_to_users/m, migration_file_path)
+      assert_match_in_file(/modify_table :users.*?add_column :email, String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
+      assert_match_in_file(/modify_table :users.*?drop_column :email/m, migration_file_path)
+      assert_match_in_file(/drop_column :age/m, migration_file_path)
+    end
+    should "generate migration for removing columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_remove_email_from_users.rb"
+      assert_match_in_file(/migration\s1.*?:remove_email_from_users/m, migration_file_path)
+      assert_match_in_file(/modify_table :users.*?drop_column :email/m, migration_file_path)
+      assert_match_in_file(/drop_column :age/m, migration_file_path)
+      assert_match_in_file(/modify_table :users.*?add_column :email, String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
+    end
+    should "properly version migration files" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields2', '-r=/tmp/sample_app']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields3', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/migration\s1.*?:modify_user_fields/m, "/tmp/sample_app/db/migrate/001_modify_user_fields.rb")
+      assert_match_in_file(/migration\s2.*?:modify_user_fields2/m, "/tmp/sample_app/db/migrate/002_modify_user_fields2.rb")
+      assert_match_in_file(/migration\s3.*?:modify_user_fields3/m, "/tmp/sample_app/db/migrate/003_modify_user_fields3.rb")
+    end
+  end
+
+  context 'the migration generator for sequel' do
+    should "generate migration for generic needs" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
+      assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
+      assert_match_in_file(/def\sup\s+end/m, migration_file_path)
+      assert_match_in_file(/def\sdown\s+end/m, migration_file_path)
+    end
+    should "generate migration for adding columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
+      assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
+      assert_match_in_file(/alter_table :users.*?add_column :email, String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
+      assert_match_in_file(/alter_table :users.*?drop_column :email/m, migration_file_path)
+      assert_match_in_file(/drop_column :age/m, migration_file_path)
+    end
+    should "generate migration for removing columns" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
+      response_success = silence_logger { @mig_gen.start(migration_params) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_remove_email_from_users.rb"
+      assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
+      assert_match_in_file(/alter_table :users.*?drop_column :email/m, migration_file_path)
+      assert_match_in_file(/drop_column :age/m, migration_file_path)
+      assert_match_in_file(/alter_table :users.*?add_column :email, String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, Integer/m, migration_file_path)
+    end
+  end
 end

data/test/test_model_generator.rb

@@ -22,6 +22,16 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/class User < ActiveRecord::Base/m, '/tmp/sample_app/app/models/user.rb')
       assert_match /'user' model has already been generated!/, response_duplicate
     end
+
+    should "generate migration file versions properly" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @model_gen.start(['user', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['account', '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['bank', '-r=/tmp/sample_app']) }
+      assert_file_exists('/tmp/sample_app/db/migrate/001_create_users.rb')
+      assert_file_exists('/tmp/sample_app/db/migrate/002_create_accounts.rb')
+      assert_file_exists('/tmp/sample_app/db/migrate/003_create_banks.rb')
+    end
   end
 
   # ACTIVERECORD
@@ -33,26 +43,28 @@ class TestModelGenerator < Test::Unit::TestCase
     end
 
     should "generate migration file with no fields" do
-      current_time = stop_time_for_test
+      current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       silence_logger { @model_gen.start(['user', '-r=/tmp/sample_app']) }
-      migration_file_path = "/tmp/sample_app/db/migrate/#{current_time.to_i}_create_users.rb"
+      migration_file_path = "/tmp/sample_app/db/migrate/001_create_users.rb"
       assert_match_in_file(/class CreateUsers < ActiveRecord::Migration/m, migration_file_path)
       assert_match_in_file(/create_table :users/m, migration_file_path)
       assert_match_in_file(/# t.column :age, :integer[\n\s]+?end/m, migration_file_path)
+      assert_match_in_file(/drop_table :users/m, migration_file_path)
     end
 
     should "generate migration file with given fields" do
-      current_time = stop_time_for_test
+      current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       silence_logger { @model_gen.start(['person', "name:string", "age:integer", "email:string", '-r=/tmp/sample_app']) }
-      migration_file_path = "/tmp/sample_app/db/migrate/#{current_time.to_i}_create_people.rb"
+      migration_file_path = "/tmp/sample_app/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)
       assert_match_in_file(/# t.column :age, :integer/m, migration_file_path)
       assert_match_in_file(/t.column :name, :string/m,   migration_file_path)
       assert_match_in_file(/t.column :age, :integer/m,   migration_file_path)
       assert_match_in_file(/t.column :email, :string/m,  migration_file_path)
+      assert_match_in_file(/drop_table :people/m, migration_file_path)
     end
   end
 
@@ -81,31 +93,44 @@ class TestModelGenerator < Test::Unit::TestCase
   context "model generator using datamapper" do
     should "generate model file with fields" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=datamapper']) }
-      silence_logger { @model_gen.start(['user', "name:string", "age:integer", "email:string", '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['user', "name:string", "age:integer", "created_at:datetime", '-r=/tmp/sample_app']) }
       assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, '/tmp/sample_app/app/models/user.rb')
       assert_match_in_file(/property :name, String/m, '/tmp/sample_app/app/models/user.rb')
       assert_match_in_file(/property :age, Integer/m, '/tmp/sample_app/app/models/user.rb')
-      assert_match_in_file(/property :email, String/m, '/tmp/sample_app/app/models/user.rb')
+      assert_match_in_file(/property :created_at, DateTime/m, '/tmp/sample_app/app/models/user.rb')
+    end
+
+    should "properly generate version numbers" do
+      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=datamapper']) }
+      silence_logger { @model_gen.start(['user', "name:string", "age:integer", "created_at:datetime", '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['person', "name:string", "age:integer", "created_at:datetime", '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['account', "name:string", "age:integer", "created_at:datetime", '-r=/tmp/sample_app']) }
+      assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, '/tmp/sample_app/app/models/user.rb')
+      assert_match_in_file(/migration 1, :create_users do/m, "/tmp/sample_app/db/migrate/001_create_users.rb")
+      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, '/tmp/sample_app/app/models/person.rb')
+      assert_match_in_file(/migration 2, :create_people do/m, "/tmp/sample_app/db/migrate/002_create_people.rb")
+      assert_match_in_file(/class Account\n\s+include DataMapper::Resource/m, '/tmp/sample_app/app/models/account.rb')
+      assert_match_in_file(/migration 3, :create_accounts do/m, "/tmp/sample_app/db/migrate/003_create_accounts.rb")
     end
 
     should "generate migration with given fields" do
-      current_time = stop_time_for_test
+      current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=datamapper']) }
-      silence_logger { @model_gen.start(['person', "name:string", "age:integer", "email:string", '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['person', "name:string", "created_at:datetime", "email:string", '-r=/tmp/sample_app']) }
       assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, '/tmp/sample_app/app/models/person.rb')
-      migration_file_path = "/tmp/sample_app/db/migrate/#{current_time.to_i}_create_people.rb"
-      assert_match_in_file(/migration NUM, :create_people do/m, migration_file_path)
-      assert_match_in_file(/create_table\(:people\) do/m, migration_file_path)
-      assert_match_in_file(/column\(:name, String\)/m, migration_file_path)
-      assert_match_in_file(/column\(:age, Integer\)/m, migration_file_path)
-      assert_match_in_file(/column\(:email, String\)/m, migration_file_path)
-      assert_match_in_file(/drop_table\(:people\)/m, migration_file_path)
+      migration_file_path = "/tmp/sample_app/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)
+      assert_match_in_file(/column :name, String/m, migration_file_path)
+      assert_match_in_file(/column :created_at, DateTime/m, migration_file_path)
+      assert_match_in_file(/column :email, String/m, migration_file_path)
+      assert_match_in_file(/drop_table :people/m, migration_file_path)
     end
   end
 
   # MONGOMAPPER
   context "model generator using mongomapper" do
-    should "generate migration file with given fields" do
+    should "generate model file with no properties" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=mongomapper']) }
       silence_logger { @model_gen.start(['person', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class Person\n\s+include MongoMapper::Document/m, '/tmp/sample_app/app/models/person.rb')
@@ -126,21 +151,22 @@ class TestModelGenerator < Test::Unit::TestCase
   context "model generator using sequel" do
     should "generate model file with given properties" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=sequel']) }
-      silence_logger { @model_gen.start(['user', "name:string", "age:integer", "email:string", '-r=/tmp/sample_app']) }
+      silence_logger { @model_gen.start(['user', "name:string", "age:integer", "created:datetime", '-r=/tmp/sample_app']) }
       assert_match_in_file(/class User < Sequel::Model/m, '/tmp/sample_app/app/models/user.rb')
     end
 
     should "generate migration file with given properties" do
-      current_time = stop_time_for_test
+      current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-d=sequel']) }
-      silence_logger { @model_gen.start(['person', "name:string", "age:integer", "email:string", '-r=/tmp/sample_app']) }
-      migration_file_path = "/tmp/sample_app/db/migrate/#{current_time.to_i}_create_people.rb"
+      silence_logger { @model_gen.start(['person', "name:string", "age:integer", "created:datetime", '-r=/tmp/sample_app']) }
+      migration_file_path = "/tmp/sample_app/db/migrate/001_create_people.rb"
       assert_match_in_file(/class Person < Sequel::Model/m, '/tmp/sample_app/app/models/person.rb')
       assert_match_in_file(/class CreatePeople < Sequel::Migration/m, migration_file_path)
       assert_match_in_file(/create_table :people/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(/string :email/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)
     end
   end
 
@@ -149,46 +175,46 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate test file for bacon" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user\.should\.not\.be\.nil/m, '/tmp/sample_app/test/models/user.rb')
+      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/@user\.should\.not\.be\.nil/m, '/tmp/sample_app/test/models/user_test.rb')
     end
 
     # RIOT
     should "generate test file for riot" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=riot', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/context "User Model" do/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/asserts\("that record is not nil"\) \{ \!@user.nil\? \}/m, '/tmp/sample_app/test/models/user.rb')
+      assert_match_in_file(/context "User Model" do/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/asserts\("that record is not nil"\) \{ \!@user.nil\? \}/m, '/tmp/sample_app/test/models/user_test.rb')
     end
 
     # RSPEC
     should "generate test file for rspec" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=rspec', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user\.should\.not\.be\snil/m, '/tmp/sample_app/test/models/user.rb')
+      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_app/test/models/user_spec.rb')
+      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user_spec.rb')
+      assert_match_in_file(/@user\.should\.not\.be\snil/m, '/tmp/sample_app/test/models/user_spec.rb')
     end
 
     # SHOULDA
     should "generate test file for shoulda" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda', '-d=activerecord']) }
-      silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/class UserControllerTest < Test::Unit::TestCase/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/context "User Model"/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/assert_not_nil @user/m, '/tmp/sample_app/test/models/user.rb')
+      silence_logger { @model_gen.start(['Person', '-r=/tmp/sample_app']) }
+      assert_match_in_file(/class PersonControllerTest < Test::Unit::TestCase/m, '/tmp/sample_app/test/models/person_test.rb')
+      assert_match_in_file(/context "Person Model"/m, '/tmp/sample_app/test/models/person_test.rb')
+      assert_match_in_file(/@person = Person.new/m, '/tmp/sample_app/test/models/person_test.rb')
+      assert_match_in_file(/assert_not_nil @person/m, '/tmp/sample_app/test/models/person_test.rb')
     end
 
     # TESTSPEC
     should "generate test file for testspec" do
       silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=testspec', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_app']) }
-      assert_match_in_file(/context "User Model"/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user.rb')
-      assert_match_in_file(/@user\.should\.not\.be\.nil/m, '/tmp/sample_app/test/models/user.rb')
+      assert_match_in_file(/context "User Model"/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/@user = User.new/m, '/tmp/sample_app/test/models/user_test.rb')
+      assert_match_in_file(/@user\.should\.not\.be\.nil/m, '/tmp/sample_app/test/models/user_test.rb')
     end
   end
 

data/test/test_skeleton_generator.rb

@@ -1,8 +1,14 @@
 require File.dirname(__FILE__) + '/helper'
 require 'thor'
+require 'fakeweb'
 
 class TestSkeletonGenerator < Test::Unit::TestCase
   def setup
+    FakeWeb.allow_net_connect = false
+    FakeWeb.register_uri(:get, "http://prototypejs.org/assets/2009/8/31/prototype.js", :body => "prototype")
+    FakeWeb.register_uri(:get, "http://github.com/nesquena/lowpro/raw/master/dist/lowpro.js", :body => "lowpro")
+    FakeWeb.register_uri(:get, "http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js", :body => "jquery")
+    FakeWeb.register_uri(:get, "http://rightjs.org/builds/current/right-min.js", :body => "rightjs")
     `rm -rf /tmp/sample_app`
     @skeleton = Padrino::Generators::Skeleton.dup
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
 description: Generators for easily creating and building padrino applications from the console
 email: nesquena@gmail.com
 executables: 
@@ -142,6 +152,7 @@ files:
 - lib/generators/components/tests/testspec_test_gen.rb
 - lib/generators/controller.rb
 - lib/generators/mailer.rb
+- lib/generators/migration.rb
 - lib/generators/model.rb
 - lib/generators/skeleton.rb
 - lib/generators/skeleton/.gitignore
@@ -161,7 +172,7 @@ files:
 - lib/generators/skeleton/public/images/.empty_directory
 - lib/generators/skeleton/public/javascripts/.empty_directory
 - lib/generators/skeleton/public/stylesheets/.empty_directory
-- lib/generators/skeleton/tmp/.emptydirectory
+- lib/generators/skeleton/tmp/.empty_directory
 - lib/generators/templates/controller.rb.tt
 - lib/generators/templates/helper.rb.tt
 - lib/generators/templates/mailer.rb.tt