josevalim-inherited_resources 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+# Version 0.5.0
+
+* Only call I18n if it's defined.
+
 # Version 0.4.6
 
 * Dealing with namespaced controllers out of the box;

data/MIT-LICENSE

@@ -1,5 +1,4 @@
-Copyright (c) 2006 Coda Hale
-Copyright (c) 2008 José Valim (jose.valim at gmail dot com)
+Copyright (c) 2009 José Valim
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.5.0
+Version: 0.5.1
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -16,7 +16,7 @@ your controllers more powerful and cleaner at the same time.
 Plus, making your controllers follow a pattern, it helps you to write better
 code by following fat models and skinny controllers convention.
 
-Inherited Resources is tested and compatible with Rails 2.2.2 and Rails 2.3.0.
+Inherited Resources is tested and compatible with Rails 2.2.x and Rails 2.3.x.
 
 keywords: resources, controller, singleton, belongs_to, polymorphic and I18n
 

data/lib/inherited_resources/base_helpers.rb

@@ -185,22 +185,26 @@ module InheritedResources #:nodoc:
       #   flash.actions.create.status
       #
       def set_flash_message!(status, default_message = '')
+        return flash[status] = default_message unless defined?(::I18n)
+
         options = {
-          :default  => default_message,
+          :default  => default_message || '',
           :resource_name => resource_class.human_name,
         }.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}"
+        slices   = controller_path.split('/')
+
+        while slices.size > 0
+          defaults << :"flash.#{slices.fill(controller_name, -1).join('.')}.#{action_name}.#{status}"
+          defaults << :"flash.#{slices.fill(:actions, -1).join('.')}.#{action_name}.#{status}"
+          slices.shift
         end
+
         options[:default] = defaults.push(options[:default])
         options[:default].flatten!
 
-        message = I18n.t options[:default].shift, options
+        message = ::I18n.t options[:default].shift, options
         flash[status] = message unless message.blank?
       end
 

data/test/base_helpers_test.rb

@@ -51,6 +51,14 @@ class FlashBaseHelpersTest < TEST_CLASS
     assert_equal 'Admin error message.', flash[:error]
   end
 
+  def test_inherited_success_flash_message_on_update_on_namespaced_controllers
+    @controller = Admin::AddressesController.new
+    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_success_flash_message_on_update
     Address.stubs(:find).returns(mock_address(:update_attributes => true))
     put :update

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -07:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: []