inherited_resources 1.3.1 → 1.4.0

data/CHANGELOG

@@ -1,8 +1,16 @@
+# Version 1.4.0
+
+* Supports Ruby 2.0.0
+* Added support for the strong_parameters gem. See the README for more
+* Added the ability to pass without_protection when creating/updating
+* Fixed multi-level nested singletons
+* Correct paths now generated for uncountable shallow resources
+
 # Version 1.3.1
 
 * Fix polymorphic_belongs_to to get the parent
-* Addes support for Rails 3.2
-* Addes support to responders >= 0.6.0
+* Added support for Rails 3.2
+* Added support to responders >= 0.6.0
 
 # Version 1.3.0
 
@@ -41,7 +49,7 @@
   To install it, please do:
 
     sudo gem install has_scope
-  
+
 # Version 0.9
 
 * Allow dual blocks in destroy;

data/Gemfile

@@ -1,6 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 3.1'
+gem 'rails', '~> 3.2'
 gem 'mocha'
+gem 'turn'

data/Gemfile.lock

@@ -3,93 +3,97 @@ PATH
   specs:
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
-      responders (~> 0.6)
+      responders (~> 0.9)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
+    ansi (1.4.3)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     erubis (2.7.0)
     has_scope (0.5.1)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    mail (2.4.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.0)
+    mime-types (1.21)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.1.0)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    responders (0.8.0)
+    responders (0.9.3)
       railties (~> 3.1)
-    sprockets (2.1.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.17.0)
+    tilt (1.3.6)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    turn (0.9.6)
+      ansi
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -97,4 +101,5 @@ PLATFORMS
 DEPENDENCIES
   inherited_resources!
   mocha
-  rails (~> 3.1)
+  rails (~> 3.2)
+  turn

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 José Valim http://blog.plataformatec.com.br
+Copyright (c) 2009-2012 José Valim http://blog.plataformatec.com.br
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,11 +1,3 @@
-=== Deprecation notice
-
-Since Rails 3 came out, I have no longer used Inherited Resources. I have found that the
-responders abstraction and custom Rails generators offer the perfect balance between
-hiding and showing too much logic. That said, I suggest developers to make use of the
-responders gem (at https://github.com/plataformatec/responders) and no longer use Inherited
-Resources.
-
 == Inherited Resources
 
 Inherited Resources speeds up development by making your controllers inherit
@@ -134,6 +126,14 @@ call inherit_resources in your controller class scope:
       inherit_resources
     end
 
+One reason to use the "inherit_resources" macro would be to ensure that your controller never responds with the html mime-type.  InheritedResources::Base already responds_to :html, and the respond_to macro is strictly additive.  Therefore, if you want to create a controller that, for example, responds ONLY via :js, you will have write it this way:
+
+    class AccountsController < ApplicationController
+      respond_to :js
+      inherit_resources
+    end
+
+
 == Overwriting defaults
 
 Whenever you inherit from InheritedResources, several defaults are assumed.
@@ -218,7 +218,7 @@ provided. So you can do:
 
     class ProjectsController < InheritedResources::Base
       def destroy
-        destroy!{ root_url }
+        destroy! { root_url }
       end
     end
 
@@ -298,7 +298,7 @@ in destroy action calculate in following order collection_url, parent_url, root_
 
 Example:
 
-    class ButtonsConntroller < InheritedResources::Base
+    class ButtonsController < InheritedResources::Base
       belongs_to :window
       actions :all, :except => [:show, :index]
     end
@@ -360,7 +360,7 @@ If you need to configure any of these belongs to, you can nest them using blocks
 
 Warning: calling several belongs_to is the same as nesting them:
 
-    class CommentsConroller < InheritedResources::Base
+    class CommentsController < InheritedResources::Base
       belongs_to :project
       belongs_to :task
     end
@@ -467,7 +467,7 @@ And they handle everything for you. :)
     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
