grimen-dry_scaffold 0.2.6 → 0.3.0

data/generators/dry_scaffold/prototypes/views/builder/index.rss.builder

@@ -1,18 +1,18 @@
 xml.instruct! :xml, :version => '1.0'
 xml.rss(:version => '2.0') do
   xml.channel do
-    xml.title 'Resources'
-    xml.description 'Index of all resources.'
-    xml.link resources_url(:rss)
-    xml.lastBuildDate (@resources.first.created_at rescue Time.now.utc).to_s(:rfc822)
+    xml.title 'Ducks'
+    xml.description 'Index of all ducks.'
+    xml.link ducks_url(:rss)
+    xml.lastBuildDate (@ducks.first.created_at rescue Time.now.utc).to_s(:rfc822)
     xml.language I18n.locale
     
-    @resources.each do |resource|
+    @ducks.each do |duck|
       xml.item do
         xml.title 'title'
         xml.description 'summary'
-        xml.pubDate resource.try(:created_at).to_s(:rfc822)
-        xml.link resource_url(resource, :rss)
+        xml.pubDate duck.try(:created_at).to_s(:rfc822)
+        xml.link duck_url(duck, :rss)
         
         xml.author 'author_name'
       end

data/generators/dry_scaffold/prototypes/views/haml/_item.html.haml

@@ -1,9 +1,9 @@
-- content_tag_for(:tr, resource) do
-  %td.title= h resource.try(:title)
-  %td.description= h resource.try(:description)
+- content_tag_for(:tr, duck) do
+  %td.title= h duck.try(:title)
+  %td.description= h duck.try(:description)
   %td.actions
-    = link_to 'Show', resource_url(resource)
+    = link_to 'Show', duck_url(duck)
     |
-    = link_to 'Edit', edit_resource_url(resource)
+    = link_to 'Edit', edit_duck_url(duck)
     |
-    = link_to 'Destroy', resource_url(resource), :confirm => 'Are you sure?', :method => :delete
+    = link_to 'Destroy', duck_url(duck), :confirm => 'Are you sure?', :method => :delete

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

@@ -1,10 +1,10 @@
 %h1.heading
-  = "Editing resource %s" % @resource.id
+  = "Editing duck %s" % @duck.id
   
-- semantic_form_for(@resource) do |form|
+- semantic_form_for(@duck) do |form|
   = render 'form', :form => form
   - form.buttons do
     = form.commit_button 'Update'
     
 %p.actions
-  = link_to 'Cancel', resources_url
+  = link_to 'Cancel', ducks_url

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

@@ -1,8 +1,8 @@
 %h1.heading
-  = 'Sections'
+  = 'Ducks'
   
 %p.actions
-  = link_to 'New resource', new_resource_url
+  = link_to 'New duck', new_duck_url
   
 %table
   %thead.header
@@ -11,7 +11,7 @@
       %th.description= 'Description'
       %th.actions= 'Actions'
   %tbody.items.resources
-    - @collection.each do |resource|
-      = render 'item', :resource => resource
+    - @ducks.each do |duck|
+      = render 'item', :duck => duck
       
-= will_paginate(@collection)
+= will_paginate(@ducks)

data/generators/dry_scaffold/prototypes/views/haml/layout.html.haml

@@ -1,6 +1,5 @@
 !!! 1.1
-
-%html{html_attrs(I18n.locale)}
+%html{html_attrs(I18n.locale).update(:lang => nil)}
   %head
     %title= "#{controller_class_name}: #{controller.action_name}"
     

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

@@ -1,10 +1,10 @@
 %h1.heading
-  = 'New resource'
+  = 'New duck'
   
-- semantic_form_for(@resource) do |form|
+- semantic_form_for(@duck) do |form|
   = render 'form', :form => form
   - form.buttons do
     = form.commit_button 'Create'
     
 %p.actions
