Permalink
Browse files

Merge pull request #1909 from r00k/master

Use 'delegate' macro instead of writing out methods by hand
  • Loading branch information...
2 parents c49d1f2 + 701e855 commit 3dedf5f0e2924424cfdab73ace019fb5d3d054a1 @josevalim josevalim committed Jun 29, 2011
Showing with 2 additions and 24 deletions.
  1. +2 −24 actionpack/lib/action_dispatch/middleware/flash.rb
@@ -73,6 +73,8 @@ def notice=(message)
class FlashHash
include Enumerable
+ delegate :[], :keys, :key?, :empty?, :clear, :each, :to => :@flashes
+
def initialize #:nodoc:
@used = Set.new
@closed = false
@@ -94,24 +96,12 @@ def []=(k, v) #:nodoc:
@flashes[k] = v
end
- def [](k)
- @flashes[k]
- end
-
def update(h) #:nodoc:
h.keys.each { |k| keep(k) }
@flashes.update h
self
end
- def keys
- @flashes.keys
- end
-
- def key?(name)
- @flashes.key? name
- end
-
def delete(key)
@flashes.delete key
self
@@ -121,18 +111,6 @@ def to_hash
@flashes.dup
end
- def empty?
- @flashes.empty?
- end
-
- def clear
- @flashes.clear
- end
-
- def each(&block)
- @flashes.each(&block)
- end
-
alias :merge! :update
def replace(h) #:nodoc:

0 comments on commit 3dedf5f

Please sign in to comment.