josevalim-inherited_resources 0.4 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+# Version 0.4.1
+
+* parent? does not take begin_of_association_chain into account anymore
+* Added options to url helpers.
+
 # Version 0.4
 
 * Added :optional to belongs_to associations. It allows you to deal with

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.4
+Version: 0.4.1
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -395,31 +395,39 @@ It will deal with everything again and hide the action :index from you.
 URL Helpers
 -----------
 
-When you use InheritedResources it creates some URL helpers for you.
-And they handle everything for you.
+When you use InheritedResources it creates some URL helpers.
+And they handle everything for you. :)
 
    # /posts/1/comments
-   resource_url          # => /posts/1/comments/#{@comment.to_param}
-   resource_url(comment) # => /posts/1/comments/#{comment.to_param}
-   new_resource_url      # => /posts/1/comments/new
-   edit_resource_url     # => /posts/1/comments/#{@comment.to_param}/edit
-   collection_url        # => /posts/1/comments
+   resource_url               # => /posts/1/comments/#{@comment.to_param}
+   resource_url(comment)      # => /posts/1/comments/#{comment.to_param}
+   new_resource_url           # => /posts/1/comments/new
+   edit_resource_url          # => /posts/1/comments/#{@comment.to_param}/edit
+   edit_resource_url(comment) #=>  /posts/1/comments/#{comment.to_param}/edit
+   collection_url             # => /posts/1/comments
 
    # /projects/1/tasks
-   resource_url          # => /products/1/tasks/#{@task.to_param}
-   resource_url(task)    # => /products/1/tasks/#{task.to_param}
-   new_resource_url      # => /products/1/tasks/new
-   edit_resource_url     # => /products/1/tasks/#{@task.to_param}/edit
-   collection_url        # => /products/1/tasks
- 
+   resource_url               # => /products/1/tasks/#{@task.to_param}
+   resource_url(task)         # => /products/1/tasks/#{task.to_param}
+   new_resource_url           # => /products/1/tasks/new
+   edit_resource_url          # => /products/1/tasks/#{@task.to_param}/edit
+   edit_resource_url(task)    # => /products/1/tasks/#{task.to_param}/edit
+   collection_url             # => /products/1/tasks
+
    # /users
-   resource_url          # => /users/#{@user.to_param}
-   resource_url(user)    # => /users/#{user.to_param}
-   new_resource_url      # => /users/new
-   edit_resource_url     # => /users/#{@user.to_param}/edit
-   collection_url        # => /users
+   resource_url               # => /users/#{@user.to_param}
+   resource_url(user)         # => /users/#{user.to_param}
+   new_resource_url           # => /users/new
+   edit_resource_url          # => /users/#{@user.to_param}/edit
+   edit_resource_url(user)    # => /users/#{user.to_param}/edit
+   collection_url             # => /users
+
+Those urls helpers also accepts a hash as options, just as in named routes.
+
+   # /projects/1/tasks
+   collection_url(:page => 1, :limit => 10) #=> /products/1/tasks?page=1&limit=10
 
-The nice thing is that those urls are not guessed during runtime. They are
+Another nice thing is that those urls are not guessed during runtime. They are
 all created when your application is loaded (except for polymorphic
 associations, that relies on Rails polymorphic_url).
 

data/lib/inherited_resources/base_helpers.rb

@@ -88,14 +88,14 @@ module InheritedResources #:nodoc:
       # set at begin_of_association_chain is not nil.
       #
       def parent?
-        !begin_of_association_chain.nil?
+        false
       end
 
       # This methods gets your begin_of_association_chain and returns the
       # scoped association.
       #
       def end_of_association_chain
-        if parent?
+        if begin_of_association_chain || parent?
           begin_of_association_chain.send(resource_collection_name)
         else
           resource_class
@@ -105,7 +105,7 @@ module InheritedResources #:nodoc:
       # Returns the appropriated method to build the resource.
       #
       def method_for_build
-        parent? ? :build : :new
+        (begin_of_association_chain || parent?) ? :build : :new
       end
 
       # Get resource ivar based on the current resource controller.

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -19,7 +19,7 @@ module InheritedResources #:nodoc:
 
       def parent?
         if resources_configuration[:polymorphic][:optional]
-          !@parent_type.nil?
+          parents_symbols.size > 1 || !@parent_type.nil?
         else
           true
         end

data/lib/inherited_resources/url_helpers.rb

@@ -105,13 +105,10 @@ module InheritedResources #:nodoc:
         ivars = resource_ivars.map{|i| i == :parent ? :parent : "@#{i}" }
 
         # If it's not a singleton, ivars are not empty, not a collection or
-        # not a new named route, we can add args to the method.
+        # not a "new" named route, we can pass a resource as argument.
         #
