fusionary-easel_helpers 0.2.6 → 0.2.7

data/Manifest

@@ -1,9 +1,9 @@
 easel_helpers.gemspec
 lib/easel_helpers/helpers/date_helper.rb
-lib/easel_helpers/helpers/flash_helper.rb
 lib/easel_helpers/helpers/form_helper.rb
 lib/easel_helpers/helpers/grid_helper.rb
 lib/easel_helpers/helpers/link_helper.rb
+lib/easel_helpers/helpers/message_helper.rb
 lib/easel_helpers/helpers/rjs_helper.rb
 lib/easel_helpers/helpers/structure_helper.rb
 lib/easel_helpers/helpers/table_helper.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.6") do |p|
+Echoe.new("easel_helpers", "0.2.7") do |p|
   p.description = "Fusionary Rails View Helpers"
   p.url = "http://github.com/fusionary/easel_helpers"
   p.author = "Joshua Clayton"

data/easel_helpers.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easel_helpers}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Clayton"]
-  s.date = %q{2009-06-01}
+  s.date = %q{2009-06-04}
   s.description = %q{Fusionary Rails View Helpers}
   s.email = %q{joshua.clayton@gmail.com}
-  s.extra_rdoc_files = ["lib/easel_helpers/helpers/date_helper.rb", "lib/easel_helpers/helpers/flash_helper.rb", "lib/easel_helpers/helpers/form_helper.rb", "lib/easel_helpers/helpers/grid_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/rjs_helper.rb", "lib/easel_helpers/helpers/structure_helper.rb", "lib/easel_helpers/helpers/table_helper.rb", "lib/easel_helpers/helpers.rb", "lib/easel_helpers/rails_partial_caching.rb", "lib/easel_helpers.rb", "README.textile", "tasks/easel_helpers_tasks.rake"]
-  s.files = ["easel_helpers.gemspec", "lib/easel_helpers/helpers/date_helper.rb", "lib/easel_helpers/helpers/flash_helper.rb", "lib/easel_helpers/helpers/form_helper.rb", "lib/easel_helpers/helpers/grid_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/rjs_helper.rb", "lib/easel_helpers/helpers/structure_helper.rb", "lib/easel_helpers/helpers/table_helper.rb", "lib/easel_helpers/helpers.rb", "lib/easel_helpers/rails_partial_caching.rb", "lib/easel_helpers.rb", "Manifest", "MIT-LICENSE", "rails/init.rb", "Rakefile", "README.textile", "tasks/easel_helpers_tasks.rake", "test/date_helper_test.rb", "test/flash_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/rjs_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["lib/easel_helpers/helpers/date_helper.rb", "lib/easel_helpers/helpers/form_helper.rb", "lib/easel_helpers/helpers/grid_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/message_helper.rb", "lib/easel_helpers/helpers/rjs_helper.rb", "lib/easel_helpers/helpers/structure_helper.rb", "lib/easel_helpers/helpers/table_helper.rb", "lib/easel_helpers/helpers.rb", "lib/easel_helpers/rails_partial_caching.rb", "lib/easel_helpers.rb", "README.textile", "tasks/easel_helpers_tasks.rake"]
+  s.files = ["easel_helpers.gemspec", "lib/easel_helpers/helpers/date_helper.rb", "lib/easel_helpers/helpers/form_helper.rb", "lib/easel_helpers/helpers/grid_helper.rb", "lib/easel_helpers/helpers/link_helper.rb", "lib/easel_helpers/helpers/message_helper.rb", "lib/easel_helpers/helpers/rjs_helper.rb", "lib/easel_helpers/helpers/structure_helper.rb", "lib/easel_helpers/helpers/table_helper.rb", "lib/easel_helpers/helpers.rb", "lib/easel_helpers/rails_partial_caching.rb", "lib/easel_helpers.rb", "Manifest", "MIT-LICENSE", "rails/init.rb", "Rakefile", "README.textile", "tasks/easel_helpers_tasks.rake", "test/date_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/message_helper_test.rb", "test/rjs_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/fusionary/easel_helpers}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Easel_helpers", "--main", "README.textile"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{easel_helpers}
   s.rubygems_version = %q{1.3.2}
   s.summary = %q{Fusionary Rails View Helpers}
-  s.test_files = ["test/date_helper_test.rb", "test/flash_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/rjs_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/date_helper_test.rb", "test/form_helper_test.rb", "test/grid_helper_test.rb", "test/link_helper_test.rb", "test/message_helper_test.rb", "test/rjs_helper_test.rb", "test/structure_helper_test.rb", "test/table_helper_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/easel_helpers/helpers/{flash_helper.rb → message_helper.rb}

@@ -1,23 +1,23 @@
 module EaselHelpers
   module Helpers
-    module FlashHelper
+    module MessageHelper
       
-      def render_flash(flash, options = {})
+      def messages(messages, options = {})
         except_keys = [options[:except]].flatten.compact
         only_keys = [options[:only]].flatten.compact
         
         raise ArgumentError, ":only and :except options conflict; use one or the other" if except_keys.any? && only_keys.any?
         
         keys = if except_keys.any?
-          flash.keys - except_keys
+          messages.keys - except_keys
         elsif only_keys.any?
-          flash.keys & only_keys
+          messages.keys & only_keys
         else
-          flash.keys
+          messages.keys
         end
         
         keys.map do |key|
-          content_tag :p, flash[key], :class => [key, "box", "single-line"].join(" ") unless flash[key].blank?
+          content_tag :p, messages[key], :class => [key, "box", "single-line"].join(" ") unless messages[key].blank?
         end.join
       end
       

data/lib/easel_helpers/helpers/rjs_helper.rb

@@ -6,9 +6,9 @@ module EaselHelpers
         container_id = options[:container] || "flash-container"
         
         if options[:replace]
-          page.replace_html container_id, render_flash(flash)
+          page.replace_html container_id, messages(flash)
         else
-          page.insert_html :top, container_id, render_flash(flash)
+          page.insert_html :top, container_id, messages(flash)
         end
       end
       

data/lib/easel_helpers/helpers.rb

@@ -4,7 +4,7 @@ require "easel_helpers/helpers/link_helper"
 require "easel_helpers/helpers/structure_helper"
 require "easel_helpers/helpers/table_helper"
 require "easel_helpers/helpers/grid_helper"
-require "easel_helpers/helpers/flash_helper"
+require "easel_helpers/helpers/message_helper"
 require "easel_helpers/helpers/rjs_helper"
 
 module EaselHelpers
@@ -15,7 +15,7 @@ module EaselHelpers
     include StructureHelper
     include TableHelper
     include GridHelper
-    include FlashHelper
+    include MessageHelper
     include RjsHelper
     
     protected

data/test/{flash_helper_test.rb → message_helper_test.rb}

@@ -1,31 +1,31 @@
 require 'test_helper'
 
-class FlashHelperTest < EaselHelpers::ViewTestCase
+class MessageHelperTest < EaselHelpers::ViewTestCase
   
-  context "render_flash" do
+  context "messages" do
     
     should "default with the correct structure" do
-      show_view %(<%= render_flash(:structure => "Flash message") %>) do
+      show_view %(<%= messages(:structure => "Flash message") %>) do
         assert_select "p.structure.box.single-line", "Flash message"
       end
     end
     
     should "display all flash messages present" do
-      show_view %(<%= render_flash(:structure => "Flash message", :error => "Warning message") %>) do
+      show_view %(<%= messages(:structure => "Flash message", :error => "Warning message") %>) do
         assert_select "p.structure", "Flash message"
         assert_select "p.error", "Warning message"
       end
     end
     
     should "not display a flash if it is blank" do
-      show_view %(<%= render_flash(:structure => "", :error => nil) %>) do
+      show_view %(<%= messages(:structure => "", :error => nil) %>) do
         assert_select "p.structure", false
         assert_select "p.error", false
       end
     end
     
     should "filter by the :only option" do
-      show_view %(<%= render_flash({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:only => [:structure, :error]}) %>) do
+      show_view %(<%= messages({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:only => [:structure, :error]}) %>) do
         assert_select "p.structure", "Flash message"
         assert_select "p.error", "Warning message"
         assert_select "p.notice", false
@@ -33,7 +33,7 @@ class FlashHelperTest < EaselHelpers::ViewTestCase
     end
     
     should "filter by the :except option" do
-      show_view %(<%= render_flash({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:except => [:structure, :error]}) %>) do
+      show_view %(<%= messages({:structure => "Flash message", :error => "Warning message", :notice => "Notice!"}, {:except => [:structure, :error]}) %>) do
         assert_select "p.structure", false
         assert_select "p.error", false
         assert_select "p.notice", "Notice!"
@@ -42,7 +42,7 @@ class FlashHelperTest < EaselHelpers::ViewTestCase
     
     should "raise an error of :only and :except are both passed" do
       assert_raise ArgumentError, /conflict/ do
-        show_view %(<%= render_flash({:structure => "Flash message"}, {:except => [:structure, :error], :only => :structure}) %>)
+        show_view %(<%= messages({:structure => "Flash message"}, {:except => [:structure, :error], :only => :structure}) %>)
       end
     end
   end

data/test/rjs_helper_test.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 
 class RjsHelperTest < ActiveSupport::TestCase
   include EaselHelpers::Helpers::RjsHelper
-  include EaselHelpers::Helpers::FlashHelper
+  include EaselHelpers::Helpers::MessageHelper
   
   context "inline_flash" do
     setup do
       @page = Object.new
-      self.expects(:render_flash).with({:notice => "Test!"}).returns("string")
+      self.expects(:messages).with({:notice => "Test!"}).returns("string")
     end
     
     should "default to inserting flash within div#flash-container" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,10 +59,10 @@ extensions: []
 
 extra_rdoc_files: 
 - lib/easel_helpers/helpers/date_helper.rb
-- lib/easel_helpers/helpers/flash_helper.rb
 - lib/easel_helpers/helpers/form_helper.rb
 - lib/easel_helpers/helpers/grid_helper.rb
 - lib/easel_helpers/helpers/link_helper.rb
+- lib/easel_helpers/helpers/message_helper.rb
 - lib/easel_helpers/helpers/rjs_helper.rb
 - lib/easel_helpers/helpers/structure_helper.rb
 - lib/easel_helpers/helpers/table_helper.rb
@@ -74,10 +74,10 @@ extra_rdoc_files:
 files: 
 - easel_helpers.gemspec
 - lib/easel_helpers/helpers/date_helper.rb
-- lib/easel_helpers/helpers/flash_helper.rb
 - lib/easel_helpers/helpers/form_helper.rb
 - lib/easel_helpers/helpers/grid_helper.rb
 - lib/easel_helpers/helpers/link_helper.rb
+- lib/easel_helpers/helpers/message_helper.rb
 - lib/easel_helpers/helpers/rjs_helper.rb
 - lib/easel_helpers/helpers/structure_helper.rb
 - lib/easel_helpers/helpers/table_helper.rb
@@ -91,10 +91,10 @@ files:
 - README.textile
 - tasks/easel_helpers_tasks.rake
 - test/date_helper_test.rb
-- test/flash_helper_test.rb
 - test/form_helper_test.rb
 - test/grid_helper_test.rb
 - test/link_helper_test.rb
+- test/message_helper_test.rb
 - test/rjs_helper_test.rb
 - test/structure_helper_test.rb
 - test/table_helper_test.rb
@@ -132,10 +132,10 @@ specification_version: 3
 summary: Fusionary Rails View Helpers
 test_files: 
 - test/date_helper_test.rb
-- test/flash_helper_test.rb
 - test/form_helper_test.rb
 - test/grid_helper_test.rb
 - test/link_helper_test.rb
+- test/message_helper_test.rb
 - test/rjs_helper_test.rb
 - test/structure_helper_test.rb
 - test/table_helper_test.rb