ivey-merb_has_flash 0.9.2 → 0.9.6

data/README

@@ -10,6 +10,13 @@ This plugin is released under the same terms as Rails itself.
 Hacked together by Michael Ivey <ivey@gweezlebur.com> ... send bug
 reports and patches to him.
 
+Official Tree:  http://github.com/ivey/merb_has_flash
+
+NOTE: Jeremy Nicoll may be taking over this codebase, and his tree is
+  http://github.com/eltiare/merb_has_flash ... I'll try to keep master
+  updated from him until we decide (IE: I can convince him) to take it
+
 Contributors:
 Tim Kofol
 Shay Arnett
+Jeremy Nicoll

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 
+spec = eval(File.read('merb_has_flash.gemspec'))
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
 task :install => [:package] do
   sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
 end

data/lib/merb_has_flash/controller_extension.rb

@@ -2,36 +2,19 @@ module MerbHasFlash
   module ControllerExtension
     def self.included(base)
       base.send :include, InstanceMethods
-      
-      base.class_eval {
-        after :sweep_flash
-      }
+      base.class_eval { after :sweep_flash }
     end
-    
+
     module InstanceMethods
-      # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
-      # <tt>flash["notice"] = "hello"</tt> to put a new one.
-      # Note that if sessions are disabled only flash.now will work.
-      def flash(refresh = false) #:doc:
-        if !defined?(@_flash) || refresh
-          @_flash =
-            if session.is_a?(Hash)
-              # don't put flash in session if disabled
-              FlashHash.new
-            else
-              # otherwise, session is a CGI::Session or a TestSession
-              # so make sure it gets retrieved from/saved to session storage after request processing
-              session["flash"] ||= FlashHash.new
-            end
-        end
 
-        @_flash
+      def flash(refresh = false) #:doc:
+        session['flash'] = FlashHash.new unless refresh || session['flash'].is_a?(FlashHash)
+        session['flash']
       end
-      
-      protected
+
+    protected
       def sweep_flash
-        flash.sweep if request.session
-        session["flash"] = flash
+        flash.sweep
       end
     end
   end

data/lib/merb_has_flash/flash_hash.rb

@@ -3,45 +3,55 @@ module MerbHasFlash
     def initialize(flash)
       @flash = flash
     end
-    
-    def []=(k, v)
-      @flash[k] = v
-      @flash.discard(k)
-      v
+
+    def []=(key, val)
+      @flash[key] = val
+      @flash.discard key
+      val
     end
-    
-    def [](k)
-      @flash[k]
+
+    def [](key)
+      @flash[key]
     end
   end
-  
-  class FlashHash < Hash
-    def initialize #:nodoc:
-      super
-      @used = {}
+
+  class FlashHash
+    def initialize(*args) #:nodoc:
+      @attrs = Hash.new(*args)
+      @keepers = []
     end
-    
-    def []=(k, v) #:nodoc:
-      keep(k)
-      super
+
+    def []=(key, val) #:nodoc:
+      @attrs[key] = val
+      keep key
     end
-    
-    def update(h) #:nodoc:
-      h.keys.each{ |k| discard(k) }
-      super
+
+    def [](key)
+      @attrs[key]
     end
-    
+
+    def update(hash) #:nodoc:
+      @attrs.update hash
+      hash.keys.each { |key| keep key }
+    end
+
     alias :merge! :update
-    
-    def replace(h) #:nodoc:
-      @used = {}
-      super
+
+    def replace(hash) #:nodoc:
+      @attrs.replace hash
+      keep  # keep with no args automatically clears out unused keys and keeps all used ones.
+    end
+
+
+    def method_missing(method_name, *args) #:nodoc:
+      @attrs.send(method_name, *args)
     end
-  
+
+
     # Sets a flash that will not be available to the next action, only to the current.
     #
     #     flash.now[:message] = "Hello current action"
-    # 
+    #
     # This method enables you to use the flash as a central messaging system in your app.
     # When you need to pass an object to the next action, you use the standard flash assign (<tt>[]=</tt>).
     # When you need to pass an object to the current action, you use <tt>now</tt>, and your object will
@@ -49,53 +59,33 @@ module MerbHasFlash
     #
     # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
     def now
-      FlashNow.new self
+      @_fn ||= FlashNow.new self  # This way, a new object is not created on every "now."
     end
-  
+
     # Keeps either the entire current flash or a specific flash entry available for the next action:
     #
     #    flash.keep            # keeps the entire flash
-    #    flash.keep(:notice)   # keeps only the "notice" entry, the rest of the flash is discarded
-    def keep(k = nil)
-      use(k, false)
+    #    flash.keep(:notice)   # keeps only the "notice" entry
+    def keep(key = nil)
+      key.nil? ? @keepers = @attrs.keys : @keepers << key unless @keepers.include?(key)
     end
-  
+
     # Marks the entire flash or a single flash entry to be discarded by the end of the current action
     #
