locale_flash 0.0.1 → 0.0.2

data/.rspec

@@ -0,0 +1,2 @@
+-I ./lib
+-I ./spec

data/Guardfile

@@ -0,0 +1,3 @@
+guard 'rspec', :cli => "--color --format nested" do
+  watch(%r{^spec/.+_spec\.rb})
+end

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+task :default => :spec

data/lib/locale_flash/action_controller.rb

@@ -0,0 +1,24 @@
+module LocaleFlash
+  module ActionController
+    
+  private
+  
+    def locale_flash(key)
+      flash[key] = {:controller => controller_name, :action => action_name}
+    end
+
+    def locale_notice
+      locale_flash :notice
+    end
+
+    def locale_alert
+      locale_flash :alert
+    end
+  end
+end
+  
+module ActionController
+  class Base
+    include LocaleFlash::ActionController
+  end
+end

data/lib/locale_flash/action_view.rb

@@ -0,0 +1,41 @@
+module LocaleFlash
+  module ActionView
+
+    def locale_flash
+      output = ''
+      flash.each do |key, value|
+        if value.is_a?(Hash) && value[:controller] && value[:action]
+          output << locale_flash_wrap(key, t(locale_flash_key(key, value), :default => locale_flash_default(key, value)))
+        else
+          output << locale_flash_wrap(key, value)
+        end
+      end
+      output
+    end
+
+  private
+
+    def locale_flash_wrap(key, value)
+      %Q{<div class="#{key}">#{value}</div>}
+    end
+
+    def locale_flash_key(key, value)
+      ['controllers', value[:controller], 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 }
+    end
+
+  end
+end
+
+
+module ActionView
+  class Base
+    include LocaleFlash::ActionView
+  end
+end

data/lib/locale_flash/version.rb

@@ -1,3 +1,3 @@
 module LocaleFlash
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/locale_flash.rb

@@ -1,2 +1,2 @@
-module LocaleFlash
-end
+require 'locale_flash/action_controller'
+require 'locale_flash/action_view'

data/locale_flash.gemspec

@@ -18,4 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency('i18n')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('guard-rspec')
 end

data/spec/fixtures/en.yml

@@ -0,0 +1,12 @@
+en:
+  controllers:
+    flash:
+      notice: Found in controllers.flash.notice
+      show:
+        notice: Found in controllers.flash.show.notice
+    users:
+      flash:
+        notice: Found in controllers.users.flash.notice
+      create:
+        flash:
+          notice: Found in controllers.users.create.flash.notice

data/spec/locale_flash/action_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'support/controllers'
+
+describe ActionController::Base do
+  before(:each) do
+    @controller = UsersController.new
+  end
+
+  describe '#locale_flash(key)' do
+    it "sets flash[key] to a hash containing the controller name and the action name" do
+      @controller.edit
+      @controller.flash.should == {:warning => {:controller => 'users', :action => 'create'}}
+    end
+  end
+
+  describe '#locale_notice' do
+    it "sets flash[:notice] to a hash contianing the controller name and the action name" do
+      @controller.create
+      @controller.flash.should == {:notice => {:controller => 'users', :action => 'create'}}
+    end
+  end
+
+  describe '#locale_alert' do
+    it "sets flash[:alert] to a hash contianing the controller name and the action name" do
+      @controller.destroy
+      @controller.flash.should == {:alert => {:controller => 'users', :action => 'create'}}
+    end
+  end
+end

data/spec/locale_flash/action_view_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'support/templates'
+
+describe ActionView::Base do
+  before(:each) do
+    @template = UsersTemplate.new
+  end
+
+  describe '#locale_flash' do
+    context "when flash is empty" do
+      it "returns an empty string" do
+        @template.flash = {}
+        @template.locale_flash.should == ''
+      end
+    end
+
+    context "when flash is a string" do
+      it "returns an html flash" do
+        @template.flash = {:notice => 'This is a string'}
+        @template.locale_flash.should == %Q{<div class="notice">This is a string</div>}
+      end  
+
+      it "returns multiple html flashes" do
+        @template.flash = {:notice => 'This is a string', :alert => 'This is another string'}
+        html = @template.locale_flash
+        html.should include(%Q{<div class="notice">This is a string</div>})
+        html.should include(%Q{<div class="alert">This is another string</div>})
+      end
+    end
+
+    context "when flash is a hash containg controller and action keys" do
+      it "returns the flash for the controller and action" do
+        @template.flash = {:notice => {:controller => 'users', :action => 'create'}}
+        @template.locale_flash.should == %Q{<div class="notice">Found in controllers.users.create.flash.notice</div>}
+      end
+
+      it "returns the flash falling back to the controller flash" do
+        @template.flash = {:notice => {:controller => 'users', :action => 'update'}}
+        @template.locale_flash.should == %Q{<div class="notice">Found in controllers.users.flash.notice</div>}
+      end
+
+      it "returns the flash falling back to the action flash" do
+        @template.flash = {:notice => {:controller => 'pages', :action => 'show'}}
+        @template.locale_flash.should == %Q{<div class="notice">Found in controllers.flash.show.notice</div>}
+      end
+
+      it "returns the flash falling back to the key flash" do
+        @template.flash = {:notice => {:controller => 'other', :action => 'index'}}
+        @template.locale_flash.should == %Q{<div class="notice">Found in controllers.flash.notice</div>}
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'locale_flash'
+require 'i18n'
+
+I18n.load_path << 'spec/fixtures/en.yml'

data/spec/support/controllers.rb

@@ -0,0 +1,34 @@
+module ActionController
+  class Base
+    attr_accessor :flash
+
+    def initialize
+      @flash = {}
+    end
+  end
+end
+
+class UsersController < ActionController::Base
+
+  def edit
+    locale_flash(:warning)
+  end
+
+  def create
+    locale_notice
+  end
+
+  def destroy
+    locale_alert
+  end
+
+private
+
+  def controller_name
+    'users'
+  end
+
+  def action_name
+    'create'
+  end
+end

data/spec/support/templates.rb

@@ -0,0 +1,12 @@
+module ActionView
+  class Base
+    attr_accessor :flash
+
+    def t(key, args={})
+      I18n.t(key, args)
+    end
+  end
+end
+  
+class UsersTemplate < ActionView::Base
+end

metadata

@@ -2,7 +2,7 @@
 name: locale_flash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Christopher Dell
@@ -12,8 +12,40 @@ cert_chain: []
 
 date: 2011-05-07 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: locale_flash lets you create flash messages easily with I18n fallbacks
 email: 
 - chris@tigrish.com
@@ -25,12 +57,22 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
+- Guardfile
 - Rakefile
 - lib/locale_flash.rb
+- lib/locale_flash/action_controller.rb
+- lib/locale_flash/action_view.rb
 - lib/locale_flash/version.rb
 - locale_flash.gemspec
+- spec/fixtures/en.yml
+- spec/locale_flash/action_controller_spec.rb
+- spec/locale_flash/action_view_spec.rb
+- spec/spec_helper.rb
+- spec/support/controllers.rb
+- spec/support/templates.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -55,9 +97,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: locale_flash
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Super charge your flash messages with I18n
-test_files: []
-
+test_files: 
+- spec/fixtures/en.yml
+- spec/locale_flash/action_controller_spec.rb
+- spec/locale_flash/action_view_spec.rb
+- spec/spec_helper.rb
+- spec/support/controllers.rb
+- spec/support/templates.rb