josevalim-inherited_resources 0.3 → 0.4

data/test/polymorphic_test.rb

@@ -0,0 +1,111 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class Factory; end
+class Company; end
+
+class Employee
+  def self.human_name; 'Employee'; end
+end
+
+class EmployeesController < InheritedResources::Base
+  belongs_to :factory, :company, :polymorphic => true
+end
+
+class PolymorphicTest < TEST_CLASS
+
+  def setup
+    @controller          = EmployeesController.new
+    @controller.request  = @request  = ActionController::TestRequest.new
+    @controller.response = @response = ActionController::TestResponse.new
+  end
+
+  def test_expose_all_employees_as_instance_variable_on_index
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with(:all).returns([mock_employee])
+    get :index, :factory_id => '37'
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal [mock_employee], assigns(:employees)
+  end
+
+  def test_expose_the_resquested_employee_on_show
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with('42').returns(mock_employee)
+    get :show, :id => '42', :factory_id => '37'
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_expose_a_new_employee_on_new
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:build).returns(mock_employee)
+    get :new, :factory_id => '37'
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_expose_the_resquested_employee_on_edit
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with('42').returns(mock_employee)
+    get :edit, :id => '42', :factory_id => '37'
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+    assert_response :success
+  end
+
+  def test_expose_a_newly_create_employee_on_create
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:build).with({'these' => 'params'}).returns(mock_employee(:save => true))
+    post :create, :factory_id => '37', :employee => {:these => 'params'}
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_update_the_requested_object_on_update
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with('42').returns(mock_employee)
+    mock_employee.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :factory_id => '37', :employee => {:these => 'params'}
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_the_resquested_employee_is_destroyed_on_destroy
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with('42').returns(mock_employee)
+    mock_employee.expects(:destroy)
+    delete :destroy, :id => '42', :factory_id => '37'
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_polymorphic_helpers
+    new_factory = Factory.new
+    Factory.expects(:find).with('37').returns(new_factory)
+    new_factory.expects(:employees).returns(Employee)
+    Employee.expects(:find).with(:all).returns([mock_employee])
+    get :index, :factory_id => '37'
+
+    assert @controller.send(:parent?)
+    assert_equal :factory, assigns(:parent_type)
+    assert_equal :factory, @controller.send(:parent_type)
+    assert_equal Factory, @controller.send(:parent_class)
+    assert_equal new_factory, assigns(:factory)
+    assert_equal new_factory, @controller.send(:parent)
+  end
+
+  protected
+    def mock_factory(stubs={})
+      @mock_factory ||= mock(stubs)
+    end
+
+    def mock_employee(stubs={})
+      @mock_employee ||= mock(stubs)
+    end
+end

data/test/singleton_test.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+# 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 Store
+end
+
+class Manager
+  def self.human_name; 'Manager'; end
+end
+
+class ManagersController < InheritedResources::Base
+  belongs_to :store, :singleton => true
+end
+
+class SingletonTest < TEST_CLASS
+
+  def setup
+    @controller          = ManagersController.new
+    @controller.request  = @request  = ActionController::TestRequest.new
+    @controller.response = @response = ActionController::TestResponse.new
+  end
+
+  def test_expose_the_resquested_manager_on_show
+    Store.expects(:find).with('37').returns(mock_store)
+    mock_store.expects(:manager).returns(mock_manager)
+    get :show, :store_id => '37'
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+  end
+
+  def test_expose_a_new_manager_on_new
+    Store.expects(:find).with('37').returns(mock_store)
+    mock_store.expects(:build_manager).returns(mock_manager)
+    get :new, :store_id => '37'
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+  end
+
+  def test_expose_the_resquested_manager_on_edit
+    Store.expects(:find).with('37').returns(mock_store)
+    mock_store.expects(:manager).returns(mock_manager)
+    get :edit, :store_id => '37'
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+    assert_response :success
+  end
+
+  def test_expose_a_newly_create_manager_on_create
+    Store.expects(:find).with('37').returns(mock_store)
+    mock_store.expects(:build_manager).with({'these' => 'params'}).returns(mock_manager(:save => true))
+    post :create, :store_id => '37', :manager => {:these => 'params'}
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+  end
+
+  def test_update_the_requested_object_on_update
+    Store.expects(:find).with('37').returns(mock_store(:manager => mock_manager))
+    mock_manager.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :store_id => '37', :manager => {:these => 'params'}
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+  end
+
+  def test_the_resquested_manager_is_destroyed_on_destroy
+    Store.expects(:find).with('37').returns(mock_store)
+    mock_store.expects(:manager).returns(mock_manager)
+    mock_manager.expects(:destroy)
+    delete :destroy, :store_id => '37'
+    assert_equal mock_store, assigns(:store)
+    assert_equal mock_manager, assigns(:manager)
+  end
+
+  protected
+    def mock_store(stubs={})
+      @mock_store ||= mock(stubs)
+    end
+
+    def mock_manager(stubs={})
+      @mock_manager ||= mock(stubs)
+    end
+end

