padrino-gen 0.9.19 → 0.9.20

data/README.rdoc

@@ -160,4 +160,4 @@ To learn more about the mailer generator, check out the guide to
 
 == Copyright
 
-Copyright (c) 2010 Padrino. See LICENSE for details.
+Copyright (c) 2010 Padrino. See LICENSE for details.

data/Rakefile

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

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

@@ -3,8 +3,6 @@ def setup_mock
   case options[:test].to_s
     when 'rspec'
       inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", :after => "RSpec.configure do |conf|\n"
-    when 'rspec1'
-      inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", :after => "Spec::Runner.configure do |conf|\n"
     else
       insert_mocking_include "Mocha::API"
   end

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

@@ -3,8 +3,6 @@ def setup_mock
   case options[:test].to_s
     when 'rspec'
       inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :rr\n", :after => "RSpec.configure do |conf|\n"
-    when 'rspec1'
-      inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :rr\n", :after => "Spec::Runner.configure do |conf|\n"
     when 'riot'
       inject_into_file "test/test_config.rb","require 'riot/rr'\n", :after => "\"/../config/boot\")\n"
     else

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

@@ -5,7 +5,7 @@ AR = (<<-AR) unless defined?(AR)
 #   ActiveRecord::Base.configurations[:development] = {
 #     :adapter   => 'mysql',
 #     :encoding  => 'utf8',
-#     :reconnect => false,
+#     :reconnect => true,
 #     :database  => 'your_database',
 #     :pool      => 5,
 #     :username  => 'root',
@@ -49,7 +49,7 @@ AR
 MYSQL = (<<-MYSQL)
   :adapter   => 'mysql',
   :encoding  => 'utf8',
-  :reconnect => false,
+  :reconnect => true,
   :database  => !DB_NAME!,
   :pool      => 5,
   :username  => 'root',
@@ -61,7 +61,7 @@ MYSQL
 MYSQL2 = (<<-MYSQL2)
   :adapter   => 'mysql2',
   :encoding  => 'utf8',
-  :reconnect => false,
+  :reconnect => true,
   :database  => !DB_NAME!,
   :pool      => 5,
   :username  => 'root',
@@ -124,7 +124,7 @@ MODEL
 # options => { :fields => ["title:string", "body:string"], :app => 'app' }
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
-  model_contents = AR_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
+  model_contents = AR_MODEL.gsub(/!NAME!/, name.to_s.camelize)
   create_file(model_path, model_contents,:skip => true)
 end
 
@@ -169,4 +169,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
     :remove => Proc.new { |field, kind| "t.remove :#{field}" }
   )
-end
+end

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

