0
@@ -12,28 +12,26 @@
0
       class_name            = options[:class_name] || singular_name.camelize
0
       plural_name           = singular_name.pluralize
0
       will_paginate_index   = options[:will_paginate] || false
0
-      url_string            = "#{singular_name}_url(@#{singular_name})"
0
-      list_url_string       = "#{plural_name}_url"
0
-      finder_base           = class_name
0
+      resource_url          = "#{singular_name}_url(@#{singular_name})"
0
+      collection_url        = "#{plural_name}_url"
0
+      resource_url          = options[:path_prefix] + resource_url unless options[:path_prefix].nil?
0
+      collection_url        = options[:path_prefix] + collection_url unless options[:path_prefix].nil?
0
       
0
       class_inheritable_accessor :resource_this_finder_options
0
       self.resource_this_finder_options = options[:finder_options] || {}
0
       
0
       unless options[:nested].nil?
0
-        nested              = options[:nested].to_s.singularize
0
-        nested_class        = nested.camelize
0
-        url_string          = "#{nested}_#{singular_name}_url(" + [nested, singular_name].map { |route| "@#{route}"}.join(', ') + ')'
0
-        list_url_string     = "#{nested}_#{plural_name}_url(@#{nested})"
0
-        finder_base         = "@#{nested}.#{plural_name}"
0
+        nested                = options[:nested].to_s.singularize
0
+        nested_class          = nested.camelize
0
+        nested_resource_url   = "#{nested}_#{singular_name}_url(" + [nested, singular_name].map { |route| "@#{route}"}.join(', ') + ')'
0
+        nested_collection_url = "#{nested}_#{plural_name}_url(@#{nested})"
0
+        nested_resource_url   = options[:path_prefix] + nested_resource_url unless options[:path_prefix].nil?
0
+        nested_collection_url = options[:path_prefix] + nested_collection_url unless options[:path_prefix].nil?
0
         module_eval <<-"end_eval", __FILE__, __LINE__
0
           before_filter :load_#{nested}
0
         end_eval
0
       end
0
-      
0
-      #process path_prefix
0
-      url_string            = options[:path_prefix] + url_string unless options[:path_prefix].nil?
0
-      list_url_string       = options[:path_prefix] + list_url_string unless options[:path_prefix].nil?
0
-      
0
+
0
       #standard before_filters
0
       module_eval <<-"end_eval", __FILE__, __LINE__
0
         before_filter :load_#{singular_name}, :only => [ :show, :edit, :update, :destroy ]
0
0
0
0
0
0
0
0
0
@@ -42,29 +40,69 @@
0
         before_filter :create_#{singular_name}, :only => [ :create ]
0
         before_filter :update_#{singular_name}, :only => [ :update ]
0
         before_filter :destroy_#{singular_name}, :only => [ :destroy ]
0
+      
0
       protected
0
+      
0
+        def finder_options
0
+          resource_this_finder_options.class == Proc ? resource_this_finder_options.call : {}
0
+        end
0
+      
0
       end_eval
0
       
0
-      unless options[:nested].nil?
0
+      if options[:nested].nil?
0
         module_eval <<-"end_eval", __FILE__, __LINE__
0
+          def finder_base
0
+            #{class_name}
0
+          end
0
+          
0
+          def collection
0
+            #{class_name}.find(:all, finder_options)
0
+          end
0
+          
0
+          def collection_url
0
+            #{collection_url}
0
+          end
0
+
0
+          def resource_url
0
+            #{resource_url}
0
+          end
0
+        end_eval
0
+      else
0
+        module_eval <<-"end_eval", __FILE__, __LINE__
0
           def load_#{nested}
0
-            @#{nested} = #{nested_class}.find(params[:#{nested}_id])
0
+            @#{nested} = #{nested_class}.find(params[:#{nested}_id]) rescue nil
0
           end
0
+          
0
+          def finder_base
0
+            @#{nested}.nil? ? #{class_name} : @#{nested}.#{plural_name}
0
+          end
0
+          
0
+          def collection
0
+            @#{nested}.nil? ? #{class_name}.find(:all, finder_options) : @#{nested}.#{plural_name}.find(:all, finder_options)
0
+          end
0
+          
0
+          def collection_url
0
+            @#{nested}.nil? ? #{collection_url} : #{nested_collection_url}
0
+          end
0
+
0
+          def resource_url
0
+            @#{nested}.nil? ? #{resource_url} : #{nested_resource_url}
0
+          end
0
         end_eval
