josevalim-inherited_resources 0.8.3 → 0.8.4

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.8.2
+Version: 0.8.4
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/inherited_resources/url_helpers.rb

@@ -44,7 +44,13 @@ module InheritedResources
       resource_config = self.resources_configuration[:self]
 
       # Add route_prefix if any.
-      resource_segments << resource_config[:route_prefix] unless resource_config[:route_prefix].blank?
+      unless resource_config[:route_prefix].blank?
+        if self.parents_symbols.include?(:polymorphic)
+          resource_ivars << resource_config[:route_prefix].to_s.inspect
+        else
+          resource_segments << resource_config[:route_prefix]
+        end
+      end
 
       # Deal with belongs_to associations and polymorphic associations.
       # Remember that we don't have to build the segments in polymorphic cases,

data/test/url_helpers_test.rb

@@ -39,6 +39,13 @@ class BedsController < InheritedResources::Base
   optional_belongs_to :house, :building
 end
 
+class Desk; end
+module Admin
+  class DesksController < InheritedResources::Base
+    optional_belongs_to :house
+  end
+end
+
 class Dish; end
 class DishesController < InheritedResources::Base
   belongs_to :house do
@@ -302,6 +309,45 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.send("edit_resource_url", :arg)
   end
 
+  def test_url_helpers_on_namespaced_polymorphic_belongs_to
+    house = House.new
+    desk  = Desk.new
+
+    new_desk = Desk.new
+    Desk.stubs(:new).returns(new_desk)
+    new_desk.stubs(:new_record?).returns(true)
+
+    controller = Admin::DesksController.new
+    controller.instance_variable_set('@parent_type', :house)
+    controller.instance_variable_set('@house', house)
+    controller.instance_variable_set('@desk', desk)
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("admin_house_desks_#{path_or_url}").with(house).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("admin_house_desk_#{path_or_url}").with(house, desk).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_admin_house_desk_#{path_or_url}").with(house).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_admin_house_desk_#{path_or_url}").with(house, desk).once
+      controller.send("edit_resource_#{path_or_url}")
+    end
+
+    # With options
+    controller.expects("admin_house_desk_url").with(house, desk, :page => 1).once
+    controller.send("resource_url", :page => 1)
+
+    # With args
+    controller.expects("polymorphic_url").with(['admin', house, :arg], {}).once
+    controller.send("resource_url", :arg)
+
+    controller.expects("edit_polymorphic_url").with(['admin', house, :arg], {}).once
+    controller.send("edit_resource_url", :arg)
+  end
+
   def test_url_helpers_on_nested_polymorphic_belongs_to
     house = House.new
     table = Table.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: inherited_resources
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3