karsthammer-inherited_resources 1.1.2.1 → 1.2.1

data/test/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  flash:
+    addresses:
+      create:
+        notice: "You created a new address close to <b>{{reference}}</b>."
+      update:
+        notice: "Nice! {{resource_name}} was updated with success!"
+        error: "Oh no! We could not update your address!"
+    admin:
+      actions:
+        create:
+          notice: "Admin notice message."
+          error: "Admin error message."
+      addresses:
+        create:
+          notice: "Admin, you created a new address close to <b>{{reference}}</b>."
+

data/test/nested_belongs_to_with_shallow_test.rb

@@ -0,0 +1,123 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Dresser
+end
+
+class Shelf
+end
+
+class Plate
+end
+
+class PlatesController < InheritedResources::Base
+  belongs_to :dresser, :shelf, :shallow => true
+end
+
+class NestedBelongsToWithShallowTest < ActionController::TestCase
+  tests PlatesController
+
+  def setup
+    mock_shelf.expects(:dresser).returns(mock_dresser)
+    mock_dresser.expects(:to_param).returns('13')
+
+    Dresser.expects(:find).with('13').returns(mock_dresser)
+    mock_dresser.expects(:shelves).returns(Shelf)
+    mock_shelf.expects(:plates).returns(Plate)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_index
+    Shelf.expects(:find).with('37').twice.returns(mock_shelf)
+    Plate.expects(:scoped).returns([mock_plate])
+    get :index, :shelf_id => '37'
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal [mock_plate], assigns(:plates)
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_show
+    should_find_parents
+    get :show, :id => '42'
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_new
+    Plate.expects(:build).returns(mock_plate)
+    Shelf.expects(:find).with('37').twice.returns(mock_shelf)
+    get :new, :shelf_id => '37'
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_edit
+    should_find_parents
+    get :edit, :id => '42'
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+
+  def test_assigns_dresser_and_shelf_and_plate_on_create
+    Shelf.expects(:find).with('37').twice.returns(mock_shelf)
+
+    Plate.expects(:build).with({'these' => 'params'}).returns(mock_plate)
+    mock_plate.expects(:save).returns(true)
+    post :create, :shelf_id => '37', :plate => {:these => 'params'}
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_update
+    should_find_parents
+    mock_plate.expects(:update_attributes).returns(true)
+    put :update, :id => '42', :plate => {:these => 'params'}
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+  def test_assigns_dresser_and_shelf_and_plate_on_destroy
+    should_find_parents
+    mock_plate.expects(:destroy)
+    delete :destroy, :id => '42'
+
+    assert_equal mock_dresser, assigns(:dresser)
+    assert_equal mock_shelf, assigns(:shelf)
+    assert_equal mock_plate, assigns(:plate)
+  end
+
+
+  protected
+    def should_find_parents
+      Plate.expects(:find).with('42').returns(mock_plate)
+      mock_plate.expects(:shelf).returns(mock_shelf)
+      mock_shelf.expects(:to_param).returns('37')
+      Plate.expects(:find).with('42').returns(mock_plate)
+      Shelf.expects(:find).with('37').returns(mock_shelf)
+    end
+
+    def mock_dresser(stubs={})
+      @mock_dresser ||= mock(stubs)
+    end
+
+    def mock_shelf(stubs={})
+      @mock_shelf ||= mock(stubs)
+    end
+
+    def mock_plate(stubs={})
+      @mock_plate ||= mock(stubs)
+    end
+end

data/test/nested_model_with_shallow_test.rb

@@ -0,0 +1,147 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Subfaculty
+end
+
+class Speciality
+end
+
+module Plan
+  class Group
+  end
+
+  class Education
+  end
+end
+
+class GroupsController < InheritedResources::Base
+  defaults :resource_class => Plan::Group, :finder => :find_by_slug
+  belongs_to :subfaculty, :shallow => true do
+    belongs_to :speciality
+  end
+end
+
+class EducationsController < InheritedResources::Base
+  defaults :resource_class => Plan::Education
+  belongs_to :subfaculty, :shallow => true do
+    belongs_to :speciality do
+      belongs_to :group, :parent_class => Plan::Group,
+                         :instance_name => :plan_group,
+                         :param => :group_id,
+                         :finder => :find_by_slug
+    end
+  end
+end
+
+class NestedModelWithShallowTest < ActionController::TestCase
+  tests GroupsController
+
+  def setup
+    mock_speciality.expects(:subfaculty).returns(mock_subfaculty)
+    mock_subfaculty.expects(:to_param).returns('13')
+
+    Subfaculty.expects(:find).with('13').returns(mock_subfaculty)
+    mock_subfaculty.expects(:specialities).returns(Speciality)
+    mock_speciality.expects(:groups).returns(Plan::Group)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_assigns_subfaculty_and_speciality_and_group_on_edit
+    should_find_parents
+    get :edit, :id => 'forty_two'
+
+    assert_equal mock_subfaculty, assigns(:subfaculty)
+    assert_equal mock_speciality, assigns(:speciality)
+    assert_equal mock_group, assigns(:group)
+  end
+
+  def test_expose_a_newly_create_group_with_speciality
+    Speciality.expects(:find).with('37').twice.returns(mock_speciality)
+    Plan::Group.expects(:build).with({'these' => :params}).returns(mock_group(:save => true))
+    post :create, :speciality_id => '37', :group => {:these => :params}
+    assert_equal mock_group, assigns(:group)
+  end
+
+  def test_expose_a_update_group_with_speciality
+    should_find_parents
+    mock_group.expects(:update_attributes).with('these' => :params).returns(true)
+    post :update, :id => 'forty_two', :group => {:these => :params}
+    assert_equal mock_group, assigns(:group)
+  end
+
+  protected
+    def should_find_parents
+      Plan::Group.expects(:find_by_slug).with('forty_two').returns(mock_group)
+      mock_group.expects(:speciality).returns(mock_speciality)
+      mock_speciality.expects(:to_param).returns('37')
+      Plan::Group.expects(:find_by_slug).with('forty_two').returns(mock_group)
+      Speciality.expects(:find).with('37').returns(mock_speciality)
+    end
+
+    def mock_group(stubs={})
+      @mock_group ||= mock(stubs)
+    end
+
+    def mock_speciality(stubs={})
+      @mock_speciality ||= mock(stubs)
+    end
+
+    def mock_subfaculty(stubs={})
+      @mock_subfaculty ||= mock(stubs)
+    end
+end
+
+class TwoNestedModelWithShallowTest < ActionController::TestCase
+  tests EducationsController
+
+  def setup
+    mock_speciality.expects(:subfaculty).returns(mock_subfaculty)
+    mock_subfaculty.expects(:to_param).returns('13')
+    Subfaculty.expects(:find).with('13').returns(mock_subfaculty)
+    mock_subfaculty.expects(:specialities).returns(Speciality)
+    mock_speciality.expects(:groups).returns(Plan::Group)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_assigns_subfaculty_and_speciality_and_group_on_new
+    should_find_parents
+    get :new, :group_id => 'forty_two'
+
+    assert_equal mock_subfaculty, assigns(:subfaculty)
+    assert_equal mock_speciality, assigns(:speciality)
+    assert_equal mock_group, assigns(:plan_group)
+    assert_equal mock_education, assigns(:education)
+  end
+
+
+  protected
+    def should_find_parents
+      Plan::Group.expects(:find_by_slug).with('forty_two').returns(mock_group)
+      mock_group.expects(:speciality).returns(mock_speciality)
+      mock_group.expects(:educations).returns(mock_education)
+      mock_education.expects(:build).returns(mock_education)
+      mock_speciality.expects(:to_param).returns('37')
+      Plan::Group.expects(:find_by_slug).with('forty_two').returns(mock_group)
+      Speciality.expects(:find).with('37').returns(mock_speciality)
+    end
+
+    def mock_group(stubs={})
+      @mock_group ||= mock(stubs)
+    end
+
+    def mock_education(stubs={})
+      @mock_education ||= mock(stubs)
+    end
+
+    def mock_speciality(stubs={})
+      @mock_speciality ||= mock(stubs)
+    end
+
+    def mock_subfaculty(stubs={})
+      @mock_subfaculty ||= mock(stubs)
+    end
+end

