trestle_generator 1.0.2 → 1.1.0

data/USAGE

@@ -4,17 +4,17 @@ Description:
     model does not exist, it creates the model as well. The generated code is
     equivalent to the "scaffold :model" declaration, making it easy to migrate
     when you wish to customize your controller and views.
-    
+
     The generator takes a model name, an optional controller name, and a
     list of views as arguments. Trestle actions and views are created
     automatically. Any views left over generate empty stubs.
-    
+
     The trestle actions are:
-        index, new, edit, destroy
-    
+        list, new, show, edit, destroy
+
     The trestle views are:
-        _index_without_id, _index_with_id, new, edit
-    
+        list, new, show, edit
+
     If a controller name is not given, the plural form of the model name
     will be used. The model and controller names may be given in CamelCase
     or under_score and should not be suffixed with 'Model' or 'Controller'.
@@ -23,13 +23,13 @@ Description:
 
 Example:
     ./script/generate trestle Account Bank debit credit
-    
+
     This will generate an Account model and BankController with a full test
     suite and a basic user interface. Now create the accounts table in your
     database and browse to http://localhost/bank/ -- voila, you're on Rails!
 
 Modules Example:
     ./script/generate trestle CreditCard 'admin/credit_card' suspend late_fee
-    
+
     This will generate a CreditCard model and CreditCardController controller
     in the admin module.

data/templates/controller.rb

@@ -1,56 +1,54 @@
 class <%= controller_class_name %>Controller < ApplicationController
-  verify :only => [ 'destroy<%= suffix %>', 'edit<%= suffix %>' ],
+  verify :only => [ 'show<%= suffix %>', 'edit<%= suffix %>', 'destroy<%= suffix %>' ],
          :params => :id,
          :add_flash => { :notice => 'Missing <%= singular_name %> ID.' },
-         :redirect_to => { :action => '<%= suffix || 'index' %>' }
-  
+         :redirect_to => { :action => 'list<%= suffix %>' }
+
 <% for action in nontrestle_actions -%>
   def <%= action %><%= suffix %>
   end
-  
+
 <% end -%>
   def destroy<%= suffix %>
     if request.post?
       <%= model_name %>.find(params[:id]).destroy
       flash[:notice] = 'The <%= singular_name %> was successfully destroyed.'
-      redirect_to :action => '<%= suffix || 'index' %>'
+      redirect_to :action => 'list<%= suffix %>'
     else
       flash[:notice] = 'Click Destroy to destroy the <%= singular_name %>.'
       redirect_to :action => 'edit<%= suffix %>', :id => params[:id]
     end
   end
-  
+
   def edit<%= suffix %>
     if request.post?
       @<%= singular_name %> = <%= model_name %>.find(params[:id])
       if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
         flash[:notice] = 'The <%= singular_name %> was successfully edited.'
-        redirect_to :action => '<%= suffix || 'index' %>', :id => @<%= singular_name %>
+        redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>
       end
     else
       @<%= singular_name %> = <%= model_name %>.find(params[:id])
     end
   end
-  
-  def <%= suffix || 'index' %>
-    if params[:id]
-      @<%= singular_name %> = <%= model_name %>.find(params[:id])
-      render '<%= plural_name %>/_<%= suffix || 'index' %>_with_id'
-    else
-      @<%= singular_name %>_pages, @<%= plural_name %> = paginate(:<%= plural_name %>)
-      render '<%= plural_name %>/_<%= suffix || 'index' %>_without_id'
-    end
+
+  def list<%= suffix %>
+    @<%= singular_name %>_pages, @<%= plural_name %> = paginate(:<%= plural_name %>)
   end
-  
+
   def new<%= suffix %>
     if request.post?
       @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
       if @<%= singular_name %>.save
         flash[:notice] = 'A new <%= singular_name %> was successfully added.'
-        redirect_to :action => '<%= suffix || 'index' %>'
+        redirect_to :action => 'list<%= suffix %>'
       end
     else
       @<%= singular_name %> = <%= model_name %>.new
     end
   end
+
+  def show<%= suffix %>
+    @<%= singular_name %> = <%= model_name %>.find(params[:id])
+  end
 end

data/templates/functional_test.rb

@@ -6,99 +6,93 @@ class <%= controller_class_name %>Controller; def rescue_action(e) raise e end;
 
 class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   fixtures :<%= table_name %>
-  
+
   def setup
     @controller = <%= controller_class_name %>Controller.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
-  
+
 <% for action in nontrestle_actions -%>
   def test_<%= action %>
     get '<%= action %>'
     assert_response :success
     assert_template '<%= action %>'
   end