data/test/url_helpers_test.rb

@@ -30,7 +30,7 @@ end
 
 class Bed; end
 class BedsController < InheritedResources::Base
-  belongs_to :house, :building, :polymorphic => true
+  belongs_to :house, :building, :polymorphic => true, :optional => true
 end
 
 class Dish; end
@@ -182,7 +182,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     end
   end
 
-  def test_url_helpers_on_singletons
+  def test_url_helpers_on_singletons_with_belongs_to
     controller = OwnersController.new
     controller.instance_variable_set('@house', :house)
     controller.instance_variable_set('@owner', :owner)
@@ -204,7 +204,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     end
   end
 
-  def test_url_helpers_on_house_polymorphic_belongs_to
+  def test_url_helpers_on_polymorphic_belongs_to
     house = House.new
     bed   = Bed.new
     
@@ -277,7 +277,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
   end
 
   def test_url_helpers_on_singleton_nested_polymorphic_belongs_to
-    # Thus must not be usefull in singleton controllers...
+    # This must not be usefull in singleton controllers...
     # Center.new
     house = House.new
     table = Table.new
@@ -308,4 +308,36 @@ class UrlHelpersTest < ActiveSupport::TestCase
     end
   end
 
+  def test_url_helpers_on_optional_polymorphic_belongs_to
+    bed   = Bed.new
+    new_bed = Bed.new
+    Bed.stubs(:new).returns(new_bed)
+    new_bed.stubs(:new_record?).returns(true)
+
+    controller = BedsController.new
+    controller.instance_variable_set('@parent_type', nil)
+    controller.instance_variable_set('@bed', bed)
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("beds_#{path_or_url}").with().once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("bed_#{path_or_url}").with(bed).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_bed_#{path_or_url}").with().once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_bed_#{path_or_url}").with(bed).once
+      controller.send("edit_resource_#{path_or_url}")
+    end
+
+    # Testing if it accepts args...
+    controller.expects("polymorphic_url").with([:arg]).once
+    controller.send("resource_url", :arg)
+
+    controller.expects("edit_polymorphic_url").with([:arg]).once
+    controller.send("edit_resource_url", :arg)
+  end
+
 end

data/test/views/products/edit.html.erb

@@ -0,0 +1 @@
+Edit HTML

data/test/views/products/index.html.erb

@@ -0,0 +1 @@
+Index HTML

data/test/views/products/new.html.erb

@@ -0,0 +1 @@
+New HTML

data/test/views/products/show.html.erb

@@ -0,0 +1 @@
+Show HTML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - lib/inherited_resources.rb
 - lib/inherited_resources/base.rb
 - lib/inherited_resources/base_helpers.rb
-- lib/inherited_resources/belongs_to.rb
 - lib/inherited_resources/belongs_to_helpers.rb
 - lib/inherited_resources/class_methods.rb
 - lib/inherited_resources/dumb_responder.rb
@@ -69,16 +68,16 @@ test_files:
 - test/aliases_test.rb
 - test/base_helpers_test.rb
 - test/base_test.rb
-- test/belongs_to_base_test.rb
 - test/belongs_to_test.rb
 - test/class_methods_test.rb
-- test/fixtures/en.yml
 - test/nested_belongs_to_test.rb
-- test/polymorphic_base_test.rb
+- test/optional_belongs_to_test.rb
+- test/polymorphic_test.rb
 - test/respond_to_test.rb
-- test/singleton_base_test.rb
+- test/singleton_test.rb
 - test/test_helper.rb
 - test/url_helpers_test.rb
+- test/fixtures/en.yml
 - test/views/cities/edit.html.erb
 - test/views/cities/index.html.erb
 - test/views/cities/new.html.erb