+    edit_resource_url(comment) # => /posts/1/comments/#{comment.to_param}/edit
     collection_url             # => /posts/1/comments
     parent_url                 # => /posts/1
 
@@ -539,11 +539,21 @@ And then you can rewrite the last example as:
       end
     end
 
+== Strong Parameters
+
+If your controller defines a method named permitted_params, Inherited Resources will call it where it would normally call params. This allows for easy integration with the strong_parameters gem:
+
+    def permitted_params
+      params.permit(:widget => [:permitted_field, :other_permitted_field])
+    end
+
+Note that this doesn't work if you use strong_parameters' require method instead of permit, because whereas permit returns the entire sanitized parameter hash, require returns only the sanitized params below the parameter you required.
+
 == Bugs and Feedback
 
 If you discover any bugs, please describe it in the issues tracker, including Rails and Inherited Resources versions.
 
 Questions are better handled on StackOverflow.
 
-Copyright (c) 2011 José Valim http://blog.plataformatec.com.br
+Copyright (c) 2009-2012 José Valim http://blog.plataformatec.com.br
 See the attached MIT License.

data/Rakefile

@@ -19,3 +19,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('MIT-LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+# Make test the default task.
+task :default => :test

data/inherited_resources.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency("responders", "~> 0.6")
+  s.add_dependency("responders", "~> 0.9")
   s.add_dependency("has_scope",  "~> 0.5.0")
 end

data/lib/inherited_resources/base_helpers.rb

@@ -67,7 +67,7 @@ module InheritedResources
       end
 
       # Responsible for updating the resource in :update method. This allow you
-      # to handle how the resource is gona be updated, let's say in a different
+      # to handle how the resource is going to be updated, let's say in a different
       # way then the usual :update_attributes:
       #
       #   def update_resource(object, attributes)
@@ -126,8 +126,16 @@ module InheritedResources
       # current resource).
       #
       def association_chain
-        @association_chain ||=
-          symbols_for_association_chain.inject([begin_of_association_chain]) do |chain, symbol|
+        return @association_chain if @association_chain
+
+        symbol_chain = if resources_configuration[:self][:singleton]
+          symbols_for_association_chain.reverse
+        else
+          symbols_for_association_chain
+        end
+
+        @association_chain =
+          symbol_chain.inject([begin_of_association_chain]) do |chain, symbol|
             chain << evaluate_parent(symbol, resources_configuration[symbol], chain.last)
           end.compact.freeze
       end
@@ -164,7 +172,6 @@ module InheritedResources
 
       # This methods gets your begin_of_association_chain, join it with your
       # parents chain and returns the scoped association.
-      #
       def end_of_association_chain #:nodoc:
         if chain = association_chain.last
           if method_for_association_chain
@@ -267,7 +274,7 @@ module InheritedResources
       # It's extend by HasScopeHelpers.
       #
       def apply_scopes_if_available(target_object) #:nodoc:
-        respond_to?(:apply_scopes) ? apply_scopes(target_object) : target_object
+        respond_to?(:apply_scopes, true) ? apply_scopes(target_object) : target_object
       end
 
       # Symbols chain in base helpers return nothing. This is later overwriten
@@ -292,27 +299,46 @@ module InheritedResources
         if respond_to? :index
           url ||= collection_url rescue nil
         end
-        if respond_to? :parent
+        if respond_to? :parent, true
           url ||= parent_url rescue nil
         end
         url ||= root_url rescue nil
       end
 
-      # extract attributes from params
+      # memoize the extraction of attributes from params
       def resource_params
-        rparams = [params[resource_request_name] || params[resource_instance_name] || {}]
-        rparams << as_role if role_given?
+        @resource_params ||= build_resource_params
+      end
+
+      # extract attributes from params
+      def build_resource_params
+        parameters = respond_to?(:permitted_params) ? permitted_params : params
+        rparams = [parameters[resource_request_name] || parameters[resource_instance_name] || {}]
+        if without_protection_given?
+          rparams << without_protection
+        else
+          rparams << as_role if role_given?
+        end
+
         rparams
       end
-      
+
       # checking if role given
       def role_given?
         self.resources_configuration[:self][:role].present?
       end
-      
+
       # getting role for mass-asignment
       def as_role
-         { :as => self.resources_configuration[:self][:role] }
+        { :as => self.resources_configuration[:self][:role] }
+      end
+
+      def without_protection_given?
+        self.resources_configuration[:self][:without_protection].present?
+      end
+
+      def without_protection
+        { :without_protection => self.resources_configuration[:self][:without_protection] }
       end
   end
 end

data/lib/inherited_resources/belongs_to_helpers.rb

@@ -74,13 +74,21 @@ module InheritedResources
         instantiated_object = instance_variable_get("@#{parent_config[:instance_name]}")
         return instantiated_object if instantiated_object
 
-        parent = if chain
-          chain.send(parent_config[:collection_name])
+        if parent_config[:singleton]
+          parent = if chain
+            chain.send(parent_config[:instance_name])
+          else
+            nil
+          end
         else
-          parent_config[:parent_class]
-        end
+          parent = if chain
+            chain.send(parent_config[:collection_name])
+          else
+            parent_config[:parent_class]
+          end
 
-        parent = parent.send(parent_config[:finder], params[parent_config[:param]])
+          parent = parent.send(parent_config[:finder], params[parent_config[:param]])
+        end
 
         instance_variable_set("@#{parent_config[:instance_name]}", parent)
       end

data/lib/inherited_resources/class_methods.rb

@@ -62,7 +62,7 @@ module InheritedResources
         create_resources_url_helpers!
       end
 
-      # Defines wich actions to keep from the inherited controller.
+      # Defines wich actions will be inherited from the inherited controller.
       # Syntax is borrowed from resource_controller.
       #
       #   actions :index, :show, :edit
@@ -145,13 +145,11 @@ module InheritedResources
 
         optional    = options.delete(:optional)
         shallow     = options.delete(:shallow)
-        singleton   = options.delete(:singleton)
         polymorphic = options.delete(:polymorphic)
         finder      = options.delete(:finder)
 
         include BelongsToHelpers if self.parents_symbols.empty?
 
-        acts_as_singleton!   if singleton
         acts_as_polymorphic! if polymorphic || optional
         acts_as_shallow!     if shallow
 
@@ -181,7 +179,7 @@ module InheritedResources
             nil
           end
 
-
+          config[:singleton]       = options.delete(:singleton) || false
           config[:collection_name] = options.delete(:collection_name) || symbol.to_s.pluralize.to_sym
           config[:instance_name]   = options.delete(:instance_name) || symbol
           config[:param]           = options.delete(:param) || :"#{symbol}_id"
@@ -260,7 +258,11 @@ module InheritedResources
       # Makes sense when using rails 3.1 mass assignment conventions
       def with_role(role)
         self.resources_configuration[:self][:role] = role.try(:to_sym)
-      end 
+      end
+
+      def without_protection(flag)
+        self.resources_configuration[:self][:without_protection] = flag
+      end
 
     private
 

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -142,7 +142,7 @@ module InheritedResources
             end.compact
 
             if keys.empty?
-              raise ScriptError, "Could not find param for polymorphic association. The request" <<
+              raise ScriptError, "Could not find param for polymorphic association. The request " <<
                                  "parameters are #{params.keys.inspect} and the polymorphic " <<
                                  "associations are #{polymorphic_config[:symbols].inspect}." unless polymorphic_config[:optional]
 

data/lib/inherited_resources/url_helpers.rb

@@ -47,7 +47,8 @@ module InheritedResources
       resource_segments, resource_ivars = [], []
       resource_config = self.resources_configuration[:self]
 
-      singleton   = self.resources_configuration[:self][:singleton]
+      singleton   = resource_config[:singleton]
+      uncountable = !singleton && resource_config[:route_collection_name] == resource_config[:route_instance_name]
       polymorphic = self.parents_symbols.include?(:polymorphic)
 
       # Add route_prefix if any.
@@ -68,8 +69,14 @@ module InheritedResources
           resource_ivars << :parent
         else
           config = self.resources_configuration[symbol]
-          resource_segments << config[:route_name]
-          resource_ivars    << :"@#{config[:instance_name]}"
+          if config[:singleton] && polymorphic
+            resource_ivars << config[:instance_name].inspect
+          else
+            resource_segments << config[:route_name]
+          end
+          if !config[:singleton]
+            resource_ivars    << :"@#{config[:instance_name]}"
+          end
         end
       end
 
@@ -123,9 +130,8 @@ module InheritedResources
       end
 
       # If route is uncountable then add "_index" suffix to collection index route name
-      #
-      if !singleton && resource_config[:route_collection_name] == resource_config[:route_instance_name]
-        collection_segments << :index
+      if uncountable
+        collection_segments << :"#{collection_segments.pop}_index"
       end
 
       generate_url_and_path_helpers nil,   :collection, collection_segments, collection_ivars

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/test/base_test.rb

@@ -178,7 +178,7 @@ class CreateActionBaseTest < ActionController::TestCase
     post :create, :user => {:these => 'params'}
     assert_equal mock_user, assigns(:user)
   end
-  
+
   def test_expose_a_newly_create_user_when_saved_with_success_and_role_setted
     @controller.class.send(:with_role, :admin)
     User.expects(:new).with({'these' => 'params'}, {:as => :admin}).returns(mock_user(:save => true))
@@ -187,6 +187,14 @@ class CreateActionBaseTest < ActionController::TestCase
     @controller.class.send(:with_role, nil)
   end
 
+  def test_expose_a_newly_create_user_when_saved_with_success_and_without_protection_setted
+   @controller.class.send(:without_protection, true)
+    User.expects(:new).with({'these' => 'params'}, {:without_protection => true}).returns(mock_user(:save => true))
+    post :create, :user => {:these => 'params'}
+    assert_equal mock_user, assigns(:user)
+    @controller.class.send(:without_protection, nil)
+  end
+
   def test_redirect_to_the_created_user
     User.stubs(:new).returns(mock_user(:save => true))
     @controller.expects(:resource_url).returns('http://test.host/')
@@ -229,7 +237,7 @@ class UpdateActionBaseTest < ActionController::TestCase
     put :update, :id => '42', :user => {:these => 'params'}
     assert_equal mock_user, assigns(:user)
   end
-  
+
   def test_update_the_requested_object_when_setted_role
     @controller.class.send(:with_role, :admin)
     User.expects(:find).with('42').returns(mock_user)
@@ -239,6 +247,15 @@ class UpdateActionBaseTest < ActionController::TestCase
     @controller.class.send(:with_role, nil)
   end
 
+  def test_update_the_requested_object_when_setted_without_protection
+    @controller.class.send(:without_protection, true)
+    User.expects(:find).with('42').returns(mock_user)
+    mock_user.expects(:update_attributes).with({'these' => 'params'}, {:without_protection => true}).returns(true)
+    put :update, :id => '42', :user => {:these => 'params'}
+    assert_equal mock_user, assigns(:user)
+    @controller.class.send(:without_protection, nil)
+  end
+
   def test_redirect_to_the_updated_user
     User.stubs(:find).returns(mock_user(:update_attributes => true))
     @controller.expects(:resource_url).returns('http://test.host/')

data/test/nested_singleton_test.rb

@@ -0,0 +1,167 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+# This test file is instead to test the how controller flow and actions
+# using a belongs_to association. This is done using mocks a la rspec.
+#
+class Party
+  extend ActiveModel::Naming
+end
+
+class Venue
+  extend ActiveModel::Naming
+end
+
+class Address 
+  extend ActiveModel::Naming
+end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.singular "address", "address"
+  inflect.plural   "address", "addresses"
+end
+
+class VenueController < InheritedResources::Base
+  defaults :singleton => true
+  belongs_to :party
+end
+
+# for the slightly pathological 
+# /party/37/venue/address case
+class AddressController < InheritedResources::Base
+  defaults :singleton => true
+  belongs_to :venue, :singleton => true do
+    belongs_to :party
+  end
+end
+
+#and the more pathological case
+class GeolocationController < InheritedResources::Base
+  defaults :singleton => true
+  belongs_to :address, :singleton => true do
+    belongs_to :venue, :singleton => true do
+      belongs_to :party
+    end
+  end
+end
+
+class NestedSingletonTest < ActionController::TestCase
+  tests AddressController
+
+  def setup
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_does_not_break_parent_controller
+    #this is kind of tacky, but seems to work
+    old_controller = @controller
+    @controller = VenueController.new
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    get :show, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+  ensure
+    @controller = old_controller
+  end
+
+  def test_does_not_break_child_controller
+    #this is kind of tacky, but seems to work
+    old_controller = @controller
+    @controller = GeolocationController.new
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:address).returns(mock_address)
+    mock_address.expects(:geolocation).returns(mock_geolocation)
+    get :show, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+    assert_equal mock_geolocation, assigns(:geolocation)
+  ensure
+    @controller = old_controller
+  end
+
+
+  def test_expose_a_new_address_on_new
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:build_address).returns(mock_address)
+    get :new, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+  end
+  
+  def test_expose_the_address_on_edit
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:address).returns(mock_address)
+    get :edit, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+    assert_response :success
+  end
+
+  def test_expose_the_address_on_show
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:address).returns(mock_address)
+    get :show, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+    assert_response :success
+  end
+
+  def test_expose_a_newly_create_address_on_create
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:build_address).with({'these' => 'params'}).returns(mock_address(:save => true))
+    post :create, :party_id => '37', :address => {:these => 'params'}
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+  end
+
+  def test_update_the_requested_object_on_update
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue(:address => mock_address))
+    mock_address.expects(:update_attributes).with({'these' => 'params'}).returns(mock_address(:save => true))
+    post :update, :party_id => '37', :address => {:these => 'params'}
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+  end
+
+  def test_the_requested_manager_is_destroyed_on_destroy
+    Party.expects(:find).with('37').returns(mock_party)
+    mock_party.expects(:venue).returns(mock_venue)
+    mock_venue.expects(:address).returns(mock_address)
+    @controller.expects(:parent_url).returns('http://test.host/')
+    mock_address.expects(:destroy)
+    delete :destroy, :party_id => '37'
+    assert_equal mock_party, assigns(:party)
+    assert_equal mock_venue, assigns(:venue)
+    assert_equal mock_address, assigns(:address)
+  end
+
+
+  protected
+    def mock_party(stubs={})
+      @mock_party ||= mock('party',stubs)
+    end
+
+    def mock_venue(stubs={})
+      @mock_venue ||= mock('venue',stubs)
+    end
+
+    def mock_address(stubs={})
+      @mock_address ||= mock('address',stubs)
+    end
+
+    def mock_geolocation(stubs={})
+      @mock_geolocation ||= mock('geolocation', stubs)
+    end
+end