-  
+
 <% end -%>
-  def test_<%= suffix || 'index' %>
-    get '<%= suffix || 'index' %>'
-    assert_response :success
-    assert_template '<%= plural_name %>/_<%= suffix || 'index' %>_without_id'
-  end
-  
   def test_destroy<%= suffix %>_using_get
     assert_not_nil <%= model_name %>.find(1)
-    
+
     get 'destroy<%= suffix %>', :id => 1
     assert_response :redirect
     assert_redirected_to :action => 'edit<%= suffix %>'
-    
+
     assert_not_nil <%= model_name %>.find(1)
   end
-  
+
   def test_destroy<%= suffix %>_using_post
     assert_not_nil <%= model_name %>.find(1)
-    
+
     post 'destroy<%= suffix %>', :id => 1
     assert_response :redirect
-    assert_redirected_to :action => '<%= suffix || 'index' %>'
-    
+    assert_redirected_to :action => 'list<%= suffix %>'
+
     assert_raise(ActiveRecord::RecordNotFound) { <%= model_name %>.find(1) }
   end
-  
+
   def test_edit<%= suffix %>_using_get
     get 'edit<%= suffix %>', :id => 1
-    
+
     assert_response :success
     assert_template 'edit<%= suffix %>'
-    
+
     assert_not_nil assigns(:<%= singular_name %>)
     assert assigns(:<%= singular_name %>).valid?
   end
-  
+
   def test_edit<%= suffix %>_using_post
     post 'edit<%= suffix %>', :id => 1
     assert_response :redirect
-    assert_redirected_to :action => '<%= suffix || 'index' %>', :id => 1
+    assert_redirected_to :action => 'show<%= suffix %>', :id => 1
   end
-  
-  def test_<%= suffix || 'index' %>_without_id
-    get '<%= suffix || 'index' %>'
-    
+
+  def test_list<%= suffix %>
+    get 'list<%= suffix %>'
+
     assert_response :success
-    assert_template '<%= plural_name %>/_<%= suffix || 'index' %>_without_id'
-    
+    assert_template '<%= plural_name %>/list<%= suffix %>'
+
     assert_not_nil assigns(:<%= plural_name %>)
   end
-  
-  def test_<%= suffix || 'index' %>_with_id
-    get '<%= suffix || 'index' %>', :id => 1
-    
-    assert_response :success
-    assert_template '<%= plural_name %>/_<%= suffix || 'index' %>_with_id'
-    
-    assert_not_nil assigns(:<%= singular_name %>)
-    assert assigns(:<%= singular_name %>).valid?
-  end
-  
+
   def test_new<%= suffix %>_using_get
     get 'new<%= suffix %>'
-    
+
     assert_response :success
     assert_template 'new<%= suffix %>'
-    
+
     assert_not_nil assigns(:<%= singular_name %>)
   end
-  
+
   def test_new<%= suffix %>_using_post
     num_<%= plural_name %> = <%= model_name %>.count
-    
+
     post 'new<%= suffix %>', :<%= singular_name %> => {}
-    
+
     assert_response :redirect
-    assert_redirected_to :action => '<%= suffix || 'index' %>'
-    
+    assert_redirected_to :action => 'list<%= suffix %>'
+
     assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
   end
+
+  def test_show<%= suffix %>
+    get 'show<%= suffix %>', :id => 1
+
+    assert_response :success
+    assert_template '<%= plural_name %>/show<%= suffix %>'
+
+    assert_not_nil assigns(:<%= singular_name %>)
+    assert assigns(:<%= singular_name %>).valid?
+  end
 end

data/templates/routes.rb

@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   # Add your own custom routes here.
   # The priority is based upon order of creation: first created -> highest priority.
-  
+
   # Here's a sample route:
   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
@@ -15,7 +15,12 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # Install the default route as the lowest priority.
-  map.connect ':controller/:action', :action => 'index', :requirements => { :action => /[^\d]+/ }
-  map.connect ':controller/:id', :action => 'index', :requirements => { :id => /[\d]+/ }
-  map.connect ':controller/:id/:action'
+  ID_REQUIREMENT     = /[\d]+/
+  ACTION_REQUIREMENT = /[A-Za-z]\S*/
+  map.connect ':controller/:action', :action => 'list<%= suffix %>',
+                                     :requirements => { :action => ACTION_REQUIREMENT }
+  map.connect ':controller/:id', :action => 'show<%= suffix %>',
+                                 :requirements => { :id => ID_REQUIREMENT }
+  map.connect ':controller/:id/:action', :requirements => { :id     => ID_REQUIREMENT,
+                                                            :action => ACTION_REQUIREMENT }
 end

