rails 1.2.6 → 2.0.0

data/lib/rails_generator/generators/components/scaffold/templates/controller.rb

@@ -1,58 +1,85 @@
 class <%= controller_class_name %>Controller < ApplicationController
-<% unless suffix -%>
+  # GET /<%= table_name %>
+  # GET /<%= table_name %>.xml
   def index
-    list
-    render :action => 'list'
-  end
-<% end -%>
+    @<%= table_name %> = <%= class_name %>.find(:all)
 
-<% for action in unscaffolded_actions -%>
-  def <%= action %><%= suffix %>
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @<%= table_name %> }
+    end
   end
 
-<% end -%>
-  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-  verify :method => :post, :only => [ :destroy<%= suffix %>, :create<%= suffix %>, :update<%= suffix %> ],
-         :redirect_to => { :action => :list<%= suffix %> }
+  # GET /<%= table_name %>/1
+  # GET /<%= table_name %>/1.xml
+  def show
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
 
-  def list<%= suffix %>
-    @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= plural_name %>, :per_page => 10
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @<%= file_name %> }
+    end
   end
 
-  def show<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.find(params[:id])
-  end
+  # GET /<%= table_name %>/new
+  # GET /<%= table_name %>/new.xml
+  def new
+    @<%= file_name %> = <%= class_name %>.new
 
-  def new<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.new
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @<%= file_name %> }
+    end
   end
 
-  def create<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
-    if @<%= singular_name %>.save
-      flash[:notice] = '<%= model_name %> was successfully created.'
-      redirect_to :action => 'list<%= suffix %>'
-    else
-      render :action => 'new<%= suffix %>'
-    end
+  # GET /<%= table_name %>/1/edit
+  def edit
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
   end
 
-  def edit<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.find(params[:id])
+  # POST /<%= table_name %>
+  # POST /<%= table_name %>.xml
+  def create
+    @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
+
+    respond_to do |format|
+      if @<%= file_name %>.save
+        flash[:notice] = '<%= class_name %> was successfully created.'
+        format.html { redirect_to(@<%= file_name %>) }
+        format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
+      end
+    end
   end
 
+  # PUT /<%= table_name %>/1
+  # PUT /<%= table_name %>/1.xml
   def update
-    @<%= singular_name %> = <%= model_name %>.find(params[:id])
-    if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-      flash[:notice] = '<%= model_name %> was successfully updated.'
-      redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>
-    else
-      render :action => 'edit<%= suffix %>'
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+
+    respond_to do |format|
+      if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
+        flash[:notice] = '<%= class_name %> was successfully updated.'
+        format.html { redirect_to(@<%= file_name %>) }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
+      end
     end
   end
 
-  def destroy<%= suffix %>
-    <%= model_name %>.find(params[:id]).destroy
-    redirect_to :action => 'list<%= suffix %>'
+  # DELETE /<%= table_name %>/1
+  # DELETE /<%= table_name %>/1.xml
+  def destroy
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+    @<%= file_name %>.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(<%= table_name %>_url) }
+      format.xml  { head :ok }
+    end
   end
 end

data/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb

@@ -1,102 +1,45 @@
-require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
-require '<%= controller_file_path %>_controller'
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
-# Re-raise errors caught by the controller.
-class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; 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
-
-    @first_id = <%= plural_name %>(:first).id
-  end
-
-<% for action in unscaffolded_actions -%>
-  def test_<%= action %>
-    get :<%= action %>
-    assert_response :success
-    assert_template '<%= action %>'
-  end
-
-<% end -%>
-<% unless suffix -%>
-  def test_index
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+  def test_should_get_index
     get :index
     assert_response :success
-    assert_template 'list'
+    assert_not_nil assigns(:<%= table_name %>)
   end
 
-<% end -%>
-  def test_list<%= suffix %>
-    get :list<%= suffix %>
-
+  def test_should_get_new
+    get :new
     assert_response :success
-    assert_template 'list<%= suffix %>'
-
-    assert_not_nil assigns(:<%= plural_name %>)
   end
 
-  def test_show<%= suffix %>
-    get :show<%= suffix %>, :id => @first_id
-
-    assert_response :success
-    assert_template 'show'
+  def test_should_create_<%= file_name %>
+    assert_difference('<%= class_name %>.count') do
+      post :create, :<%= file_name %> => { }
+    end
 
-    assert_not_nil assigns(:<%= singular_name %>)
-    assert assigns(:<%= singular_name %>).valid?
+    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
-  def test_new<%= suffix %>
-    get :new<%= suffix %>
-
+  def test_should_show_<%= file_name %>
+    get :show, :id => 1
     assert_response :success