data/test/singleton_test.rb

@@ -13,7 +13,8 @@ class Manager
 end
 
 class ManagersController < InheritedResources::Base
-  belongs_to :store, :singleton => true
+  defaults :singleton => true
+  belongs_to :store
 end
 
 class SingletonTest < ActionController::TestCase

data/test/strong_parameters_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Widget
+  extend ActiveModel::Naming
+end
+
+class WidgetsController < InheritedResources::Base
+end
+
+class StrongParametersTest < ActionController::TestCase
+  def setup
+    @controller = WidgetsController.new
+    @controller.stubs(:widget_url).returns("/")
+    @controller.stubs(:permitted_params).returns(:widget => {:permitted => 'param'})
+  end
+
+  def test_permitted_params_from_new
+    Widget.expects(:new).with(:permitted => 'param')
+    get :new, :widget => { :permitted => 'param', :prohibited => 'param' }
+  end
+
+  def test_permitted_params_from_create
+    Widget.expects(:new).with(:permitted => 'param').returns(mock(:save => true))
+    post :create, :widget => { :permitted => 'param', :prohibited => 'param' }
+  end
+
+  def test_permitted_params_from_update
+    mock_widget = mock
+    mock_widget.stubs(:class).returns(Widget)
+    mock_widget.expects(:update_attributes).with(:permitted => 'param')
+    Widget.expects(:find).with('42').returns(mock_widget)
+    put :update, :id => '42', :widget => {:permitted => 'param', :prohibited => 'param'}
+  end
+end