data/templates/view_edit.rhtml

@@ -6,5 +6,5 @@
 <%%= end_form_tag %>
 <%%= button_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => @<%= singular_name %> }, :confirm => 'Are you sure you want to destroy this <%= singular_name %>?' %>
 
-<%%= link_to 'Show', :action => '<%= suffix || 'index' %>', :id => @<%= singular_name %> %> |
-<%%= link_to 'Back to list', :action => '<%= suffix || 'index' %>' %>
+<%%= link_to 'Show', :action => 'show<%= suffix %>', :id => @<%= singular_name %> %> |
+<%%= link_to 'Back to list', :action => 'list<%= suffix %>' %>

data/templates/{view__index_without_id.rhtml → view_list.rhtml}

@@ -12,7 +12,7 @@
   <%% for column in <%= model_name %>.content_columns %>
     <td><%%=h <%= singular_name %>.send(column.name) %></td>
   <%% end %>
-    <td><%%= link_to 'Show', :action => '<%= suffix || 'index' %>', :id => <%= singular_name %> %></td>
+    <td><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %></td>
     <td><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %></td>
     <td><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :post => true, :confirm => 'Are you sure you want to destroy this <%= singular_name %>?' %>
   </tr>

data/templates/view_new.rhtml

@@ -5,4 +5,4 @@
   <%%= submit_tag 'Save' %>
 <%%= end_form_tag %>
 
-<%%= link_to 'Back to list', :action => '<%= suffix || 'index' %>' %>
+<%%= link_to 'Back to list', :action => 'list<%= suffix %>' %>

data/templates/{view__index_with_id.rhtml → view_show.rhtml}

@@ -5,4 +5,4 @@
 <%% end %>
 
 <%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => @<%= singular_name %> %> |
-<%%= link_to 'Back to list', :action => '<%= suffix || 'index' %>' %>
+<%%= link_to 'Back to list', :action => 'list<%= suffix %>' %>

data/trestle_generator.rb

@@ -1,12 +1,12 @@
 class TrestleSandbox
   include ActionView::Helpers::ActiveRecordHelper
-  
+
   attr_accessor :form_action, :singular_name, :suffix, :model_instance
-  
+
   def sandbox_binding
     binding
   end
-  
+
   def default_input_block
     Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br/>\n#{input(record, column.name)}</p>\n" }
   end
@@ -17,15 +17,15 @@ class ActionView::Helpers::InstanceTag
     field_meth = "#{field_type}_field"
     "<%= #{field_meth} '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+options.inspect} %>"
   end
-  
+
   def to_text_area_tag(options = {})
     "<%= text_area '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
   end
-  
+
   def to_date_select_tag(options = {})
     "<%= date_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
   end
-  
+
   def to_datetime_select_tag(options = {})
     "<%= datetime_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
   end
@@ -45,36 +45,36 @@ class TrestleGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    
+
     # Take controller name from the next argument. Default to the pluralized model name.
     @controller_name = args.shift
     @controller_name ||= ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
-    
+
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
     @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
-    
+
     if @controller_class_nesting.empty?
       @controller_class_name = @controller_class_name_without_nesting
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
   end
-  
+
   def manifest
     record do |m|
       # Check for class naming collisions.
       m.class_collisions controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper"
-      
+
       # Controller, helper, views, test, and config directories.
       m.directory File.join('app/controllers', controller_class_path)
       m.directory File.join('app/helpers', controller_class_path)
       m.directory File.join('app/views', controller_class_path, controller_file_name)
       m.directory File.join('test/functional', controller_class_path)
       m.directory File.join('config', controller_class_path)
-      
+
       # Depend on model generator but skip if the model exists.
       m.dependency 'model', [singular_name], :collision => :skip
-      
+
       # Trestle forms.
       m.complex_template "form.rhtml",
         File.join('app/views',
@@ -86,7 +86,7 @@ class TrestleGenerator < Rails::Generator::NamedBase
         :begin_mark => 'form',
         :end_mark => 'eoform',
         :mark_id => singular_name
-      
+
       # Trestle views.
       trestle_views.each do |action|
         m.template "view_#{action}.rhtml",
@@ -96,28 +96,28 @@ class TrestleGenerator < Rails::Generator::NamedBase
                              "#{action}.rhtml"),
                    :assigns => { :action => action }
       end