-        arg = unless base.singleton || ivars.empty? || name == :collection || prefix == :new
-          ivars.push "(given_arg || #{ivars.pop})"
-          'given_arg=nil'
-        else
-          ''
+        unless base.singleton || ivars.empty? || name == :collection || prefix == :new
+          ivars.push "(given_args.first || #{ivars.pop})"
         end
 
         # When polymorphic is true, the segments must be replace by :polymorphic
@@ -167,8 +164,10 @@ module InheritedResources #:nodoc:
             ivars << 'resource_class.new'
           end
 
+          ivars  = "[#{ivars.join(', ')}]"
+
           # Add compact to deal with polymorphic optional associations.
-          ivars  = "[#{ivars.join(', ')}].compact"
+          ivars << '.compact' if base.resources_configuration[:polymorphic][:optional]
         else
           # In the last case, if segments is empty (this usually happens with
           # root singleton resources, we set it to root)
@@ -177,15 +176,20 @@ module InheritedResources #:nodoc:
           ivars    = ivars.join(', ')
         end
 
-        prefix   = prefix ? "#{prefix}_" : ''
+        prefix = prefix ? "#{prefix}_" : ''
+
+        # Add given_options to ivars
+        ivars << (ivars.empty? ? 'given_options' : ', given_options')
 
         base.class_eval <<URL_HELPERS, __FILE__, __LINE__
 protected
-  def #{prefix}#{name}_path(#{arg})
+  def #{prefix}#{name}_path(*given_args)
+    given_options = given_args.extract_options!
     #{prefix}#{segments}_path(#{ivars})
   end
 
-  def #{prefix}#{name}_url(#{arg})
+  def #{prefix}#{name}_url(*given_args)
+    given_options = given_args.extract_options!
     #{prefix}#{segments}_url(#{ivars})
   end
 URL_HELPERS

data/test/url_helpers_test.rb

