locale_flash 0.0.3 → 0.0.4

data/README.markdown

@@ -1,6 +1,6 @@
 # locale_flash
 
-## Intallation
+## Installation
 
 Add locale_flash to your Gemfile :
 
@@ -76,8 +76,16 @@ Given that I call *locale_notice* from the create action in a UsersController, t
     controllers.flash.create.notice       # fallback to the notice message for all create actions
     controllers.flash.notice              # fallback to the generic notice message
 
+Given a nested Admin::UsersController, the order of fallbacks will be as follows :
+
+    controllers.admin.users.create.flash.notice
+    controllers.admin.create.flash.show.notice
+    controllers.admin.create.flash.notice
+    controllers.admin.flash.notice
+    controllers.flash.create.notice
+    controllers.flash.notice
+
 ## TODO
 + Add an option to configure the wrapping html tags/classes
-+ Make sure that nested controllers have the correct fallbacks
 + Allow options to be passed to the I18n.t call (like :locale => :fr for example)
 + Add the option of predefining common messages (like resource_created for example)

data/lib/locale_flash/action_controller.rb

@@ -4,7 +4,7 @@ module LocaleFlash
   private
   
     def locale_flash(key)
-      flash[key] = {:controller => controller_name, :action => action_name}
+      flash[key] = {:controller => controller_path, :action => action_name}
     end
 
     def locale_notice

data/lib/locale_flash/action_view.rb

@@ -21,14 +21,27 @@ module LocaleFlash
     end
 
     def locale_flash_key(key, value)
-      ['controllers', value[:controller], value[:action], 'flash', key].join('.').to_sym
+      ['controllers', value[:controller].split('/').join('.'), value[:action], 'flash', key].join('.').to_sym
     end
 
-    def locale_flash_default(key, value)
-      [ ['controllers', value[:controller], 'flash', key],
-        ['controllers', 'flash', value[:action], key],
-        ['controllers', 'flash', key]
-      ].map { |i| i.join('.').to_sym }
+    def locale_flash_default(type, msg)
+      controllers = msg[:controller].split('/')
+
+      if controllers.size > 1
+        defaults = []
+        controllers.each_with_index do |controller, i|
+          controller = controllers[0, (controllers.size - i)].join('.')
+          parent     = controllers[0, (controllers.size - i - 1)].join('.')
+          defaults << ['controllers', controller, 'flash', type]
+          defaults << ['controllers', parent, 'flash', msg[:action], type] unless parent.empty?
+        end
+      else
+        defaults = [['controllers', controllers.first, 'flash', type]]
+      end
+
+      defaults << ['controllers', 'flash', msg[:action], type]
+      defaults << ['controllers', 'flash', type]
+      defaults.map { |i| i.join('.').to_sym }
     end
 
   end

data/lib/locale_flash/version.rb

@@ -1,3 +1,3 @@
 module LocaleFlash
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/locale_flash/action_controller_spec.rb

@@ -11,6 +11,17 @@ describe ActionController::Base do
       @controller.edit
       @controller.flash.should == {:warning => {:controller => 'users', :action => 'create'}}
     end
+
+    context "when the controller is nested" do
+      before(:each) do
+        @controller = Admin::UsersController.new
+      end
+
+      it "sets the flash[key] to a hash containing the full path to the controller and the action name" do
+        @controller.show
+        @controller.flash.should == {:alert => {:controller => 'admin/users', :action => 'show'}}
+      end
+    end
   end
 
   describe '#locale_notice' do

data/spec/locale_flash/action_view_spec.rb

@@ -49,6 +49,46 @@ describe ActionView::Base do
         @template.locale_flash.should == %Q{<div class="notice">Found in controllers.flash.notice</div>}
       end
     end
+  end
+
+  describe "#locale_flash_default(type, msg)" do
+    it "should be correct for simple controllers" do
+      @template.send(
+        :locale_flash_default,
+        :notice, {:controller => 'users',  :action => 'show'}
+      ).should == [
+        :"controllers.users.flash.notice",
+        :"controllers.flash.show.notice",
+        :"controllers.flash.notice"
+      ]
+    end
 
+    it "should be correct for nested controllers" do
+      @template.send(
+        :locale_flash_default,
+        :notice, {:controller => 'admin/users', :action => 'show'}
+      ).should == [
+        :"controllers.admin.users.flash.notice",
+        :"controllers.admin.flash.show.notice",
+        :"controllers.admin.flash.notice",
+        :"controllers.flash.show.notice",
+        :"controllers.flash.notice"
+      ]
+    end
+
+    it "should be correct for multiply nested controllers" do
+      @template.send(
+        :locale_flash_default,
+        :notice, {:controller => 'admin/users/projects', :action => 'show'}
+      ).should == [
+        :"controllers.admin.users.projects.flash.notice",
+        :"controllers.admin.users.flash.show.notice",
+        :"controllers.admin.users.flash.notice",
+        :"controllers.admin.flash.show.notice",
+        :"controllers.admin.flash.notice",
+        :"controllers.flash.show.notice",
+        :"controllers.flash.notice"
+      ]
+    end
   end
 end

data/spec/support/controllers.rb

@@ -9,7 +9,6 @@ module ActionController
 end
 
 class UsersController < ActionController::Base
-
   def edit
     locale_flash(:warning)
   end
@@ -24,11 +23,28 @@ class UsersController < ActionController::Base
 
 private
 
-  def controller_name
+  def controller_path
     'users'
   end
 
   def action_name
     'create'
   end
+end
+
+module Admin
+end
+
+class Admin::UsersController < ActionController::Base
+  def show
+    locale_alert
+  end
+
+  def controller_path
+    'admin/users'
+  end
+
+  def action_name
+    'show'
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: locale_flash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Christopher Dell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency