fusionary-easel_helpers 0.2.7 → 0.2.9

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'echoe'
 
-Echoe.new("easel_helpers", "0.2.7") do |p|
+Echoe.new("easel_helpers", "0.2.9") 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,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easel_helpers}
-  s.version = "0.2.7"
+  s.version = "0.2.9"
 
   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-04}
+  s.date = %q{2009-06-11}
   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/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"]

data/lib/easel_helpers/helpers/rjs_helper.rb

@@ -4,11 +4,14 @@ module EaselHelpers
       
       def inline_flash(page, flash, options = {})
         container_id = options[:container] || "flash-container"
+        current_flash = flash
+        
+        flash.discard unless options[:keep_flash]
         
         if options[:replace]
-          page.replace_html container_id, messages(flash)
+          page.replace_html container_id, messages(current_flash)
         else
-          page.insert_html :top, container_id, messages(flash)
+          page.insert_html :top, container_id, messages(current_flash)
         end
       end
       

data/test/rjs_helper_test.rb

@@ -7,22 +7,40 @@ class RjsHelperTest < ActiveSupport::TestCase
   context "inline_flash" do
     setup do
       @page = Object.new
+      @flash_hash = {:notice => "Test!"}
       self.expects(:messages).with({:notice => "Test!"}).returns("string")
     end
     
-    should "default to inserting flash within div#flash-container" do
-      @page.expects(:insert_html).with(:top, "flash-container", "string")
-      inline_flash(@page, {:notice => "Test!"})
-    end
-    
-    should "allow assignment of container id" do
-      @page.expects(:insert_html).with(:top, "my-custom-id", "string")
-      inline_flash(@page, {:notice => "Test!"}, {:container => "my-custom-id"})
+    context "without keeping flash" do
+      setup do
+        @flash_hash.expects(:discard).returns(true)
+      end
+      
+      should "default to inserting flash within div#flash-container" do
+        @page.expects(:insert_html).with(:top, "flash-container", "string")
+        inline_flash(@page, @flash_hash)
+      end
+
+      should "allow assignment of container id" do
+        @page.expects(:insert_html).with(:top, "my-custom-id", "string")
+        inline_flash(@page, @flash_hash, {:container => "my-custom-id"})
+      end
+
+      should "allow replacement of current flash container's HTML" do
+        @page.expects(:replace_html).with("flash-container", "string")
+        inline_flash(@page, @flash_hash, {:replace => true})
+      end
     end
     
-    should "allow replacement of current flash container's HTML" do
-      @page.expects(:replace_html).with("flash-container", "string")
-      inline_flash(@page, {:notice => "Test!"}, {:replace => true})
+    context "when keeping flash" do
+      setup do
+        @flash_hash.expects(:discard).never
+      end
+      
+      should "default to inserting flash within div#flash-container" do
+        @page.expects(:insert_html).with(:top, "flash-container", "string")
+        inline_flash(@page, @flash_hash, :keep_flash => true)
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fusionary-easel_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors: 
 - Joshua Clayton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency