inherited_resources 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,5 +1,6 @@
 # Version 0.9
 
+* Allow dual blocks in destroy;
 * Added :if and :unless to has_scope (thanks to Jack Danger);
 * Added create_resource, update_resource and delete_resource hooks (thanks to Carlos Antonio da Silva);
 * Backported ActionController::Responder from Rails 3;

data/README.rdoc

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.9.1
+Version: 0.9.2
 
 == Description
 
@@ -23,8 +23,8 @@ keywords: resources, controller, singleton, belongs_to, polymorphic, named_scope
 Install Inherited Resources is very easy. It is stored in GitHub, so just run
 the following:
 
-    gem sources -a http://gems.github.com
-    sudo gem install josevalim-inherited_resources
+    gem sources -a http://gemcutter.org
+    sudo gem install inherited_resources
 
 If you want it as plugin, just do:
 
@@ -232,7 +232,7 @@ clean and organized inside the same action.
 
 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
-need to add a DSL block to your application controller:
+need to add a DSL module to your application controller:
 
     class ApplicationController < ActionController::Base
       include InheritedResources::DSL

data/Rakefile

@@ -8,7 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "inherited_resources"
-    s.version = "0.9.2"
+    s.version = "0.9.3"
     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

@@ -59,15 +59,15 @@ module InheritedResources
     # DELETE /resources/1
     def destroy(options={}, &block)
       object = resource
+      options[:location] ||= collection_url rescue nil
 
       if destroy_resource(object)
         set_flash_message!(:notice, '{{resource_name}} was successfully destroyed.')
+        respond_with_dual_blocks(object, options, true, block)
       else
         set_flash_message!(:error, '{{resource_name}} could not be destroyed.')
+        respond_with_dual_blocks(object, options, false, block)
       end
-
-      options[:location] ||= collection_url rescue nil
-      respond_with_dual_blocks(object, options, nil, block)
     end
     alias :destroy! :destroy
 

data/lib/inherited_resources/base.rb

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

data/test/base_test.rb

@@ -198,7 +198,7 @@ class DestroyActionBaseTest < ActionController::TestCase
   
   def test_the_requested_user_is_destroyed
     User.expects(:find).with('42').returns(mock_user)
-    mock_user.expects(:destroy)
+    mock_user.expects(:destroy).returns(true)
     delete :destroy, :id => '42'
     assert_equal mock_user, assigns(:user)
   end
@@ -221,5 +221,12 @@ class DestroyActionBaseTest < ActionController::TestCase
     delete :destroy
     assert_redirected_to 'http://test.host/'
   end
+
+  def test_redirects_to_the_resource_if_cannot_be_destroyed
+    User.stubs(:find).returns(mock_user(:destroy => false))
+    @controller.expects(:collection_url).returns('http://test.host/')
+    delete :destroy
+    assert_redirected_to 'http://test.host/'
+  end
 end
 

data/test/optional_belongs_to_test.rb

@@ -123,7 +123,7 @@ class OptionalTest < ActionController::TestCase
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
-    mock_product.expects(:destroy)
+    mock_product.expects(:destroy).returns(true)
     @controller.expects(:collection_url).returns('/')
 
     delete :destroy, :id => '42', :category_id => '37'
@@ -133,7 +133,7 @@ class OptionalTest < ActionController::TestCase
 
   def test_the_resquested_product_is_destroyed_without_category
     Product.expects(:find).with('42').returns(mock_product)
-    mock_product.expects(:destroy)
+    mock_product.expects(:destroy).returns(true)
     @controller.expects(:collection_url).returns('/')
 
     delete :destroy, :id => '42'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -03:00
+date: 2009-11-21 00:00:00 -02:00
 default_executable: 
 dependencies: []