@@ -57,24 +57,28 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@house', :house)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("houses_#{path_or_url}").with().once
+      controller.expects("houses_#{path_or_url}").with({}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_#{path_or_url}").with(:house).once
+      controller.expects("house_#{path_or_url}").with(:house, {}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_#{path_or_url}").with().once
+      controller.expects("new_house_#{path_or_url}").with({}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_#{path_or_url}").with(:house).once
+      controller.expects("edit_house_#{path_or_url}").with(:house, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
       # With arg
-      controller.expects("house_#{path_or_url}").with(:arg).once
+      controller.expects("house_#{path_or_url}").with(:arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
 
-      controller.expects("house_#{path_or_url}").with(:arg).once
+      controller.expects("house_#{path_or_url}").with(:arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
+
+      # With options
+      controller.expects("house_#{path_or_url}").with(:arg, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -83,20 +87,22 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@universe', :universe)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("root_#{path_or_url}").with().once
+      controller.expects("root_#{path_or_url}").with({}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("universe_#{path_or_url}").with().once
+      controller.expects("universe_#{path_or_url}").with({}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_universe_#{path_or_url}").with().once
+      controller.expects("new_universe_#{path_or_url}").with({}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_universe_#{path_or_url}").with().once
+      controller.expects("edit_universe_#{path_or_url}").with({}).once
       controller.send("edit_resource_#{path_or_url}")
 
-      # With arg
-      assert_raise(ArgumentError){ controller.send("resource_#{path_or_url}", :arg) }
+      # With options
+      # Also tests that argument sent are not used
+      controller.expects("universe_#{path_or_url}").with(:page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -106,24 +112,28 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@table', :table)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_tables_#{path_or_url}").with(:house).once
+      controller.expects("house_tables_#{path_or_url}").with(:house, {}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_table_#{path_or_url}").with(:house, :table).once
+      controller.expects("house_table_#{path_or_url}").with(:house, :table, {}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_table_#{path_or_url}").with(:house).once
+      controller.expects("new_house_table_#{path_or_url}").with(:house, {}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_table_#{path_or_url}").with(:house, :table).once
+      controller.expects("edit_house_table_#{path_or_url}").with(:house, :table, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
       # With arg
-      controller.expects("house_table_#{path_or_url}").with(:house, :arg).once
+      controller.expects("house_table_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
 
-      controller.expects("edit_house_table_#{path_or_url}").with(:house, :arg).once
+      controller.expects("edit_house_table_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
+
+      # With options
+      controller.expects("house_table_#{path_or_url}").with(:house, :arg, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -133,24 +143,28 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@room', :room)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("big_house_rooms_#{path_or_url}").with(:house).once
+      controller.expects("big_house_rooms_#{path_or_url}").with(:house, {}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("big_house_room_#{path_or_url}").with(:house, :room).once
+      controller.expects("big_house_room_#{path_or_url}").with(:house, :room, {}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_big_house_room_#{path_or_url}").with(:house).once
+      controller.expects("new_big_house_room_#{path_or_url}").with(:house, {}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :room).once
+      controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :room, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
       # With args
-      controller.expects("big_house_room_#{path_or_url}").with(:house, :arg).once
+      controller.expects("big_house_room_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
 
-      controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :arg).once
+      controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
+
+      # With options
+      controller.expects("big_house_room_#{path_or_url}").with(:house, :arg, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -161,24 +175,28 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@chair', :chair)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_table_chairs_#{path_or_url}").with(:house, :table).once
+      controller.expects("house_table_chairs_#{path_or_url}").with(:house, :table, {}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_table_chair_#{path_or_url}").with(:house, :table, :chair).once
+      controller.expects("house_table_chair_#{path_or_url}").with(:house, :table, :chair, {}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_table_chair_#{path_or_url}").with(:house, :table).once
+      controller.expects("new_house_table_chair_#{path_or_url}").with(:house, :table, {}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :chair).once
+      controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :chair, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
       # With args
-      controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :arg).once
+      controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
 
-      controller.expects("house_table_chair_#{path_or_url}").with(:house, :table, :arg).once
+      controller.expects("house_table_chair_#{path_or_url}").with(:house, :table, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
+
+      # With options
+      controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :arg, :page => 1).once
+      controller.send("edit_resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -188,19 +206,22 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.instance_variable_set('@owner', :owner)
 
     [:url, :path].each do |path_or_url|
-      controller.expects("house_#{path_or_url}").with(:house).once
+      controller.expects("house_#{path_or_url}").with(:house, {}).once
       controller.send("collection_#{path_or_url}")
 
-      controller.expects("house_owner_#{path_or_url}").with(:house).once
+      controller.expects("house_owner_#{path_or_url}").with(:house, {}).once
       controller.send("resource_#{path_or_url}")
 
-      controller.expects("new_house_owner_#{path_or_url}").with(:house).once
+      controller.expects("new_house_owner_#{path_or_url}").with(:house, {}).once
       controller.send("new_resource_#{path_or_url}")
 
-      controller.expects("edit_house_owner_#{path_or_url}").with(:house).once
+      controller.expects("edit_house_owner_#{path_or_url}").with(:house, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
-      assert_raise(ArgumentError){ controller.send("resource_#{path_or_url}", :arg) }
+      # With options
+      # Also tests that argument sent are not used
+      controller.expects("house_owner_#{path_or_url}").with(:house, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
 
@@ -230,12 +251,16 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_bed_#{path_or_url}").with(house, bed).once
       controller.send("edit_resource_#{path_or_url}")
     end
-    
-    # Testing if it accepts args...
-    controller.expects("polymorphic_url").with([house, :arg]).once
+
+    # With options
+    controller.expects("house_bed_url").with(house, bed, :page => 1).once
+    controller.send("resource_url", :page => 1)
+
+    # With args
+    controller.expects("polymorphic_url").with([house, :arg], {}).once
     controller.send("resource_url", :arg)
 
-    controller.expects("edit_polymorphic_url").with([house, :arg]).once
+    controller.expects("edit_polymorphic_url").with([house, :arg], {}).once
     controller.send("edit_resource_url", :arg)
   end
 
@@ -268,11 +293,15 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.send("edit_resource_#{path_or_url}")
     end
 
-    # Testing if it accepts args...
-    controller.expects("polymorphic_url").with([house, table, :arg]).once
+    # With options
+    controller.expects("house_table_dish_url").with(house, table, dish, :page => 1).once
+    controller.send("resource_url", :page => 1)
+
+    # With args
+    controller.expects("polymorphic_url").with([house, table, :arg], {}).once
     controller.send("resource_url", :arg)
 
-    controller.expects("edit_polymorphic_url").with([house, table, :arg]).once
+    controller.expects("edit_polymorphic_url").with([house, table, :arg], {}).once
     controller.send("edit_resource_url", :arg)
   end
 
@@ -302,10 +331,15 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("edit_house_table_center_#{path_or_url}").with(house, table).once
       controller.send("edit_resource_#{path_or_url}")
-
-      # With arg
-      assert_raise(ArgumentError){ controller.send("resource_#{path_or_url}", :arg) }
     end
+
+    # With options
+    controller.expects("house_table_center_url").with(house, table, :page => 1)
+    controller.send("resource_url", :page => 1)
+
+    # With args
+    controller.expects("polymorphic_url").with([house, table, :center], {}).once
+    controller.send("resource_url", :arg)
   end
 
   def test_url_helpers_on_optional_polymorphic_belongs_to
@@ -332,11 +366,15 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.send("edit_resource_#{path_or_url}")
     end
 
-    # Testing if it accepts args...
-    controller.expects("polymorphic_url").with([:arg]).once
+    # With options
+    controller.expects("bed_url").with(bed, :page => 1).once
+    controller.send("resource_url", :page => 1)
+
+    # With args
+    controller.expects("polymorphic_url").with([:arg], {}).once
     controller.send("resource_url", :arg)
 
-    controller.expects("edit_polymorphic_url").with([:arg]).once
+    controller.expects("edit_polymorphic_url").with([:arg], {}).once
     controller.send("edit_resource_url", :arg)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 -08:00
+date: 2009-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: []