grimen-dry_scaffold 0.3.1 → 0.3.2

data/CHANGELOG.textile

@@ -1,3 +1,7 @@
+h1. 0.3.1 (2009-09-09)
+
+* Added Rspec tests generation
+
 h1. 0.3.0 (2009-07-23)
 
 * Major refactoring of the code.

data/README.textile

@@ -37,6 +37,7 @@ h4. Models
 h4. Testing
  
 * "*shoulda*":http://github.com/thoughtbot/shoulda - Testing framework
+* "*rspec*":http://wiki.github.com/dchelimsky/rspec - Testing framework
 
 h2. Features
 
@@ -157,11 +158,7 @@ InheritedResources with pagination:
     paginate_options ||= {}
     paginate_options[:page] ||= (params[:page] || 1)
     paginate_options[:per_page] ||= (params[:per_page] || 20)
-    @collection = @resources ||= end_of_association_chain.paginate(paginate_options)
-  end
-  
-  def resource
-    @resource = @resource ||= end_of_association_chain.find(params[:id])
+    @resources ||= end_of_association_chain.paginate(paginate_options)
   end</pre>
 
 h3. View Partials
@@ -226,15 +223,24 @@ config.gem 'will_paginate'
 config.gem 'justinfrench-formtastic', :lib => 'formtastic', :source => 'http://gems.github.com'
 config.gem 'josevalim-inherited_resources', :lib => 'inherited_resources', :source => 'http://gems.github.com'</pre>
 
+Also configure @config/environments/test.rb@ with the Rspec library if you want to
+
+<pre>config.gem 'rspec'
+config.gem 'rspec-rails'</pre>
+
+And don't forget to initialize it as well:
+
+<pre>./script/generate rspec</pre>
+
 h2. Usage
 
-<pre>./script/generate dry_scaffold ModelName [attribute:type attribute:type] [_actions:new,create,...] [_formats:html,json,...] [_indexes:attribute,...] [--skip-pagination] [--skip-resourceful] [--skip-formtastic] [--skip-views] [--skip-helpers] [--skip-migration] [--skip-timestamps] [--skip-tests] [--layout] [--tunit] [--shoulda] [--fixtures] [--fgirl] [--machinist] [--odaddy]</pre>
+<pre>./script/generate dry_scaffold ModelName [attribute:type attribute:type] [_actions:new,create,...] [_formats:html,json,...] [_indexes:attribute,...] [--skip-pagination] [--skip-resourceful] [--skip-formtastic] [--skip-views] [--skip-helpers] [--skip-migration] [--skip-timestamps] [--skip-tests] [--layout] [--tunit] [--shoulda] [--rspec] [--fixtures] [--fgirl] [--machinist] [--odaddy]</pre>
 
 ...or use the alias @dscaffold@ instead of @dry_scaffold@.
 
 For generating just a *model*, then use:
 
-<pre>./script/generate dry_model ModelName [attribute:type attribute:type] [_indexes:attribute,...] [--skip-migration] [--skip-timestamps] [--skip-tests] [--tunit] [--shoulda] [--fixtures] [--fgirl] [--machinist] [--odaddy]</pre>
+<pre>./script/generate dry_model ModelName [attribute:type attribute:type] [_indexes:attribute,...] [--skip-migration] [--skip-timestamps] [--skip-tests] [--tunit] [--shoulda] [--rspec] [--fixtures] [--fgirl] [--machinist] [--odaddy]</pre>
 
 ...or use the alias @dmodel@ instead of @dry_model@.
 
@@ -399,6 +405,7 @@ h4. All
 * @--skip-tests@        - Don't generate tests (functional/unit/...).
 * @--tunit@             - Generate/Use test_unit tests. Note: Rails default.
 * @--shoulda@           - Generate/Use *shoulda* tests.
+* @--rspec@             - Generate/Use *rspec* tests.
 * @--fixtures@          - Generate/Use fixtures. Note: Rails default.
 * @--fgirl@             - Generate/Use *factory_girl* factories.
 * @--machinist@         - Generate/Use *machinist* blueprints (factories).

data/config/scaffold.yml