@@ -60,7 +60,7 @@ MODEL
 # options => { :fields => ["title:string", "body:string"], :app => 'app' }
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
-  model_contents = DM_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
+  model_contents = DM_MODEL.gsub(/!NAME!/, name.to_s.camelize)
   field_tuples = options[: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  ")
@@ -82,7 +82,7 @@ MIGRATION
 
 DM_MODEL_UP_MG =  (<<-MIGRATION).gsub(/^/, '    ') unless defined?(DM_MODEL_UP_MG)
 create_table :!TABLE! do
-  column :id, DataMapper::Property::Integer, :serial => true
+  column :id, Integer, :serial => true
   !FIELDS!
 end
 MIGRATION
@@ -93,7 +93,7 @@ MIGRATION
 
 def create_model_migration(migration_name, name, columns)
   output_model_migration(migration_name, name, columns,
-       :column_format => Proc.new { |field, kind| "column :#{field}, DataMapper::Property::#{kind.classify}" },
+       :column_format => Proc.new { |field, kind| "column :#{field}, #{kind.classify}" },
        :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
 end
 
@@ -106,7 +106,7 @@ 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 => Proc.new { |field, kind| "add_column :#{field}, DataMapper::Property::#{kind.classify}" },
+    :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.classify}" },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
 end

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

@@ -24,7 +24,7 @@ class !NAME! < Mongomatic::Base
   # Staying true to the "ad-hoc" nature of MongoDB,
   # there are no explicit column definitions in the
   # model file.
- 
+
   # However you can "fake it" by making a column
   # required using expectations
   # For the sake of padrino g model,
@@ -34,7 +34,7 @@ class !NAME! < Mongomatic::Base
   # the expectation: be_a_number
   # Future enhancement may allow a regex for
   # String datatypes
- 
+
 
   # Examples
   # def validate
@@ -82,4 +82,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

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

@@ -38,7 +38,7 @@ class !NAME! < Ohm::Model
 
   # Examples:
   # attribute :name
-  # attribute :email, String 
+  # attribute :email, String
   # reference :venue, Venue
   # set :participants, Person
   # counter :votes
@@ -69,4 +69,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

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

@@ -43,7 +43,7 @@ MODEL
 # options => { :fields => ["title:string", "body:string"], :app => 'app' }
 def create_model_file(name, options={})
   model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
-  model_contents = SQ_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
+  model_contents = SQ_MODEL.gsub(/!NAME!/, name.to_s.camelize)
   create_file(model_path, model_contents)
 end
 

data/lib/padrino-gen/generators/components/renderers/erubis.rb

@@ -1,3 +1,3 @@
 def setup_renderer
-    require_dependencies 'erubis'
+  require_dependencies 'erubis'
 end

data/lib/padrino-gen/generators/components/renderers/slim.rb

@@ -0,0 +1,3 @@
+def setup_renderer
+  require_dependencies 'slim'
+end

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

@@ -82,4 +82,4 @@ def setup_test
   require_dependencies 'rspec', :group => 'test'
   insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE
-end
+end

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

@@ -12,7 +12,7 @@ class Riot::Situation
   ##
   # You can handle all padrino applications using instead:
   #   Padrino.application
-  
+
   def app
     CLASS_NAME.tap { |app|  }
   end

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

@@ -15,7 +15,7 @@ end
 TEST
 
 RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'spec_helper'
 
 describe "!NAME!Controller" do
   before do
@@ -38,7 +38,7 @@ end
 TEST
 
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'spec_helper'
 
 describe "!NAME! Model" do
   let(:!DNAME!) { !NAME!.new }
@@ -64,4 +64,4 @@ end
 def generate_model_test(name)
   rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
   create_file destination_root("spec/models/#{name.to_s.underscore}_spec.rb"), rspec_contents, :skip => true
-end
+end

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

@@ -31,10 +31,10 @@ module Padrino
 
       # Definitions for the available customizable components
       component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic], :default => :none
-      component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec1, :rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
+      component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
       component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none
-      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :erubis, :liquid], :default => :haml
+      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :erubis, :liquid, :slim], :default => :haml
       component_option :stylesheet, "stylesheet engine",  :aliases => '-c', :choices => [:less, :sass, :compass, :scss], :default => :none
 
       # Show help if no argv given
@@ -100,4 +100,4 @@ module Padrino
       end
     end # Project
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -87,4 +87,4 @@ module Padrino
         end
     end # Runner
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -342,7 +342,7 @@ if defined?(ActiveRecord)
               locale     = "#{lang}:" + "\n" +
                            "  models:" + "\n" +
                            "    #{m}:" + "\n" +
-                           "      name: #{klass.human_name}" + "\n" +
+                           "      name: #{klass.human}" + "\n" +
                            "      attributes:" + "\n" +
                            columns.collect { |c| "        #{c}: #{klass.human_attribute_name(c)}" }.join("\n")
               print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
@@ -567,4 +567,4 @@ if defined?(ActiveRecord)
   end
 
   ActiveRecord::Migration.send :include, AutoMigrations
-end
+end

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

@@ -2,4 +2,4 @@ desc 'Load the seed data from db/seeds.rb'
 task :seed => :environment do
   seed_file = Padrino.root('db', 'seeds.rb')
   load(seed_file) if File.exist?(seed_file)
-end
+end

data/test/fixtures/example_template.rb

@@ -11,4 +11,4 @@ initializer :test, "# Example"
 
 app :testapp do
   generate :controller, "users get:index"
-end
+end

data/test/helper.rb

@@ -153,4 +153,4 @@ module Webrat
       @logger = nil
     end
   end
-end
+end

data/test/test_app_generator.rb