-  = link_to 'Cancel', resources_url
+  = link_to 'Cancel', ducks_url

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

@@ -1,13 +1,13 @@
 %h1.heading
-  = "Resource %s" % @resource.id
+  = "Duck %s" % @duck.id
   
-- content_tag_for(:dl, @resource) do
+- content_tag_for(:dl, @duck) do
   %dt.label= 'Title'
-  %dd.title= h @resource.try(:title)
+  %dd.title= h @duck.try(:title)
   %dt.label= 'Description'
-  %dd.description= h @resource.try(:description)
+  %dd.description= h @duck.try(:description)
   
 %p.actions
-  = link_to 'Edit', edit_resource_url(@resource)
+  = link_to 'Edit', edit_duck_url(@duck)
   |
-  = link_to 'Index', resources_url
+  = link_to 'Index', ducks_url

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

@@ -105,7 +105,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     
     respond_to do |format|
       if <%= resource_instance %>.save
-        flash[:notice] = '<%= singular_name.humanize %> was successfully created.'
+        flash[:notice] = "<%= singular_name.humanize %> was successfully created."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { redirect_to(<%= resource_instance %>) }
@@ -122,7 +122,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
 <% end -%>
       else
-        #flash[:error] = '<%= singular_name.humanize %> could not be created.'
+        flash[:error] = "<%= singular_name.humanize %> could not be created."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { render 'new' }
@@ -150,6 +150,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def update
     respond_to do |format|
       if <%= resource_instance %>.update_attributes(params[:<%= singular_name %>])
+        flash[:notice] = "<%= singular_name.humanize %> was successfully updated."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { redirect_to(<%= resource_instance %>) }
@@ -162,7 +163,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
 <% end -%>
       else
-        #flash[:error] = '<%= singular_name.humanize %> could not be updated.'
+        flash[:error] = "<%= singular_name.humanize %> could not be updated."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { render 'edit' }
@@ -190,7 +191,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def destroy
     respond_to do |format|
       if <%= resource_instance %>.destroy
-        flash[:notice] = '<%= singular_name.humanize %> was successfully destroyed.'
+        flash[:notice] = "<%= singular_name.humanize %> was successfully destroyed."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { redirect_to(<%= plural_name %>_url) }
@@ -203,7 +204,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
 <% end -%>
       else
-        flash[:error] = '<%= singular_name.humanize %> could not be destroyed.'
+        flash[:error] = "<%= singular_name.humanize %> could not be destroyed."
 <% formats.each do |_format| -%>
 <% case _format when :html then -%>
         format.html { redirect_to(<%= singular_name %>_url(<%= resource_instance %>)) }
@@ -223,7 +224,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
-    # TODO: Implement action "<%= plural_name %>/<%= action.to_s %>"
+    
   end
   
 <% end -%>

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

@@ -18,7 +18,7 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
   # GET /<%= plural_name %>/<%= action.to_s %>
   def <%= action.to_s %>
-    # TODO: Implement action "<%= plural_name %>/<%= action.to_s %>"
+    
   end
   
 <% end -%>
@@ -29,7 +29,7 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
       paginate_options ||= {}
       paginate_options[:page] ||= (params[:page] || 1)
       paginate_options[:per_page] ||= (params[:per_page] || 20)
-      @<%= plural_name %> = @<%= model_plural_name %> ||= end_of_association_chain.paginate(paginate_options)
+      @collection = @<%= model_plural_name %> ||= end_of_association_chain.paginate(paginate_options)
 <% else -%>
       @collection = @<%= model_plural_name %> ||= end_of_association_chain.all
 <% end -%>

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

