ryanb-nifty-generators 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.1.6* (August 7th, 2008)
+
+* adding option to specify Shoulda as testing framework in nifty_scaffold generator
+
+* adding options to manually specify rspec or testunit framework in nifty_scaffold generator
+
 *0.1.5* (August 7th, 2008)
 
 * adding option to nifty layout to generate HAML views and SASS stylesheets

data/Manifest

@@ -35,6 +35,15 @@ rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb
 rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb
 rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb
 rails_generators/nifty_scaffold/templates/tests/rspec/model.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb
+rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb
 rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb
 rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb
 rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb

data/TODO

@@ -1,6 +1,7 @@
 
 Nifty Scaffold Generator
   - add some validation for attributes/action names
+  - refactor out long methods in scaffold generator
 
 Nifty Config Generator
   - make it easier to specify non environment specific configs

data/nifty-generators.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Nifty-generators-0.1.5
+# Gem::Specification for Nifty-generators-0.1.6
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{nifty-generators}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q{A collection of useful generator scripts for Rails.}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "README", "tasks/deployment.rake", "TODO"]
-  s.files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "Manifest", "rails_generators/nifty_config/nifty_config_generator.rb", "rails_generators/nifty_config/templates/config.yml", "rails_generators/nifty_config/templates/load_config.rb", "rails_generators/nifty_config/USAGE", "rails_generators/nifty_layout/nifty_layout_generator.rb", "rails_generators/nifty_layout/templates/helper.rb", "rails_generators/nifty_layout/templates/layout.html.erb", "rails_generators/nifty_layout/templates/layout.html.haml", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/templates/stylesheet.sass", "rails_generators/nifty_layout/USAGE", "rails_generators/nifty_scaffold/nifty_scaffold_generator.rb", "rails_generators/nifty_scaffold/templates/actions/create.rb", "rails_generators/nifty_scaffold/templates/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/actions/edit.rb", "rails_generators/nifty_scaffold/templates/actions/index.rb", "rails_generators/nifty_scaffold/templates/actions/new.rb", "rails_generators/nifty_scaffold/templates/actions/show.rb", "rails_generators/nifty_scaffold/templates/actions/update.rb", "rails_generators/nifty_scaffold/templates/controller.rb", "rails_generators/nifty_scaffold/templates/fixtures.yml", "rails_generators/nifty_scaffold/templates/helper.rb", "rails_generators/nifty_scaffold/templates/migration.rb", "rails_generators/nifty_scaffold/templates/model.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/model.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/model.rb", "rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/index.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/new.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/show.html.erb", "rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/index.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/new.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/show.html.haml", "rails_generators/nifty_scaffold/USAGE", "README", "tasks/deployment.rake", "test/test_helper.rb", "test/test_nifty_config_generator.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "nifty-generators.gemspec"]
+  s.files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "Manifest", "rails_generators/nifty_config/nifty_config_generator.rb", "rails_generators/nifty_config/templates/config.yml", "rails_generators/nifty_config/templates/load_config.rb", "rails_generators/nifty_config/USAGE", "rails_generators/nifty_layout/nifty_layout_generator.rb", "rails_generators/nifty_layout/templates/helper.rb", "rails_generators/nifty_layout/templates/layout.html.erb", "rails_generators/nifty_layout/templates/layout.html.haml", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/templates/stylesheet.sass", "rails_generators/nifty_layout/USAGE", "rails_generators/nifty_scaffold/nifty_scaffold_generator.rb", "rails_generators/nifty_scaffold/templates/actions/create.rb", "rails_generators/nifty_scaffold/templates/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/actions/edit.rb", "rails_generators/nifty_scaffold/templates/actions/index.rb", "rails_generators/nifty_scaffold/templates/actions/new.rb", "rails_generators/nifty_scaffold/templates/actions/show.rb", "rails_generators/nifty_scaffold/templates/actions/update.rb", "rails_generators/nifty_scaffold/templates/controller.rb", "rails_generators/nifty_scaffold/templates/fixtures.yml", "rails_generators/nifty_scaffold/templates/helper.rb", "rails_generators/nifty_scaffold/templates/migration.rb", "rails_generators/nifty_scaffold/templates/model.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/model.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/model.rb", "rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/index.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/new.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/show.html.erb", "rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/index.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/new.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/show.html.haml", "rails_generators/nifty_scaffold/USAGE", "README", "tasks/deployment.rake", "test/test_helper.rb", "test/test_nifty_config_generator.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "nifty-generators.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/ryanb/nifty-generators}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nifty-generators", "--main", "README"]
@@ -38,22 +38,15 @@ end
 # 
 # require 'rubygems'
 # require 'rake'
-#  
-# begin
-#   require 'echoe'
+# require 'echoe'
 # 
-#   Echoe.new('nifty-generators', '0.1.5') do |p|
-#     p.summary        = "A collection of useful generator scripts for Rails."
-#     p.description    = "A collection of useful generator scripts for Rails."
-#     p.url            = "http://github.com/ryanb/nifty-generators"
-#     p.author         = 'Ryan Bates'
-#     p.email          = "ryan (at) railscasts (dot) com"
-#     p.ignore_pattern = ["script/*", "*.gemspec"]
-#   end
-# 
-# rescue LoadError => boom
-#   puts "You are missing a dependency required for meta-operations on this gem."
-#   puts "#{boom.to_s.capitalize}."
+# Echoe.new('nifty-generators', '0.1.6') do |p|
+#   p.summary        = "A collection of useful generator scripts for Rails."
+#   p.description    = "A collection of useful generator scripts for Rails."
+#   p.url            = "http://github.com/ryanb/nifty-generators"
+#   p.author         = 'Ryan Bates'
+#   p.email          = "ryan (at) railscasts (dot) com"
+#   p.ignore_pattern = ["script/*", "*.gemspec"]
 # end
 # 
 # Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/rails_generators/nifty_scaffold/nifty_scaffold_generator.rb

@@ -49,14 +49,14 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
           m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{plural_name}"
         end
         
-        if spec_dir?
+        if rspec?
           m.directory "spec/models"
-          m.template "tests/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
+          m.template "tests/#{test_framework}/model.rb", "spec/models/#{singular_name}_spec.rb"
           m.directory "spec/fixtures"
           m.template "fixtures.yml", "spec/fixtures/#{plural_name}.yml"
         else
           m.directory "test/unit"
-          m.template "tests/testunit/model.rb", "test/unit/#{singular_name}_test.rb"
+          m.template "tests/#{test_framework}/model.rb", "test/unit/#{singular_name}_test.rb"
           m.directory "test/fixtures"
           m.template "fixtures.yml", "test/fixtures/#{plural_name}.yml"
         end
@@ -65,10 +65,10 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       unless options[:skip_controller]
         m.directory "app/controllers"
         m.template "controller.rb", "app/controllers/#{plural_name}_controller.rb"
-      
+        
         m.directory "app/helpers"
         m.template "helper.rb", "app/helpers/#{plural_name}_helper.rb"
-      
+        
         m.directory "app/views/#{plural_name}"
         controller_actions.each do |action|
           if File.exist? source_path("views/#{view_language}/#{action}.html.#{view_language}")
@@ -82,12 +82,12 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
       
         m.route_resources plural_name
         
-        if spec_dir?
+        if rspec?
           m.directory "spec/controllers"
-          m.template "tests/rspec/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
+          m.template "tests/#{test_framework}/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
         else
           m.directory "test/functional"
-          m.template "tests/testunit/controller.rb", "test/functional/#{plural_name}_controller_test.rb"
+          m.template "tests/#{test_framework}/controller.rb", "test/functional/#{plural_name}_controller_test.rb"
         end
       end
     end
@@ -173,16 +173,24 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     end
   end
   
-  def spec_dir?
-    File.exist? destination_path("spec")
+  def rspec?
+    test_framework == :rspec
   end
   
 protected
-
+  
   def view_language
     options[:haml] ? 'haml' : 'erb'
   end
-
+  
+  def test_framework
+    options[:test_framework] ||= default_test_framework
+  end
+  
+  def default_test_framework
+    File.exist?(destination_path("spec")) ? :rspec : :testunit
+  end
+  
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
@@ -192,8 +200,11 @@ protected
     opt.on("--skip-controller", "Don't generate controller, helper, or views.") { |v| options[:skip_controller] = v }
     opt.on("--invert", "Generate all controller actions except these mentioned.") { |v| options[:invert] = v }
     opt.on("--haml", "Generate HAML views instead of ERB.") { |v| options[:haml] = v }
+    opt.on("--testunit", "Use test/unit for test files.") { options[:test_framework] = :testunit }
+    opt.on("--rspec", "Use RSpec for test files.") { options[:test_framework] = :rspec }
+    opt.on("--shoulda", "Use Shoulda for test files.") { options[:test_framework] = :shoulda }
   end
-
+  
   # is there a better way to do this? Perhaps with const_defined?
   def model_exists?
     File.exist? destination_path("app/models/#{singular_name}.rb")

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb

@@ -0,0 +1,13 @@
+  context "create action"
+    should "render new template when model is invalid"
+      <%= class_name %>.any_instance.stubs(:valid?).returns(false)
+      post :create
+      assert_template 'new'
+    end
+    
+    should "redirect when model is valid"
+      <%= class_name %>.any_instance.stubs(:valid?).returns(true)
+      post :create
+      assert_redirected_to <%= item_path_for_test('url') %>
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb

@@ -0,0 +1,8 @@
+  context "destroy action"
+    should "destroy model and redirect to index action"
+      <%= singular_name %> = <%= class_name %>.first
+      delete :destroy, :id => <%= singular_name %>
+      assert_redirected_to <%= plural_name %>_url
+      assert !<%= class_name %>.exists?(<%= singular_name %>.id)
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb

@@ -0,0 +1,6 @@
+  context "edit action"
+    should "render edit template"
+      get :edit, :id => <%= class_name %>.first
+      assert_template 'edit'
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb

@@ -0,0 +1,6 @@
+  context "index action"
+    should "render index template"
+      get :index
+      assert_template 'index'
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb

@@ -0,0 +1,6 @@
+  context "new action"
+    should "render new template"
+      get :new
+      assert_template 'new'
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb

@@ -0,0 +1,6 @@
+  context "show action"
+    should "render show template"
+      get :show, :id => <%= class_name %>.first
+      assert_template 'show'
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb

@@ -0,0 +1,13 @@
+  context "update action"
+    should "render edit template when model is invalid"
+      <%= class_name %>.any_instance.stubs(:valid?).returns(false)
+      put :update, :id => <%= class_name %>.first
+      assert_template 'edit'
+    end
+  
+    should "redirect when model is valid"
+      <%= class_name %>.any_instance.stubs(:valid?).returns(true)
+      put :update, :id => <%= class_name %>.first
+      assert_redirected_to <%= item_path_for_test('url') %>
+    end
+  end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb

@@ -0,0 +1,5 @@
+require 'test_helper'
+
+class <%= plural_class_name %>ControllerTest < ActionController::TestCase
+  <%= controller_methods 'tests/shoulda/actions' %>
+end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActiveSupport::TestCase
+  should "be valid"
+    assert <%= class_name %>.new.valid?
+  end
+end

data/test/test_nifty_scaffold_generator.rb

@@ -392,7 +392,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           end
         end
         
-        should "should redirect to index action on successful create" do
+        should "redirect to index action on successful create" do
           assert_generated_file "spec/controllers/line_items_controller_spec.rb" do |body|
             assert_match "redirect_to(line_items_url)", body
           end
@@ -402,12 +402,18 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
       context "generator with edit and index actions" do
         rails_generator :nifty_scaffold, "line_item", "edit", "index"
         
-        should "should redirect to index action on successful update" do
+        should "redirect to index action on successful update" do
           assert_generated_file "spec/controllers/line_items_controller_spec.rb" do |body|
             assert_match "redirect_to(line_items_url)", body
           end
         end
       end
+      
+      context "generator with testunit specified" do
+        rails_generator :nifty_scaffold, "line_item", "name:string", :test_framework => :testunit
+        
+        should_generate_file "test/unit/line_item_test.rb"
+      end
     end
     
     context "with test dir" do
@@ -459,7 +465,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           end
         end
         
-        should "should redirect to index action on successful create" do
+        should "redirect to index action on successful create" do
           assert_generated_file "test/functional/line_items_controller_test.rb" do |body|
             assert_match "assert_redirected_to line_items_url", body
           end
@@ -469,12 +475,32 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
       context "generator with edit and index actions" do
         rails_generator :nifty_scaffold, "line_item", "edit", "index"
         
-        should "should redirect to index action on successful update" do
+        should "redirect to index action on successful update" do
           assert_generated_file "test/functional/line_items_controller_test.rb" do |body|
             assert_match "assert_redirected_to line_items_url", body
           end
         end
       end
+      
+      context "generator with rspec specified" do
+        rails_generator :nifty_scaffold, "line_item", "name:string", :test_framework => :rspec
+        
+        should_generate_file "spec/models/line_item_spec.rb"
+      end
+      
+      context "generator with shoulda specified" do
+        rails_generator :nifty_scaffold, "line_item", "name:string", :test_framework => :shoulda
+        
+        should "have controller and model tests using shoulda syntax" do
+          assert_generated_file "test/functional/line_items_controller_test.rb" do |body|
+            assert_match " should ", body
+          end
+          
+          assert_generated_file "test/unit/line_item_test.rb" do |body|
+            assert_match " should ", body
+          end
+        end
+      end
     end
     
     context "generator with haml option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ryanb-nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ryan Bates
@@ -64,6 +64,15 @@ files:
 - rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb
 - rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb
 - rails_generators/nifty_scaffold/templates/tests/rspec/model.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb
+- rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb
 - rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb
 - rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb
 - rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb