grimen-dry_scaffold 0.3.3 → 0.3.4

data/config/scaffold.yml

@@ -11,7 +11,7 @@ dry_scaffold:
     views: true
     helpers: true
     tests: true
-    tunit: true
+    test_unit: true
     shoulda: false
     rspec: false
     fixtures: true
@@ -23,8 +23,9 @@ dry_model:
     migration: true
     timestamps: true
     tests: true
-    tunit: true
+    test_unit: true
     shoulda: false
+    rspec: false
     fixtures: true
     fgirl: false
     machinist: false

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

@@ -6,6 +6,6 @@ describe <%= class_name %> do
 
 <% end -%>
   it "should be valid" do
-    Comment.new.should be_valid
+    <%= class_name %>.new.should be_valid
   end
 end

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

@@ -5,7 +5,11 @@ describe <%= controller_class_name %>Controller do
   fixtures :all
 <% end -%>
   integrate_views
-  
+<% unless options[:factory_framework]==:fixtures %>
+  before(:each) do
+    <%= build_object %>
+  end
+<% end %>
 <% if actions.include?(:index) -%>
   it "index action should render index template" do
     get :index
@@ -15,7 +19,7 @@ describe <%= controller_class_name %>Controller do
 <% end %>
 <% if actions.include?(:show) -%>
   it "show action should render show template" do
-    get :show, :id => Duck.first
+    get :show, :id => <%= class_name %>.first
     response.should render_template(:show)
   end
   
@@ -29,45 +33,45 @@ describe <%= controller_class_name %>Controller do
 <% end %>
 <% if actions.include?(:create) -%>
   it "create action should render new template when model is invalid" do
-    Duck.any_instance.stubs(:valid?).returns(false)
+    <%= class_name %>.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)
+    <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create
-    response.should redirect_to(duck_url(assigns[:duck]))
+    response.should redirect_to(<%= singular_name %>_url(assigns[:<%= singular_name %>]))
   end
 
 <% end %>
 <% if actions.include?(:edit) -%>
   it "edit action should render edit template" do
-    get :edit, :id => Duck.first
+    get :edit, :id => <%= class_name %>.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
+    <%= class_name %>.any_instance.stubs(:valid?).returns(false)
+    put :update, :id => <%= class_name %>.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]))
+    <%= class_name %>.any_instance.stubs(:valid?).returns(true)
+    put :update, :id => <%= class_name %>.first
+    response.should redirect_to(<%= singular_name %>_url(assigns[:<%= singular_name %>]))
   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
+    <%= singular_name %> = <%= class_name %>.first
+    delete :destroy, :id => <%= singular_name %>
+    response.should redirect_to(<%= plural_name %>_url)
+    <%= class_name %>.exists?(<%= singular_name %>.id).should be_false
   end
   
 <% end %>

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

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

data/lib/dry_generator.rb

@@ -12,7 +12,6 @@ class DryGenerator < Rails::Generator::NamedBase
     custom_config_file = File.expand_path(File.join(Rails.root, 'config', 'scaffold.yml'))
     config_file = File.join(File.exist?(custom_config_file) ? custom_config_file : default_config_file)
     config = YAML::load(File.open(config_file))
-    
     CONFIG_ARGS = config['dry_scaffold']['args'] rescue nil
     CONFIG_OPTIONS = config['dry_scaffold']['options'] rescue nil
   end
@@ -48,7 +47,7 @@ class DryGenerator < Rails::Generator::NamedBase
       :factory_girl     => CONFIG_OPTIONS['factory_girl'] || CONFIG_OPTIONS['fgirl'] || false,
       :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,
+      :test_unit        => CONFIG_OPTIONS['test_unit']    || CONFIG_OPTIONS['tunit'] || false,
       :shoulda          => CONFIG_OPTIONS['shoulda']      || false,
       :rspec            => CONFIG_OPTIONS['rspec']        || false
     }.freeze
@@ -70,12 +69,12 @@ class DryGenerator < Rails::Generator::NamedBase
   
   TESTS_PATH =                  File.join('test').freeze
   FUNCTIONAL_TESTS_PATH =       {
-    :test       => 'functional',
+    :test_unit  => 'functional',
     :shoulda    => 'functional',
     :rspec      => 'controllers'
   }
   UNIT_TESTS_PATH =  {
-    :test       => 'unit',
+    :test_unit  => 'unit',
     :shoulda    => 'unit',
     :rspec      => 'models',
   }
@@ -89,7 +88,9 @@ class DryGenerator < Rails::Generator::NamedBase
   def initialize(runtime_args, runtime_options = {})
     super(runtime_args, runtime_options)
     
-    @test_framework = options[:test_framework] || DEFAULT_TEST_FRAMEWORK
+    @test_framework = ( options[:test_framework] && options[:test_framework].to_sym ) || 
+                      [:rspec,:test_unit,:shoulda].detect{|t|options[t]} || 
+                      DEFAULT_TEST_FRAMEWORK
   end
   
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grimen-dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2009-09-14 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. Has support for Rspec, Shoulda, Formtastic, Inherited Resources, Factory Girl, Machinist, Object Daddy, Will Paginate
+description: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.
 email: grimen@gmail.com
 executables: 
 - dscaffold
@@ -101,6 +101,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
@@ -121,7 +122,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.