padrino-gen 0.9.10 → 0.9.11

data/padrino-gen.gemspec

@@ -1,139 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.9.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubyforge_project = %q{padrino-gen}
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-04-22}
-  s.default_executable = %q{padrino-gen}
-  s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
-  s.executables = ["padrino-gen"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/padrino-gen",
-     "lib/padrino-gen.rb",
-     "lib/padrino-gen/generators/actions.rb",
-     "lib/padrino-gen/generators/app.rb",
-     "lib/padrino-gen/generators/app/app.rb.tt",
-     "lib/padrino-gen/generators/app/controllers/.empty_directory",
-     "lib/padrino-gen/generators/app/helpers/.empty_directory",
-     "lib/padrino-gen/generators/app/views/.empty_directory",
-     "lib/padrino-gen/generators/app/views/layouts/.emptydirectory",
-     "lib/padrino-gen/generators/cli.rb",
-     "lib/padrino-gen/generators/components/actions.rb",
-     "lib/padrino-gen/generators/components/mocks/mocha.rb",
-     "lib/padrino-gen/generators/components/mocks/rr.rb",
-     "lib/padrino-gen/generators/components/orms/activerecord.rb",
-     "lib/padrino-gen/generators/components/orms/couchrest.rb",
-     "lib/padrino-gen/generators/components/orms/datamapper.rb",
-     "lib/padrino-gen/generators/components/orms/mongoid.rb",
-     "lib/padrino-gen/generators/components/orms/mongomapper.rb",
-     "lib/padrino-gen/generators/components/orms/sequel.rb",
-     "lib/padrino-gen/generators/components/renderers/erb.rb",
-     "lib/padrino-gen/generators/components/renderers/haml.rb",
-     "lib/padrino-gen/generators/components/scripts/extcore.rb",
-     "lib/padrino-gen/generators/components/scripts/jquery.rb",
-     "lib/padrino-gen/generators/components/scripts/mootools.rb",
-     "lib/padrino-gen/generators/components/scripts/prototype.rb",
-     "lib/padrino-gen/generators/components/scripts/rightjs.rb",
-     "lib/padrino-gen/generators/components/stylesheets/less.rb",
-     "lib/padrino-gen/generators/components/stylesheets/sass.rb",
-     "lib/padrino-gen/generators/components/tests/bacon.rb",
-     "lib/padrino-gen/generators/components/tests/cucumber.rb",
-     "lib/padrino-gen/generators/components/tests/riot.rb",
-     "lib/padrino-gen/generators/components/tests/rspec.rb",
-     "lib/padrino-gen/generators/components/tests/shoulda.rb",
-     "lib/padrino-gen/generators/components/tests/testspec.rb",
-     "lib/padrino-gen/generators/controller.rb",
-     "lib/padrino-gen/generators/mailer.rb",
-     "lib/padrino-gen/generators/migration.rb",
-     "lib/padrino-gen/generators/model.rb",
-     "lib/padrino-gen/generators/project.rb",
-     "lib/padrino-gen/generators/project/.gitignore",
-     "lib/padrino-gen/generators/project/config.ru",
-     "lib/padrino-gen/generators/project/config/apps.rb.tt",
-     "lib/padrino-gen/generators/project/config/boot.rb",
-     "lib/padrino-gen/generators/project/public/favicon.ico",
-     "lib/padrino-gen/generators/project/public/images/.empty_directory",
-     "lib/padrino-gen/generators/project/public/javascripts/.empty_directory",
-     "lib/padrino-gen/generators/project/public/stylesheets/.empty_directory",
-     "lib/padrino-gen/generators/project/tmp/.empty_directory",
-     "lib/padrino-gen/generators/templates/Gemfile.tt",
-     "lib/padrino-gen/generators/templates/controller.rb.tt",
-     "lib/padrino-gen/generators/templates/helper.rb.tt",
-     "lib/padrino-gen/generators/templates/mailer.rb.tt",
-     "lib/padrino-gen/generators/templates/mailer_initializer.rb.tt",
-     "lib/padrino-gen/generators/templates/scripts/ext-core.js",
-     "lib/padrino-gen/generators/templates/scripts/jquery.js",
-     "lib/padrino-gen/generators/templates/scripts/lowpro.js",
-     "lib/padrino-gen/generators/templates/scripts/mootools-core.js",
-     "lib/padrino-gen/generators/templates/scripts/protopak.js",
-     "lib/padrino-gen/generators/templates/scripts/right.js",
-     "lib/padrino-gen/padrino-tasks/activerecord.rb",
-     "lib/padrino-gen/padrino-tasks/datamapper.rb",
-     "lib/padrino-gen/padrino-tasks/mongomapper.rb",
-     "lib/padrino-gen/padrino-tasks/seed.rb",
-     "lib/padrino-gen/padrino-tasks/sequel.rb",
-     "padrino-gen.gemspec",
-     "test/helper.rb",
-     "test/test_app_generator.rb",
-     "test/test_cli.rb",
-     "test/test_controller_generator.rb",
-     "test/test_generator.rb",
-     "test/test_mailer_generator.rb",
-     "test/test_migration_generator.rb",
-     "test/test_model_generator.rb",
-     "test/test_project_generator.rb"
-  ]
+  s.summary = %q{Generators for easily creating and building padrino applications}
   s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-gen}
+  s.description = %q{Generators for easily creating and building padrino applications from the console}
+  s.default_executable = %q{padrino-gen}
+  s.executables = ["padrino-gen"]
+  s.required_rubygems_version = ">= 1.3.6"
+  s.version = Padrino.version
+  s.date = Time.now.strftime("%Y-%m-%d")
+  s.extra_rdoc_files = Dir["*.rdoc"]
+  s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-gen.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{padrino-gen}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Generators for easily creating and building padrino applications}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.10"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-      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<padrino-core>, ["= 0.9.10"])
-      s.add_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-      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<padrino-core>, ["= 0.9.10"])
-    s.add_dependency(%q<haml>, [">= 2.2.1"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-    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
-
+  s.require_path = 'lib'
+  s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
+  s.add_bundler_dependencies :gen, :development
+end

data/test/helper.rb

@@ -1,20 +1,12 @@
-require 'rubygems'
+require File.expand_path('../../../load_paths', __FILE__)
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'webrat'
 require 'thor/group'
-
-# We try to load the vendored padrino-core if exist
-%w(core).each do |lib|
-  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{lib}/lib")
-    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{lib}/lib"
-  end
-end
-
 require 'padrino-gen'
-require 'padrino-core/support_lite'
+require 'padrino-core/support_lite' unless defined?(SupportLite)
 
 Padrino::Generators.load_components!
 
@@ -32,7 +24,7 @@ class Test::Unit::TestCase
     Time.stubs(:now).returns(time)
     return time
   end
-  
+
   # generate(:controller, 'DemoItems', '-r=/tmp/sample_project')
   def generate(name, *params)
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)

data/test/test_app_generator.rb

@@ -26,6 +26,20 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_match_in_file 'class Demo < Padrino::Application', '/tmp/sample_project/demo/app.rb'
     end
 
+    should "generate tiny app skeleton" do
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp') } }
+      assert_nothing_raised { silence_logger { generate(:app,'demo','--tiny','--root=/tmp/sample_project') } }
+      assert_file_exists('/tmp/sample_project')
+      assert_file_exists('/tmp/sample_project/demo')
+      assert_file_exists('/tmp/sample_project/demo/helpers.rb')
+      assert_file_exists('/tmp/sample_project/demo/controllers.rb')
+      assert_file_exists('/tmp/sample_project/demo/mailers.rb')
+      assert_dir_exists('/tmp/sample_project/demo/views/mailers')
+      assert_match_in_file(/:notifier/,'/tmp/sample_project/demo/mailers.rb')
+      assert_no_file_exists('/tmp/sample_project/demo/helpers')
+      assert_no_file_exists('/tmp/sample_project/demo/controllers')
+    end
+
     should "correctly create a new controller inside a padrino application" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp') }
       silence_logger { generate(:app, 'demo', '--root=/tmp/sample_project') }
@@ -37,12 +51,10 @@ class TestAppGenerator < Test::Unit::TestCase
 
     should "correctly create a new mailer inside a padrino application" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'demo', '--root=/tmp/sample_project') }
-      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project', '-a=demo') }
-      assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/demo/mailers/demo_mailer.rb')
-      assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
-      assert_match_in_file(/register MailerInitializer/,'/tmp/sample_project/demo/app.rb')
-      assert_file_exists('/tmp/sample_project/demo/views/demo_mailer')
+      silence_logger { generate(:app, 'demo_app', '--root=/tmp/sample_project') }
+      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project', '-a=demo_app') }
+      assert_match_in_file(/DemoApp.mailer :demo/m, '/tmp/sample_project/demo_app/mailers/demo.rb')
+      assert_dir_exists('/tmp/sample_project/demo_app/views/mailers/demo')
     end
   end
-end
+end

data/test/test_controller_generator.rb

@@ -14,6 +14,16 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/app/controllers/demo.rb')
     end
 
+    should "generate controller in specified app" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:app, 'subby', '-r=/tmp/sample_project') }
+      silence_logger { generate(:controller, 'DemoItems','-a=/subby', '-r=/tmp/sample_project') }
+      assert_match_in_file(/Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
+      assert_match_in_file(/Subby.helpers do/m, '/tmp/sample_project/subby/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/subby/views/demo_items')
+      assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
+    end
+
     should 'not fail if we don\'t have test component' do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=none') }
       silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
@@ -107,4 +117,4 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
   end
-end
+end

data/test/test_mailer_generator.rb

@@ -12,29 +12,33 @@ class TestMailerGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
+    should "generate mailer in specified app" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:app, 'subby', '-r=/tmp/sample_project') }
+      silence_logger { generate(:mailer, 'demo', '-a=/subby', '-r=/tmp/sample_project') }
+      assert_match_in_file(/Subby.mailer :demo/m, '/tmp/sample_project/subby/mailers/demo.rb')
+      assert_dir_exists('/tmp/sample_project/subby/views/mailers/demo')
+    end
+
     should "support generating a new mailer extended from base" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project') }
-      assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/app/mailers/demo_mailer.rb')
-      assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
-      assert_match_in_file(/register MailerInitializer/m, '/tmp/sample_project/app/app.rb')
-      assert_file_exists('/tmp/sample_project/app/views/demo_mailer')
+      assert_match_in_file(/SampleProject.mailer :demo/m, '/tmp/sample_project/app/mailers/demo.rb')
+      assert_dir_exists('/tmp/sample_project/app/views/mailers/demo')
     end
 
     should "support generating a new mailer extended from base with long name" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
-      silence_logger { generate(:mailer, 'user_notice', '-r=/tmp/sample_project') }
-      assert_match_in_file(/class UserNoticeMailer/m, '/tmp/sample_project/app/mailers/user_notice_mailer.rb')
-      assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
-      assert_file_exists('/tmp/sample_project/app/views/user_notice_mailer')
+      silence_logger { generate(:mailer, 'UserNotice', '-r=/tmp/sample_project') }
+      assert_match_in_file(/SampleProject.mailer :user_notice/m, '/tmp/sample_project/app/mailers/user_notice.rb')
+      assert_dir_exists('/tmp/sample_project/app/views/mailers/user_notice')
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       silence_logger { generate(:mailer, 'DEMO', '-r=/tmp/sample_project') }
-      assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/app/mailers/demo_mailer.rb')
-      assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
-      assert_file_exists('/tmp/sample_project/app/views/demo_mailer')
+      assert_match_in_file(/SampleProject.mailer :demo/m, '/tmp/sample_project/app/mailers/demo.rb')
+      assert_dir_exists('/tmp/sample_project/app/views/mailers/demo')
     end
   end
 
@@ -43,9 +47,8 @@ class TestMailerGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project') }
       silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project','-d') }
-      assert_no_dir_exists('/tmp/sample_project/app/views/demo_mailer')
-      assert_no_file_exists('/tmp/sample_project/app/mailers/demo_mailer.rb')
-      assert_no_file_exists('/tmp/sample_project/lib/mailer.rb')
+      assert_no_dir_exists('/tmp/sample_project/app/views/demo')
+      assert_no_file_exists('/tmp/sample_project/app/mailers/demo.rb')
     end
   end
-end
+end

data/test/test_migration_generator.rb

@@ -102,8 +102,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
       response_success = silence_logger { generate(:migration, *migration_params) }
       migration_file_path = "/tmp/sample_project/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.*?add_column :email, DataMapper::Property::String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, DataMapper::Property::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
@@ -116,8 +116,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
       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)
+      assert_match_in_file(/modify_table :users.*?add_column :email, DataMapper::Property::String/m, migration_file_path)
+      assert_match_in_file(/add_column :age, DataMapper::Property::Integer/m, migration_file_path)
     end
 
     should "properly version migration files" do

data/test/test_model_generator.rb

@@ -18,18 +18,40 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/app/models/demo_item.rb')
     end
 
