inherited_resources 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+# Version 0.9.4
+
+* Since InheritedResouces 0.9.4, :notice and :error in I18n messages are deprecated in
+favor of :success and :failure. If you try to access them, a deprecation message is shown.
+If you want to skip the message, because you are sure you *won't* access such keys,
+just set DO_NOT_SET_NOTICE_MESSAGE to true somewhere in your app.
+
 # Version 0.9
 
 * Allow dual blocks in destroy;

data/README.rdoc

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.9.2
+Version: 0.9.4
 
 == Description
 
@@ -36,6 +36,13 @@ When used with integrate_views equals to false, rspec overwrites default_render,
 render and some other controller methods which makes Inherited Resources not work
 properly. In such cases, you have to set integrate_views to true.
 
+== Deprecation
+
+Since InheritedResouces 0.9.4, :notice and :error in I18n messages are deprecated in
+favor of :success and :failure. If you try to access them, a deprecation message is shown.
+If you want to skip the message, because you are sure you *won't* access such keys,
+just set DO_NOT_SET_NOTICE_MESSAGE to true somewhere in your app.
+
 == Basic Usage
 
 To use Inherited Resources you just have to inherit (duh) it:
@@ -260,8 +267,8 @@ on projects controller, it will search for:
     flash.projects.create.status
     flash.actions.create.status
 
-The status can be :notice (when the object can be created, updated
-or destroyed with success) or :error (when the objecy cannot be created
+The status can be :success (when the object can be created, updated
+or destroyed with success) or :failure (when the objecy cannot be created
 or updated).
 
 Those messages are interpolated by using the resource class human name, which 
@@ -270,7 +277,7 @@ is also localized and it means you can set:
     flash:
       actions:
         create:
-          notice: "Hooray! {{resource_name}} was successfully created!"
+          success: "Hooray! {{resource_name}} was successfully created!"
 
 It will replace {{resource_name}} by the human name of the resource class,
 which is "Project" in this case.
@@ -281,7 +288,7 @@ the title of the project while updating a project. Well, that's easy also:
     flash:
       projects:
         update:
-          notice: "Hooray! The project "{{project_title}}" was updated!"
+          success: "Hooray! The project "{{project_title}}" was updated!"
 
 Since :project_title is not available for interpolation by default, you have
 to overwrite interpolation_options.

data/Rakefile

@@ -3,12 +3,13 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'lib', 'inherited_resources', 'version')
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "inherited_resources"
-    s.version = "0.9.3"
+    s.version = InheritedResources::VERSION
     s.rubyforge_project = "inherited_resources"
     s.summary = "Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important."
     s.email = "jose.valim@gmail.com"

data/lib/inherited_resources/actions.rb

@@ -31,11 +31,11 @@ module InheritedResources
       object = build_resource
 
       if create_resource(object)
-        set_flash_message!(:notice, '{{resource_name}} was successfully created.')
+        set_flash_message!(:success, '{{resource_name}} was successfully created.')
         options[:location] ||= resource_url rescue nil
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:error)
+        set_flash_message!(:failure)
         respond_with_dual_blocks(object, options, false, block)
       end
     end
@@ -46,11 +46,11 @@ module InheritedResources
       object = resource
 
       if update_resource(object, params[resource_instance_name])
-        set_flash_message!(:notice, '{{resource_name}} was successfully updated.')
+        set_flash_message!(:success, '{{resource_name}} was successfully updated.')
         options[:location] ||= resource_url rescue nil
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:error)
+        set_flash_message!(:failure)
         respond_with_dual_blocks(object, options, false, block)
       end
     end
@@ -62,10 +62,10 @@ module InheritedResources
       options[:location] ||= collection_url rescue nil
 
       if destroy_resource(object)
-        set_flash_message!(:notice, '{{resource_name}} was successfully destroyed.')
+        set_flash_message!(:success, '{{resource_name}} was successfully destroyed.')
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:error, '{{resource_name}} could not be destroyed.')
+        set_flash_message!(:failure, '{{resource_name}} could not be destroyed.')
         respond_with_dual_blocks(object, options, false, block)
       end
     end

data/lib/inherited_resources/base_helpers.rb

@@ -226,8 +226,8 @@ module InheritedResources
       #   flash.cars.create.status
       #   flash.actions.create.status
       #
-      # The statuses can be :notice (when the object can be created, updated
-      # or destroyed with success) or :error (when the objecy cannot be created
+      # The statuses can be :success (when the object can be created, updated
+      # or destroyed with success) or :failure (when the objecy cannot be created
       # or updated).
       #
       # Those messages are interpolated by using the resource class human name.
@@ -236,7 +236,7 @@ module InheritedResources
       #   flash:
       #     actions:
       #       create:
-      #         notice: "Hooray! {{resource_name}} was successfully created!"
+      #         success: "Hooray! {{resource_name}} was successfully created!"
       #
       # But sometimes, flash messages are not that simple. Going back
       # to cars example, you might want to say the brand of the car when it's
@@ -245,7 +245,7 @@ module InheritedResources
       #   flash:
       #     cars:
       #       update:
-      #         notice: "Hooray! You just tuned your {{car_brand}}!"
+      #         success: "Hooray! You just tuned your {{car_brand}}!"
       #
       # Since :car_name is not available for interpolation by default, you have
       # to overwrite interpolation_options.
@@ -266,7 +266,7 @@ module InheritedResources
       #   flash.cars.create.status
       #   flash.actions.create.status
       #
-      def set_flash_message!(status, default_message=nil)
+      def orig_set_flash_message!(status, default_message=nil)
         return flash[status] = default_message unless defined?(::I18n)
 
         resource_name = if resource_class
@@ -306,6 +306,29 @@ module InheritedResources
         flash[status] = message unless message.blank?
       end
 
+      def set_flash_message!(status, default_message=nil)
+        return orig_set_flash_message!(status, default_message) if defined?(DO_NOT_SET_DEPRECATED_FLASH)
+
+        fallback = status == :success ? :notice : :error
+        result   = orig_set_flash_message!(status)
+
+        if result.blank?
+          result = orig_set_flash_message!(fallback)
+
+          if result.blank?
+            result = orig_set_flash_message!(status, default_message) if default_message
+          else
+            ActiveSupport::Deprecation.warn "Using :#{fallback} in I18n with InheritedResources is deprecated, please use :#{status} instead"
+          end
+        end
+
+        unless result.blank?
+          flash[status]   = result
+          flash[fallback] = ActiveSupport::Deprecation::DeprecatedObjectProxy.new result, "Accessing :#{fallback} in flash with InheritedResources is deprecated, please use :#{status} instead"
+          result
+        end
+      end
+
       # Used to allow to specify success and failure within just one block:
       #
       #   def create

data/lib/inherited_resources/class_methods.rb

@@ -63,9 +63,11 @@ module InheritedResources
         raise ArgumentError, 'Wrong number of arguments. You have to provide which actions you want to keep.' if actions_to_keep.empty?
 
         options = actions_to_keep.extract_options!
-        actions_to_remove = Array(options[:except])
-        actions_to_remove += ACTIONS - actions_to_keep.map { |a| a.to_sym } unless actions_to_keep.first == :all
-        actions_to_remove.map! { |a| a.to_sym }.uniq!
+        actions_to_remove  = Array(options[:except])
+        actions_to_remove += ACTIONS - actions_to_keep.map { |a| a.to_sym } unless actions_to_keep.include?(:all)
+        actions_to_remove.map! { |a| a.to_sym }
+        actions_to_remove.uniq!
+
         (instance_methods.map { |m| m.to_sym } & actions_to_remove).each do |action|
           undef_method action, "#{action}!"
         end

data/lib/inherited_resources/url_helpers.rb

@@ -76,7 +76,10 @@ module InheritedResources
       collection_segments = resource_segments.dup
 
       # Generate parent url before we add resource instances.
-      generate_url_and_path_helpers nil, :parent, resource_segments, resource_ivars
+      unless parents_symbols.empty?
+        generate_url_and_path_helpers nil,   :parent, resource_segments, resource_ivars
+        generate_url_and_path_helpers :edit, :parent, resource_segments, resource_ivars
+      end
 
       # This is the default route configuration, later we have to deal with
       # exception from polymorphic and singleton cases.

data/lib/inherited_resources/version.rb

@@ -0,0 +1,3 @@
+module InheritedResources
+  VERSION = '0.9.4'.freeze
+end

data/test/aliases_test.rb

@@ -55,7 +55,7 @@ class AliasesTest < ActionController::TestCase
     assert_equal 'New HTML', @response.body.strip
   end
 
-  def test_expose_the_resquested_user_on_edit
+  def test_expose_the_requested_user_on_edit
     Student.expects(:find).with('42').returns(mock_student)
     get :edit, :id => '42'
     assert_equal mock_student, assigns(:student)

data/test/base_test.rb

@@ -53,7 +53,7 @@ end
 class ShowActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
-  def test_expose_the_resquested_user
+  def test_expose_the_requested_user
     User.expects(:find).with('42').returns(mock_user)
     get :show, :id => '42'
     assert_equal mock_user, assigns(:user)
@@ -105,7 +105,7 @@ end
 class EditActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
-  def test_expose_the_resquested_user
+  def test_expose_the_requested_user
     User.expects(:find).with('42').returns(mock_user)
     get :edit, :id => '42'
     assert_response :success

data/test/belongs_to_test.rb

@@ -29,7 +29,7 @@ class BelongsToTest < ActionController::TestCase
     assert_equal [mock_comment], assigns(:comments)
   end
 
-  def test_expose_the_resquested_comment_on_show
+  def test_expose_the_requested_comment_on_show
     Comment.expects(:find).with('42').returns(mock_comment)
     get :show, :id => '42', :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -43,7 +43,7 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_expose_the_resquested_comment_on_edit
+  def test_expose_the_requested_comment_on_edit
     Comment.expects(:find).with('42').returns(mock_comment)
     get :edit, :id => '42', :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -65,7 +65,7 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_comment, assigns(:comment)
   end
 
-  def test_the_resquested_comment_is_destroyed_on_destroy
+  def test_the_requested_comment_is_destroyed_on_destroy
     Comment.expects(:find).with('42').returns(mock_comment)
     mock_comment.expects(:destroy)
     delete :destroy, :id => '42', :post_id => '37'

data/test/class_methods_test.rb

@@ -27,14 +27,27 @@ class DeansController < InheritedResources::Base
   belongs_to :school
 end
 
+class ActionsClassMethodTest < ActionController::TestCase
+  tests BooksController
+
+  def test_cannot_render_actions
+    assert_raise ActionController::UnknownAction do
+      get :new
+    end
+  end
 
-class ActionsClassMethodTest < ActiveSupport::TestCase
   def test_actions_are_undefined
-    action_methods = BooksController.send(:action_methods)
+    action_methods = BooksController.send(:action_methods).map(&:to_sym)
     assert_equal 2, action_methods.size
 
-    ['index', 'show'].each do |action|
-      assert action_methods.include? action
+    [:index, :show].each do |action|
+      assert action_methods.include?(action)
+    end
+
+    instance_methods = BooksController.send(:instance_methods).map(&:to_sym)
+
+    [:new, :edit, :create, :update, :destroy].each do |action|
+      assert !instance_methods.include?(action)
     end
   end
 
@@ -48,7 +61,6 @@ class ActionsClassMethodTest < ActiveSupport::TestCase
   end
 end
 
-
 class DefaultsClassMethodTest < ActiveSupport::TestCase
   def test_resource_class_is_set_to_nil_when_resource_model_cannot_be_found
     assert_nil ReadersController.send(:resource_class)

data/test/customized_base_test.rb

@@ -60,7 +60,7 @@ end
 class ShowActionCustomizedBaseTest < ActionController::TestCase
   include CarTestHelper
 
-  def test_expose_the_resquested_user
+  def test_expose_the_requested_user
     Car.expects(:get).with('42').returns(mock_car)
     get :show, :id => '42'
     assert_equal mock_car, assigns(:car)
@@ -80,7 +80,7 @@ end
 class EditActionCustomizedBaseTest < ActionController::TestCase
   include CarTestHelper
 
-  def test_expose_the_resquested_user
+  def test_expose_the_requested_user
     Car.expects(:get).with('42').returns(mock_car)
     get :edit, :id => '42'
     assert_response :success

data/test/customized_belongs_to_test.rb

