diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-19 03:30:01 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-19 03:31:55 -0700 |
commit | 0d5b50ee3a6d65471f311980b9b6e49fe4b4a021 (patch) | |
tree | 917f49063f4ea60ed3edb7532435c9fcd002a18a /actionpack/lib | |
parent | 6335f5d5186dfb97453dfa1a55aabe4c6f3962b0 (diff) | |
download | rails-0d5b50ee3a6d65471f311980b9b6e49fe4b4a021.tar.gz rails-0d5b50ee3a6d65471f311980b9b6e49fe4b4a021.tar.bz2 rails-0d5b50ee3a6d65471f311980b9b6e49fe4b4a021.zip |
pluginize concurrent block body part
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_view/body_parts/concurrent_block.rb | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 3bbd2ca530..9c0134e7f7 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -288,12 +288,12 @@ module ActionView #:nodoc: # Access the current template being rendered. # Returns a ActionView::Template object. def template - Thread.current[:_current_render] + @_current_render end def template=(template) #:nodoc: @_first_render ||= template - Thread.current[:_current_render] = template + @_current_render = template end def with_template(current_template) diff --git a/actionpack/lib/action_view/body_parts/concurrent_block.rb b/actionpack/lib/action_view/body_parts/concurrent_block.rb deleted file mode 100644 index 28a3a3bf4d..0000000000 --- a/actionpack/lib/action_view/body_parts/concurrent_block.rb +++ /dev/null @@ -1,25 +0,0 @@ -module ActionView - module BodyParts - class ConcurrentBlock - def initialize(&block) - @block = block - @body = [] - start - end - - def to_s - finish - @body.join - end - - protected - def start - @worker = Thread.new { @block.call(@body) } - end - - def finish - @worker.join if @worker && @worker.alive? - end - end - end -end |