Permalink
Browse files

Add more tests, ensure we never yield outside the fiber context and t…

…hat we swap buffers when moving from parent to child.
  • Loading branch information...
1 parent 29078ff commit 3e0aedba909562411b8f369115828a79a7a77a0a @josevalim josevalim committed Apr 16, 2011
@@ -22,8 +22,11 @@ def append(key, value)
end
class StreamingFlow < OutputFlow
- def initialize(flow, fiber)
- @content = flow.content
+ def initialize(view, fiber)
+ @view = view
+ @parent = nil
+ @child = view.output_buffer
+ @content = view._view_flow.content
@fiber = fiber
@root = Fiber.current.object_id
end
@@ -36,11 +39,15 @@ def get(key)
return super if @content.key?(key)
if inside_fiber?
+ view = @view
+
begin
@waiting_for = key
+ view.output_buffer, @parent = @child, view.output_buffer
Fiber.yield
ensure
@waiting_for = nil
+ view.output_buffer, @child = @parent, view.output_buffer
end
end
@@ -55,7 +55,7 @@ def delayed_render(buffer, template, layout, view, locals)
# Set the view flow to support streaming. It will be aware
# when to stop rendering the layout because it needs to search
# something in the template and vice-versa.
- view._view_flow = StreamingFlow.new(view._view_flow, fiber)
+ view._view_flow = StreamingFlow.new(view, fiber)
# Yo! Start the fiber!
fiber.resume
@@ -86,4 +86,12 @@ def test_render_with_file_in_layout
def test_render_with_handler_without_streaming_support
assert_match "<p>This is grand!</p>", buffered_render(:template => "test/hello")
end
+
+ def test_render_with_streaming_multiple_yields_provide_and_content_for
+ assert_equal "Yes, \nthis works\n like a charm.", buffered_render(:template => "test/streaming", :layout => "layouts/streaming")
+ end
+
+ def test_render_with_streaming_with_fake_yields_and_streaming_buster
+ assert_equal "This won't look\n good.", buffered_render(:template => "test/streaming_buster", :layout => "layouts/streaming")
+ end
end if defined?(Fiber)

0 comments on commit 3e0aedb

Please sign in to comment.