josevalim-inherited_resources 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+# Version 0.9
+
+* Backported ActionController::Responder from Rails 3;
+* Added parent_url helper;
+* Added association_chain helper (as suggested by http://github.com/emmanuel);
+
 # Version 0.8
 
 * Fixed a small bug on optional belongs to with namespaced controllers.

data/{README → README.rdoc}

@@ -1,13 +1,8 @@
 Inherited Resources
 License: MIT
-Version: 0.9.0
+Version: 0.9.1
 
-You can also read this README in pretty html at the GitHub project Wiki page:
-
-  http://wiki.github.com/josevalim/inherited_resources
-
-Description
------------
+== Description
 
 Inherited Resources speeds up development by making your controllers inherit
 all restful actions so you just have to focus on what is important. It makes
@@ -20,8 +15,7 @@ Inherited Resources is tested and compatible with Rails 2.2.x and Rails 2.3.x.
 
 keywords: resources, controller, singleton, belongs_to, polymorphic, named_scope and I18n
 
-Installation
-------------
+== Installation
 
 Install Inherited Resources is very easy. It is stored in GitHub, so just run
 the following:
@@ -33,8 +27,7 @@ If you want it as plugin, just do:
 
     script/plugin install git://github.com/josevalim/inherited_resources.git
 
-Basic Usage
------------
+== Basic Usage
 
 To use Inherited Resources you just have to inherit (duh) it:
 
@@ -92,8 +85,7 @@ call inherit_resources in your controller class scope:
       inherit_resources
     end
 
-Overwriting defaults
---------------------
+== Overwriting defaults
 
 Whenever you inherit from InheritedResources, several defaults are assumed.
 For example you can have an AccountsController to account management while the
@@ -146,8 +138,7 @@ You can deal with it just doing:
         end
     end
 
-Overwriting actions
--------------------
+== Overwriting actions
 
 Let's suppose that after destroying a project you want to redirect to your
 root url instead of redirecting to projects url. You just have to do:
@@ -228,8 +219,7 @@ give a block that expects two arguments, the first will be executed only in
 success scenarios and the second in failure scenarios. You keep everything
 clean and organized inside the same action.
 
-Some DSL
---------
+== Some DSL
 
 For those DSL lovers, InheritedResources won't leave you alone. You can overwrite
 your success/failure blocks straight from your class binding. For it, you just
@@ -247,8 +237,7 @@ And then you can rewrite the last example as:
       end
     end
 
-Flash messages and I18n
------------------------
+== Flash messages and I18n
 
 Flash messages are powered by I18n api. It checks for messages in the following
 order:
@@ -311,8 +300,7 @@ the messages will be checked in the following order:
     flash.projects.create.notice
     flash.actions.create.notice
 
-Has Scope
----------
+== Has Scope
 
 InheritedResources tries to integrate nicely with your model. In order to do so,
 it also is named_scope fluent. Let's suppose our Project model with the scopes:
@@ -352,8 +340,7 @@ per page. In such cases, you can give a proc as default value:
 
     has_scope :limit, :default => proc{|c| c.session[:limit] || 10 }
 
-Belongs to
-----------
+== Belongs to
 
 Finally, our Projects are going to get some Tasks. Then you create a
 TasksController and do:
@@ -373,8 +360,7 @@ customize how InheritedResources find your projects:
 It also accepts :route_name, :parent_class and :instance_name as options.
 Check the lib/inherited_resources/class_methods.rb for more.
 
-Nested belongs to
------------------
+== Nested belongs to
 
 Now, our Tasks get some Comments and you need to nest even deeper. Good
 practices says that you should never nest more than two resources, but sometimes
@@ -401,8 +387,7 @@ Warning: calling several belongs_to is the same as nesting them:
 
 In other words, the code above is the same as calling nested_belongs_to.
 
-Polymorphic belongs to
-----------------------
+== Polymorphic belongs to
 
 We can go even further. Let's suppose our Projects can now have Files, Messages
 and Tasks, and they are all commentable. In this case, the best solution is to
@@ -434,8 +419,7 @@ When using polymorphic associations, you get some free helpers:
     parent_class    #=> Task
     parent          #=> @task
 
-Optional belongs to
--------------------
+== Optional belongs to
 
 Later you decide to create a view to show all comments, independent if they belong
 to a task, file or message. You can reuse your polymorphic controller just doing:
@@ -460,8 +444,7 @@ are available. As you expect, when no parent is found, the helpers return:
     parent_class    #=> nil
     parent          #=> nil
 
-Singletons
-----------
+== Singletons
 
 Now we are going to add manager to projects. We say that Manager is a singleton
 resource because a Project has just one manager. You should declare it as
@@ -477,8 +460,7 @@ option.
 
 It will deal with everything again and hide the action :index from you.
 
-URL Helpers
------------
+== URL Helpers
 
 When you use InheritedResources it creates some URL helpers.
 And they handle everything for you. :)
