dry_scaffold 0.3.7 → 0.3.8

data/TODO.textile

@@ -9,28 +9,3 @@ h2. Maybe
 
 * Feature: Handle belongs_to, i.e. specify MODEL --belongs-to PARENT_MODEL, which generates proper routes, proper before-filters if inherited_resources-controller, adding belongs_to-association in model, and correct form_for arguments.
 * Feature: Builder for podcast-feed, similar to RSS/Atom-builders. http://wiki.github.com/radiant/radiant/host-a-podcast
-
-h2. Issues
-
-* Contact José regarding the InheritedResources-issue:
-
-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'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/base_helpers.rb:311:in `parse_redirect_url'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/base.rb:79:in `create'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/respond_to.rb:301:in `call'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/respond_to.rb:301:in `respond_any'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/respond_to.rb:233:in `respond_to'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/base_helpers.rb:283:in `respond_to_with_dual_blocks'
-/opt/local/lib/ruby/gems/1.8/gems/josevalim-inherited_resources-0.7.3/lib/inherited_resources/base.rb:78:in `create'
-    haml (2.0.9) rails/./lib/sass/plugin/rails.rb:19:in `process'
-    /test/functional/donkeys_controller_test.rb:8:in `test_create'
-    
-  test 'create' do
-    Donkey.any_instance.expects(:save).returns(true)
-    @donkey = donkeys(:basic)
-    post :create, :donkey => @donkey.attributes   # <<<<<<<<<<<<< donkeys_controller_test.rb:8
-    assert_response :redirect
-  end

data/generators/dry_model/templates/models/fixture_data/factory_girl_factories.rb

@@ -1,5 +1,5 @@
 Factory.define :<%= singular_name %>, :class => <%= class_name %> do |f|
 <% attributes.each do |attribute| -%>
-  f.<%= attribute.name %> "<%= attribute.default_for_factory %>"
+  f.<%= attribute.name %> <%= attribute.default_for_factory %>
 <% end -%>
 end

data/generators/dry_scaffold/dry_scaffold_generator.rb

@@ -226,11 +226,11 @@ class DryScaffoldGenerator < DryGenerator
   ### Link Helpers.
   
   def collection_instance
-    "@#{collection_name}"
+    options[:resourceful] ? "#{collection_name}" : "@#{collection_name}"
   end
   
   def resource_instance
-    "@#{singular_name}"
+    options[:resourceful] ? "#{singular_name}" : "@#{singular_name}"
   end
   
   def index_path

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

@@ -9,7 +9,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
       post :create, :<%= singular_name %> => <%= resource_instance %>.attributes
       <%= resource_instance %> = <%= class_name %>.find(:all).last
     end
-    should_redirect_to '<%= show_path %>'
+    should_redirect_to("the <%= resource_instance %>'s show page") { <%= show_path %> }
   end
   
 <% end -%>
@@ -19,7 +19,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
       <%= resource_instance %> = <%= build_object %>
       put :update, :id => <%= resource_instance %>.to_param, :<%= singular_name %> => <%= resource_instance %>.attributes
     end
-    should_redirect_to '<%= show_path %>'
+    should_redirect_to("the <%= resource_instance %>'s show page") { <%= show_path %> }
   end
   
 <% end -%>
@@ -29,7 +29,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
       <%= resource_instance %> = <%= build_object %>
       delete :destroy, :id => <%= resource_instance %>.to_param
     end
-    should_redirect_to '<%= index_path %>'
+    should_redirect_to("the <%= resource_instance %>'s index page") { <%= index_path %> }
   end
   
 <% end -%>

data/generators/dry_scaffold/templates/views/haml/edit.html.haml

@@ -1,5 +1,5 @@
 %h1.heading
-  = "Editing <%= singular_name %> %s" % <%= resource_instance %>.id
+  = "Editing <%= model_singular_name %> %s" % <%= resource_instance %>.id
   
 <% if options[:formtastic] -%>
 - semantic_form_for(<%= resource_instance %>) do |form|
@@ -15,4 +15,4 @@
 <% end -%>
     
 %p.actions
-  = link_to 'Cancel', <%= index_path %>
+  = link_to 'Cancel', <%= index_path %>

data/generators/dry_scaffold/templates/views/haml/index.html.haml

@@ -1,8 +1,8 @@
 %h1.heading
-  = "<%= plural_name.humanize %>"
+  = "<%= model_plural_name.humanize %>"
   
 %p.actions
-  = link_to 'New <%= singular_name.humanize %>', <%= new_path %>
+  = link_to 'New <%= model_singular_name.humanize %>', <%= new_path %>
   
 %table
   %thead.header
@@ -17,4 +17,4 @@
       
 <% if options[:pagination] -%>
 = will_paginate(<%= collection_instance %>)
-<% end -%>
+<% end -%>

data/generators/dry_scaffold/templates/views/haml/new.html.haml

@@ -1,5 +1,5 @@
 %h1.heading
-  = 'New <%= singular_name.humanize %>'
+  = 'New <%= model_singular_name.humanize %>'
   
 <% if options[:formtastic] -%>
 - semantic_form_for(<%= resource_instance %>) do |form|
@@ -15,4 +15,4 @@
 <% end -%>
     
 %p.actions
-  = link_to 'Cancel', <%= index_path %>
+  = link_to 'Cancel', <%= index_path %>

data/generators/dry_scaffold/templates/views/haml/show.html.haml

@@ -1,5 +1,5 @@
 %h1.heading
-  = "<%= singular_name.humanize %> %s" % <%= resource_instance %>.id
+  = "<%= model_singular_name.humanize %> %s" % <%= resource_instance %>.id
   
 - content_tag_for(:dl, <%= resource_instance %>) do
 <% attributes.each do |attribute| -%>
@@ -10,4 +10,4 @@
 %p.actions
   = link_to 'Edit', <%= edit_path %>
   |
-  = link_to 'Index', <%= index_path %>
+  = link_to 'Index', <%= index_path %>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dry_scaffold
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 +01:00
+date: 2010-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.
 email: grimen@gmail.com
 executables: 
@@ -121,18 +128,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A DRYer scaffold generator for Rails. Generates dry semantic and standards compliant views, and dry RESTful controllers.