-    assert_template 'new<%= suffix %>'
-
-    assert_not_nil assigns(:<%= singular_name %>)
   end
 
-  def test_create
-    num_<%= plural_name %> = <%= model_name %>.count
-
-    post :create<%= suffix %>, :<%= singular_name %> => {}
-
-    assert_response :redirect
-    assert_redirected_to :action => 'list<%= suffix %>'
-
-    assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
-  end
-
-  def test_edit<%= suffix %>
-    get :edit<%= suffix %>, :id => @first_id
-
+  def test_should_get_edit
+    get :edit, :id => 1
     assert_response :success
-    assert_template 'edit<%= suffix %>'
-
-    assert_not_nil assigns(:<%= singular_name %>)
-    assert assigns(:<%= singular_name %>).valid?
   end
 
-  def test_update<%= suffix %>
-    post :update<%= suffix %>, :id => @first_id
-    assert_response :redirect
-    assert_redirected_to :action => 'show<%= suffix %>', :id => @first_id
+  def test_should_update_<%= file_name %>
+    put :update, :id => 1, :<%= file_name %> => { }
+    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
-  def test_destroy<%= suffix %>
-    assert_nothing_raised {
-      <%= model_name %>.find(@first_id)
-    }
-
-    post :destroy, :id => @first_id
-    assert_response :redirect
-    assert_redirected_to :action => 'list<%= suffix %>'
+  def test_should_destroy_<%= file_name %>
+    assert_difference('<%= class_name %>.count', -1) do
+      delete :destroy, :id => 1
+    end
 
-    assert_raise(ActiveRecord::RecordNotFound) {
-      <%= model_name %>.find(@first_id)
-    }
+    assert_redirected_to <%= table_name %>_path
   end
 end

data/lib/rails_generator/generators/components/scaffold/templates/style.css

