josevalim-inherited_resources 0.3 → 0.4

data/lib/inherited_resources/url_helpers.rb

@@ -167,7 +167,8 @@ module InheritedResources #:nodoc:
             ivars << 'resource_class.new'
           end
 
-          ivars  = "[#{ivars.join(', ')}]"
+          # Add compact to deal with polymorphic optional associations.
+          ivars  = "[#{ivars.join(', ')}].compact"
         else
           # In the last case, if segments is empty (this usually happens with
           # root singleton resources, we set it to root)

data/test/belongs_to_test.rb

@@ -1,109 +1,99 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class GreatSchool
+# This test file is instead to test the how controller flow and actions
+# using a belongs_to association. This is done using mocks a la rspec.
+#
+class Post
 end
 
-class Professor
-  def self.human_name; 'Professor'; end
+class Comment
+  def self.human_name; 'Comment'; end
 end
 
-BELONGS_TO_OPTIONS = {
-  :parent_class => GreatSchool,
-  :instance_name => :great_school,
-  :finder => :find_by_title!,
-  :param => :school_title
-}
-
-class ProfessorsController < InheritedResources::Base
-  belongs_to :school, BELONGS_TO_OPTIONS
+class CommentsController < InheritedResources::Base
+  belongs_to :post
 end
 
-# Create a TestHelper module with some helpers
 class BelongsToTest < TEST_CLASS
+
   def setup
-    @controller          = ProfessorsController.new
+    @controller          = CommentsController.new
     @controller.request  = @request  = ActionController::TestRequest.new
     @controller.response = @response = ActionController::TestResponse.new
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:find).returns([mock_professor])
-    get :index, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_expose_all_comments_as_instance_variable_on_index
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:find).with(:all).returns([mock_comment])
+    get :index, :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal [mock_comment], assigns(:comments)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:find).returns(mock_professor)
-    get :show, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_expose_the_resquested_comment_on_show
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:find).with('42').returns(mock_comment)
+    get :show, :id => '42', :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:build).returns(mock_professor)
-    get :new, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_expose_a_new_comment_on_new
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:build).returns(mock_comment)
+    get :new, :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:find).returns(mock_professor)
-    get :edit, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_expose_the_resquested_comment_on_edit
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:find).with('42').returns(mock_comment)
+    get :edit, :id => '42', :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:build).returns(mock_professor(:save => true))
-    post :create, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_expose_a_newly_create_comment_on_create
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:build).with({'these' => 'params'}).returns(mock_comment(:save => true))
+    post :create, :post_id => '37', :comment => {:these => 'params'}
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:find).returns(mock_professor(:update_attributes => true))
-    put :update, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_update_the_requested_object_on_update
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:find).with('42').returns(mock_comment)
+    mock_comment.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :post_id => '37', :comment => {:these => 'params'}
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
-    Professor.stubs(:find).returns(mock_professor(:destroy => true))
-    delete :destroy, :school_title => 'nice'
-    assert_equal mock_school, assigns(:great_school)
+  def test_the_resquested_comment_is_destroyed_on_destroy
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+    Comment.expects(:find).with('42').returns(mock_comment)
+    mock_comment.expects(:destroy)
+    delete :destroy, :id => '42', :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_comment, assigns(:comment)
   end
-
-  def test_belongs_to_raise_errors_with_invalid_arguments
-    assert_raise ArgumentError do
-      ProfessorsController.send(:belongs_to)
-    end
-
-    assert_raise ArgumentError do
-      ProfessorsController.send(:belongs_to, :arguments, :with_options, :parent_class => Professor)
-    end
-
-    assert_raise ArgumentError do
-      ProfessorsController.send(:belongs_to, :nice, :invalid_key => '')
-    end
-  end
-
-  def test_url_helpers_are_recreated_when_defaults_change
-    InheritedResources::UrlHelpers.expects(:create_resources_url_helpers!).returns(true).once
-    ProfessorsController.send(:defaults, BELONGS_TO_OPTIONS)
-  ensure
-    # Reestore default settings
-    ProfessorsController.send(:parents_symbols=, [:school])
-  end
-
   protected