@@ -79,4 +79,4 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_no_match_in_file(/Padrino\.mount\("Demo"\).to\("\/demo"\)/,"#{@apptmp}/sample_project/config/apps.rb")
     end
   end
-end
+end

data/test/test_cli.rb

@@ -23,4 +23,4 @@ class TestCli < Test::Unit::TestCase
       assert_nothing_raised { silence_logger { generate(:cli, "--root=#{@apptmp}/sample_project") } }
     end
   end
-end
+end

data/test/test_controller_generator.rb

@@ -130,4 +130,4 @@ class TestControllerGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/spec/controllers/demo_items_controller_spec.rb")
     end
   end
-end
+end

data/test/test_mailer_generator.rb

@@ -66,4 +66,4 @@ class TestMailerGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/app/mailers/demo.rb")
     end
   end
-end
+end

data/test/test_migration_generator.rb

@@ -14,7 +14,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     should "fail outside app root" do
       output = silence_logger { generate(:migration, 'add_email_to_users', '-r=/tmp') }
       assert_match(/not at the root/, output)
-      assert_no_file_exists("#{@apptmp}/db/migration")
+      assert_no_file_exists("#{@apptmp}/db/migrate")
     end
 
     should "fail if we don't use an adapter" do
@@ -107,8 +107,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
       response_success = silence_logger { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/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, 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.*?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
@@ -121,8 +121,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, 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.*?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
@@ -191,4 +191,4 @@ class TestMigrationGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_remove_email_from_users.rb")
     end
   end
-end
+end

data/test/test_model_generator.rb

@@ -86,6 +86,13 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
     end
 
+    should "generate model file with camelized name" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
+    end
+
     should "generate migration file with no fields" do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
@@ -140,6 +147,13 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'data_mapper'/m,"#{@apptmp}/sample_project/Gemfile")
     end
 
+    should "generate model file with camelized name" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+      silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class ChunkyBacon\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
+    end
+
     should "generate model file with fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
@@ -170,9 +184,9 @@ class TestModelGenerator < Test::Unit::TestCase
       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)
-      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(/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
@@ -185,6 +199,13 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/class User < Sequel::Model/m, "#{@apptmp}/sample_project/app/models/user.rb")
     end
 
+    should "generate model file with camelized name" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class ChunkyBacon < Sequel::Model/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
+    end
+
     should "generate migration file with given properties" do
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
@@ -357,4 +378,4 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_bar_foos.rb")
     end
   end
-end
+end

data/test/test_plugin_generator.rb

@@ -125,4 +125,4 @@ class TestPluginGenerator < Test::Unit::TestCase
       expects_generated :admin_page, "post -r=#{@apptmp}/sample_admin"
     end
   end
-end
+end

data/test/test_project_generator.rb

@@ -29,13 +29,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/class ProjectCom < Padrino::Application/,"#{@apptmp}/project.com/app/app.rb")
       assert_match_in_file(/Padrino.mount\("ProjectCom"\).to\('\/'\)/,"#{@apptmp}/project.com/config/apps.rb")
     end
-    
+
     should "display the right path" do
       buffer = silence_logger { generate(:project, 'project', "--root=/tmp") }
       assert_file_exists("/tmp/project")
       assert_match(/cd \/tmp\/project/, buffer)
     end
-    
+
 
     should "allow specifying alternate application name" do
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--app=base_app') } }
@@ -139,27 +139,12 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/conf.mock_with :mocha/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
     end
 