@@ -0,0 +1,90 @@
+require 'test_helper'
+
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  
+<% if actions.include?(:create) -%>
+  context 'create' do
+    setup do
+      <%= resource_instance %> = <%= build_object %>
+      post :create, :<%= singular_name %> => <%= resource_instance %>.attributes
+      <%= resource_instance %> = <%= class_name %>.find(:all).last
+    end
+    should_redirect_to '<%= show_path %>'
+  end
+  
+<% end -%>
+<% if actions.include?(:update) -%>
+  context 'update' do
+    setup do
+      <%= resource_instance %> = <%= build_object %>
+      put :update, :id => <%= resource_instance %>.to_param, :<%= singular_name %> => <%= resource_instance %>.attributes
+    end
+    should_redirect_to '<%= show_path %>'
+  end
+  
+<% end -%>
+<% if actions.include?(:destroy) -%>
+  context 'destroy' do
+    setup do
+      <%= resource_instance %> = <%= build_object %>
+      delete :destroy, :id => <%= resource_instance %>.to_param
+    end
+    should_redirect_to '<%= index_path %>'
+  end
+  
+<% end -%>
+<% if actions.include?(:new) -%>
+  context 'new' do
+    setup do
+      get :new
+    end
+    should_respond_with :success
+    should_render_template :new
+    should_assign_to :<%= singular_name %>
+  end
+  
+<% end -%>
+<% if actions.include?(:edit) -%>
+  context 'edit' do
+    setup do
+      <%= resource_instance %> = <%= build_object %>
+      get :edit, :id => <%= resource_instance %>.to_param
+    end
+    should_respond_with :success
+    should_render_template :edit
+    should_assign_to :<%= singular_name %>
+  end
+  
+<% end -%>
+<% if actions.include?(:show) -%>
+  context 'show' do
+    setup do
+      <%= resource_instance %> = <%= build_object %>
+      get :show, :id => <%= resource_instance %>.to_param
+    end
+    should_respond_with :success
+    should_render_template :show
+    should_assign_to :<%= singular_name %>
+  end
+  
+<% end -%>
+<% if actions.include?(:index) -%>
+  context 'index' do
+    setup do
+      get :index
+    end
+    should_respond_with :success
+    should_assign_to :<%= plural_name %>
+  end
+  
+<% end -%>
+<% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
+  context '<%= action.to_s %>' do
+    setup do
+      get :<%= action.to_s %>
+    end
+    should_respond_with :success
+  end
+  
+<% end -%>
+end

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

@@ -3,81 +3,90 @@ require 'test_helper'
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   
 <% if actions.include?(:create) -%>
-  test "create" do
+  test 'create' do
     <%= class_name %>.any_instance.expects(:save).returns(true)
-    post :create, :<%= file_name %> => { }
+    <%= resource_instance %> = <%= build_object %>
+    post :create, :<%= singular_name %> => <%= resource_instance %>.attributes
     assert_response :redirect
   end
   
-  test "create_with_failure" do
+  test 'create with failure' do
     <%= class_name %>.any_instance.expects(:save).returns(false)
-    post :create, :<%= file_name %> => { }
+    <%= resource_instance %> = <%= build_object %>
+    post :create, :<%= singular_name %> => <%= resource_instance %>.attributes
     assert_template 'new'
   end
   
+<% end -%>
+<% if actions.include?(:update) -%>
+  test 'update' do
+    <%= class_name %>.any_instance.expects(:save).returns(true)
+    <%= resource_instance %> = <%= build_object %>
+    put :update, :id => <%= build_object %>.to_param, :<%= singular_name %> => <%= resource_instance %>.attributes
+    assert_response :redirect
+  end
+  
+  test 'update with failure' do
+    <%= class_name %>.any_instance.expects(:save).returns(false)
+    <%= resource_instance %> = <%= build_object %>
+    put :update, :id => <%= build_object %>.to_param, :<%= singular_name %> => <%= resource_instance %>.attributes
+    assert_template 'edit'
+  end
+  
 <% end -%>
 <% if actions.include?(:destroy) -%>
-  test "destroy" do
+  test 'destroy' do
     <%= class_name %>.any_instance.expects(:destroy).returns(true)
