Skip to content
Browse files

Session objects are always a hash, so we need to ensure a flash hash …

…is always assigned to the session
  • Loading branch information...
1 parent 8905688 commit 95c839bd2aca1576a33a6503f0dd67266d53a353 @josh josh committed
Showing with 20 additions and 35 deletions.
  1. +20 −35 actionpack/lib/action_controller/flash.rb
View
55 actionpack/lib/action_controller/flash.rb
@@ -31,51 +31,50 @@ def self.included(base)
alias_method_chain :reset_session, :flash
end
end
-
-
+
class FlashNow #:nodoc:
def initialize(flash)
@flash = flash
end
-
+
def []=(k, v)
@flash[k] = v
@flash.discard(k)
v
end
-
+
def [](k)
@flash[k]
end
end
-
+
class FlashHash < Hash
def initialize #:nodoc:
super
@used = {}
end
-
+
def []=(k, v) #:nodoc:
keep(k)
super
end
-
+
def update(h) #:nodoc:
h.keys.each { |k| keep(k) }
super
end
-
+
alias :merge! :update
-
+
def replace(h) #:nodoc:
@used = {}
super
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
@@ -85,7 +84,7 @@ def replace(h) #:nodoc:
def now
FlashNow.new(self)
end
-
+
# Keeps either the entire current flash or a specific flash entry available for the next action:
#
# flash.keep # keeps the entire flash
@@ -93,7 +92,7 @@ def now
def keep(k = nil)
use(k, false)
end
-
+
# Marks the entire flash or a single flash entry to be discarded by the end of the current action:
#
# flash.discard # discard the entire flash at the end of the current action
@@ -101,12 +100,12 @@ def keep(k = nil)
def discard(k = nil)
use(k)
end
-
+
# Mark for removal entries that were kept, and delete unkept ones.
#
# This method is called automatically by filters, so you generally don't need to care about it.
def sweep #:nodoc:
- keys.each do |k|
+ keys.each do |k|
unless @used[k]
use(k)
else
@@ -118,7 +117,7 @@ def sweep #:nodoc:
# clean up after keys that could have been left over by calling reject! or shift on the flash
(@used.keys - keys).each{ |k| @used.delete(k) }
end
-
+
private
# Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
# use() # marks the entire flash as used
@@ -139,32 +138,18 @@ module InstanceMethods #:nodoc:
def reset_session_with_flash
reset_session_without_flash
remove_instance_variable(:@_flash)
- flash(:refresh)
end
-
- # 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
+ # 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.
+ def flash #:doc:
+ @_flash ||= session["flash"] ||= FlashHash.new
end
private
def assign_shortcuts_with_flash(request, response) #:nodoc:
assign_shortcuts_without_flash(request, response)
- flash(:refresh)
flash.sweep if @_session
end
end

0 comments on commit 95c839b

Please sign in to comment.
Something went wrong with that request. Please try again.