-    #     flash.keep                 # keep entire flash available for the next action
-    #     flash.discard(:warning)    # discard the "warning" entry (it'll still be available for the current action)
-    def discard(k = nil)
-      use(k)
+    #     flash.discard              # discard the entire hash (it'll still be available for the current action)
+    #     flash.discard(:warning)    # discard the "warning" entry (still available as above)
+    def discard(key = nil)
+      key.nil? ? @keepers = [] : @keepers.delete(key)
     end
-  
-    # Mark for removal entries that were kept, and delete unkept ones.
-    #
+
+    # Clear the keys that are kept, and delete the ones that are currently unkept
     # This method is called automatically by filters, so you generally don't need to care about it.
     def sweep #:nodoc:
-      keys.each do |k| 
-        unless @used[k]
-          use(k)
-        else
-          delete(k)
-          @used.delete(k)
-        end
-      end
-
-      (@used.keys - keys).each{|k| @used.delete k } # clean up after keys that could have been left over by calling reject! or shift on the flash
+      @attrs.keys.each { |key| @attrs.delete key unless @keepers.include?(key) }
+      discard
     end
-  
-    private
-      # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-      #     use()               # marks the entire flash as used
-      #     use('msg')          # marks the "msg" entry as used
-      #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-      #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-      def use(k=nil, v=true)
-        unless k.nil?
-          @used[k] = v
-        else
-          keys.each{|key| use key, v }
-        end
-      end
+
+
   end
-end
+
+end

data/lib/merb_has_flash.rb

@@ -4,16 +4,18 @@ end
 
 require 'merb_has_flash/flash_hash'
 
+require 'merb_has_flash/helper'
+Merb::RenderMixin.send :include, MerbHasFlash::FlashHelperMixin
+
 require 'merb_has_flash/controller_extension'
 Merb::Controller.send :include, MerbHasFlash::ControllerExtension
 
-require 'merb_has_flash/helper'
-Merb::RenderMixin.send :include, MerbHasFlash::FlashHelperMixin
+
 
 module MerbHasFlash
   # The flash provides a way to pass temporary objects between actions. Anything you place in the flash will be exposed
   # to the very next action and then cleared out. This is a great way of doing notices and alerts, such as a create action
-  # that sets <tt>flash[:notice] = "Successfully created"</tt> before redirecting to a display action that can then expose 
+  # that sets <tt>flash[:notice] = "Successfully created"</tt> before redirecting to a display action that can then expose
   # the flash to its template. Actually, that exposure is automatically done. Example:
   #
   #   class WeblogController < Merb::Controller

data/spec/merb_has_flash/controller_extension_spec.rb

@@ -1,7 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "merb_has_flash Controller Extension" do
-  it "should copy-and-paste from rails" do
-    
-  end
+  it "should have specs, but doesn't..."
 end

data/spec/merb_has_flash/flash_hash_spec.rb

@@ -5,20 +5,43 @@ describe "merb_has_flash FlashHash" do
   before(:each) do
     @hash = MerbHasFlash::FlashHash.new
   end
-  
-  it "should be a kind of Hash" do
-    @hash.should be_a_kind_of(Hash)
+
+  it "should not be a kind of Hash" do
+    # Merb 0.9.6 now transmutes all Hashes in sessions into Mashes.. destroying the functionality.
+    @hash.should_not be_a_kind_of(Hash)
   end
-  
-  it "should initialize an empty @used hash" do
-    @hash.instance_variable_get(:@used).should == {}
+
+  it "should keep appropriate variables on sweep" do
+    @hash[:a] = true
+    @hash[:b] = false
+    @hash[:c] = 90928
+
+    @hash.sweep
+
+    @hash[:a].should eql(true)
+    @hash[:b].should eql(false)
+    @hash[:c].should eql(90928)
   end
-  
-  it "should have more specs" do
-    
+
+  it "should not keep variables when using now" do
+    @hash.now[:a] = true
+    @hash[:b] = true
+    @hash.instance_variable_get(:@keepers).should_not include(:a)
   end
-  
-  it "should copy-and-paste most of this from Rails" do
-    
+
+  it "should discard appropriate variables on sweep" do
+    @hash.now[:a] = true
+    @hash[:b] = false
+    @hash[:c] = 90928
+    @hash.discard(:c)
+    @hash[:d] = 'Sir, the smurfs are eating your lunch...'
+
+    @hash.sweep
+
+    @hash[:a].should be_nil
+    @hash[:b].should eql(false)
+    @hash[:c].should be_nil
+    @hash[:d].should  eql('Sir, the smurfs are eating your lunch...')
   end
+
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: ivey-merb_has_flash
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.6
 platform: ruby
 authors: 
 - Michael D. Ivey
+- Jeremy Nicoll
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-06 00:00:00 -07:00
+date: 2008-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Rails' 'flash' session notification system ported to Merb