@@ -62,7 +62,7 @@ div.progressBar {
 
 div.progressBar div.border {
   background-color: #fff;
-  border: 1px solid grey;
+  border: 1px solid gray;
   width: 100%;
 }
 

data/lib/rails_generator/generators/components/{scaffold_resource/templates/view_edit.rhtml → scaffold/templates/view_edit.html.erb}

@@ -2,7 +2,7 @@
 
 <%%= error_messages_for :<%= singular_name %> %>
 
-<%% form_for(:<%= singular_name %>, :url => <%= singular_name %>_path(@<%= singular_name %>), :html => { :method => :put }) do |f| %>
+<%% form_for(@<%= singular_name %>) do |f| %>
 <% for attribute in attributes -%>
   <p>
     <b><%= attribute.column.human_name %></b><br />
@@ -11,9 +11,9 @@
 
 <% end -%>
   <p>
-    <%%= submit_tag "Update" %>
+    <%%= f.submit "Update" %>
   </p>
 <%% end %>
 
-<%%= link_to 'Show', <%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Show', @<%= singular_name %> %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/{scaffold_resource/templates/view_index.rhtml → scaffold/templates/view_index.html.erb}

@@ -6,19 +6,19 @@
     <th><%= attribute.column.human_name %></th>
 <% end -%>
   </tr>
-  
+
 <%% for <%= singular_name %> in @<%= plural_name %> %>
   <tr>
 <% for attribute in attributes -%>
     <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
-    <td><%%= link_to 'Show', <%= singular_name %>_path(<%= singular_name %>) %></td>
+    <td><%%= link_to 'Show', <%= singular_name %> %></td>
     <td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%%= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <%% end %>
 </table>
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>

data/lib/rails_generator/generators/components/{scaffold_resource/templates/view_new.rhtml → scaffold/templates/view_new.html.erb}

@@ -2,7 +2,7 @@
 
 <%%= error_messages_for :<%= singular_name %> %>
 
-<%% form_for(:<%= singular_name %>, :url => <%= plural_name %>_path) do |f| %>
+<%% form_for(@<%= singular_name %>) do |f| %>
 <% for attribute in attributes -%>
   <p>
     <b><%= attribute.column.human_name %></b><br />
@@ -11,8 +11,8 @@
 
 <% end -%>
   <p>
-    <%%= submit_tag "Create" %>
+    <%%= f.submit "Create" %>
   </p>
 <%% end %>
 
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/{scaffold_resource/templates/view_show.rhtml → scaffold/templates/view_show.html.erb}

@@ -7,4 +7,4 @@
 <% end -%>
 
 <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/session_migration/USAGE

@@ -1,15 +1,10 @@
 Description:
-    The session table migration generator creates a migration for adding a session table 
-    used by CGI::Session::ActiveRecordStore.
-
-    The generator takes a migration name as its argument.  The migration name may be
-    given in CamelCase or under_score.
-
-    The generator creates a migration class in db/migrate prefixed by its number
-    in the queue.
+    Creates a migration to add the sessions table used by the Active Record
+    session store. Pass the migration name, either CamelCased or under_scored,
+    as an argument.
 
 Example:
-    ./script/generate session_migration AddSessionTable
+    `./script/generate session_migration CreateSessionTable`
 
-    With 4 existing migrations, this will create an AddSessionTable migration in the
-    file db/migrate/005_add_session_table.rb
+    With 4 existing migrations, this creates the AddSessionTable migration
+    in db/migrate/005_add_session_table.rb

data/lib/rails_generator/generators/components/session_migration/templates/migration.rb

@@ -1,9 +1,9 @@
 class <%= class_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= session_table_name %> do |t|
-      t.column :session_id, :string
-      t.column :data, :text
-      t.column :updated_at, :datetime
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
     end
 
     add_index :<%= session_table_name %>, :session_id

data/lib/rails_generator/lookup.rb

@@ -46,7 +46,7 @@ module Rails
     #
     # A spec is not a generator:  it's a description of where to find
     # the generator and how to create it.  A source is anything that
-    # yields generators from #each.  PathSource and GemSource are provided.
+    # yields generators from #each.  PathSource and GemGeneratorSource are provided.
     module Lookup
       def self.included(base)
         base.extend(ClassMethods)
@@ -92,18 +92,26 @@ module Rails
         # 1.  Rails application.  If RAILS_ROOT is defined we know we're
         #     generating in the context of a Rails application, so search
         #     RAILS_ROOT/generators.
-        # 2.  User home directory.  Search ~/.rails/generators.
-        # 3.  RubyGems.  Search for gems named *_generator.
-        # 4.  Builtins.  Model, controller, mailer, scaffold.
+        # 2.  Look in plugins, either for generators/ or rails_generators/ 
+        #     directories within each plugin
+        # 3.  User home directory.  Search ~/.rails/generators.
+        # 4.  RubyGems.  Search for gems named *_generator, and look for 
+        #     generators within any RubyGem's 
+        #     /rails_generators/<generator_name>_generator.rb file.
+        # 5.  Builtins.  Model, controller, mailer, scaffold, and so on.
         def use_component_sources!
           reset_sources
           if defined? ::RAILS_ROOT
             sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
             sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
-            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators")
+            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
+            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/rails_generators")
           end
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
-          sources << GemSource.new if Object.const_defined?(:Gem)
+          if Object.const_defined?(:Gem)
+            sources << GemGeneratorSource.new
+            sources << GemPathSource.new
+          end
           sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")
         end
 
@@ -185,14 +193,15 @@ module Rails
       end
     end
 
-
-    # GemSource hits the mines to quarry for generators.  The latest versions
-    # of gems named *_generator are selected.
-    class GemSource < Source
+    class AbstractGemSource < Source
       def initialize
         super :RubyGems
       end
+    end
 
+    # GemGeneratorSource hits the mines to quarry for generators.  The latest versions
+    # of gems named *_generator are selected.
+    class GemGeneratorSource < AbstractGemSource
       # Yield latest versions of generator gems.
       def each
         Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
@@ -205,5 +214,31 @@ module Rails
       end
     end
 
+    # GemPathSource looks for generators within any RubyGem's /rails_generators/<generator_name>_generator.rb file.
+    class GemPathSource < AbstractGemSource
+      # Yield each generator within rails_generator subdirectories.
+      def each
+        generator_full_paths.each do |generator|
+          yield Spec.new(File.basename(generator).sub(/_generator.rb$/, ''), File.dirname(generator), label)
+        end
+      end
+
+      private
+        def generator_full_paths
+          @generator_full_paths ||=
+            Gem::cache.inject({}) do |latest, name_gem|
+              name, gem = name_gem
+              hem = latest[gem.name]
+              latest[gem.name] = gem if hem.nil? or gem.version > hem.version
+              latest
+            end.values.inject([]) do |mem, gem|
+              Dir[gem.full_gem_path + '/{rails_,}generators/**/*_generator.rb'].each do |generator|
+                mem << generator
+              end
+              mem
+            end
+        end
+    end
+
   end
 end