@@ -490,6 +472,7 @@ And they handle everything for you. :)
     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
+    parent_url                 # => /posts/1
 
     # /projects/1/tasks
     resource_url               # => /projects/1/tasks/#{@task.to_param}
@@ -498,6 +481,7 @@ And they handle everything for you. :)
     edit_resource_url          # => /projects/1/tasks/#{@task.to_param}/edit
     edit_resource_url(task)    # => /projects/1/tasks/#{task.to_param}/edit
     collection_url             # => /projects/1/tasks
+    parent_url                 # => /projects/1
 
     # /users
     resource_url               # => /users/#{@user.to_param}
@@ -506,6 +490,7 @@ And they handle everything for you. :)
     edit_resource_url          # => /users/#{@user.to_param}/edit
     edit_resource_url(user)    # => /users/#{user.to_param}/edit
     collection_url             # => /users
+    parent_url                 # => /
 
 Those urls helpers also accepts a hash as options, just as in named routes.
 
@@ -518,11 +503,10 @@ 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).
 
-Bugs and Feedback
------------------
+== Bugs and Feedback
 
 If you discover any bugs, please send an e-mail to jose.valim@plataformatec.com.br
 If you just want to give some positive feedback or drop a line, that's fine too!
 
-Copyright (c) 2009 José Valim
+Copyright (c) 2009 José Valim<br />
 http://blog.plataformatec.com.br/

data/Rakefile