0
       end
0
       
0
       module_eval <<-"end_eval", __FILE__, __LINE__
0
         def load_#{singular_name}
0
-          @#{singular_name} = #{finder_base}.find(params[:id])
0
+          @#{singular_name} = finder_base.find(params[:id])
0
         end
0
         
0
         def new_#{singular_name}
0
-          @#{singular_name} = #{finder_base}.new
0
+          @#{singular_name} = finder_base.new
0
         end
0
         
0
         def create_#{singular_name}
0
           returning true do
0
-            @#{singular_name} = #{finder_base}.new(params[:#{singular_name}])
0
+            @#{singular_name} = finder_base.new(params[:#{singular_name}])
0
             @created = @#{singular_name}.save
0
           end
0
         end
0
0
0
@@ -80,19 +118,16 @@
0
         end
0
       end_eval
0
             
0
-      #TODO: add sorting customizable by subclassed controllers      
0
       if will_paginate_index
0
         module_eval <<-"end_eval", __FILE__, __LINE__
0
           def load_#{plural_name}
0
-            finder_options = resource_this_finder_options.class == Proc ? resource_this_finder_options.call : resource_this_finder_options
0
-            @#{plural_name} = #{finder_base}.paginate(finder_options.merge(:page => params[:page]))
0
+            @#{plural_name} = finder_base.paginate(finder_options.merge(:page => params[:page]))
0
           end
0
         end_eval
0
       else
0
         module_eval <<-"end_eval", __FILE__, __LINE__
0
           def load_#{plural_name}
0
-            finder_options = resource_this_finder_options.class == Proc ? resource_this_finder_options.call : resource_this_finder_options
0
-            @#{plural_name} = #{finder_base}.find(:all, finder_options)
0
+            @#{plural_name} = collection
0
           end
0
         end_eval
0
       end
0
@@ -127,8 +162,8 @@
0
           respond_to do |format|
0
             if @created
0
               flash[:notice] = '#{class_name} was successfully created.'