@@ -21,43 +21,43 @@ class CustomizedBelongsToTest < ActionController::TestCase
     @controller.stubs(:collection_url).returns('/')
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_index
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_index
     Professor.stubs(:find).returns([mock_professor])
     get :index, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_show
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_show
     Professor.stubs(:find).returns(mock_professor)
     get :show, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_new
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_new
     Professor.stubs(:build).returns(mock_professor)
     get :new, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_edit
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_edit
     Professor.stubs(:find).returns(mock_professor)
     get :edit, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_create
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_create
     Professor.stubs(:build).returns(mock_professor(:save => true))
     post :create, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_update
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_update
     Professor.stubs(:find).returns(mock_professor(:update_attributes => true))
     put :update, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
-  def test_expose_the_resquested_school_with_chosen_instance_variable_on_destroy
+  def test_expose_the_requested_school_with_chosen_instance_variable_on_destroy
     Professor.stubs(:find).returns(mock_professor(:destroy => true))
     delete :destroy, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)

data/test/defaults_test.rb

@@ -23,7 +23,7 @@ class DefaultsTest < ActionController::TestCase
     assert_equal [mock_painter], assigns(:malarze)
   end
 
-  def test_expose_the_resquested_painter_on_show
+  def test_expose_the_requested_painter_on_show
     Malarz.expects(:find).with('42').returns(mock_painter)
     get :show, :id => '42'
     assert_equal mock_painter, assigns(:malarz)
@@ -35,7 +35,7 @@ class DefaultsTest < ActionController::TestCase
     assert_equal mock_painter, assigns(:malarz)
   end
 
-  def test_expose_the_resquested_painter_on_edit
+  def test_expose_the_requested_painter_on_edit
     Malarz.expects(:find).with('42').returns(mock_painter)
     get :edit, :id => '42'
     assert_response :success
@@ -55,7 +55,7 @@ class DefaultsTest < ActionController::TestCase
     assert_equal mock_painter, assigns(:malarz)
   end
 
-  def test_the_resquested_painter_is_destroyed
+  def test_the_requested_painter_is_destroyed
     Malarz.expects(:find).with('42').returns(mock_painter)
     mock_painter.expects(:destroy)
     delete :destroy, :id => '42'

data/test/flash_test.rb

@@ -34,7 +34,7 @@ class FlashBaseHelpersTest < ActionController::TestCase
   def test_success_flash_message_on_create_with_yml
     Address.stubs(:new).returns(mock_address(:save => true))
     post :create
-    assert_equal 'You created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
+    assert_equal 'You created a new address close to <b>Ocean Avenue</b>.', flash[:success]
   end
 
   def test_success_flash_message_on_create_with_namespaced_controller
@@ -42,7 +42,7 @@ class FlashBaseHelpersTest < ActionController::TestCase
     @controller.stubs(:resource_url).returns("http://test.host/")
     Address.stubs(:new).returns(mock_address(:save => true))
     post :create
-    assert_equal 'Admin, you created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
+    assert_equal 'Admin, you created a new address close to <b>Ocean Avenue</b>.', flash[:success]
   end
 
   def test_failure_flash_message_on_create_with_namespaced_controller_actions
@@ -50,7 +50,7 @@ class FlashBaseHelpersTest < ActionController::TestCase
     @controller.stubs(:resource_url).returns("http://test.host/")
     Address.stubs(:new).returns(mock_address(:save => false))
     post :create
-    assert_equal 'Admin error message.', flash[:error]
+    assert_equal 'Admin error message.', flash[:failure]
   end
 
   def test_inherited_success_flash_message_on_update_on_namespaced_controllers
@@ -59,26 +59,26 @@ class FlashBaseHelpersTest < ActionController::TestCase
     Address.stubs(:find).returns(mock_address(:update_attributes => true))
     put :update
     assert_response :success
-    assert_equal 'Nice! Address was updated with success!', flash[:notice]
+    assert_equal 'Nice! Address was updated with success!', flash[:success]
   end
 
   def test_success_flash_message_on_update
     Address.stubs(:find).returns(mock_address(:update_attributes => true))
     put :update
     assert_response :success
-    assert_equal 'Nice! Address was updated with success!', flash[:notice]
+    assert_equal 'Nice! Address was updated with success!', flash[:success]
   end
 
   def test_failure_flash_message_on_update
     Address.stubs(:find).returns(mock_address(:update_attributes => false, :errors => {:some => :error}))
     put :update
-    assert_equal 'Oh no! We could not update your address!', flash[:error]
+    assert_equal 'Oh no! We could not update your address!', flash[:failure]
   end
 
   def test_success_flash_message_on_destroy
     Address.stubs(:find).returns(mock_address(:destroy => true))
     delete :destroy
-    assert_equal 'Address was successfully destroyed.', flash[:notice]
+    assert_equal 'Address was successfully destroyed.', flash[:success]
   end
 
   protected

data/test/optional_belongs_to_test.rb

@@ -35,7 +35,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal [mock_product], assigns(:products)
   end
 
-  def test_expose_the_resquested_product_with_category
+  def test_expose_the_requested_product_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
@@ -44,7 +44,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_expose_the_resquested_product_without_category
+  def test_expose_the_requested_product_without_category
     Product.expects(:find).with('42').returns(mock_product)
     get :show, :id => '42'
     assert_equal nil, assigns(:category)
@@ -67,7 +67,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_expose_the_resquested_product_for_edition_with_category
+  def test_expose_the_requested_product_for_edition_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
@@ -76,7 +76,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_expose_the_resquested_product_for_edition_without_category
+  def test_expose_the_requested_product_for_edition_without_category
     Product.expects(:find).with('42').returns(mock_product)
     get :edit, :id => '42'
     assert_equal nil, assigns(:category)
@@ -119,7 +119,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_the_resquested_product_is_destroyed_with_category
+  def test_the_requested_product_is_destroyed_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
@@ -131,7 +131,7 @@ class OptionalTest < ActionController::TestCase
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_the_resquested_product_is_destroyed_without_category
+  def test_the_requested_product_is_destroyed_without_category
     Product.expects(:find).with('42').returns(mock_product)
     mock_product.expects(:destroy).returns(true)
     @controller.expects(:collection_url).returns('/')

data/test/polymorphic_test.rb

@@ -29,7 +29,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
     assert_equal [mock_employee], assigns(:employees)
   end
 
-  def test_expose_the_resquested_employee_on_show
+  def test_expose_the_requested_employee_on_show
     Employee.expects(:find).with('42').returns(mock_employee)
     get :show, :id => '42', :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -43,7 +43,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
     assert_equal mock_employee, assigns(:employee)
   end
 
-  def test_expose_the_resquested_employee_on_edit
+  def test_expose_the_requested_employee_on_edit
     Employee.expects(:find).with('42').returns(mock_employee)
     get :edit, :id => '42', :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -66,7 +66,7 @@ class PolymorphicFactoriesTest < ActionController::TestCase
     assert_equal mock_employee, assigns(:employee)
   end
 
-  def test_the_resquested_employee_is_destroyed_on_destroy
+  def test_the_requested_employee_is_destroyed_on_destroy
     Employee.expects(:find).with('42').returns(mock_employee)
     mock_employee.expects(:destroy)
     delete :destroy, :id => '42', :factory_id => '37'
@@ -116,7 +116,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
     assert_equal [mock_employee], assigns(:employees)
   end
 
-  def test_expose_the_resquested_employee_on_show
+  def test_expose_the_requested_employee_on_show
     Employee.expects(:find).with('42').returns(mock_employee)
     get :show, :id => '42', :company_id => '37'
     assert_equal mock_company, assigns(:company)
@@ -130,7 +130,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
     assert_equal mock_employee, assigns(:employee)
   end
 
-  def test_expose_the_resquested_employee_on_edit
+  def test_expose_the_requested_employee_on_edit
     Employee.expects(:find).with('42').returns(mock_employee)
     get :edit, :id => '42', :company_id => '37'
     assert_equal mock_company, assigns(:company)
@@ -153,7 +153,7 @@ class PolymorphicCompanyTest < ActionController::TestCase
     assert_equal mock_employee, assigns(:employee)
   end
 
-  def test_the_resquested_employee_is_destroyed_on_destroy
+  def test_the_requested_employee_is_destroyed_on_destroy
     Employee.expects(:find).with('42').returns(mock_employee)
     mock_employee.expects(:destroy)
     delete :destroy, :id => '42', :company_id => '37'

data/test/singleton_test.rb

@@ -22,7 +22,7 @@ class SingletonTest < ActionController::TestCase
     @controller.stubs(:collection_url).returns('/')
   end
 