-    def mock_school(stubs={})
-      @mock_school ||= mock(stubs)
+    def mock_post(stubs={})
+      @mock_post ||= mock(stubs)
     end
 
-    def mock_professor(stubs={})
-      @mock_professor ||= mock(stubs)
+    def mock_comment(stubs={})
+      @mock_comment ||= mock(stubs)
     end
+
 end
 

data/test/class_methods_test.rb

@@ -14,7 +14,27 @@ end
 class FoldersController < InheritedResources::Base
 end
 
-class ActionsTest < ActiveSupport::TestCase
+# For belongs_to tests
+class GreatSchool
+end
+
+class Professor
+  def self.human_name; 'Professor'; end
+end
+
+BELONGS_TO_OPTIONS = {
+  :parent_class => GreatSchool,
+  :instance_name => :great_school,
+  :finder => :find_by_title!,
+  :param => :school_title
+}
+
+class ProfessorsController < InheritedResources::Base
+  belongs_to :school, BELONGS_TO_OPTIONS
+end
+
+
+class ActionsClassMethodTest < ActiveSupport::TestCase
   def test_actions_are_undefined_when_only_option_is_given
     action_methods = BooksController.send(:action_methods)
     assert_equal 2, action_methods.size
@@ -34,7 +54,8 @@ class ActionsTest < ActiveSupport::TestCase
   end
 end
 
-class DefaultsTest < ActiveSupport::TestCase
+
+class DefaultsClassMethodTest < ActiveSupport::TestCase
   def test_resource_class_is_set_to_nil_when_resource_model_cannot_be_found
     assert_nil ReadersController.send(:resource_class)
   end
@@ -69,5 +90,93 @@ class DefaultsTest < ActiveSupport::TestCase
     InheritedResources::UrlHelpers.expects(:create_resources_url_helpers!).returns(true).once
     BooksController.send(:defaults, :instance_name => 'string', :collection_name => 'strings')
   end
+end
+
+
+class BelongsToClassMethodTest < TEST_CLASS
+  def setup
+    @controller          = ProfessorsController.new
+    @controller.request  = @request  = ActionController::TestRequest.new
+    @controller.response = @response = ActionController::TestResponse.new
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:find).returns([mock_professor])
+    get :index, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:find).returns(mock_professor)
+    get :show, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:build).returns(mock_professor)
+    get :new, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:find).returns(mock_professor)
+    get :edit, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:build).returns(mock_professor(:save => true))
+    post :create, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:find).returns(mock_professor(:update_attributes => true))
+    put :update, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_expose_the_resquested_school_with_chosen_instance_variable
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+    Professor.stubs(:find).returns(mock_professor(:destroy => true))
+    delete :destroy, :school_title => 'nice'
+    assert_equal mock_school, assigns(:great_school)
+  end
+
+  def test_belongs_to_raise_errors_with_invalid_arguments
+    assert_raise ArgumentError do
+      ProfessorsController.send(:belongs_to)
+    end
+
+    assert_raise ArgumentError do
+      ProfessorsController.send(:belongs_to, :arguments, :with_options, :parent_class => Professor)
+    end
+
+    assert_raise ArgumentError do
+      ProfessorsController.send(:belongs_to, :nice, :invalid_key => '')
+    end
+  end
 
+  def test_url_helpers_are_recreated_when_defaults_change
+    InheritedResources::UrlHelpers.expects(:create_resources_url_helpers!).returns(true).once
+    ProfessorsController.send(:defaults, BELONGS_TO_OPTIONS)
+  ensure
+    # Reestore default settings
+    ProfessorsController.send(:parents_symbols=, [:school])
+  end
+
+  protected
+    def mock_school(stubs={})
+      @mock_school ||= mock(stubs)
+    end
+
+    def mock_professor(stubs={})
+      @mock_professor ||= mock(stubs)
+    end
 end

data/test/optional_belongs_to_test.rb