@@ -5,7 +5,7 @@ dry_scaffold:
     formats: html,js,xml,json
   options:
     formtastic: true
-    resourceful: false
+    resourceful: true
     pagination: true
     layout: false
     views: true
@@ -13,6 +13,7 @@ dry_scaffold:
     tests: true
     tunit: true
     shoulda: false
+    rspec: false
     fixtures: true
     fgirl: false
     machinist: false

data/generators/dry_model/dry_model_generator.rb

@@ -60,7 +60,7 @@ class DryModelGenerator < DryGenerator
         
       # Model Tests.
       unless options[:skip_tests]
-        model_tests_path = File.join(TEST_PATHS[test_framework], 'unit')
+        model_tests_path = File.join(TEST_PATHS[test_framework], UNIT_TESTS_PATH[test_framework])
         m.directory File.join(model_tests_path, class_path)
         m.template File.join('models', 'tests', "#{test_framework}", 'unit_test.rb'),
           File.join(model_tests_path, class_path, "#{file_name}_test.rb")
@@ -70,7 +70,7 @@ class DryModelGenerator < DryGenerator
           fixtures_path = File.join(TEST_PATHS[test_framework], 'fixtures')
           m.directory File.join(fixtures_path, class_path)
           m.template File.join('models', 'fixture_data', 'active_record_fixtures.yml'),
-            File.join(fixtures_path, class_path, "#{plural_name}.yml")
+            File.join(fixtures_path, class_path, "#{table_name}.yml")
         end
         if options[:factory_girl]
           factory_girl_path = File.join(TEST_PATHS[test_framework], 'factories')
@@ -131,4 +131,4 @@ class DryModelGenerator < DryGenerator
       [super, banner_args, banner_options].join(' ')
     end
     
-end
+end

data/generators/dry_model/prototypes/tests/rspec/unit_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe DuckTest do
+  fixtures :ducks
+  
+  it "should be valid" do
+    DuckTest.new.should be_valid
+  end
+end

data/generators/dry_model/templates/models/tests/rspec/unit_test.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe <%= class_name %> do
+<% if options[:fixtures] -%>
+  fixtures :<%= table_name %>
+
+<% end -%>
+  it "should be valid" do
+    Comment.new.should be_valid
+  end
+end

data/generators/dry_model/templates/models/tests/test_unit/unit_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class <%= class_name %>Test < ActiveRecord::TestCase
   
 <% if options[:fixtures] -%>
-  fixtures :<%= plural_name %>
+  fixtures :<%= table_name %>
   
 <% end -%>
   setup do
@@ -14,4 +14,4 @@ class <%= class_name %>Test < ActiveRecord::TestCase
     assert true
   end
   
-end
+end

data/generators/dry_scaffold/dry_scaffold_generator.rb

@@ -142,7 +142,7 @@ class DryScaffoldGenerator < DryGenerator
         
       # Controller Tests.
       unless options[:skip_tests]
-        controller_tests_path = File.join(TEST_PATHS[test_framework], 'functional')
+        controller_tests_path = File.join(TEST_PATHS[test_framework], FUNCTIONAL_TESTS_PATH[test_framework])
         m.directory File.join(controller_tests_path, controller_class_path)
         m.template File.join('controllers', 'tests', "#{test_framework}", 'functional_test.rb'),
           File.join(controller_tests_path, controller_class_path, "#{controller_file_name}_controller_test.rb")
@@ -219,7 +219,7 @@ class DryScaffoldGenerator < DryGenerator
       when :object_daddy then
         "#{class_name}.generate"
       else #:fixtures
-        "#{plural_name}(:basic)"
+        "#{table_name}(:basic)"
     end
   end
   
@@ -398,4 +398,4 @@ class DryScaffoldGenerator < DryGenerator
       [super, banner_args, banner_options].join(' ')
     end
     
-end
+end

