inherited_resources 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,9 +1,6 @@
 # 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.
+* DEPRECATION: Use :success and :failure as flash messages instead :notice and :error
 
 # Version 0.9
 

data/README.rdoc

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.9.4
+Version: 0.9.2
 
 == Description
 
@@ -36,13 +36,6 @@ 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:
@@ -267,8 +260,8 @@ on projects controller, it will search for:
     flash.projects.create.status
     flash.actions.create.status
 
-The status can be :success (when the object can be created, updated
-or destroyed with success) or :failure (when the objecy cannot be created
+The status can be :notice (when the object can be created, updated
+or destroyed with success) or :error (when the objecy cannot be created
 or updated).
 
 Those messages are interpolated by using the resource class human name, which 
@@ -277,7 +270,7 @@ is also localized and it means you can set:
     flash:
       actions:
         create:
-          success: "Hooray! {{resource_name}} was successfully created!"
+          notice: "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.
@@ -288,7 +281,7 @@ the title of the project while updating a project. Well, that's easy also:
     flash:
       projects:
         update:
-          success: "Hooray! The project "{{project_title}}" was updated!"
+          notice: "Hooray! The project "{{project_title}}" was updated!"
 
 Since :project_title is not available for interpolation by default, you have
 to overwrite interpolation_options.

data/lib/inherited_resources/actions.rb

@@ -31,11 +31,11 @@ module InheritedResources
       object = build_resource
 
       if create_resource(object)
-        set_flash_message!(:success, '{{resource_name}} was successfully created.')
+        set_flash_message!(:notice, '{{resource_name}} was successfully created.')
         options[:location] ||= resource_url rescue nil
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:failure)
+        set_flash_message!(:error)
         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!(:success, '{{resource_name}} was successfully updated.')
+        set_flash_message!(:notice, '{{resource_name}} was successfully updated.')
         options[:location] ||= resource_url rescue nil
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:failure)
+        set_flash_message!(:error)
         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!(:success, '{{resource_name}} was successfully destroyed.')
+        set_flash_message!(:notice, '{{resource_name}} was successfully destroyed.')
         respond_with_dual_blocks(object, options, true, block)
       else
-        set_flash_message!(:failure, '{{resource_name}} could not be destroyed.')
+        set_flash_message!(:error, '{{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 :success (when the object can be created, updated
-      # or destroyed with success) or :failure (when the objecy cannot be created
+      # The statuses can be :notice (when the object can be created, updated
+      # or destroyed with success) or :error (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:
-      #         success: "Hooray! {{resource_name}} was successfully created!"
+      #         notice: "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:
-      #         success: "Hooray! You just tuned your {{car_brand}}!"
+      #         notice: "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 orig_set_flash_message!(status, default_message=nil)
+      def set_flash_message!(status, default_message=nil)
         return flash[status] = default_message unless defined?(::I18n)
 
         resource_name = if resource_class
@@ -306,29 +306,6 @@ 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,11 +63,9 @@ 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.include?(:all)
-        actions_to_remove.map! { |a| a.to_sym }
-        actions_to_remove.uniq!
-
+        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!
         (instance_methods.map { |m| m.to_sym } & actions_to_remove).each do |action|
           undef_method action, "#{action}!"
         end

data/lib/inherited_resources/version.rb

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

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[:success]
+    assert_equal 'You created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
   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[:success]
+    assert_equal 'Admin, you created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
   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[:failure]
+    assert_equal 'Admin error message.', flash[:error]
   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[:success]
+    assert_equal 'Nice! Address was updated with success!', flash[:notice]
   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[:success]
+    assert_equal 'Nice! Address was updated with success!', flash[:notice]
   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[:failure]
+    assert_equal 'Oh no! We could not update your address!', flash[:error]
   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[:success]
+    assert_equal 'Address was successfully destroyed.', flash[:notice]
   end
 
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -02:00
+date: 2009-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: []