@@ -0,0 +1,190 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class Brands; end
+class Category; end
+
+class Product
+  def self.human_name; 'Product'; end
+end
+
+class ProductsController < InheritedResources::Base
+  belongs_to :brand, :category, :polymorphic => true, :optional => true
+end
+
+# Create a TestHelper module with some helpers
+module ProductTestHelper
+  def setup
+    @controller          = ProductsController.new
+    @controller.request  = @request  = ActionController::TestRequest.new
+    @controller.response = @response = ActionController::TestResponse.new
+  end
+
+  protected
+    def mock_category(stubs={})
+      @mock_category ||= mock(stubs)
+    end
+
+    def mock_product(stubs={})
+      @mock_product ||= mock(stubs)
+    end
+end
+
+class IndexActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_expose_all_products_as_instance_variable_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:find).with(:all).returns([mock_product])
+    get :index, :category_id => '37'
+    assert_equal mock_category, assigns(:category)
+    assert_equal [mock_product], assigns(:products)
+  end
+
+  def test_expose_all_products_as_instance_variable_without_category
+    Product.expects(:find).with(:all).returns([mock_product])
+    get :index
+    assert_equal nil, assigns(:category)
+    assert_equal [mock_product], assigns(:products)
+  end
+end
+
+class ShowActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_expose_the_resquested_product_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:find).with('42').returns(mock_product)
+    get :show, :id => '42', :category_id => '37'
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_expose_the_resquested_product_without_category
+    Product.expects(:find).with('42').returns(mock_product)
+    get :show, :id => '42'
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class NewActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_expose_a_new_product_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:build).returns(mock_product)
+    get :new, :category_id => '37'
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_expose_a_new_product_without_category
+    Product.expects(:new).returns(mock_product)
+    get :new
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class EditActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_expose_the_resquested_product_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:find).with('42').returns(mock_product)
+    get :edit, :id => '42', :category_id => '37'
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_expose_the_resquested_product_without_category
+    Product.expects(:find).with('42').returns(mock_product)
+    get :edit, :id => '42'
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class CreateActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_expose_a_newly_create_product_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:build).with({'these' => 'params'}).returns(mock_product(:save => true))
+    post :create, :category_id => '37', :product => {:these => 'params'}
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_expose_a_newly_create_product_without_category
+    Product.expects(:new).with({'these' => 'params'}).returns(mock_product(:save => true))
+    post :create, :product => {:these => 'params'}
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class UpdateActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_update_the_requested_object_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:find).with('42').returns(mock_product)
+    mock_product.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :category_id => '37', :product => {:these => 'params'}
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_update_the_requested_object_without_category
+    Product.expects(:find).with('42').returns(mock_product)
+    mock_product.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :product => {:these => 'params'}
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class DestroyActionOptionalTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_the_resquested_product_is_destroyed_with_category
+    Category.expects(:find).with('37').returns(mock_category)
+    mock_category.expects(:products).returns(Product)
+    Product.expects(:find).with('42').returns(mock_product)
+    mock_product.expects(:destroy)
+    delete :destroy, :id => '42', :category_id => '37'
+    assert_equal mock_category, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+
+  def test_the_resquested_product_is_destroyed_without_category
+    Product.expects(:find).with('42').returns(mock_product)
+    mock_product.expects(:destroy)
+    delete :destroy, :id => '42'
+    assert_equal nil, assigns(:category)
+    assert_equal mock_product, assigns(:product)
+  end
+end
+
+class OptionalHelpersTest < TEST_CLASS
+  include ProductTestHelper
+
+  def test_polymorphic_helpers
+    Product.expects(:find).with(:all).returns([mock_product])
+    get :index
+
+    assert !@controller.send(:parent?)
+    assert_equal nil, assigns(:parent_type)
+    assert_equal nil, @controller.send(:parent_type)
+    assert_equal nil, @controller.send(:parent_class)
+    assert_equal nil, assigns(:category)
+    assert_equal nil, @controller.send(:parent)
+  end
+end