@@ -95,6 +94,10 @@ test_files:
 - test/views/managers/new.html.erb
 - test/views/managers/show.html.erb
 - test/views/pets/edit.html.erb
+- test/views/products/edit.html.erb
+- test/views/products/index.html.erb
+- test/views/products/new.html.erb
+- test/views/products/show.html.erb
 - test/views/professors/edit.html.erb
 - test/views/professors/index.html.erb
 - test/views/professors/new.html.erb

data/lib/inherited_resources/belongs_to.rb

@@ -1,227 +0,0 @@
-# = belongs_to
-#
-# This allows you to specify to belongs_to in your controller. You might use
-# this when you are having nested resources in your routes:
-#
-#   class TasksController < InheritedResources::Base
-#     belongs_to :project
-#   end
-#
-# This will do all magic assuming some defaults. It assumes that your URL to
-# access those tasks are:
-#
-#   /projects/:project_id/tasks
-#
-# But all defaults are configurable. The options are:
-#
-# * :parent_class => Allows you to specify what is the parent class.
-#
-#     belongs_to :project, :parent_class => AdminProject
-#
-# * :class_name => Also allows you to specify the parent class, but you should
-#   give a string. Added for ActiveRecord belongs to compatibility.
-#
-# * :instance_name => How this object will appear in your views. In this case
-#   the default is @project. Overwrite it with a symbol.
-#
-#     belongs_to :project, :instance_name => :my_project
-#
-# * :finder => Specifies which method should be called to instantiate the
-#   parent. Let's suppose you are using slugs ("this-is-project-title") in URLs
-#   so your tasks url would be: "projects/this-is-project-title/tasks". Then you
-#   should do this in your TasksController:
-#
-#     belongs_to :project, :finder => :find_by_title!
-#
-#   This will make your projects be instantiated as:
-#
-#     Project.find_by_title!(params[:project_id])
-#
-#   Instead of:
-#
-#     Project.find(params[:project_id])
-#
-# * param => Allows you to specify params key used to instantiate the parent.
-#   Default is :parent_id, which in this case is :project_id.
-#
-# * route_name => Allows you to specify what is the route name in your url
-#   helper. By default is 'project'. But if your url helper should be
-#   "admin_project_task_url" instead of "project_task_url", just do:
-#
-#     belongs_to :project, :route_name => "admin_project"
-#
-# = nested_belongs_to
-#
-# If for some reason you need to nested more than two resources, you can do:
-#
-#   class TasksController
-#     belongs_to :company, :project
-#   end
-#
-# ATTENTION! This DOES NOT mean polymorphic associations as in resource_controller.
-# Polymorphic associations are not supported yet.
-#
-# It means that companies have many projects which have many tasks. You URL
-# should be:
-#
-#   /companies/:company_id/projects/:project_id/tasks/:id
-#
-# Everything will be handled for you again. And all defaults will describe above
-# will be assumed. But if you have to change the defaults. You will have to
-# specify one association by one:
-#
-#   class TasksController
-#     belongs_to :company, :finder => :find_by_name!, :param => :company_name
-#     belongs_to :project
-#   end
-#
-# belongs_to is aliased as nested_belongs_to, so this provides a nicer syntax:
-#
-#   class TasksController
-#     nested_belongs_to :company, :finder => :find_by_name!, :param => :company_name
-#     nested_belongs_to :project
-#   end
-#
-# In this case the association chain would be:
-#
-#   Company.find_by_name!(params[:company_name]).projects.find(params[:project_id]).tasks.find(:all)
-#
-# When you are using nested resources, you have one more option to config.
-# Let's suppose that to get all projects from a company, you have to do:
-#
-#   Company.admin_projects
-#
-# Instead of:
-#
-#   Company.projects
-#
-# In this case, you can set the collection_name in belongs_to:
-#
-#   nested_belongs_to :project, :collection_name => 'admin_projects'
-#
-# = polymorphic associations
-#
-# In some cases you have a resource that belongs to two different resources
-# but not at the same time. For example, let's suppose you have File, Message
-# and Task as resources and they are all commentable.
-#
-# Polymorphic associations allows you to create just one controller that will
-# deal with each case.
-#
-#   class Comment < InheritedResources::Base
-#     belongs_to :file, :message, :task, :polymorphic => true
-#   end
-#
-# Your routes should be something like:
-#
-#   m.resources :files,    :has_many => :comments #=> /files/13/comments
-#   m.resources :tasks,    :has_many => :comments #=> /tasks/17/comments
-#   m.resources :messages, :has_many => :comments #=> /messages/11/comments
-#
-# When using polymorphic associations, you get some free helpers:
-#
-#   parent?         #=> true
-#   parent_type     #=> :task
-#   parent_class    #=> Task
-#   parent          #=> @task
-#
-# This polymorphic controllers thing is a great idea by James Golick and he
-# built it in resource_controller. Here is just a re-implementation.
-#
-# = nested polymorphic associations
-#
-# You can have polymorphic associations with nested resources. Let's suppose
-# that our File, Task and Message resources in the previous example belongs to
-# a project.
-#
-# This way we can have:
-#
-#   class Comment < InheritedResources::Base
-#     belongs_to :project {
-#       belongs_to :file, :message, :task, :polymorphic => true
-#     }
-#   end
-#
-# Or:
-#
-#   class Comment < InheritedResources::Base
-#     nested_belongs_to :project
-#     nested_belongs_to :file, :message, :task, :polymorphic => true
-#   end
-#
-# Choose the syntax that makes more sense to you. :)
-#
-# Finally your routes should be something like:
-#
-#   map.resources :projects do |m|
-#     m.resources :files,    :has_many => :comments #=> /projects/1/files/13/comments
-#     m.resources :tasks,    :has_many => :comments #=> /projects/1/tasks/17/comments
-#     m.resources :messages, :has_many => :comments #=> /projects/1/messages/11/comments
-#   end
-#
-# The helpers work in the same way as above.
-#
-# = singleton
-#
-# If you have singleton resources, in other words, if your controller resource
-# associates to another through a has_one association, you can pass the option
-# :singleton to it. It will deal with all the details and automacally remove
-# the :index action.
-#
-#   class ManagersController < InheritedResources::Base
-#     belongs_to :project, :singleton => true # a project has one manager
-#   end
-#
-module InheritedResources #:nodoc:
-  module BelongsTo #:nodoc:
-
-    protected
-      def belongs_to(*symbols, &block)
-        options = symbols.extract_options!
-
-        options.symbolize_keys!
-        options.assert_valid_keys(:class_name, :parent_class, :instance_name, :param, :finder, :route_name, :collection_name, :singleton, :polymorphic)
-
-        acts_as_singleton!   if singleton   = options.delete(:singleton)
-        acts_as_polymorphic! if polymorphic = options.delete(:polymorphic)
-
-        raise ArgumentError, 'You have to give me at least one association name.' if symbols.empty?
-        raise ArgumentError, 'You cannot define multiple associations with the options: #{options.keys.inspect}.' unless symbols.size == 1 || options.empty?
-
-        # Add BelongsToHelpers if we haven't yet.
-        include BelongsToHelpers if self.parents_symbols.empty?
-
-        # Set configuration default values
-        symbols.each do |symbol|
-          symbol = symbol.to_sym
-
-          if polymorphic
-            self.parents_symbols     << :polymorphic unless self.parents_symbols.include? :polymorphic
-            self.polymorphic_symbols << symbol
-          else
-            self.parents_symbols << symbol
-          end
-
-          config = self.resources_configuration[symbol] = {}
-          config[:parent_class]    = options.delete(:parent_class)
-          config[:parent_class]  ||= (options.delete(:class_name) || symbol).to_s.classify.constantize rescue nil
-          config[:collection_name] = (options.delete(:collection_name) || symbol.to_s.pluralize).to_sym
-          config[:instance_name]   = (options.delete(:instance_name) || symbol).to_sym
-          config[:param]           = (options.delete(:param) || "#{symbol}_id").to_sym
-          config[:finder]          = (options.delete(:finder) || :find).to_sym
-          config[:route_name]      = (options.delete(:route_name) || symbol).to_s
-          config[:polymorphic]     = polymorphic
-        end
-
-        # Regenerate url helpers unless block is given
-        if block_given?
-          class_eval(&block)
-        else
-          InheritedResources::UrlHelpers.create_resources_url_helpers!(self)
-        end
-      end
-      alias :nested_belongs_to :belongs_to
-
-  end
-end
-