-    should "properly generate for mocha and rspec1" do
-      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}",'--test=rspec1', '--mock=mocha', '--script=none') }
-      assert_match(/Applying.*?mocha.*?mock/, buffer)
-      assert_match_in_file(/gem 'mocha'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/conf.mock_with :mocha/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
-    end
-
     should "properly generate for rr and rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec', '--mock=rr', '--script=none') }
       assert_match(/Applying.*?rr.*?mock/, buffer)
       assert_match_in_file(/gem 'rr'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/conf.mock_with :rr/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
     end
-
-    should "properly generate for rr and rspec1" do
-      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec1', '--mock=rr', '--script=none') }
-      assert_match(/Applying.*?rr.*?mock/, buffer)
-      assert_match_in_file(/gem 'rr'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/conf.mock_with :rr/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
-    end
-
   end
 
   context "the generator for orm components" do
@@ -333,19 +318,24 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match(/Applying.*?haml.*?renderer/, buffer)
       assert_match_in_file(/gem 'haml'/, "#{@apptmp}/sample_project/Gemfile")
     end
-    
-    should "properly generate for erubis" do 
+
+    should "properly generate for erubis" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=erubis','--script=none') }
       assert_match(/Applying.*?erubis.*?renderer/,buffer)
       assert_match_in_file(/gem 'erubis'/, "#{@apptmp}/sample_project/Gemfile")
     end
 
-    should "properly generate for liquid" do 
+    should "properly generate for liquid" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=liquid','--script=none') }
       assert_match(/Applying.*?liquid.*?renderer/,buffer)
       assert_match_in_file(/gem 'liquid'/, "#{@apptmp}/sample_project/Gemfile")
     end
 
+    should "properly generate for slim" do
+      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=slim','--script=none') }
+      assert_match(/Applying.*?slim.*?renderer/,buffer)
+      assert_match_in_file(/gem 'slim'/, "#{@apptmp}/sample_project/Gemfile")
+    end
   end
 
   context "the generator for script component" do
@@ -421,18 +411,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
     end
 
-    should "properly generate for rspec1" do
-      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec1', '--script=none') }
-      assert_match(/Applying.*?rspec.*?test/, buffer)
-      assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/:require => "rack\/test"/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'rspec'.*?"~>\s*1.2.3".*?:require => "spec"/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
-      assert_match_in_file(/Spec::Runner/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
-      assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")
-    end
-    
     should "properly generate for rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec', '--script=none') }
       assert_match(/Applying.*?rspec.*?test/, buffer)
@@ -527,6 +505,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/register ScssInitializer/m, "#{@apptmp}/sample_project/app/app.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
-    
+
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 9
-        - 19
-        version: 0.9.19
+        - 20
+        version: 0.9.20
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - lib/padrino-gen/generators/components/renderers/erubis.rb
 - lib/padrino-gen/generators/components/renderers/haml.rb
 - lib/padrino-gen/generators/components/renderers/liquid.rb
+- lib/padrino-gen/generators/components/renderers/slim.rb
 - lib/padrino-gen/generators/components/scripts/dojo.rb
 - lib/padrino-gen/generators/components/scripts/extcore.rb
 - lib/padrino-gen/generators/components/scripts/jquery.rb
@@ -119,7 +120,6 @@ files:
 - 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/rspec1.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
 - lib/padrino-gen/generators/components/tests/testspec.rb
 - lib/padrino-gen/generators/controller.rb

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

@@ -1,67 +0,0 @@
-RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_SETUP)
-PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
-
-Spec::Runner.configure do |conf|
-  conf.include Rack::Test::Methods
-end
-
-def app
-  ##
-  # You can handle all padrino applications using instead:
-  #   Padrino.application
-  CLASS_NAME.tap { |app|  }
-end
-TEST
-
-RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-
-describe "!NAME!Controller" do
-  before do
-    get "/"
-  end
-
-  it "returns hello world" do
-    last_response.body.should == "Hello World"
-  end
-end
-TEST
-
-RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
-require 'spec/rake/spectask'
-
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = Dir['spec/**/*_spec.rb']
-  t.spec_opts  = %w(-fs --color)
-end
-TEST
-
-RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-
-describe "!NAME! Model" do
-  let(:!DNAME!) { !NAME!.new }
-  it 'can be created' do
-    !DNAME!.should_not be_nil
-  end
-end
-TEST
-
-def setup_test
-  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
-  require_dependencies 'rspec', :version => "~> 1.2.3", :require => 'spec', :group => 'test'
-  insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
-  create_file destination_root("spec/spec.rake"), RSPEC_RAKE
-end
-
-# Generates a controller test given the controllers name
-def generate_controller_test(name)
-  rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-  create_file destination_root("spec/controllers/#{name.to_s.underscore}_controller_spec.rb"), rspec_contents, :skip => true
-end
-
-def generate_model_test(name)
-  rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
-  create_file destination_root("spec/models/#{name.to_s.underscore}_spec.rb"), rspec_contents, :skip => true
-end