data/test/optional_belongs_to_test.rb

@@ -22,14 +22,14 @@ class OptionalTest < ActionController::TestCase
   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(:all).returns([mock_product])
+    Product.expects(:scoped).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(:all).returns([mock_product])
+    Product.expects(:scoped).returns([mock_product])
     get :index
     assert_equal nil, assigns(:category)
     assert_equal [mock_product], assigns(:products)
@@ -142,7 +142,7 @@ class OptionalTest < ActionController::TestCase
   end
 
   def test_polymorphic_helpers
-    Product.expects(:all).returns([mock_product])
+    Product.expects(:scoped).returns([mock_product])
     get :index
 
     assert !@controller.send(:parent?)

data/test/polymorphic_test.rb

@@ -23,7 +23,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
     assert_equal [mock_employee], assigns(:employees)
@@ -77,7 +77,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
   def test_polymorphic_helpers
     mock_factory.stubs(:class).returns(Factory)
 
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :factory_id => '37'
 
     assert @controller.send(:parent?)
@@ -110,7 +110,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :company_id => '37'
     assert_equal mock_company, assigns(:company)
     assert_equal [mock_employee], assigns(:employees)
@@ -164,7 +164,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
   def test_polymorphic_helpers
     mock_company.stubs(:class).returns(Company)
 
-    Employee.expects(:all).returns([mock_employee])
+    Employee.expects(:scoped).returns([mock_employee])
     get :index, :company_id => '37'
 
     assert @controller.send(:parent?)

data/test/singleton_test.rb

@@ -4,10 +4,12 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 # using a belongs_to association. This is done using mocks a la rspec.
 #
 class Store
+  extend ActiveModel::Naming
 end
 
 class Manager
-  def self.human_name; 'Manager'; end
+  extend ActiveModel::Naming
+#  def self.human_name; 'Manager'; end
 end
 
 class ManagersController < InheritedResources::Base
@@ -66,6 +68,7 @@ class SingletonTest < ActionController::TestCase
   def test_the_requested_manager_is_destroyed_on_destroy
     Store.expects(:find).with('37').returns(mock_store)
     mock_store.expects(:manager).returns(mock_manager)
+    @controller.expects(:parent_url).returns('http://test.host/')
     mock_manager.expects(:destroy)
     delete :destroy, :store_id => '37'
     assert_equal mock_store, assigns(:store)

data/test/test_helper.rb

@@ -26,9 +26,10 @@ require 'inherited_resources'
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
 InheritedResources::Routes = ActionDispatch::Routing::RouteSet.new
-InheritedResources::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action'
+InheritedResources::Routes.draw do
+  match ':controller(/:action(/:id))'
+  match ':controller(/:action)'
+  resources 'posts'
 end
 
 ActionController::Base.send :include, InheritedResources::Routes.url_helpers

data/test/url_helpers_test.rb

@@ -91,6 +91,38 @@ class CentersController < InheritedResources::Base
   end
 end
 
+class Mirror
+  extend ActiveModel::Naming
+end
+class MirrorsController < InheritedResources::Base
+  belongs_to :house, :shallow => true
+end
+class Admin::MirrorsController < InheritedResources::Base
+  belongs_to :house, :shallow => true
+end
+
+
+class Display
+  extend ActiveModel::Naming
+end
+
+class Window
+  extend ActiveModel::Naming
+end
+
+class Button
+  extend ActiveModel::Naming
+end
+
+class ButtonsController < InheritedResources::Base
+  belongs_to :display, :window, :shallow => true
+  custom_actions :resource => :delete, :collection => :search
+end
+
+class ImageButtonsController < ButtonsController
+end
+
+
 # Create a TestHelper module with some helpers
 class UrlHelpersTest < ActiveSupport::TestCase
 
