stackable_flash 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+Version 0.0.6 - AUG.22.2012
+- Performance - reduce number of calls made in the StackLayer
+- Added support for hashes, nils, and other object that Array() destroyed (no longer uses Array())
+- Expanded spec suite
+
 Version 0.0.5 - AUG.22.2012
 - Added Rspec Matchers and Test::Unit helpers.
 

data/lib/stackable_flash/stack_layer.rb

@@ -25,37 +25,39 @@ module StackableFlash
       return send("[]_without_stacking", key)
     end
 
+    # Make an array at the key, while providing a seamless upgrade to existing flashes
+    #
+    # Initial set to Array
+    #
+    # Principle of least surprise
+    # flash[:notice] = ['message1','message2']
+    # flash[:notice] # => ['message1','message2']
+    #
+    # Initial set to String
+    #
+    # Principle of least surprise
+    # flash[:notice] = 'original'
+    # flash[:notice] # => ['original']
+    #
+    # Overwrite!
+    #
+    # Principle of least surprise
+    # flash[:notice] = 'original'
+    # flash[:notice] = 'altered'
+    # flash[:notice] # => ['altered']
+    #
+    # The same line of code does all of the above.
+    # Leave existing behavior in place, but send the full array as the value so it doesn't get killed.
     define_method "[]_with_stacking=" do |key, value|
       if StackableFlash.stacking
-        # Do it in a non-stacking block so we get normal behavior from flash[:notice] calls
-        StackableFlash.not_stacked do
-          # Make an array at the key, while providing a seamless upgrade to existing flashes
-          #
-          # Initial set to Array
-          #
-          # Principle of least surprise
-          # flash[:notice] = ['message1','message2']
-          # flash[:notice] # => ['message1','message2']
-          #
-          # Initial set to String
-          #
-          # Principle of least surprise
-          # flash[:notice] = 'original'
-          # flash[:notice] # => ['original']
-          #
-          # Overwrite!
-          #
-          # Principle of least surprise
-          # flash[:notice] = 'original'
-          # flash[:notice] = 'altered'
-          # flash[:notice] # => ['altered']
-          #
-          # The same line of code does all of the above:
-          self[key] = StackableFlash::FlashStack.new.replace(value.kind_of?(Array) ? value : Array(value))
-
-          # Leave existing behavior in place, but send the full array as the value so it doesn't get killed.
-          send("[]_without_stacking=", key, self[key])
-        end
+        send("[]_without_stacking=", key,
+          StackableFlash::FlashStack.new.replace(
+            value.kind_of?(Array) ?
+              value :
+              # Preserves nil values in the result... I suppose that's OK, users can compact if needed :)
+              Array.new(1, value)
+          )
+        )
       else
         # All StackableFlash functionality is completely bypassed
         send("[]_without_stacking=", key, value)

data/lib/stackable_flash/version.rb

@@ -1,3 +1,3 @@
 module StackableFlash
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/stackable_flash/rspec_matchers_spec.rb

@@ -1,25 +1,33 @@
 require 'spec_helper'
 
-describe StackableFlash::StackLayer do
+describe StackableFlash::RspecMatchers do
   before(:each) do
     @flash = ActionDispatch::Flash::FlashHash.new
   end
   describe "tests against strange things" do
     context "should" do
-      it "should be able to test against odd values like an Object.new" do
-        lambda {@flash[:notice].should have_stackable_flash(Object.new)}.should raise_error RSpec::Expectations::ExpectationNotMetError
-      end
-      it "should be able to test against odd values like {:hello => 'asdf'}" do
+      it "should raise error when not a match" do
+        lambda {@flash[:notice].should have_stackable_flash(1)}.should raise_error RSpec::Expectations::ExpectationNotMetError
         lambda {@flash[:notice].should have_stackable_flash({:hello => 'asdf'})}.should raise_error RSpec::Expectations::ExpectationNotMetError
       end
+      it "should not raise an error when a match" do
+        lambda { @flash[:notice] = 1
+          @flash[:notice].should have_stackable_flash(1)}.should_not raise_exception
+        lambda { @flash[:notice] = {:hello => 'asdf'}
+          @flash[:notice].should have_stackable_flash({:hello => 'asdf'})}.should_not raise_exception
+      end
     end
     context "should_not" do
-      it "should be able to test against odd values like an Object.new" do
-        lambda {@flash[:notice].should_not have_stackable_flash(Object.new)}.should_not raise_exception
-      end
-      it "should be able to test against odd values like {:hello => 'asdf'}" do
+      it "should raise error when not a match" do
+        lambda {@flash[:notice].should_not have_stackable_flash(1)}.should_not raise_exception
         lambda {@flash[:notice].should_not have_stackable_flash({:hello => 'asdf'})}.should_not raise_exception
       end
+      it "should not raise an error when a match" do
+        lambda { @flash[:notice] = 1
+          @flash[:notice].should_not have_stackable_flash(1)}.should raise_error RSpec::Expectations::ExpectationNotMetError
+        lambda { @flash[:notice] = {:hello => 'asdf'}
+          @flash[:notice].should_not have_stackable_flash({:hello => 'asdf'})}.should raise_error RSpec::Expectations::ExpectationNotMetError
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackable_flash
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: