diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-04-06 12:30:08 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-04-06 15:45:23 -0300 |
commit | 90ecad0bc944fc3adb847c0c754d8f0dc2bed4b5 (patch) | |
tree | 9d4b9a65dcddcaf7581c01f6ccfac271fcba282b /actionpack/lib/action_dispatch/middleware | |
parent | 2e757bc298cef715e5c56945161bbd84f2610729 (diff) | |
download | rails-90ecad0bc944fc3adb847c0c754d8f0dc2bed4b5.tar.gz rails-90ecad0bc944fc3adb847c0c754d8f0dc2bed4b5.tar.bz2 rails-90ecad0bc944fc3adb847c0c754d8f0dc2bed4b5.zip |
Add ClosedError message to the initializer
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/closed_error.rb | 7 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/closed_error.rb b/actionpack/lib/action_dispatch/middleware/closed_error.rb new file mode 100644 index 0000000000..0a4db47f4b --- /dev/null +++ b/actionpack/lib/action_dispatch/middleware/closed_error.rb @@ -0,0 +1,7 @@ +module ActionDispatch + class ClosedError < StandardError #:nodoc: + def initialize(kind) + super "Cannot modify #{kind} because it was closed. This means it was already streamed back to the client or converted to HTTP headers." + end + end +end diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 410d3f7127..6eda1f31a7 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -51,7 +51,7 @@ module ActionDispatch def close!; @closed = true end def []=(k, v) - raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed? + raise ClosedError, :flash if closed? @flash[k] = v @flash.discard(k) v @@ -84,7 +84,7 @@ module ActionDispatch def close!; @closed = true end def []=(k, v) #:nodoc: - raise ClosedError, "Cannot modify flash because it was closed. This means it was already streamed back to the client or converted to HTTP headers." if closed? + raise ClosedError, :flash if closed? keep(k) super end @@ -208,7 +208,4 @@ module ActionDispatch end end end - - class ClosedError < StandardError #:nodoc: - end end |