0
-              format.html { redirect_to #{url_string} }
0
-              format.xml  { render :xml => @#{singular_name}, :status => :created, :location => #{url_string} }
0
+              format.html { redirect_to(resource_url) }
0
+              format.xml  { render :xml => @#{singular_name}, :status => :created, :location => resource_url }
0
               format.js
0
             else
0
               format.html { render :action => :edit }
0
@@ -149,7 +184,7 @@
0
           respond_to do |format|
0
             if @updated
0
               flash[:notice] = '#{class_name} was successfully updated.'
0
-              format.html { redirect_to #{url_string} }
0
+              format.html { redirect_to(resource_url) }
0
               format.xml  { head :ok }
0
               format.js
0
             else
0
@@ -162,7 +197,7 @@
0
 
0
         def destroy          
0
           respond_to do |format|
0
-            format.html { redirect_to #{list_url_string} }
0
+            format.html { redirect_to(collection_url) }
0
             format.xml  { head :ok }
0
             format.js
0
           end

0
@@ -7,11 +7,14 @@
0
     @request.accept = 'application/xml'  
0
     @response   = ActionController::TestResponse.new
0
     @first = Post.create(:title => "test", :body => "test")
0
+    @second = Post.create(:title => "test2", :body => "test2")
0
     @first_comment = Comment.create(:post => @first, :body => "test")
0
+    @second_comment = Comment.create(:post => @second, :body => "test")
0
     ActionController::Routing::Routes.draw do |map|  
0
       map.resources :posts do |post|
0
         post.resources :comments
0
       end
0
+      map.resources :comments
0
     end
0
   end
0
   
0
0
@@ -23,10 +26,17 @@
0
   def test_should_get_index
0
     get :index, :post_id => @first.id
0
     assert_response :success
0
-    assert assigns(:comments)
0
-    assert assigns(:post)
0
+    assert_equal @first.comments, assigns(:comments)
0
+    assert_equal @first, assigns(:post)
0
   end
0
 
0
+  def test_should_get_index_without_post
0
+    get :index
0
+    assert_response :success
0
+    assert assigns(:post).nil?
0
+    assert_equal Comment.find(:all), assigns(:comments)
0
+  end
0
+
0
   def test_should_get_new
0
     get :new, :post_id => @first.id
0
     assert_response :success
0
0
@@ -34,9 +44,16 @@
0
     assert assigns(:post)
0
   end
0
 
0
+  def test_should_get_new_without_post
0
+    get :new
0
+    assert_response :success
0
+    assert assigns(:post).nil?
0
+    assert assigns(:comment)
0
+  end
0
+
0
   def test_should_create_comment
0
     assert_difference('Comment.count') do
0
-      post :create, :post_id => @first.id, :post => { :body => "test" }
0
+      post :create, :post_id => @first.id, :comment => { :body => "test" }
0
     end
0
     assert_response :created
0
     assert assigns(:comment)
0
0
@@ -46,11 +63,19 @@
0
   def test_should_create_comment_html
0
     @request.accept = 'text/html'
0
     assert_difference('Comment.count') do
0
-      post :create, :post_id => @first.id, :post => { :body => "test" }
0
+      post :create, :post_id => @first.id, :comment => { :body => "test" }
0
     end
0
     assert_redirected_to "posts/#{assigns(:post).id}/comments/#{assigns(:comment).id}"
0
   end
0
 
0
+  def test_should_create_comment_html_without_post
0
+    @request.accept = 'text/html'
0
+    assert_difference('Comment.count') do
0
+      post :create, :comment => { :body => "test" }
0
+    end
0
+    assert_redirected_to "/comments/#{assigns(:comment).id}"
0
+  end
0
+
0
   def test_should_show_comment
0
     get :show, :post_id => @first.id, :id => @first_comment.id
0
     assert_response :success
0
@@ -58,6 +83,13 @@
0
     assert assigns(:post)
0
   end
0
 
0
+  def test_should_show_comment_without_post
0
+    get :show, :id => @first_comment.id
0
+    assert_response :success
0
+    assert_equal Comment.find(@first_comment.id), assigns(:comment)
0
+    assert assigns(:post).nil?
0
+  end
0
+
0
   def test_should_update_comment
0
     put :update, :post_id => @first.id, :id => @first_comment.id, :comment => { :post => @first, :body => "test" }
0
     assert_response :success
0
@@ -71,6 +103,12 @@
0
     assert_redirected_to "posts/#{assigns(:post).id}/comments/#{assigns(:comment).id}"
0
   end
0
 
0
+  def test_should_update_comment_html_without_post
0
+    @request.accept = 'text/html'
0
+    put :update, :id => @first_comment.id, :comment => { :post => @first, :body => "test2" }
0
+    assert_redirected_to "/comments/#{assigns(:comment).id}"
0
+  end
0
+
0
   def test_should_destroy_comment
0
     assert_difference('Comment.count', -1) do
0
       delete :destroy, :post_id => @first.id, :id => @first_comment.id
0
@@ -84,6 +122,14 @@
0
       delete :destroy, :post_id => @first.id, :id => @first_comment.id
0
     end
0
     assert_redirected_to "posts/#{assigns(:post).id}/comments"
0
+  end
0
+
0
+  def test_should_destroy_html_without_post
0
+    @request.accept = 'text/html'
0
+    assert_difference('Comment.count', -1) do
0
+      delete :destroy, :id => @first_comment.id
0
+    end
0
+    assert_redirected_to "/comments"
0
   end
0
 end

0
@@ -27,8 +27,8 @@
0
     assert_equal @a, assigns(:widgets).first
0
   end
0
   
0
-  def test_should_get_index_sorted
0
-    @controller.resource_this_finder_options = {:order => 'body'}
0
+  def test_should_get_index_sorted_with_inline_proc
0
+    @controller.resource_this_finder_options = Proc.new { { :order => 'body' } }
0
     get :index
0
     assert_response :success
0
     assert assigns(:widgets)

0
@@ -15,7 +15,8 @@
0
 RAILS_ROOT = '.'    unless defined? RAILS_ROOT
0
 RAILS_ENV  = 'test' unless defined? RAILS_ENV
0
 
0
-
0
+ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
0
+ActionController::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
0
 
0
 ActionController::Base.send :include, ResourceThis
0