josevalim-inherited_resources 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,5 +1,8 @@
 # Version 0.8
 
+* Fixed a small bug on optional belongs to with namespaced controllers.
+* Allow a parameter to be given to collection_url in polymorphic cases to replace
+  the parent.
 * Allow InheritedResources to be called without inheritance.
 * Ensure that controllers that inherit from a controller with InheritedResources
   works properly.

data/README

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

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/lib/inherited_resources/url_helpers.rb

@@ -43,9 +43,12 @@ module InheritedResources
       resource_segments, resource_ivars = [], []
       resource_config = self.resources_configuration[:self]
 
+      singleton   = self.resources_configuration[:self][:singleton]
+      polymorphic = self.parents_symbols.include?(:polymorphic)
+
       # Add route_prefix if any.
       unless resource_config[:route_prefix].blank?
-        if self.parents_symbols.include?(:polymorphic)
+        if polymorphic
           resource_ivars << resource_config[:route_prefix].to_s.inspect
         else
           resource_segments << resource_config[:route_prefix]
@@ -66,9 +69,6 @@ module InheritedResources
         end
       end
 
-      singleton   = self.resources_configuration[:self][:singleton]
-      polymorphic = self.parents_symbols.include?(:polymorphic)
-
       collection_ivars    = resource_ivars.dup
       collection_segments = resource_segments.dup
 
@@ -108,7 +108,7 @@ module InheritedResources
           new_ivars       = resource_ivars
         end
       elsif polymorphic
-        collection_ivars << 'resource_class.new'
+        collection_ivars << '(@_resource_class_new ||= resource_class.new)'
       end
 
       generate_url_and_path_helpers nil,   :collection, collection_segments, collection_ivars
@@ -130,6 +130,15 @@ module InheritedResources
         ivars.push "(given_args.first || #{ivars.pop})"
       end
 
+      # In collection in polymorphic cases, allow an argument to be given as a
+      # replacemente for the parent.
+      #
+      if name == :collection && polymorphic
+        index = ivars.index(:parent)
+        ivars.insert index, "(given_args.first || parent)"
+        ivars.delete(:parent)
+      end
+
       # When polymorphic is true, the segments must be replace by :polymorphic
       # and ivars should be gathered into an array, which is compacted when
       # optional.

data/test/url_helpers_test.rb

@@ -302,6 +302,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.send("resource_url", :page => 1)
 
     # With args
+    controller.expects("polymorphic_url").with([:arg, new_bed], {}).once
+    controller.send("collection_url", :arg)
+
     controller.expects("polymorphic_url").with([house, :arg], {}).once
     controller.send("resource_url", :arg)
 
@@ -341,6 +344,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.send("resource_url", :page => 1)
 
     # With args
+    controller.expects("polymorphic_url").with(['admin', :arg, new_desk], {}).once
+    controller.send("collection_url", :arg)
+
     controller.expects("polymorphic_url").with(['admin', house, :arg], {}).once
     controller.send("resource_url", :arg)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"