aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-28 17:35:45 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-28 17:35:45 -0800
commitea35967524797c0ae82333bdef3667ddb0934d05 (patch)
tree938985bcf740f0773158d3c6b2d5a7f19dd7ec0b /actionpack/lib/action_dispatch
parentb88a181b7f296d89237bdb727ecc15cbfdf13b65 (diff)
downloadrails-ea35967524797c0ae82333bdef3667ddb0934d05.tar.gz
rails-ea35967524797c0ae82333bdef3667ddb0934d05.tar.bz2
rails-ea35967524797c0ae82333bdef3667ddb0934d05.zip
Use Set#subtract and Set#merge for keeping track of used / unused keys
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/flash.rb19
1 files changed, 4 insertions, 15 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index c9d23f23ec..e79050706d 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -163,7 +163,8 @@ module ActionDispatch
# 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)
+ @used.subtract Array(k || keys)
+ k ? self[k] : self
end
# Marks the entire flash or a single flash entry to be discarded by the end of the current action:
@@ -171,7 +172,8 @@ module ActionDispatch
# flash.discard # discard the entire flash at the end of the current action
# flash.discard(:warning) # discard only the "warning" entry at the end of the current action
def discard(k = nil)
- use(k)
+ @used.merge Array(k || keys)
+ k ? self[k] : self
end
# Mark for removal entries that were kept, and delete unkept ones.
@@ -215,19 +217,6 @@ module ActionDispatch
def now_is_loaded?
@now
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)
- # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
- # if no key is passed.
- def use(key = nil, used = true)
- Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
- return key ? self[key] : self
- end
end
def initialize(app)