-  def test_expose_the_resquested_manager_on_show
+  def test_expose_the_requested_manager_on_show
     Store.expects(:find).with('37').returns(mock_store)
     mock_store.expects(:manager).returns(mock_manager)
     get :show, :store_id => '37'
@@ -38,7 +38,7 @@ class SingletonTest < ActionController::TestCase
     assert_equal mock_manager, assigns(:manager)
   end
 
-  def test_expose_the_resquested_manager_on_edit
+  def test_expose_the_requested_manager_on_edit
     Store.expects(:find).with('37').returns(mock_store)
     mock_store.expects(:manager).returns(mock_manager)
     get :edit, :store_id => '37'
@@ -63,7 +63,7 @@ class SingletonTest < ActionController::TestCase
     assert_equal mock_manager, assigns(:manager)
   end
 
-  def test_the_resquested_manager_is_destroyed_on_destroy
+  def test_the_requested_manager_is_destroyed_on_destroy
     Store.expects(:find).with('37').returns(mock_store)
     mock_store.expects(:manager).returns(mock_manager)
     mock_manager.expects(:destroy)

data/test/url_helpers_test.rb

@@ -82,9 +82,6 @@ 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)
@@ -117,9 +114,6 @@ 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)
@@ -150,9 +144,6 @@ 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
@@ -181,6 +172,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("house_#{path_or_url}").with(:house, {}).once
       controller.send("parent_#{path_or_url}")
 
+      controller.expects("edit_house_#{path_or_url}").with(:house, {}).once
+      controller.send("edit_parent_#{path_or_url}")
+
       # With arg
       controller.expects("house_table_#{path_or_url}").with(:house, :arg, {}).once
       controller.send("resource_#{path_or_url}", :arg)
@@ -218,6 +212,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("big_house_#{path_or_url}").with(:house, {}).once
       controller.send("parent_#{path_or_url}")
 
+      controller.expects("edit_big_house_#{path_or_url}").with(:house, {}).once
+      controller.send("edit_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)
@@ -256,6 +253,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("house_table_#{path_or_url}").with(:house, :table, {}).once
       controller.send("parent_#{path_or_url}")
 
+      controller.expects("edit_house_table_#{path_or_url}").with(:house, :table, {}).once
+      controller.send("edit_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)
@@ -293,6 +293,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
       controller.expects("house_#{path_or_url}").with(:house, {}).once
       controller.send("parent_#{path_or_url}")
 
+      controller.expects("edit_house_#{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_owner_#{path_or_url}").with(:house, :page => 1).once
@@ -328,6 +331,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("house_#{path_or_url}").with(house).once
       controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_house_#{path_or_url}").with(house).once
+      controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
@@ -379,6 +385,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("admin_house_#{path_or_url}").with(house).once
       controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_admin_house_#{path_or_url}").with(house).once
+      controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
@@ -432,6 +441,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("house_table_#{path_or_url}").with(house, table).once
       controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_house_table_#{path_or_url}").with(house, table).once
+      controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options
@@ -481,6 +493,9 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
       controller.expects("house_table_#{path_or_url}").with(house, table).once
       controller.send("parent_#{path_or_url}")
+
+      controller.expects("edit_house_table_#{path_or_url}").with(house, table).once
+      controller.send("edit_parent_#{path_or_url}")
     end
 
     # With options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -02:00
+date: 2009-12-12 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
+- lib/inherited_resources/version.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/inherited_resources
 licenses: []
@@ -69,21 +70,21 @@ 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.
 test_files: 
-- test/respond_to_test.rb
-- test/customized_belongs_to_test.rb
-- test/nested_belongs_to_test.rb
-- test/base_test.rb
-- 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/association_chain_test.rb
+- test/base_test.rb
 - test/belongs_to_test.rb
+- test/class_methods_test.rb
 - test/customized_base_test.rb
-- test/polymorphic_test.rb
+- test/customized_belongs_to_test.rb
 - test/defaults_test.rb
-- test/singleton_test.rb
+- test/flash_test.rb
+- test/has_scope_test.rb
+- test/nested_belongs_to_test.rb
 - test/optional_belongs_to_test.rb
+- test/polymorphic_test.rb
+- test/redirect_to_test.rb
+- test/respond_to_test.rb
+- test/singleton_test.rb
 - test/test_helper.rb
+- test/url_helpers_test.rb