@@ -365,7 +397,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
   def test_url_helpers_on_polymorphic_belongs_to
     house = House.new
     bed   = Bed.new
-    
+
     new_bed = Bed.new
     Bed.stubs(:new).returns(new_bed)
     new_bed.stubs(:persisted?).returns(false)
@@ -419,7 +451,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
   def test_url_helpers_on_polymorphic_belongs_to_using_uncountable
     sheep  = Sheep.new
     news = News.new
-    
+
     new_sheep = Sheep.new
     Sheep.stubs(:new).returns(new_sheep)
     new_sheep.stubs(:persisted?).returns(false)
@@ -662,4 +694,116 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.send("edit_resource_url", :arg)
   end
 
+
+  def test_url_helpers_on_belongs_to_with_shallowed_route
+    controller = MirrorsController.new
+    controller.instance_variable_set('@house', :house)
+    controller.instance_variable_set('@mirror', :mirror)
+
+    [:url, :path].each do |path_or_url|
+
+      controller.expects("house_mirrors_#{path_or_url}").with(:house, {}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("mirror_#{path_or_url}").with(:mirror, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_house_mirror_#{path_or_url}").with(:house, {}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_mirror_#{path_or_url}").with(:mirror, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("house_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_house_#{path_or_url}").with(:house, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
+
+  def test_url_helpers_on_nested_belongs_to_with_shallowed_route
+    controller = ButtonsController.new
+    controller.instance_variable_set('@display', :display)
+    controller.instance_variable_set('@window', :window)
+    controller.instance_variable_set('@button', :button)
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("window_buttons_#{path_or_url}").with(:window, {}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("button_#{path_or_url}").with(:button, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_window_button_#{path_or_url}").with(:window, {}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_button_#{path_or_url}").with(:button, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("window_#{path_or_url}").with(:window, {}).once
+      controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_window_#{path_or_url}").with(:window, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
+
+  def test_url_helpers_with_custom_actions
+    controller = ButtonsController.new
+    controller.instance_variable_set('@display', :display)
+    controller.instance_variable_set('@window', :window)
+    controller.instance_variable_set('@button', :button)
+    [:url, :path].each do |path_or_url|
+      controller.expects("delete_button_#{path_or_url}").with(:button, {}).once
+      controller.send("delete_resource_#{path_or_url}")
+
+      controller.expects("search_window_buttons_#{path_or_url}").with(:window, {}).once
+      controller.send("search_resources_#{path_or_url}")
+    end
+  end
+
+  def test_helper_methods_with_custom_actions
+    controller = ButtonsController.new
+    helper_methods = controller.class._helpers.instance_methods.map {|m| m.to_s }
+    [:url, :path].each do |path_or_url|
+      assert helper_methods.include?("delete_resource_#{path_or_url}")
+      assert helper_methods.include?("search_resources_#{path_or_url}")
+    end
+  end
+
+  def test_helpers_on_inherited_controller
+    controller = ImageButtonsController.new
+    controller.expects("edit_image_button_path").once
+    controller.send("edit_resource_path")
+    controller.expects("delete_image_button_path").once
+    controller.send("delete_resource_path")
+  end
+
+  def test_url_helpers_on_namespaced_resource_with_shallowed_route
+    controller = Admin::MirrorsController.new
+    controller.instance_variable_set('@house', :house)
+    controller.instance_variable_set('@mirror', :mirror)
+
+    [:url, :path].each do |path_or_url|
+
+      controller.expects("admin_house_mirrors_#{path_or_url}").with(:house, {}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("admin_mirror_#{path_or_url}").with(:mirror, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_admin_house_mirror_#{path_or_url}").with(:house, {}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_admin_mirror_#{path_or_url}").with(:mirror, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("admin_house_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_admin_house_#{path_or_url}").with(:house, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
 end