data/generators/dry_scaffold/prototypes/controllers/tests/rspec/functional_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
+describe DucksController do
+  fixtures :all
+  integrate_views
+  
+  it "index action should render index template" do
+    get :index
+    response.should render_template(:index)
+  end
+  
+  it "show action should render show template" do
+    get :show, :id => Duck.first
+    response.should render_template(:show)
+  end
+  
+  it "new action should render new template" do
+    get :new
+    response.should render_template(:new)
+  end
+  
+  it "create action should render new template when model is invalid" do
+    Duck.any_instance.stubs(:valid?).returns(false)
+    post :create
+    response.should render_template(:new)
+  end
+  
+  it "create action should redirect when model is valid" do
+    Duck.any_instance.stubs(:valid?).returns(true)
+    post :create
+    response.should redirect_to(duck_url(assigns[:duck]))
+  end
+  
+  it "edit action should render edit template" do
+    get :edit, :id => Duck.first
+    response.should render_template(:edit)
+  end
+  
+  it "update action should render edit template when model is invalid" do
+    Duck.any_instance.stubs(:valid?).returns(false)
+    put :update, :id => Duck.first
+    response.should render_template(:edit)
+  end
+  
+  it "update action should redirect when model is valid" do
+    Duck.any_instance.stubs(:valid?).returns(true)
+    put :update, :id => Duck.first
+    response.should redirect_to(duck_url(assigns[:duck]))
+  end
+  
+  it "destroy action should destroy model and redirect to index action" do
+    duck = Duck.first
+    delete :destroy, :id => duck
+    response.should redirect_to(ducks_url)
+    Duck.exists?(duck.id).should be_false
+  end
+end

data/generators/dry_scaffold/prototypes/helpers/tests/rspec/unit_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
+describe DucksHelperTest
+  
+  it 'should do something' do
+    assert true
+  end
+  
+end

data/generators/dry_scaffold/templates/controllers/inherited_resources_controller.rb

@@ -7,38 +7,20 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
   respond_to <%= symbol_array_to_expression(formats) %>
   
 <% end -%>
-<% if actions -%>
-  before_filter :load_resource, :only => [<%= symbol_array_to_expression(actions & DryScaffoldGenerator::DEFAULT_MEMBER_AUTOLOAD_ACTIONS) %>]
-<% end -%>
-<% if actions -%>
-  before_filter :load_and_paginate_resources, :only => [<%= symbol_array_to_expression(actions & DryScaffoldGenerator::DEFAULT_COLLECTION_AUTOLOAD_ACTIONS) %>]
-  
-<% end -%>
-
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
-    
   end
   
 <% end -%>
+<% if options[:pagination] -%>
   protected
     
     def collection
-<% if options[:pagination] -%>
       paginate_options ||= {}
       paginate_options[:page] ||= (params[:page] || 1)
       paginate_options[:per_page] ||= (params[:per_page] || 20)
-      @collection = @<%= model_plural_name %> ||= end_of_association_chain.paginate(paginate_options)
-<% else -%>
-      @collection = @<%= model_plural_name %> ||= end_of_association_chain.all
-<% end -%>
+      @<%= model_plural_name %> ||= end_of_association_chain.paginate(paginate_options)
     end
-    alias :load_and_paginate_resources :collection
-    
-    def resource
-      @resource = @<%= model_singular_name %> ||= end_of_association_chain.find(params[:id])
-    end
-    alias :load_resource :resource
-    
+<% end %>        
 end

data/generators/dry_scaffold/templates/controllers/tests/rspec/functional_test.rb