-      
+
       # Controller class, functional test, helper, and views.
       m.template 'controller.rb',
                   File.join('app/controllers',
                             controller_class_path,
                             "#{controller_file_name}_controller.rb")
-      
+
       m.template 'functional_test.rb',
                   File.join('test/functional',
                             controller_class_path,
                             "#{controller_file_name}_controller_test.rb")
-      
+
       m.template 'helper.rb',
                   File.join('app/helpers',
                             controller_class_path,
                             "#{controller_file_name}_helper.rb")
-      
+
       # Layout and stylesheet.
       m.template 'layout.rhtml',  "app/views/layouts/#{controller_file_name}.rhtml"
       m.template 'style.css',     'public/stylesheets/trestle.css'
-      
-      
+
+
       # Non-trestle views.
       nontrestle_actions.each do |action|
         path = File.join('app/views',
@@ -127,40 +127,40 @@ class TrestleGenerator < Rails::Generator::NamedBase
         m.template "controller:view.rhtml", path,
                    :assigns => { :action => action, :path => path}
       end
-      
+
       # Routes.
       m.template 'routes.rb', 'config/routes.rb'
     end
   end
-  
-  
+
+
   protected
-  
+
   # Override with your own usage banner.
   def banner
     "Usage: #{$0} trestle ModelName [ControllerName] [action, ...]"
   end
-  
+
   def trestle_views
-    %w(edit _index_without_id _index_with_id new)
+    %w(edit list new show)
   end
-  
+
   def trestle_actions
-    %w(destroy edit index new)
+    %w(destroy edit list new show)
   end
-  
+
   def model_name 
     class_name.demodulize
   end
-  
+
   def nontrestle_actions
     args - trestle_actions
   end
-  
+
   def suffix
     "_#{singular_name}" if options[:suffix]
   end
-  
+
   def create_sandbox
     sandbox = TrestleSandbox.new
     sandbox.singular_name = singular_name
@@ -174,7 +174,7 @@ class TrestleGenerator < Rails::Generator::NamedBase
     sandbox.suffix = suffix
     sandbox
   end
-  
+
   def model_instance
     base = class_nesting.split('::').inject(Object) do |base, nested|
       break base.const_get(nested) if base.const_defined?(nested)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: trestle_generator
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2006-01-27
+  version: 1.1.0
+date: 2006-03-14
 summary: "[Rails] A drop-in replacement for the scaffold generator that produces
   production-ready controllers that are safe from state-changing HTTP GET requests
   and that have streamlined URLs."
@@ -21,11 +21,11 @@ description: "Don
   the HTTP POST method for actions that change data. Well-behaved web applications
   protect themselves against errant HTTP GET requests such as come from Google Web
   Accelerator and the like. Scaffolded controllers fail to do this.  USABILITY 
-  Trestle controllers have just four actions (index, new, edit, and destroy). The
-  scaffold generator produces controllers that have eight actions. Fewer actions
-  exposed to the outside world is better if the behavior of these actions is in
-  line with the semantics of HTTP GET and HTTP POST. The net effect of this design
-  improvement is that you will not have to throw away or tweak as much
+  Trestle controllers have just five actions (list, new, show, edit, and destroy).
+  The scaffold generator produces controllers that have eight actions. Fewer
+  actions exposed to the outside world is better if the behavior of these actions
+  is in line with the semantics of HTTP GET and HTTP POST. The net effect of this
+  design improvement is that you will not have to throw away or tweak as much
   trestle-generated code as you do scaffold-generated code. Less work for you
   means your application gets built sooner. Tobias L�tke�s postback_generator
   RubyGem had the same idea, but trestle goes further.  A scaffold for a database
@@ -42,7 +42,7 @@ description: "Don
   from request parameters  /people/99 - GET or POST shows the person record having
   ID 99  /people/99/edit - GET shows a person form for the person record having ID
   99  /people/99/edit - POST updates the person record having ID 99 using request
-  parameters /people/99/destroy - GET redirects to /people/99/edit with a notice
+  parameters  /people/99/destroy - GET redirects to /people/99/edit with a notice
   that the user must click the form�s Destroy button in order to destroy a record 
   /people/99/destroy - POST deletes the person record having ID 99 after prompting
   the user for confirmation  Notice the hierarchical nature of trestle URLs.
@@ -79,9 +79,9 @@ files:
   - templates/routes.rb
   - templates/style.css
   - templates/view_edit.rhtml
+  - templates/view_list.rhtml
   - templates/view_new.rhtml
-  - templates/view__index_without_id.rhtml
-  - templates/view__index_with_id.rhtml
+  - templates/view_show.rhtml
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []