josevalim-inherited_resources 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+# Version 0.4.5
+
+* Added fix when resource_url is not defined;
+
 # Version 0.4.4
 
 * Added better handling for namespaced controllers;

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.4.4
+Version: 0.4.5
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -290,12 +290,13 @@ Then you will finally have:
 
    'Hooray! You just tuned your Aston Martin!'
 
-If your controller is namespaced, for example Deluxe::CarsController, the
-the messages will be checked in the following order:
+If your controller is namespaced, for example Rars::CarsController, the
+messages will be checked in the following order:
 
-   flash.deluxe.cars.create.status
-   flash.cars.create.status
-   flash.actions.create.status
+   flash.rare.cars.create.notice
+   flash.rare.actions.create.notice
+   flash.cars.create.notice
+   flash.actions.create.notice
 
 Belongs to
 ----------

data/lib/inherited_resources/base.rb

@@ -226,17 +226,18 @@ module InheritedResources
 
         if object.save
           set_flash_message!(:notice, '{{resource_name}} was successfully created.')
+          location_url = resource_url rescue nil # Sometimes resource_url is undefined
 
-          respond_to(:with => object, :status => :created, :location => resource_url) do |format|
-            block.call args_for_block(block, format, true) if block_given?
+          respond_to(:with => object, :status => :created, :location => location_url) do |format|
+            block.call(args_for_block(block, format, true)) if block_given?
             format.html { redirect_to(resource_url) }
           end
         else
           set_flash_message!(:error)
 
           respond_to(:with => object.errors, :status => :unprocessable_entity) do |format|
-            block.call args_for_block(block, format, false) if block_given?
-            format.html { render :action => "new" }
+            block.call(args_for_block(block, format, false)) if block_given?
+            format.html { render :action => 'new' }
           end
         end
       end
@@ -250,7 +251,7 @@ module InheritedResources
           set_flash_message!(:notice, '{{resource_name}} was successfully updated.')
 
           respond_to do |format|
-            block.call args_for_block(block, format, true) if block_given?
+            block.call(args_for_block(block, format, true)) if block_given?
             format.html { redirect_to(resource_url) }
             format.all  { head :ok }
           end
@@ -258,8 +259,8 @@ module InheritedResources
           set_flash_message!(:error)
 
           respond_to(:with => object.errors, :status => :unprocessable_entity) do |format|
-            block.call args_for_block(block, format, false) if block_given?
-            format.html { render :action => "edit" }
+            block.call(args_for_block(block, format, false)) if block_given?
+            format.html { render :action => 'edit' }
           end
         end
       end

data/lib/inherited_resources/base_helpers.rb

@@ -176,24 +176,29 @@ module InheritedResources #:nodoc:
       #
       #   'Hooray! You just tuned your Aston Martin!'
       #
-      # If your controller is namespaced, for example Deluxe::CarsController, the
+      # If your controller is namespaced, for example Rare::CarsController,
       # the messages will be checked in the following order:
       #
-      #   flash.deluxe.cars.create.status
+      #   flash.rare.cars.create.status
+      #   flash.rare.actions.create.status
       #   flash.cars.create.status
       #   flash.actions.create.status
       #
       def set_flash_message!(status, default_message = '')
-        options = interpolation_options.merge({
-          :default  => [ :"flash.#{controller_name}.#{action_name}.#{status}",
-                         :"flash.actions.#{action_name}.#{status}",
-                         default_message ],
+        options = {
+          :default  => default_message,
           :resource_name => resource_class.human_name,
-        })
-
-        unless controller_path == controller_name
-          options[:default].unshift(:"flash.#{controller_path.gsub('/','.')}.#{action_name}.#{status}")
+        }.merge(interpolation_options)
+
+        defaults = []
+        slices   = [:flash]
+        controller_path.split('/').each do |path|
+          slices << path
+          defaults << :"#{slices[0..-1].join('.')}.#{action_name}.#{status}"
+          defaults << :"#{slices[0..-2].join('.')}.actions.#{action_name}.#{status}"
         end
+        options[:default] = defaults.push(options[:default])
+        options[:default].flatten!
 
         # TODO Deprecate this whole begin/rescue block and replace it for:
         #

data/test/base_helpers_test.rb

@@ -28,14 +28,14 @@ class FlashBaseHelpersTest < TEST_CLASS
     @request.accept      = 'application/xml'
   end
 
-  def test_default_success_flash_message_on_create
+  def test_success_flash_message_on_create_with_yml
     Address.stubs(:new).returns(mock_address(:save => true))
     @controller.stubs(:address_url)
     post :create
     assert_equal 'You created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
   end
 
-  def test_default_success_flash_message_on_create_for_namespaced_controller
+  def test_success_flash_message_on_create_with_namespaced_controller
     @controller = Admin::AddressesController.new
     Address.stubs(:new).returns(mock_address(:save => true))
     @controller.stubs(:address_url)
@@ -43,20 +43,28 @@ class FlashBaseHelpersTest < TEST_CLASS
     assert_equal 'Admin, you created a new address close to <b>Ocean Avenue</b>.', flash[:notice]
   end
 
-  def test_set_success_flash_message_on_update
+  def test_failure_flash_message_on_create_with_namespaced_controller_actions
+    @controller = Admin::AddressesController.new
+    Address.stubs(:new).returns(mock_address(:save => false))
+    @controller.stubs(:address_url)
+    post :create
+    assert_equal 'Admin error message.', flash[:error]
+  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]
   end
 
-  def test_set_failure_flash_message_on_update
+  def test_failure_flash_message_on_update
     Address.stubs(:find).returns(mock_address(:update_attributes => false, :errors => []))
     put :update
     assert_equal 'Oh no! We could not update your address!', flash[:error]
   end
 
-  def test_default_success_flash_message_on_destroy
+  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]

data/test/{fixtures → locales}/en.yml

@@ -7,6 +7,10 @@ en:
         notice: "Nice! {{resource_name}} was updated with success!"
         error: "Oh no! We could not update your address!"
     admin:
+      actions:
+        create:
+          notice: "Admin notice message."
+          error: "Admin error message."
       addresses:
         create:
           notice: "Admin, you created a new address close to <b>{{reference}}</b>."

data/test/test_helper.rb

@@ -16,7 +16,7 @@ require 'action_controller/test_process'
 
 TEST_CLASS = ActionController::TestCase
 
-I18n.load_path << File.join(File.dirname(__FILE__), 'fixtures', 'en.yml') 
+I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!
 
 # Load respond_to before defining ApplicationController

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -78,7 +78,7 @@ test_files:
 - test/singleton_test.rb
 - test/test_helper.rb
 - test/url_helpers_test.rb
-- test/fixtures/en.yml
+- test/locales/en.yml
 - test/views/cities/edit.html.erb
 - test/views/cities/index.html.erb
 - test/views/cities/new.html.erb