-    delete :destroy, :id => <%= table_name %>(:one).to_param
+    <%= resource_instance %> = <%= build_object %>
+    delete :destroy, :id => <%= resource_instance %>.to_param
     assert_not_nil flash[:notice] 
     assert_response :redirect
   end
   
-  test "destroy_with_failure" do
+  test 'destroy with failure' do
     <%= class_name %>.any_instance.expects(:destroy).returns(false)
-    delete :destroy, :id => <%= table_name %>(:one).to_param
+    <%= resource_instance %> = <%= build_object %>
+    delete :destroy, :id => <%= resource_instance %>.to_param
     assert_not_nil flash[:error]
     assert_response :redirect
   end
   
 <% end -%>
-<% if actions.include?(:edit) -%>
-  test "edit" do
-    get :edit, :id => <%= table_name %>(:one).to_param
-    assert_response :success
-  end
-  
-<% end -%>
-<% if actions.include?(:index) -%>
-  test "index" do
-    get :index
+<% if actions.include?(:new) -%>
+  test 'new' do
+    get :new
     assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
   end
   
 <% end -%>
-<% if actions.include?(:new) -%>
-  test "new" do
-    get :new
+<% if actions.include?(:edit) -%>
+  test 'edit' do
+    <%= resource_instance %> = <%= build_object %>
+    get :edit, :id => <%= resource_instance %>.to_param
     assert_response :success
   end
   
 <% end -%>
 <% if actions.include?(:show) -%>
-  test "show" do
-    get :show, :id => <%= table_name %>(:one).to_param
+  test 'show' do
+    <%= resource_instance %> = <%= build_object %>
+    get :show, :id => <%= resource_instance %>.to_param
     assert_response :success
   end
   
 <% end -%>
-<% if actions.include?(:update) -%>
-  test "update" do
-    <%= class_name %>.any_instance.expects(:save).returns(true)
-    put :update, :id => <%= table_name %>(:one).to_param, :<%= file_name %> => { }
-    assert_response :redirect
-  end
-  
-  test "update_with_failure" do
-    <%= class_name %>.any_instance.expects(:save).returns(false)
-    put :update, :id => <%= table_name %>(:one).to_param, :<%= file_name %> => { }
-    assert_template 'edit'
+<% if actions.include?(:index) -%>
+  test 'index' do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:<%= table_name %>)
   end
   
 <% end -%>
 <% (actions - DryScaffoldGenerator::DEFAULT_CONTROLLER_ACTIONS).each do |action| -%>
-  test "<%= action.to_s %>" do
-    assert true
+  test '<%= action.to_s %>' do
+    get :<%= action.to_s %>
+    assert_response :success
   end
   
 <% end -%>

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

@@ -0,0 +1,9 @@
+require 'test_helper'
+ 
+class <%= controller_class_name %>HelperTest < ActionView::TestCase
+  
+  should 'test something' do
+    assert true
+  end
+  
+end

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

@@ -2,4 +2,8 @@ require 'test_helper'
  
 class <%= controller_class_name %>HelperTest < ActionView::TestCase
   
+  test 'something' do
+    assert true
+  end
+  
 end

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

@@ -3,8 +3,8 @@
   %td.<%= attribute.name %>= h <%= singular_name %>.try(:<%= attribute.name %>)
 <% end -%>
   %td.actions
-    = link_to 'Show', <%= show_link(singular_name) %>
+    = link_to 'Show', <%= show_path(singular_name) %>
     |
-    = link_to 'Edit', <%= edit_link(singular_name) %>
+    = link_to 'Edit', <%= edit_path(singular_name) %>
     |
-    = link_to 'Destroy', <%= destroy_link(singular_name) %>, :confirm => 'Are you sure?', :method => :delete
+    = link_to 'Destroy', <%= destroy_path(singular_name) %>, :confirm => 'Are you sure?', :method => :delete