data/test/test_helper.rb

@@ -4,7 +4,8 @@ require 'bundler'
 Bundler.setup
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
+begin; require 'turn/autorun'; rescue LoadError; end
 
 ENV["RAILS_ENV"] = "test"
 RAILS_ROOT = "anywhere"

data/test/url_helpers_test.rb

@@ -45,7 +45,21 @@ class ChairsController < InheritedResources::Base
 end
 
 class OwnersController < InheritedResources::Base
-  singleton_belongs_to :house
+  defaults :singleton => true
+  
+  belongs_to :house
+end
+
+class Fireplace
+  extend ActiveModel::Naming
+end
+class Flame
+  extend ActiveModel::Naming
+end
+class FlamesController < InheritedResources::Base
+  belongs_to :house do
+    belongs_to :fireplace, :singleton => true
+  end
 end
 
 class Bed
@@ -62,6 +76,13 @@ class SheepController < InheritedResources::Base
   belongs_to :news, :table, :polymorphic => true
 end
 
+class Fish
+  extend ActiveModel::Naming
+end
+class FishController < InheritedResources::Base
+  belongs_to :bed, :shallow => true
+end
+
 class Desk
   extend ActiveModel::Naming
 end
@@ -80,6 +101,23 @@ class DishesController < InheritedResources::Base
   end
 end
 
+class Dishwasher
+  extend ActiveModel::Naming
+end
+class Fork
+  extend ActiveModel::Naming
+end
+class Spot
+  extend ActiveModel::Naming
+end
+class SpotsController < InheritedResources::Base
+  belongs_to :house do
+    belongs_to :dishwasher, :singleton => true do
+      polymorphic_belongs_to :dish, :fork
+    end
+  end
+end
+
 class Center
   extend ActiveModel::Naming
 end
@@ -244,6 +282,38 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
+  
+  def test_url_helpers_on_singleton_belongs_to
+    controller = FlamesController.new
+    controller.instance_variable_set('@house', :house)
+    controller.instance_variable_set('@fireplace', :fireplace)
+    controller.instance_variable_set('@flame', :flame)
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("house_fireplace_flames_#{path_or_url}").with(:house, {}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("house_fireplace_flame_#{path_or_url}").with(:house, :flame, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_house_fireplace_flame_#{path_or_url}").with(:house, {}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_house_fireplace_flame_#{path_or_url}").with(:house, :flame, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("house_fireplace_#{path_or_url}").with(:house, {}).once
+      controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_house_fireplace_#{path_or_url}").with(:house, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+
+      # With options
+      # Also tests that argument sent are not used
+      controller.expects("house_fireplace_flame_#{path_or_url}").with(:house, :arg, :page => 1).once
+      controller.send("resource_#{path_or_url}", :arg, :page => 1)
+    end
+  end
 
   def test_url_helpers_on_belongs_to
     controller = TablesController.new
@@ -396,6 +466,80 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.send("resource_#{path_or_url}", :arg, :page => 1)
     end
   end
+  
+  def test_url_helpers_on_nested_polymorphic_belongs_to
+    house = House.new
+    table = Table.new
+    dish  = Dish.new
+
+    new_dish = Dish.new
+    Dish.stubs(:new).returns(new_dish)
+    new_dish.stubs(:persisted?).returns(false)
+
+    controller = DishesController.new
+    controller.instance_variable_set('@parent_type', :table)
+    controller.instance_variable_set('@house', house)
+    controller.instance_variable_set('@table', table)
+    controller.instance_variable_set('@dish', dish)
+
+    [:url, :path].each do |path_or_url|
+      mock_polymorphic(controller, "house_table_dishes_#{path_or_url}").with(house, table).once
+      controller.send("collection_#{path_or_url}")
+
+      mock_polymorphic(controller, "house_table_dish_#{path_or_url}").with(house, table, dish).once
+      controller.send("resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "new_house_table_dish_#{path_or_url}").with(house, table).once
+      controller.send("new_resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "edit_house_table_dish_#{path_or_url}").with(house, table, dish).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "house_table_#{path_or_url}").with(house, table).once
+      controller.send("parent_#{path_or_url}")
+
+      mock_polymorphic(controller, "edit_house_table_#{path_or_url}").with(house, table).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
+
+  def test_url_helpers_on_singleton_and_polymorphic_belongs_to
+    house = House.new
+    dishwasher = Dishwasher.new
+    fork = Fork.new
+    spot = Spot.new
+
+    new_spot = Spot.new
+    Spot.stubs(:new).returns(new_spot)
+    new_spot.stubs(:persisted?).returns(false)
+    
+    controller = SpotsController.new
+    controller.instance_variable_set('@parent_type', :fork)
+    controller.instance_variable_set('@house', house)
+    controller.instance_variable_set('@dishwasher', dishwasher)
+    controller.instance_variable_set('@fork', fork)
+    controller.instance_variable_set('@spot', spot)
+
+    [:url, :path].each do |path_or_url|
+      mock_polymorphic(controller, "house_dishwasher_fork_spots_#{path_or_url}").with(house, fork).once
+      controller.send("collection_#{path_or_url}")
+
+      mock_polymorphic(controller, "house_dishwasher_fork_spot_#{path_or_url}").with(house, fork, spot).once
+      controller.send("resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "new_house_dishwasher_fork_spot_#{path_or_url}").with(house, fork).once
+      controller.send("new_resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "edit_house_dishwasher_fork_spot_#{path_or_url}").with(house, fork, spot).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      mock_polymorphic(controller, "house_dishwasher_fork_#{path_or_url}").with(house, fork).once
+      controller.send("parent_#{path_or_url}")
+
+      mock_polymorphic(controller, "edit_house_dishwasher_fork_#{path_or_url}").with(house, fork).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
 
   def test_url_helpers_on_polymorphic_belongs_to
     house = House.new
@@ -505,6 +649,39 @@ class UrlHelpersTest < ActiveSupport::TestCase
     controller.send("parent_url", :arg)
   end
 
+  def test_url_helpers_on_shallow_belongs_to_using_uncountable
+    fish = Fish.new
+    bed  = Bed.new
+
+    new_fish = Fish.new
+    new_fish.stubs(:persisted?).returns(false)
+    Sheep.stubs(:new).returns(new_fish)
+
+    controller = FishController.new
+    controller.instance_variable_set('@bed', bed)
+    controller.instance_variable_set('@fish', fish)
+
+    [:url, :path].each do |path_or_url|
+      controller.expects("bed_fish_index_#{path_or_url}").with(bed, {}).once
+      controller.send("collection_#{path_or_url}")
+
+      controller.expects("fish_#{path_or_url}").with(fish, {}).once
+      controller.send("resource_#{path_or_url}")
+
+      controller.expects("new_bed_fish_#{path_or_url}").with(bed, {}).once
+      controller.send("new_resource_#{path_or_url}")
+
+      controller.expects("edit_fish_#{path_or_url}").with(fish, {}).once
+      controller.send("edit_resource_#{path_or_url}")
+
+      controller.expects("bed_#{path_or_url}").with(bed, {}).once
+      controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_bed_#{path_or_url}").with(bed, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+    end
+  end
+
   def test_url_helpers_on_namespaced_polymorphic_belongs_to
     house = House.new
     desk  = Desk.new

data/test/views/address/edit.html.erb

@@ -0,0 +1 @@
+edit html

data/test/views/address/new.html.erb

@@ -0,0 +1 @@
+new html

data/test/views/address/show.html.erb

@@ -0,0 +1 @@
+show html

data/test/views/geolocation/show.html.erb

@@ -0,0 +1 @@
+show html

data/test/views/venue/show.html.erb

@@ -0,0 +1 @@
+show html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
-  requirement: &70244803257400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70244803257400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &70244803256640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244803256640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Inherited Resources speeds up development by making your controllers
   inherit all restful actions so you just have to focus on what is important.
 email: developers@plataformatec.com.br
@@ -80,12 +90,17 @@ files:
 - test/nested_belongs_to_test.rb
 - test/nested_belongs_to_with_shallow_test.rb
 - test/nested_model_with_shallow_test.rb
+- test/nested_singleton_test.rb
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb
 - test/redirect_to_test.rb
 - test/singleton_test.rb
+- test/strong_parameters_test.rb
 - test/test_helper.rb
 - test/url_helpers_test.rb
+- test/views/address/edit.html.erb
+- test/views/address/new.html.erb
+- test/views/address/show.html.erb
 - test/views/cars/edit.html.erb
 - test/views/cars/index.html.erb
 - test/views/cars/new.html.erb
@@ -103,6 +118,7 @@ files:
 - test/views/employees/index.html.erb
 - test/views/employees/new.html.erb
 - test/views/employees/show.html.erb
+- test/views/geolocation/show.html.erb
 - test/views/groups/edit.html.erb
 - test/views/managers/edit.html.erb
 - test/views/managers/new.html.erb
@@ -156,6 +172,8 @@ files:
 - test/views/users/new.html.erb
 - test/views/users/show.html.erb
 - test/views/users/update.js.erb
+- test/views/venue/show.html.erb
+- test/views/widgets/new.html.erb
 homepage: http://github.com/josevalim/inherited_resources
 licenses: []
 post_install_message: 
@@ -168,21 +186,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2360799182694923826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2360799182694923826
 requirements: []
 rubyforge_project: inherited_resources
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit
@@ -203,12 +215,17 @@ test_files:
 - test/nested_belongs_to_test.rb
 - test/nested_belongs_to_with_shallow_test.rb
 - test/nested_model_with_shallow_test.rb
+- test/nested_singleton_test.rb
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb
 - test/redirect_to_test.rb
 - test/singleton_test.rb
+- test/strong_parameters_test.rb
 - test/test_helper.rb
 - test/url_helpers_test.rb
+- test/views/address/edit.html.erb
+- test/views/address/new.html.erb
+- test/views/address/show.html.erb
 - test/views/cars/edit.html.erb
 - test/views/cars/index.html.erb
 - test/views/cars/new.html.erb
@@ -226,6 +243,7 @@ test_files:
 - test/views/employees/index.html.erb
 - test/views/employees/new.html.erb
 - test/views/employees/show.html.erb
+- test/views/geolocation/show.html.erb
 - test/views/groups/edit.html.erb
 - test/views/managers/edit.html.erb
 - test/views/managers/new.html.erb
@@ -279,3 +297,5 @@ test_files:
 - test/views/users/new.html.erb
 - test/views/users/show.html.erb
 - test/views/users/update.js.erb
+- test/views/venue/show.html.erb
+- test/views/widgets/new.html.erb