@@ -31,7 +31,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'InheritedResources'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('MIT-LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/inherited_resources/base.rb

@@ -25,7 +25,7 @@ module InheritedResources
 
         helper_method :collection_url, :collection_path, :resource_url, :resource_path,
                       :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
-                      :resource, :collection, :resource_class
+                      :parent_url, :parent_path, :resource, :collection, :resource_class, :association_chain
 
         base.with_options :instance_writer => false do |c|
           c.class_inheritable_accessor :resource_class

data/lib/inherited_resources/base_helpers.rb

@@ -82,6 +82,16 @@ module InheritedResources
         false
       end
 
+      # Returns the association chain, with all parents (does not include the
+      # current resource).
+      #
+      def association_chain
+        @association_chain ||=
+          symbols_for_association_chain.inject([begin_of_association_chain]) do |chain, symbol|
+            chain << evaluate_parent(symbol, resources_configuration[symbol], chain.last)
+          end.compact.freeze
+      end
+
       # Overwrite this method to provide other interpolation options when
       # the flash message is going to be set.
       #
@@ -107,11 +117,7 @@ module InheritedResources
       # parents chain and returns the scoped association.
       #
       def end_of_association_chain #:nodoc:
-        chain = symbols_for_association_chain.inject(begin_of_association_chain) do |chain, symbol|
-          evaluate_parent(symbol, resources_configuration[symbol], chain)
-        end
-
-        if chain
+        if chain = association_chain.last
           if method_for_association_chain
             apply_scope_to(chain.send(method_for_association_chain))
           else

data/lib/inherited_resources/class_methods.rb

@@ -115,8 +115,8 @@ module InheritedResources
       #
       # * <tt>:except</tt> - In which actions the scope is not applied. By default is :none.
       #
-      # * <tt>:key</tt> - The key in the params hash expected to find the scope.
-      #                   Defaults to the scope name.
+      # * <tt>:as</tt> - The key in the params hash expected to find the scope.
+      #                  Defaults to the scope name.
       #
       # * <tt>:default</tt> - Default value for the scope. Whenever supplied the scope
       #                       is always called. This is useful to add easy pagination.
@@ -125,7 +125,12 @@ module InheritedResources
         options = scopes.extract_options!
 
         options.symbolize_keys!
-        options.assert_valid_keys(:boolean, :key, :only, :except, :default)
+        options.assert_valid_keys(:boolean, :key, :only, :except, :default, :as)
+
+        if options[:key]
+          ActiveSupport::Deprecation.warn "has_scope :key is deprecated, use :as instead"
+          options[:as] ||= options[:key]
+        end
 
         if self.scopes_configuration.empty?
           include HasScopeHelpers
@@ -134,7 +139,7 @@ module InheritedResources
 
         scopes.each do |scope|
           self.scopes_configuration[scope]         ||= {}
-          self.scopes_configuration[scope][:key]     = options[:key] || scope
+          self.scopes_configuration[scope][:as]      = options[:as] || scope
           self.scopes_configuration[scope][:only]    = Array(options[:only])
           self.scopes_configuration[scope][:except]  = Array(options[:except])
           self.scopes_configuration[scope][:boolean] = options[:boolean] if options.key?(:boolean)

data/lib/inherited_resources/dsl.rb

@@ -0,0 +1,26 @@
+module InheritedResources
+  # Allows controllers to write actions using a class method DSL.
+  #
+  #   class MyController < InheritedResources::Base
+  #     create! do |success, failure|
+  #       success.html { render :text => "It works!" }
+  #     end
+  #   end
+  #
+  module DSL
+    def self.included(base)
+      ACTIONS.each do |action|
+        base.class_eval <<-WRITTER
+          def self.#{action}!(options={}, &block)
+            define_method #{action.inspect}!, &block
+            class_eval <<-ACTION
+              def #{action}
+                super(\#{options.inspect}, &method(#{action.inspect}!))
+              end
+            ACTION
+          end
+        WRITTER
+      end
+    end
+  end
+end

data/lib/inherited_resources/has_scope_helpers.rb

@@ -17,7 +17,7 @@ module InheritedResources
 
         self.scopes_configuration.each do |scope, options|
           next unless apply_scope_to_action?(options)
-          key = options[:key]
+          key = options[:as]
 
           if params.key?(key)
             value, call_scope = params[key], true

data/lib/inherited_resources/legacy/respond_to.rb

@@ -53,32 +53,17 @@ module ActionController #:nodoc:
 
     def respond_to(*mimes, &block)
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
-
-      responder = ActionController::MimeResponds::Responder.new(self)
-      mimes = collect_mimes_from_class_level if mimes.empty?
-      mimes.each { |mime| responder.send(mime) }
-      block.call(responder) if block_given?
-
-      if format = responder.negotiate_mime
-        self.response.template.template_format = format.to_sym
-        self.response.content_type = format.to_s
-        self.formats = [ format.to_sym ]
-
-        if response = responder.response_for(format)
-          response.call
-        else
-          default_render
-        end
-      else
-        head :not_acceptable
+      if response = retrieve_response_from_mimes(mimes, &block)
+        response.call
       end
     end
 
     def respond_with(*resources, &block)
-      respond_to(&block)
-    rescue ActionView::MissingTemplate
-      options = resources.extract_options!
-      (options.delete(:responder) || responder).call(self, resources, options)
+      if response = retrieve_response_from_mimes([], &block)
+        options = resources.extract_options!
+        options.merge!(:default_response => response)
+        (options.delete(:responder) || responder).call(self, resources, options)
+      end
     end
 
     def responder
@@ -105,6 +90,26 @@ module ActionController #:nodoc:
         end
       end
     end
+
+    # Collects mimes and return the response for the negotiated format. Returns
+    # nil if :not_acceptable was sent to the client.
+    #
+    def retrieve_response_from_mimes(mimes, &block)
+      responder = ActionController::MimeResponds::Responder.new(self)
+      mimes = collect_mimes_from_class_level if mimes.empty?
+      mimes.each { |mime| responder.send(mime) }
+      block.call(responder) if block_given?
+
+      if format = responder.negotiate_mime
+        self.response.template.template_format = format.to_sym
+        self.response.content_type = format.to_s
+        self.formats = [ format.to_sym ]
+        responder.response_for(format) || proc { default_render }
+      else
+        head :not_acceptable
+        nil
+      end
+    end
   end
 
   module MimeResponds

data/lib/inherited_resources/legacy/responder.rb

@@ -79,15 +79,16 @@ module ActionController #:nodoc:
   # Check polymorphic_url documentation for more examples.
   #
   class Responder
-    attr_reader :controller, :request, :format, :resource, :resource_location, :options
+    attr_reader :controller, :request, :format, :resource, :resources, :options
 
     def initialize(controller, resources, options={})
       @controller = controller
       @request = controller.request
       @format = controller.formats.first
       @resource = resources.is_a?(Array) ? resources.last : resources
-      @resource_location = options[:location] || resources
+      @resources = resources
       @options = options
+      @default_response = options.delete(:default_response)
     end
 
     delegate :head, :render, :redirect_to,   :to => :controller
@@ -109,8 +110,10 @@ module ActionController #:nodoc:
     # template.
     #
     def to_html
+      default_render
+    rescue ActionView::MissingTemplate
       if get?
-        render
+        raise
       elsif has_errors?
         render :action => default_action
       else
@@ -118,12 +121,14 @@ module ActionController #:nodoc:
       end
     end
 
-    # All others formats try to render the resource given instead. For this
-    # purpose a helper called display as a shortcut to render a resource with
-    # the current format.
+    # All others formats follow the procedure below. First we try to render a
+    # template, if the template is not available, we verify if the resource
+    # responds to :to_format and display it.
     #
     def to_format
-      return render unless resourceful?
+      default_render
+    rescue ActionView::MissingTemplate
+      raise unless resourceful?
 
       if get?
         display resource
@@ -144,6 +149,20 @@ module ActionController #:nodoc:
       resource.respond_to?(:"to_#{format}")
     end
 
+    # Returns the resource location by retrieving it from the options or
+    # returning the resources array.
+    #
+    def resource_location
+      options[:location] || resources
+    end
+
+    # If a given response block was given, use it, otherwise call render on
+    # controller.
+    #
+    def default_render
+      @default_response.call
+    end
+
     # display is just a shortcut to render a resource with the current format.
     #
     #   display @user, :status => :ok

data/lib/inherited_resources/url_helpers.rb

@@ -10,13 +10,15 @@ module InheritedResources
   #  new_resource_url      # => /posts/1/comments/new
   #  edit_resource_url     # => /posts/1/comments/#{@comment.to_param}/edit
   #  collection_url        # => /posts/1/comments
+  #  parent_url            # => /posts/1
   #
   #  # /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          # => /projects/1/tasks/#{@task.to_param}
+  #  resource_url(task)    # => /projects/1/tasks/#{task.to_param}
+  #  new_resource_url      # => /projects/1/tasks/new
+  #  edit_resource_url     # => /projects/1/tasks/#{@task.to_param}/edit
+  #  collection_url        # => /projects/1/tasks
+  #  parent_url            # => /projects/1
   #
   #  # /users
   #  resource_url          # => /users/#{@user.to_param}
@@ -24,6 +26,7 @@ module InheritedResources
   #  new_resource_url      # => /users/new
   #  edit_resource_url     # => /users/#{@user.to_param}/edit
   #  collection_url        # => /users
+  #  parent_url            # => /
   #
   # The nice thing is that those urls are not guessed during runtime. They are
   # all created when you inherit.
@@ -72,6 +75,9 @@ module InheritedResources
       collection_ivars    = resource_ivars.dup
       collection_segments = resource_segments.dup
 
+      # Generate parent url before we add resource instances.
+      generate_url_and_path_helpers nil, :parent, resource_segments, resource_ivars
+
       # This is the default route configuration, later we have to deal with
       # exception from polymorphic and singleton cases.
       #
@@ -126,7 +132,7 @@ module InheritedResources
       # If it's not a singleton, ivars are not empty, not a collection or
       # not a "new" named route, we can pass a resource as argument.
       #
-      unless singleton || ivars.empty? || name == :collection || prefix == :new
+      unless (singleton && name != :parent) || ivars.empty? || name == :collection || prefix == :new
         ivars.push "(given_args.first || #{ivars.pop})"
       end
 

data/test/association_chain_test.rb

@@ -0,0 +1,125 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class Pet
+  def self.human_name; 'Pet'; end
+end
+
+class Puppet
+  def self.human_name; 'Puppet'; end
+end
+
+class PetsController < InheritedResources::Base
+  attr_accessor :current_user
+  
+  def edit
+    @pet = 'new pet'
+    edit!
+  end
+
+  protected
+    def collection
+      @pets ||= end_of_association_chain.all
+    end
+
+    def begin_of_association_chain
+      @current_user
+    end
+end
+
+class BeginOfAssociationChainTest < ActionController::TestCase
+  tests PetsController
+
+  def setup
+    @controller.current_user = mock()
+  end
+
+  def test_begin_of_association_chain_is_called_on_index
+    @controller.current_user.expects(:pets).returns(Pet)
+    Pet.expects(:all).returns(mock_pet)
+    get :index
+    assert_response :success
+    assert_equal 'Index HTML', @response.body.strip
+  end
+
+  def test_begin_of_association_chain_is_called_on_new
+    @controller.current_user.expects(:pets).returns(Pet)
+    Pet.expects(:build).returns(mock_pet)
+    get :new
+    assert_response :success
+    assert_equal 'New HTML', @response.body.strip
+  end
+
+  def test_begin_of_association_chain_is_called_on_show
+    @controller.current_user.expects(:pets).returns(Pet)
+    Pet.expects(:find).with('47').returns(mock_pet)
+    get :show, :id => '47'
+    assert_response :success
+    assert_equal 'Show HTML', @response.body.strip
+  end
+
+  def test_instance_variable_should_not_be_set_if_already_defined
+    @controller.current_user.expects(:pets).never
+    Pet.expects(:find).never
+    get :edit
+    assert_response :success
+    assert_equal 'new pet', assigns(:pet)
+  end
+
+  def test_model_is_not_initialized_with_nil
+    @controller.current_user.expects(:pets).returns(Pet)
+    Pet.expects(:build).with({}).returns(mock_pet)
+    get :new
+    assert_equal mock_pet, assigns(:pet)
+  end
+
+  def test_begin_of_association_chain_is_included_in_chain
+    @controller.current_user.expects(:pets).returns(Pet)
+    Pet.expects(:build).with({}).returns(mock_pet)
+    get :new
+    assert_equal [@controller.current_user], @controller.send(:association_chain)
+  end
+
+  protected
+    def mock_pet(stubs={})
+      @mock_pet ||= mock(stubs)
+    end
+
+end
+
+class PuppetsController < InheritedResources::Base
+  optional_belongs_to :pet
+end
+
+class AssociationChainTest < ActionController::TestCase
+  tests PuppetsController
+
+  def setup
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_parent_is_added_to_association_chain
+    Pet.expects(:find).with('37').returns(mock_pet)
+    mock_pet.expects(:puppets).returns(Puppet)
+    Puppet.expects(:find).with('42').returns(mock_puppet)
+    mock_puppet.expects(:destroy)
+    delete :destroy, :id => '42', :pet_id => '37'
+    assert_equal [mock_pet], @controller.send(:association_chain)
+  end
+
+  def test_parent_is_added_to_association_chain_if_not_available
+    Puppet.expects(:find).with('42').returns(mock_puppet)
+    mock_puppet.expects(:destroy)
+    delete :destroy, :id => '42'
+    assert_equal [], @controller.send(:association_chain)
+  end
+
+  protected
+    def mock_pet(stubs={})
+      @mock_pet ||= mock(stubs)
+    end
+
+    def mock_puppet(stubs={})
+      @mock_puppet ||= mock(stubs)
+    end
+end

data/test/class_methods_test.rb

@@ -131,7 +131,7 @@ class HasScopeClassMethods < ActiveSupport::TestCase
     assert config.key?(:by_city)
     assert config.key?(:featured)
 
-    assert_equal config[:by_city], { :key => :by_city, :only => [], :except => [] }
-    assert_equal config[:featured], { :key => :by_featured, :only => [ :index ], :except => [], :boolean => true }
+    assert_equal config[:by_city], { :as => :by_city, :only => [], :except => [] }
+    assert_equal config[:featured], { :as => :by_featured, :only => [ :index ], :except => [], :boolean => true }
   end
 end

data/test/has_scope_test.rb

@@ -8,7 +8,7 @@ class TreesController < InheritedResources::Base
   has_scope :color
   has_scope :only_tall, :boolean => true, :only => :index
   has_scope :shadown_range, :default => 10, :except => [ :index, :show, :destroy, :new ]
-  has_scope :root_type, :key => :root
+  has_scope :root_type, :as => :root
   has_scope :calculate_height, :default => proc {|c| c.session[:height] || 20 }, :only => :new
 end
 

data/test/url_helpers_test.rb

@@ -82,6 +82,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_#{path_or_url}").with(:house, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("root_#{path_or_url}").with({}).once
+      controller.send("parent_#{path_or_url}")
+
       # With arg
       controller.expects("house_#{path_or_url}").with(:arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
@@ -114,6 +117,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_admin_backpack_#{path_or_url}").with(:backpack, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("admin_#{path_or_url}").with({}).once
+      controller.send("parent_#{path_or_url}")
+
       # With arg
       controller.expects("admin_backpack_#{path_or_url}").with(:arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
@@ -144,6 +150,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_universum_#{path_or_url}").with({}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("root_#{path_or_url}").with({}).once
+      controller.send("parent_#{path_or_url}")
+
       # With options
       # Also tests that argument sent are not used
       controller.expects("universum_#{path_or_url}").with(:page => 1).once
@@ -169,6 +178,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_table_#{path_or_url}").with(:house, :table, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("house_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
       # With arg
       controller.expects("house_table_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
@@ -176,6 +188,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_table_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
 
+      controller.expects("house_#{path_or_url}").with(:arg, {}).once
+      controller.send("parent_#{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)
@@ -200,6 +215,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :room, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("big_house_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
       # With args
       controller.expects("big_house_room_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
@@ -207,6 +225,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_big_house_room_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
 
+      controller.expects("big_house_#{path_or_url}").with(:arg, {}).once
+      controller.send("parent_#{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)
@@ -232,6 +253,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :chair, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("house_table_#{path_or_url}").with(:house, :table, {}).once
+      controller.send("parent_#{path_or_url}")
+
       # With args
       controller.expects("edit_house_table_chair_#{path_or_url}").with(:house, :table, :arg, {}).once
       controller.send("edit_resource_#{path_or_url}", :arg)
@@ -239,6 +263,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("house_table_chair_#{path_or_url}").with(:house, :table, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
 
+      controller.expects("house_table_#{path_or_url}").with(:house, :arg, {}).once
+      controller.send("parent_#{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)
@@ -263,6 +290,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("edit_house_owner_#{path_or_url}").with(:house, {}).once
       controller.send("edit_resource_#{path_or_url}")
 
+      controller.expects("house_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
       # With options
       # Also tests that argument sent are not used
       controller.expects("house_owner_#{path_or_url}").with(:house, :page => 1).once
@@ -295,12 +325,18 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("edit_house_bed_#{path_or_url}").with(house, bed).once
       controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("house_#{path_or_url}").with(house).once
+      controller.send("parent_#{path_or_url}")
     end
 
     # With options
     controller.expects("house_bed_url").with(house, bed, :page => 1).once
     controller.send("resource_url", :page => 1)
 
+    controller.expects("house_url").with(house, :page => 1).once
+    controller.send("parent_url", :page => 1)
+
     # With args
     controller.expects("polymorphic_url").with([:arg, new_bed], {}).once
     controller.send("collection_url", :arg)
@@ -310,6 +346,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
     controller.expects("edit_polymorphic_url").with([house, :arg], {}).once
     controller.send("edit_resource_url", :arg)
+
+    controller.expects("polymorphic_url").with([:arg], {}).once
+    controller.send("parent_url", :arg)
   end
 
   def test_url_helpers_on_namespaced_polymorphic_belongs_to
@@ -337,12 +376,18 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("edit_admin_house_desk_#{path_or_url}").with(house, desk).once
       controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("admin_house_#{path_or_url}").with(house).once
+      controller.send("parent_#{path_or_url}")
     end
 
     # With options
     controller.expects("admin_house_desk_url").with(house, desk, :page => 1).once
     controller.send("resource_url", :page => 1)
 
+    controller.expects("admin_house_url").with(house, :page => 1).once
+    controller.send("parent_url", :page => 1)
+
     # With args
     controller.expects("polymorphic_url").with(['admin', :arg, new_desk], {}).once
     controller.send("collection_url", :arg)
@@ -352,6 +397,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
     controller.expects("edit_polymorphic_url").with(['admin', house, :arg], {}).once
     controller.send("edit_resource_url", :arg)
+
+    controller.expects("polymorphic_url").with(['admin', :arg], {}).once
+    controller.send("parent_url", :arg)
   end
 
   def test_url_helpers_on_nested_polymorphic_belongs_to
@@ -381,18 +429,27 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("edit_house_table_dish_#{path_or_url}").with(house, table, dish).once
       controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("house_table_#{path_or_url}").with(house, table).once
+      controller.send("parent_#{path_or_url}")
     end
 
     # With options
     controller.expects("house_table_dish_url").with(house, table, dish, :page => 1).once
     controller.send("resource_url", :page => 1)
 
+    controller.expects("house_table_url").with(house, table, :page => 1).once
+    controller.send("parent_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.send("edit_resource_url", :arg)
+
+    controller.expects("polymorphic_url").with([house, :arg], {}).once
+    controller.send("parent_url", :arg)
   end
 
   def test_url_helpers_on_singleton_nested_polymorphic_belongs_to
@@ -421,15 +478,24 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("edit_house_table_center_#{path_or_url}").with(house, table).once
       controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("house_table_#{path_or_url}").with(house, table).once
+      controller.send("parent_#{path_or_url}")
     end
 
     # With options
     controller.expects("house_table_center_url").with(house, table, :page => 1)
     controller.send("resource_url", :page => 1)
 
+    controller.expects("house_table_url").with(house, table, :page => 1)
+    controller.send("parent_url", :page => 1)
+
     # With args
     controller.expects("polymorphic_url").with([house, table, :center], {}).once
     controller.send("resource_url", :arg)
+
+    controller.expects("polymorphic_url").with([house, :arg], {}).once
+    controller.send("parent_url", :arg)
   end
 
   def test_url_helpers_on_optional_polymorphic_belongs_to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,11 +20,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - CHANGELOG
 - MIT-LICENSE
-- README
+- README.rdoc
 - Rakefile
 - VERSION
 - lib/inherited_resources.rb
@@ -33,6 +33,7 @@ files:
 - lib/inherited_resources/base_helpers.rb
 - lib/inherited_resources/belongs_to_helpers.rb
 - lib/inherited_resources/class_methods.rb
+- lib/inherited_resources/dsl.rb
 - lib/inherited_resources/dumb_responder.rb
 - lib/inherited_resources/has_scope_helpers.rb
 - lib/inherited_resources/legacy/respond_to.rb
@@ -40,8 +41,9 @@ files:
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/josevalim/inherited_resources
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -62,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
@@ -74,10 +76,10 @@ test_files:
 - test/redirect_to_test.rb
 - test/has_scope_test.rb
 - test/class_methods_test.rb
+- test/association_chain_test.rb
 - test/aliases_test.rb
 - test/flash_test.rb
 - test/url_helpers_test.rb
-- test/base_helpers_test.rb
 - test/belongs_to_test.rb
 - test/polymorphic_test.rb
 - test/defaults_test.rb

data/test/base_helpers_test.rb

@@ -1,77 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Pet
-  def self.human_name; 'Pet'; end
-end
-
-class PetsController < InheritedResources::Base
-  attr_accessor :current_user
-  
-  def edit
-    @pet = 'new pet'
-    edit!
-  end
-
-  protected
-    def collection
-      @pets ||= end_of_association_chain.all
-    end
-
-    def begin_of_association_chain
-      @current_user
-    end
-end
-
-class AssociationChainBaseHelpersTest < ActionController::TestCase
-  tests PetsController
-
-  def setup
-    @controller.current_user = mock()
-  end
-
-  def test_begin_of_association_chain_is_called_on_index
-    @controller.current_user.expects(:pets).returns(Pet)
-    Pet.expects(:all).returns(mock_pet)
-    get :index
-    assert_response :success
-    assert 'Index HTML', @response.body.strip
-  end
-
-  def test_begin_of_association_chain_is_called_on_new
-    @controller.current_user.expects(:pets).returns(Pet)
-    Pet.expects(:build).returns(mock_pet)
-    get :new
-    assert_response :success
-    assert 'New HTML', @response.body.strip
-  end
-
-  def test_begin_of_association_chain_is_called_on_show
-    @controller.current_user.expects(:pets).returns(Pet)
-    Pet.expects(:find).with('47').returns(mock_pet)
-    get :show, :id => '47'
-    assert_response :success
-    assert 'Show HTML', @response.body.strip
-  end
-
-  def test_instance_variable_should_not_be_set_if_already_defined
-    @controller.current_user.expects(:pets).never
-    Pet.expects(:find).never
-    get :edit
-    assert_response :success
-    assert_equal 'new pet', assigns(:pet)
-  end
-
-  def test_model_is_not_initialized_with_nil
-    @controller.current_user.expects(:pets).returns(Pet)
-    Pet.expects(:build).with({}).returns(mock_pet)
-    get :new
-    assert mock_pet, assigns(:pet)
-  end
-
-  protected
-    def mock_pet(stubs={})
-      @mock_pet ||= mock(stubs)
-    end
-
-end
-