josevalim-inherited_resources 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+# Version 0.4.4
+
+* Added better handling for namespaced controllers;
+* Added flash messages scoped by namespaced controllers;
+* Deprecated {{resource}} in I18n, use {{resource_name}} instead.
+
 # Version 0.4.3
 
 * rspec bug fix is not automatically required anymore. User has to do it

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.4.3
+Version: 0.4.4
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -265,9 +265,10 @@ is also localized and it means you can set:
    flash:
      actions:
        create:
-         notice: "Hooray! {{resource}} was successfully created!"
+         notice: "Hooray! {{resource_name}} was successfully created!"
 
-It will replace {{resource}} for Car properly.
+It will replace {{resource_name}} by the human name of the resource class,
+which is "Car" in this case.
 
 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
@@ -289,6 +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:
+
+   flash.deluxe.cars.create.status
+   flash.cars.create.status
+   flash.actions.create.status
+
 Belongs to
 ----------
 

data/lib/inherited_resources/base.rb

@@ -117,9 +117,9 @@
 #   flash:
 #     actions:
 #       update:
-#         notice: "Hooray! {{resource}} was updated with success!"
+#         notice: "Hooray! {{resource_name}} was updated with success!"
 #
-# It will replace {{resource}} by Project.human_name, which is also localized
+# It will replace {{resource_name}} by Project.human_name, which is also localized
 # (check http://rails-i18n.org/wiki/pages/i18n-rails-guide for more info).
 #
 # But sometimes, flash messages are not that simple. You might want to say the
@@ -225,7 +225,7 @@ module InheritedResources
         object = build_resource(params[resource_instance_name])
 
         if object.save
-          set_flash_message!(:notice, '{{resource}} was successfully created.')
+          set_flash_message!(:notice, '{{resource_name}} was successfully created.')
 
           respond_to(:with => object, :status => :created, :location => resource_url) do |format|
             block.call args_for_block(block, format, true) if block_given?
@@ -247,7 +247,7 @@ module InheritedResources
         object = resource
 
         if object.update_attributes(params[resource_instance_name])
-          set_flash_message!(:notice, '{{resource}} was successfully updated.')
+          set_flash_message!(:notice, '{{resource_name}} was successfully updated.')
 
           respond_to do |format|
             block.call args_for_block(block, format, true) if block_given?
@@ -269,7 +269,7 @@ module InheritedResources
       def destroy
         resource.destroy
 
-        set_flash_message!(:notice, '{{resource}} was successfully destroyed.')
+        set_flash_message!(:notice, '{{resource_name}} was successfully destroyed.')
 
         respond_to do |format|
           yield(format) if block_given?

data/lib/inherited_resources/base_helpers.rb

@@ -58,11 +58,11 @@ module InheritedResources #:nodoc:
       #   @current_user.projects.find(params[:id])
       #
       # The variable set in begin_of_association_chain is not sent when building
-      # urls, so this is never going to happen:
+      # urls, so this is never going to happen when calling resource_url:
       #
       #   project_url(@current_user, @project)
       #
-      # If the user actually scopes the url, you should user belongs_to method
+      # If the user actually scopes the url, you should use belongs_to method
       # and declare that projects belong to user.
       #
       def begin_of_association_chain
@@ -154,7 +154,7 @@ module InheritedResources #:nodoc:
       #   flash:
       #     actions:
       #       create:
-      #         notice: "Hooray! {{resource}} 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
@@ -176,20 +176,47 @@ module InheritedResources #:nodoc:
       #
       #   '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:
+      #
+      #   flash.deluxe.cars.create.status
+      #   flash.cars.create.status
+      #   flash.actions.create.status
+      #
       def set_flash_message!(status, default_message = '')
-        options = {
-          :default  => [ :"flash.actions.#{action_name}.#{status}", default_message ],
-          :resource => resource_class.human_name
-        }.merge(interpolation_options)
-      
-        message = I18n.t "flash.#{controller_name}.#{action_name}.#{status}", options
+        options = interpolation_options.merge({
+          :default  => [ :"flash.#{controller_name}.#{action_name}.#{status}",
+                         :"flash.actions.#{action_name}.#{status}",
+                         default_message ],
+          :resource_name => resource_class.human_name,
+        })
+
+        unless controller_path == controller_name
+          options[:default].unshift(:"flash.#{controller_path.gsub('/','.')}.#{action_name}.#{status}")
+        end
+
+        # TODO Deprecate this whole begin/rescue block and replace it for:
+        #
+        #   message = I18n.t options[:default].shift, options
+        #
+        first = options[:default].shift
+        begin
+          message = I18n.t first, options
+        rescue Exception => e
+          options[:resource] = options[:resource_name]
+          warn "[DEPRECATION] {{resource}} is deprecated as interpolation option " <<
+               "in InheritedResources I18n. Please use {{resource_name}} instead."
+          message = I18n.t first, options
+        end
 
         flash[status] = message unless message.blank?
       end
 
       # Overwrite this method to provide other interpolation options when
-      # the flash message is going to be set. Check set_flash_message! for
-      # more information.
+      # the flash message is going to be set.
+      #
+      # You cannot overwrite :resource_name and :default options using this
+      # method. Check <tt>set_flash_message!</tt> for more information.
       #
       def interpolation_options
         { }

data/lib/inherited_resources/belongs_to_helpers.rb

@@ -12,6 +12,9 @@ module InheritedResources #:nodoc:
       # association chain.
       #
       def evaluate_parent(parent_config, chain = nil)
+        instantiated_object = instance_variable_get("@#{parent_config[:instance_name]}")
+        return instantiated_object if instantiated_object
+
         scoped_parent = if chain
           chain.send(parent_config[:collection_name])
         else

data/lib/inherited_resources/dumb_responder.rb

@@ -12,7 +12,7 @@ module InheritedResources #:nodoc:
     # This is like a good husband, he will just listen everything that his wife
     # says (which is a lot) without complaining. :)
     def method_missing(*args)
-      return true
+      nil
     end
 
   end

data/lib/inherited_resources/respond_to.rb

@@ -259,9 +259,11 @@ module ActionController #:nodoc:
     private
 
       # Define template_exists? for Rails 2.3
-      unless ActionController::Base.private_instance_methods.include? 'template_exists?'
+      unless ActionController::Base.private_instance_methods.include?('template_exists?') ||
+             ActionController::Base.private_instance_methods.include?(:template_exists?)
+
         def template_exists?
-          self.view_paths.find_template("#{controller_name}/#{action_name}", response.template.template_format)
+          default_template ? true : false
         rescue ActionView::MissingTemplate
           false
         end

data/test/base_helpers_test.rb

@@ -11,6 +11,14 @@ class AddressesController < InheritedResources::Base
     end
 end
 
+module Admin; end
+class Admin::AddressesController < InheritedResources::Base
+  protected
+    def interpolation_options
+      { :reference => 'Ocean Avenue' }
+    end
+end
+
 class FlashBaseHelpersTest < TEST_CLASS
 
   def setup
@@ -27,6 +35,14 @@ class FlashBaseHelpersTest < TEST_CLASS
     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
+    @controller = Admin::AddressesController.new
+    Address.stubs(:new).returns(mock_address(:save => true))
+    @controller.stubs(:address_url)
+    post :create
+    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
     Address.stubs(:find).returns(mock_address(:update_attributes => true))
     put :update

data/test/fixtures/en.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: []