@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
+describe <%= controller_class_name %>Controller do
+<% if options[:fixtures] -%>
+  fixtures :all
+<% end -%>
+  integrate_views
+  
+<% if actions.include?(:index) -%>
+  it "index action should render index template" do
+    get :index
+    response.should render_template(:index)
+  end
+  
+<% end %>
+<% if actions.include?(:show) -%>
+  it "show action should render show template" do
+    get :show, :id => Duck.first
+    response.should render_template(:show)
+  end
+  
+<% end %>
+<% if actions.include?(:new) -%>
+  it "new action should render new template" do
+    get :new
+    response.should render_template(:new)
+  end
+  
+<% end %>
+<% if actions.include?(:create) -%>
+  it "create action should render new template when model is invalid" do
+    Duck.any_instance.stubs(:valid?).returns(false)
+    post :create
+    response.should render_template(:new)
+  end
+  
+  it "create action should redirect when model is valid" do
+    Duck.any_instance.stubs(:valid?).returns(true)
+    post :create
+    response.should redirect_to(duck_url(assigns[:duck]))
+  end
+
+<% end %>
+<% if actions.include?(:edit) -%>
+  it "edit action should render edit template" do
+    get :edit, :id => Duck.first
+    response.should render_template(:edit)
+  end
+  
+<% end %>
+<% if actions.include?(:update) -%>  
+  it "update action should render edit template when model is invalid" do
+    Duck.any_instance.stubs(:valid?).returns(false)
+    put :update, :id => Duck.first
+    response.should render_template(:edit)
+  end
+
+  it "update action should redirect when model is valid" do
+    Duck.any_instance.stubs(:valid?).returns(true)
+    put :update, :id => Duck.first
+    response.should redirect_to(duck_url(assigns[:duck]))
+  end
+  
+<% end %>
+<% if actions.include?(:destroy) -%>
+  it "destroy action should destroy model and redirect to index action" do
+    duck = Duck.first
+    delete :destroy, :id => duck
+    response.should redirect_to(ducks_url)
+    Duck.exists?(duck.id).should be_false
+  end
+  
+<% end %>
+<% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
+  it '<%= action.to_s %> action should render <%= action.to_s %> template' do
+    get :<%= action.to_s %>
+    response.should render_template(:<%= action.to_s %>)
+  end
+  
+<% end -%>
+end

data/generators/dry_scaffold/templates/helpers/tests/rspec/unit_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+ 
+describe <%= controller_class_name %>HelperTest
+  
+  it 'should do something' do
+    assert true
+  end
+  
+end

data/lib/dry_generator.rb

@@ -4,6 +4,7 @@ class DryGenerator < Rails::Generator::NamedBase
   HAS_FORMTASTIC =            defined?(Formtastic)
   HAS_INHERITED_RESOURCES =   defined?(InheritedResources)
   HAS_SHOULDA =               defined?(Shoulda)
+  HAS_RSPEC =                 defined?(Rspec)
   
   # Load defaults from config file - default or custom.
   begin
@@ -23,6 +24,7 @@ class DryGenerator < Rails::Generator::NamedBase
   BANNER_OPTIONS = [
       "[--skip-tests]",
       "[--shoulda]",
+      "[--rspec]",
       "[--fixtures]",
       "[--fgirl]",
       "[--machinist]",
@@ -47,20 +49,30 @@ class DryGenerator < Rails::Generator::NamedBase
       :machinist        => CONFIG_OPTIONS['machinist']    || false,
       :object_daddy     => CONFIG_OPTIONS['object_daddy'] || CONFIG_OPTIONS['odaddy'] || false,
       :test_unit        => CONFIG_OPTIONS['test_unit']    || CONFIG_OPTIONS['tunit'] || true,
-      :shoulda          => CONFIG_OPTIONS['shoulda']      || false
+      :shoulda          => CONFIG_OPTIONS['shoulda']      || false,
+      :rspec            => CONFIG_OPTIONS['rspec']        || false
     }.freeze
   
   TEST_PATHS = {
       :test_unit        => 'test',
-      :shoulda          => 'test'
+      :shoulda          => 'test',
+      :rspec            => 'spec'
     }.freeze
     
   DEFAULT_TEST_FRAMEWORK =      :test_unit
   DEFAULT_FACTORY_FRAMEWORK =   :fixtures
   
   TESTS_PATH =                  File.join('test').freeze
-  FUNCTIONAL_TESTS_PATH =       File.join(TESTS_PATH, 'functional').freeze
-  UNIT_TESTS_PATH =             File.join(TESTS_PATH, 'unit').freeze
+  FUNCTIONAL_TESTS_PATH =       {
+    :test       => 'functional',
+    :shoulda    => 'functional',
+    :rspec      => 'controllers'
+  }
+  UNIT_TESTS_PATH =  {
+    :test       => 'unit',
+    :shoulda    => 'unit',
+    :rspec      => 'models',
+  }
   
   NON_ATTR_ARG_KEY_PREFIX =     '_'.freeze
   
@@ -110,12 +122,10 @@ class DryGenerator < Rails::Generator::NamedBase
         options[:test_framework] = :shoulda
       end
       
-      #opt.on('--rspec', "Test: Generate \"rspec\" tests.") do |v|
-      #  # TODO: Implement RSpec templates. Maybe.
-      #  puts '[dry_scaffold:] RSpec currently not supported.'
-      #  options[:rspec] = v
-      #  options[:test_framework] = :rspec
-      #end
+      opt.on("--rspec", "Test: Generate \"rspec\" tests.") do |v|
+        options[:rspec] = v
+        options[:test_framework] = :rspec
+      end
       
       opt.on("--fixtures", "Test: Generate fixtures. Note: Rails default.") do |v|
         options[:fixtures] = v

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -13,7 +13,7 @@ date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.
+description: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers. Has support for Rspec, Shoulda, Formtastic, Inherited Resources, Factory Girl, Machinist, Object Daddy, Will Paginate
 email: grimen@gmail.com
 executables: 
 - dscaffold
@@ -45,6 +45,7 @@ files:
 - generators/dry_model/prototypes/fixture_data/active_record_fixtures.yml
 - generators/dry_model/prototypes/fixture_data/factory_girl_factories.rb
 - generators/dry_model/prototypes/fixture_data/machinist_blueprints.rb
+- generators/dry_model/prototypes/tests/rspec/unit_test.rb
 - generators/dry_model/prototypes/tests/shoulda/unit_test.rb
 - generators/dry_model/prototypes/tests/test_unit/unit_test.rb
 - generators/dry_model/templates/models/active_record_migration.rb
@@ -52,15 +53,18 @@ files:
 - generators/dry_model/templates/models/fixture_data/active_record_fixtures.yml
 - generators/dry_model/templates/models/fixture_data/factory_girl_factories.rb
 - generators/dry_model/templates/models/fixture_data/machinist_blueprints.rb
+- generators/dry_model/templates/models/tests/rspec/unit_test.rb
 - generators/dry_model/templates/models/tests/shoulda/unit_test.rb
 - generators/dry_model/templates/models/tests/test_unit/unit_test.rb
 - generators/dry_scaffold/USAGE
 - generators/dry_scaffold/dry_scaffold_generator.rb
 - generators/dry_scaffold/prototypes/controllers/action_controller.rb
 - generators/dry_scaffold/prototypes/controllers/inherited_resources_controller.rb
+- generators/dry_scaffold/prototypes/controllers/tests/rspec/functional_test.rb
 - generators/dry_scaffold/prototypes/controllers/tests/shoulda/functional_test.rb
 - generators/dry_scaffold/prototypes/controllers/tests/test_unit/functional_test.rb
 - generators/dry_scaffold/prototypes/helpers/helper.rb
+- generators/dry_scaffold/prototypes/helpers/tests/rspec/unit_test.rb
 - generators/dry_scaffold/prototypes/helpers/tests/shoulda/unit_test.rb
 - generators/dry_scaffold/prototypes/helpers/tests/test_unit/unit_test.rb
 - generators/dry_scaffold/prototypes/views/builder/index.atom.builder
@@ -74,9 +78,11 @@ files:
 - generators/dry_scaffold/prototypes/views/haml/show.html.haml
 - generators/dry_scaffold/templates/controllers/action_controller.rb
 - generators/dry_scaffold/templates/controllers/inherited_resources_controller.rb
+- generators/dry_scaffold/templates/controllers/tests/rspec/functional_test.rb
 - generators/dry_scaffold/templates/controllers/tests/shoulda/functional_test.rb
 - generators/dry_scaffold/templates/controllers/tests/test_unit/functional_test.rb
 - generators/dry_scaffold/templates/helpers/helper.rb
+- generators/dry_scaffold/templates/helpers/tests/rspec/unit_test.rb
 - generators/dry_scaffold/templates/helpers/tests/shoulda/unit_test.rb
 - generators/dry_scaffold/templates/helpers/tests/test_unit/unit_test.rb
 - generators/dry_scaffold/templates/views/builder/index.atom.builder
@@ -95,7 +101,6 @@ files:
 - tasks/dry_scaffold.rake
 has_rdoc: false
 homepage: http://github.com/grimen/dry_scaffold/tree/master
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -116,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.