grimen-dry_scaffold 0.3.0 → 0.3.1

data/README.textile

@@ -36,7 +36,7 @@ h4. Models
  
 h4. Testing
  
-* "*Shoulda*":http://github.com/thoughtbot/shoulda - Testing framework
+* "*shoulda*":http://github.com/thoughtbot/shoulda - Testing framework
 
 h2. Features
 

data/TODO.textile

@@ -5,6 +5,7 @@ h2. Next
 * Bug/Issue: InheritedResources functional testing issue.
 * Feature: RSpec-templates?
 * Optimization: Write even better functional tests for REST-actions. Goal: Killer-tests, i.e. "best practice"-tests. Suggestion: Routing, formats, ...
+* Feature: Auto-detection of testing frameworks in working project.
 
 h2. Maybe
 
@@ -17,7 +18,7 @@ h2. Issues
 
 * Contact José regarding the InheritedResources-issue:
 
-1) ActionController::RoutingError: parrot_url failed to generate from {:controller=>"parrots", :id=>#<Parrot id: nil, name: "Hello", created_at: "2009-07-21 18:53:25", updated_at: "2009-07-21 18:53:25">, :action=>"show"}, expected: {:controller=>"parrots", :action=>"show"}, diff: {:id=>#<Parrot id: nil, name: "Hello", created_at: "2009-07-21 18:53:25", updated_at: "2009-07-21 18:53:25">}
+ActionController::RoutingError: parrot_url failed to generate from {:controller=>"parrots", :id=>#<Parrot id: nil, name: "Hello", created_at: "2009-07-21 18:53:25", updated_at: "2009-07-21 18:53:25">, :action=>"show"}, expected: {:controller=>"parrots", :action=>"show"}, diff: {:id=>#<Parrot id: nil, name: "Hello", created_at: "2009-07-21 18:53:25", updated_at: "2009-07-21 18:53:25">}
   (eval):16:in `parrot_url'
 /opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/url_helpers.rb:194:in `resource_url'
 /opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/base_helpers.rb:311:in `send'
@@ -37,14 +38,3 @@ h2. Issues
     post :create, :donkey => @donkey.attributes   # <<<<<<<<<<<<< donkeys_controller_test.rb:8
     assert_response :redirect
   end
-  
-2) test_destroy_with_failure(DonkeysControllerTest) [/test/functional/donkeys_controller_test.rb:45]:
-<nil> expected to not be nil.
-  
-  test 'destroy with failure' do
-    Donkey.any_instance.expects(:destroy).returns(false)
-    @donkey = donkeys(:basic)
-    delete :destroy, :id => @donkey.to_param
-    assert_not_nil flash[:error]                  # <<<<<<<<<<<<< donkeys_controller_test.rb:45
-    assert_response :redirect
-  end

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

@@ -56,15 +56,7 @@ class DucksControllerTest < ActionController::TestCase
       should_assign_to flash[:notice]
       should_redirect_to 'ducks_path'
     end
-    context 'with failure' do
-      setup do
-        Duck.any_instance.expects(:destroy).returns(false)
-        @duck = Factory(:duck)
-        delete :destroy, :id => @duck.to_param
-      end
-      should_assign_to flash[:error]
-      should_redirect_to 'ducks_path'
-    end
+    # Not possible: destroy with failure
   end
   
   context 'new' do

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

@@ -42,13 +42,7 @@ class DucksControllerTest < ActionController::TestCase
     assert_response :redirect
   end
   
-  test 'destroy with failure' do
-    Duck.any_instance.expects(:destroy).returns(false)
-    @duck = ducks(:basic)
-    delete :destroy, :id => @duck.to_param
-    assert_not_nil flash[:error]
-    assert_response :redirect
-  end
+  # Not possible: destroy with failure
   
   test 'new' do
     get :new

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

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
- 
+require 'test_helper'
+
 class DucksHelperTest < ActionView::TestCase
   
   should 'test something' do

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'test_helper'
  
 class DucksHelperTest < ActionView::TestCase
   

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

@@ -43,13 +43,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
     assert_response :redirect
   end
   
-  test 'destroy with failure' do
-    <%= class_name %>.any_instance.expects(:destroy).returns(false)
-    <%= resource_instance %> = <%= build_object %>
-    delete :destroy, :id => <%= resource_instance %>.to_param
-    assert_not_nil flash[:error]
-    assert_response :redirect
-  end
+  # Not possible: destroy with failure
   
 <% end -%>
 <% if actions.include?(:new) -%>

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

@@ -1,5 +1,5 @@
 require 'test_helper'
- 
+
 class <%= controller_class_name %>HelperTest < ActionView::TestCase
   
   should 'test something' do

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

@@ -1,5 +1,5 @@
 require 'test_helper'
- 
+
 class <%= controller_class_name %>HelperTest < ActionView::TestCase
   
   test 'something' do

data/lib/dry_generator.rb

@@ -43,10 +43,10 @@ class DryGenerator < Rails::Generator::NamedBase
       :skip_views       => !CONFIG_OPTIONS['views']       || false,
       :layout           => CONFIG_OPTIONS['layout']       || false,
       :fixtures         => CONFIG_OPTIONS['fixtures']     || false,
-      :fgirl            => CONFIG_OPTIONS['factory_girl'] || false,
+      :factory_girl     => CONFIG_OPTIONS['factory_girl'] || CONFIG_OPTIONS['fgirl'] || false,
       :machinist        => CONFIG_OPTIONS['machinist']    || false,
-      :odaddy           => CONFIG_OPTIONS['object_daddy'] || false,
-      :tunit            => CONFIG_OPTIONS['test_unit']    || true,
+      :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
     }.freeze
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -95,6 +95,7 @@ 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
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.