+    should "fail if field name is not acceptable" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon', '-d=couchrest') }
+      output = silence_logger { generate(:model, 'DemoItem', "re@l$ly:string","display-name:string", "age&year:datetime", "email_two:string", '-r=/tmp/sample_project') }
+      assert_match(/Invalid field name:/, output)
+      assert_match(/display-name:string/, output)
+      assert_match(/age&year:datetime/, output)
+      assert_match(/re@l\$ly:string/, output)
+      assert_no_match(/email_two:string/, output)
+      assert_no_match(/apply/, output)
+      assert_no_file_exists('/tmp/sample_project/app/models/demo_item.rb')
+    end
+
     should "fail if we don't use an adapter" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
       assert_raise(SystemExit) { silence_logger { generate(:model, 'user', '-r=/tmp/sample_project') } }
     end
 
-    should 'not fail if we don\'t have test component' do
+    should "not fail if we don't have test component" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=none', '-d=activerecord') }
       response_success = silence_logger { generate(:model, 'user', '-r=/tmp/sample_project') }
       assert_match_in_file(/class User < ActiveRecord::Base/m, '/tmp/sample_project/app/models/user.rb')
       assert_no_file_exists('/tmp/sample_project/test')
     end
 
+    should "generate model in specified app" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '-d=datamapper', '--script=none', '-t=bacon') }
+      silence_logger { generate(:app, 'subby', '-r=/tmp/sample_project') }
+      silence_logger { generate(:model, 'Post', "body:string", '-a=/subby', '-r=/tmp/sample_project') }
+      assert_match_in_file(/class Post\n\s+include DataMapper::Resource/m, '/tmp/sample_project/subby/models/post.rb')
+      assert_match_in_file(/property :body, String/m, '/tmp/sample_project/subby/models/post.rb')
+      assert_match_in_file(/migration 1, :create_posts do/m, "/tmp/sample_project/db/migrate/001_create_posts.rb")
+      assert_match_in_file(/gem 'data_mapper'/m,'/tmp/sample_project/Gemfile')
+    end
+
     should "generate only generate model once" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = silence_logger { generate(:model, 'user', '-r=/tmp/sample_project') }
@@ -109,7 +131,7 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate gemfile gem" do
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-d=datamapper') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", '-r=/tmp/sample_project') }
-      assert_match_in_file(/gem 'datamapper'/m,'/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'data_mapper'/m,'/tmp/sample_project/Gemfile')
     end
 
     should "generate model file with fields" do
@@ -119,7 +141,6 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/property :name, String/m, '/tmp/sample_project/app/models/user.rb')
       assert_match_in_file(/property :age, Integer/m, '/tmp/sample_project/app/models/user.rb')
       assert_match_in_file(/property :created_at, DateTime/m, '/tmp/sample_project/app/models/user.rb')
-      assert_match_in_file(/gem 'datamapper'/m,'/tmp/sample_project/Gemfile')
     end
 
     should "properly generate version numbers" do
@@ -138,14 +159,14 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate migration with given fields" do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-d=datamapper') }
-      silence_logger { generate(:model, 'person', "name:string", "created_at:datetime", "email:string", '-r=/tmp/sample_project') }
+      silence_logger { generate(:model, 'person', "name:string", "created_at:date_time", "email:string", '-r=/tmp/sample_project') }
       assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, '/tmp/sample_project/app/models/person.rb')
       migration_file_path = "/tmp/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)
-      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(/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)
     end
   end
@@ -227,8 +248,8 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=riot', '-d=activerecord') }
       silence_logger { generate(:model, 'SomeUser', '-r=/tmp/sample_project') }
       assert_match_in_file(/context "SomeUser Model" do/m, '/tmp/sample_project/test/models/some_user_test.rb')
-      assert_match_in_file(/@some_user = SomeUser.new/m, '/tmp/sample_project/test/models/some_user_test.rb')
-      assert_match_in_file(/asserts\("that record is not nil"\) \{ \!@some_user.nil\? \}/m, '/tmp/sample_project/test/models/some_user_test.rb')
+      assert_match_in_file(/SomeUser.new/m, '/tmp/sample_project/test/models/some_user_test.rb')
+      assert_match_in_file(/asserts\("that record is not nil"\) \{ \!topic.nil\? \}/m, '/tmp/sample_project/test/models/some_user_test.rb')
     end
 
     # RSPEC