From 91d274059536f09dffd87141e570c3eab9ebd9b4 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 12 Mar 2009 21:47:34 -0700
Subject: Return body parts directly to Rack rather than building a response
 string ourselves. Allows Rack middleware to orchestrate response building.

---
 actionpack/test/controller/rack_test.rb      | 2 +-
 actionpack/test/controller/send_file_test.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index b550d3db78..89bf4fdacc 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -258,7 +258,7 @@ class RackResponseTest < BaseRackTest
     }, headers)
 
     parts = []
-    body.each { |part| parts << part }
+    body.each { |part| parts << part.to_s }
     assert_equal ["0", "1", "2", "3", "4"], parts
   end
 end
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index a27e951929..3d1904fee9 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -44,12 +44,12 @@ class SendFileTest < ActionController::TestCase
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-    assert_kind_of Proc, response.body
+    assert_kind_of Proc, response.body_parts
 
     require 'stringio'
     output = StringIO.new
     output.binmode
-    assert_nothing_raised { response.body.call(response, output) }
+    assert_nothing_raised { response.body_parts.call(response, output) }
     assert_equal file_data, output.string
   end
 
-- 
cgit v1.2.3


From 3d260760f035c5aab11ab218881ed36e3046157b Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 00:25:05 -0700
Subject: Introduce flush_output_buffer to append the buffer to the response
 body then start a new buffer. Useful for pushing custom parts to the response
 body without disrupting template rendering.

---
 actionpack/test/template/output_buffer_test.rb | 35 ++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 actionpack/test/template/output_buffer_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
new file mode 100644
index 0000000000..6d8eab63dc
--- /dev/null
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class OutputBufferTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render :text => 'foo'
+    end
+  end
+
+  tests TestController
+
+  def test_flush_output_buffer
+    # Start with the default body parts
+    get :index
+    assert_equal ['foo'], @response.body_parts
+    assert_nil @response.template.output_buffer
+
+    # Nil output buffer is skipped
+    @response.template.flush_output_buffer
+    assert_nil @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Empty output buffer is skipped
+    @response.template.output_buffer = ''
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Flushing appends the output buffer to the body parts
+    @response.template.output_buffer = 'bar'
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo', 'bar'], @response.body_parts
+  end
+end
-- 
cgit v1.2.3


From 7c1714cbd0b37d1fc5ca2ac3e08980943454d516 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 02:36:00 -0700
Subject: Body parts: future rendering, threaded future, queued future,
 open-uri example

---
 actionpack/test/template/body_parts_test.rb    | 142 +++++++++++++++++++++++++
 actionpack/test/template/output_buffer_test.rb |  35 ------
 2 files changed, 142 insertions(+), 35 deletions(-)
 create mode 100644 actionpack/test/template/body_parts_test.rb
 delete mode 100644 actionpack/test/template/output_buffer_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
new file mode 100644
index 0000000000..d15c8808d9
--- /dev/null
+++ b/actionpack/test/template/body_parts_test.rb
@@ -0,0 +1,142 @@
+require 'abstract_unit'
+require 'action_view/body_parts/queued'
+require 'action_view/body_parts/open_uri'
+
+class OutputBufferTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render :text => 'foo'
+    end
+  end
+
+  tests TestController
+
+  def test_flush_output_buffer
+    # Start with the default body parts
+    get :index
+    assert_equal ['foo'], @response.body_parts
+    assert_nil @response.template.output_buffer
+
+    # Nil output buffer is skipped
+    @response.template.flush_output_buffer
+    assert_nil @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Empty output buffer is skipped
+    @response.template.output_buffer = ''
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Flushing appends the output buffer to the body parts
+    @response.template.output_buffer = 'bar'
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo', 'bar'], @response.body_parts
+  end
+end
+
+class QueuedPartTest < ActionController::TestCase
+  class SimpleQueued < ActionView::BodyParts::Queued
+    protected
+      def submit(job)
+        job
+      end
+
+      def redeem(receipt)
+        receipt.to_s.reverse
+      end
+  end
+
+  class TestController < ActionController::Base
+    def index
+      queued_render 'foo'
+      queued_render 'bar'
+      queued_render 'baz'
+      @performed_render = true
+    end
+
+    def queued_render(job)
+      response.template.punctuate_body! SimpleQueued.new(job)
+    end
+  end
+
+  tests TestController
+
+  def test_queued_parts
+    get :index
+    assert_equal 'oofrabzab', @response.body
+  end
+end
+
+class ThreadedPartTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      append_thread_id = lambda do |parts|
+        parts << Thread.current.object_id
+        parts << '::'
+        parts << Time.now.to_i
+        sleep 1
+      end
+
+      future_render &append_thread_id
+      response.body_parts << '-'
+
+      future_render &append_thread_id
+      response.body_parts << '-'
+
+      future_render do |parts|
+        parts << ActionView::BodyParts::Threaded.new(true, &append_thread_id)
+        parts << '-'
+        parts << ActionView::BodyParts::Threaded.new(true, &append_thread_id)
+      end
+
+      @performed_render = true
+    end
+
+    def future_render(&block)
+      response.template.punctuate_body! ActionView::BodyParts::Threaded.new(true, &block)
+    end
+  end
+
+  tests TestController
+
+  def test_concurrent_threaded_parts
+    get :index
+
+    before = Time.now.to_i
+    thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
+    elapsed = Time.now.to_i - before
+
+    assert_equal thread_ids.size, thread_ids.uniq.size
+    assert elapsed < 1.1
+  end
+end
+
+class OpenUriPartTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render_url 'http://localhost/foo'
+      render_url 'http://localhost/bar'
+      render_url 'http://localhost/baz'
+      @performed_render = true
+    end
+
+    def render_url(url)
+      url = URI.parse(url)
+      def url.read; path end
+      response.template.punctuate_body! ActionView::BodyParts::OpenUri.new(url)
+    end
+  end
+
+  tests TestController
+
+  def test_concurrent_open_uri_parts
+    get :index
+
+    elapsed = Benchmark.ms do
+      assert_equal '/foo/bar/baz', @response.body
+    end
+    assert elapsed < 1.1
+  end
+end
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
deleted file mode 100644
index 6d8eab63dc..0000000000
--- a/actionpack/test/template/output_buffer_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'abstract_unit'
-
-class OutputBufferTest < ActionController::TestCase
-  class TestController < ActionController::Base
-    def index
-      render :text => 'foo'
-    end
-  end
-
-  tests TestController
-
-  def test_flush_output_buffer
-    # Start with the default body parts
-    get :index
-    assert_equal ['foo'], @response.body_parts
-    assert_nil @response.template.output_buffer
-
-    # Nil output buffer is skipped
-    @response.template.flush_output_buffer
-    assert_nil @response.template.output_buffer
-    assert_equal ['foo'], @response.body_parts
-
-    # Empty output buffer is skipped
-    @response.template.output_buffer = ''
-    @response.template.flush_output_buffer
-    assert_equal '', @response.template.output_buffer
-    assert_equal ['foo'], @response.body_parts
-
-    # Flushing appends the output buffer to the body parts
-    @response.template.output_buffer = 'bar'
-    @response.template.flush_output_buffer
-    assert_equal '', @response.template.output_buffer
-    assert_equal ['foo', 'bar'], @response.body_parts
-  end
-end
-- 
cgit v1.2.3


From 5d76dee329282acc918de50fecde869f1431e2f1 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 02:55:24 -0700
Subject: Example using an edge side include body part to fetch queued
 rendering results

---
 actionpack/test/template/body_parts_test.rb | 36 +++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index d15c8808d9..88f09af94f 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -36,28 +36,36 @@ class OutputBufferTest < ActionController::TestCase
   end
 end
 
+
 class QueuedPartTest < ActionController::TestCase
-  class SimpleQueued < ActionView::BodyParts::Queued
+  class EdgeSideInclude < ActionView::BodyParts::Queued
+    QUEUE_REDEMPTION_URL = 'http://queue/jobs/%s'
+    ESI_INCLUDE_TAG = '<esi:include src="%s" />'
+
+    def self.redemption_tag(receipt)
+      ESI_INCLUDE_TAG % QUEUE_REDEMPTION_URL % receipt
+    end
+
     protected
       def submit(job)
-        job
+        job.reverse
       end
 
       def redeem(receipt)
-        receipt.to_s.reverse
+        self.class.redemption_tag(receipt)
       end
   end
 
   class TestController < ActionController::Base
     def index
-      queued_render 'foo'
-      queued_render 'bar'
-      queued_render 'baz'
+      edge_side_include 'foo'
+      edge_side_include 'bar'
+      edge_side_include 'baz'
       @performed_render = true
     end
 
-    def queued_render(job)
-      response.template.punctuate_body! SimpleQueued.new(job)
+    def edge_side_include(job)
+      response.template.punctuate_body! EdgeSideInclude.new(job)
     end
   end
 
@@ -65,10 +73,12 @@ class QueuedPartTest < ActionController::TestCase
 
   def test_queued_parts
     get :index
-    assert_equal 'oofrabzab', @response.body
+    expected = %(oof rab zab).map { |receipt| EdgeSideInclude.redemption_tag(receipt) }
+    assert_equal expected, @response.body
   end
 end
 
+
 class ThreadedPartTest < ActionController::TestCase
   class TestController < ActionController::Base
     def index
@@ -113,7 +123,15 @@ class ThreadedPartTest < ActionController::TestCase
   end
 end
 
+
 class OpenUriPartTest < ActionController::TestCase
+  class OpenUri < ActionView::BodyParts::Threaded
+    def initialize(url)
+      url = URI::Generic === url ? url : URI.parse(url)
+      super(true) { |parts| parts << url.read }
+    end
+  end
+
   class TestController < ActionController::Base
     def index
       render_url 'http://localhost/foo'
-- 
cgit v1.2.3


From d54d97b07c1b258f42210b1a3fc2e8c56e434ee9 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 03:01:47 -0700
Subject: Fix tests

---
 actionpack/test/template/body_parts_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 88f09af94f..7418f4a716 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'action_view/body_parts/queued'
-require 'action_view/body_parts/open_uri'
+require 'action_view/body_parts/threaded'
 
 class OutputBufferTest < ActionController::TestCase
   class TestController < ActionController::Base
@@ -73,7 +73,7 @@ class QueuedPartTest < ActionController::TestCase
 
   def test_queued_parts
     get :index
-    expected = %(oof rab zab).map { |receipt| EdgeSideInclude.redemption_tag(receipt) }
+    expected = %w(oof rab zab).map { |receipt| EdgeSideInclude.redemption_tag(receipt) }.join
     assert_equal expected, @response.body
   end
 end
@@ -125,7 +125,7 @@ end
 
 
 class OpenUriPartTest < ActionController::TestCase
-  class OpenUri < ActionView::BodyParts::Threaded
+  class OpenUriPart < ActionView::BodyParts::Threaded
     def initialize(url)
       url = URI::Generic === url ? url : URI.parse(url)
       super(true) { |parts| parts << url.read }
@@ -143,7 +143,7 @@ class OpenUriPartTest < ActionController::TestCase
     def render_url(url)
       url = URI.parse(url)
       def url.read; path end
-      response.template.punctuate_body! ActionView::BodyParts::OpenUri.new(url)
+      response.template.punctuate_body! OpenUriPart.new(url)
     end
   end
 
-- 
cgit v1.2.3


From b2f98c13a3308e6db618d6f3f9f706cbc19f13fd Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 03:16:14 -0700
Subject: Simplify parts and tests

---
 actionpack/test/template/body_parts_test.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 7418f4a716..4555a6b015 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -47,7 +47,7 @@ class QueuedPartTest < ActionController::TestCase
     end
 
     protected
-      def submit(job)
+      def enqueue(job)
         job.reverse
       end
 
@@ -114,12 +114,11 @@ class ThreadedPartTest < ActionController::TestCase
   def test_concurrent_threaded_parts
     get :index
 
-    before = Time.now.to_i
-    thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
-    elapsed = Time.now.to_i - before
-
-    assert_equal thread_ids.size, thread_ids.uniq.size
-    assert elapsed < 1.1
+    elapsed = Benchmark.ms do
+      thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
+      assert_equal thread_ids.size, thread_ids.uniq.size
+    end
+    assert (elapsed - 1000).abs < 100, elapsed
   end
 end
 
@@ -142,7 +141,7 @@ class OpenUriPartTest < ActionController::TestCase
 
     def render_url(url)
       url = URI.parse(url)
-      def url.read; path end
+      def url.read; sleep 1; path end
       response.template.punctuate_body! OpenUriPart.new(url)
     end
   end
@@ -155,6 +154,6 @@ class OpenUriPartTest < ActionController::TestCase
     elapsed = Benchmark.ms do
       assert_equal '/foo/bar/baz', @response.body
     end
-    assert elapsed < 1.1
+    assert (elapsed - 1000).abs < 100, elapsed
   end
 end
-- 
cgit v1.2.3


From 2f998fc81fd3525e4f19ba55937ee423c4b71856 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 03:23:13 -0700
Subject: Extract output buffer test

---
 actionpack/test/template/body_parts_test.rb    | 34 -------------------------
 actionpack/test/template/output_buffer_test.rb | 35 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 actionpack/test/template/output_buffer_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 4555a6b015..aece24635c 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -2,40 +2,6 @@ require 'abstract_unit'
 require 'action_view/body_parts/queued'
 require 'action_view/body_parts/threaded'
 
-class OutputBufferTest < ActionController::TestCase
-  class TestController < ActionController::Base
-    def index
-      render :text => 'foo'
-    end
-  end
-
-  tests TestController
-
-  def test_flush_output_buffer
-    # Start with the default body parts
-    get :index
-    assert_equal ['foo'], @response.body_parts
-    assert_nil @response.template.output_buffer
-
-    # Nil output buffer is skipped
-    @response.template.flush_output_buffer
-    assert_nil @response.template.output_buffer
-    assert_equal ['foo'], @response.body_parts
-
-    # Empty output buffer is skipped
-    @response.template.output_buffer = ''
-    @response.template.flush_output_buffer
-    assert_equal '', @response.template.output_buffer
-    assert_equal ['foo'], @response.body_parts
-
-    # Flushing appends the output buffer to the body parts
-    @response.template.output_buffer = 'bar'
-    @response.template.flush_output_buffer
-    assert_equal '', @response.template.output_buffer
-    assert_equal ['foo', 'bar'], @response.body_parts
-  end
-end
-
 
 class QueuedPartTest < ActionController::TestCase
   class EdgeSideInclude < ActionView::BodyParts::Queued
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
new file mode 100644
index 0000000000..6d8eab63dc
--- /dev/null
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class OutputBufferTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render :text => 'foo'
+    end
+  end
+
+  tests TestController
+
+  def test_flush_output_buffer
+    # Start with the default body parts
+    get :index
+    assert_equal ['foo'], @response.body_parts
+    assert_nil @response.template.output_buffer
+
+    # Nil output buffer is skipped
+    @response.template.flush_output_buffer
+    assert_nil @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Empty output buffer is skipped
+    @response.template.output_buffer = ''
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Flushing appends the output buffer to the body parts
+    @response.template.output_buffer = 'bar'
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo', 'bar'], @response.body_parts
+  end
+end
-- 
cgit v1.2.3


From 4a7b11d5d857a0f5ce6eb8af7a6dfcb94f31fcfa Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 13 Mar 2009 18:49:53 -0700
Subject: Less ceremony

---
 actionpack/test/template/body_parts_test.rb | 61 ++++++++++++++++-------------
 1 file changed, 34 insertions(+), 27 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index aece24635c..369756cbf5 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -1,37 +1,44 @@
 require 'abstract_unit'
-require 'action_view/body_parts/queued'
-require 'action_view/body_parts/threaded'
+require 'action_view/body_parts/concurrent_block'
 
-
-class QueuedPartTest < ActionController::TestCase
-  class EdgeSideInclude < ActionView::BodyParts::Queued
-    QUEUE_REDEMPTION_URL = 'http://queue/jobs/%s'
+class BodyPartTest < ActionController::TestCase
+  module EdgeSideInclude
+    QUEUE_REDEMPTION_URL = 'http://render.farm/renderings/%s'
     ESI_INCLUDE_TAG = '<esi:include src="%s" />'
 
     def self.redemption_tag(receipt)
       ESI_INCLUDE_TAG % QUEUE_REDEMPTION_URL % receipt
     end
 
-    protected
-      def enqueue(job)
-        job.reverse
+    class BodyPart
+      def initialize(rendering)
+        @receipt = enqueue(rendering)
       end
 
-      def redeem(receipt)
-        self.class.redemption_tag(receipt)
+      def to_s
+        EdgeSideInclude.redemption_tag(@receipt)
       end
+
+      protected
+        # Pretend we sent this rendering off for processing.
+        def enqueue(rendering)
+          rendering.object_id.to_s
+        end
+    end
   end
 
   class TestController < ActionController::Base
+    RENDERINGS = [Object.new, Object.new, Object.new]
+
     def index
-      edge_side_include 'foo'
-      edge_side_include 'bar'
-      edge_side_include 'baz'
+      RENDERINGS.each do |rendering|
+        edge_side_include rendering
+      end
       @performed_render = true
     end
 
-    def edge_side_include(job)
-      response.template.punctuate_body! EdgeSideInclude.new(job)
+    def edge_side_include(rendering)
+      response.template.punctuate_body! EdgeSideInclude::BodyPart.new(rendering)
     end
   end
 
@@ -39,20 +46,20 @@ class QueuedPartTest < ActionController::TestCase
 
   def test_queued_parts
     get :index
-    expected = %w(oof rab zab).map { |receipt| EdgeSideInclude.redemption_tag(receipt) }.join
+    expected = TestController::RENDERINGS.map { |rendering| EdgeSideInclude.redemption_tag(rendering.object_id) }.join
     assert_equal expected, @response.body
   end
 end
 
 
-class ThreadedPartTest < ActionController::TestCase
+class ConcurrentBlockPartTest < ActionController::TestCase
   class TestController < ActionController::Base
     def index
       append_thread_id = lambda do |parts|
         parts << Thread.current.object_id
         parts << '::'
         parts << Time.now.to_i
-        sleep 1
+        sleep 0.1
       end
 
       future_render &append_thread_id
@@ -62,16 +69,16 @@ class ThreadedPartTest < ActionController::TestCase
       response.body_parts << '-'
 
       future_render do |parts|
-        parts << ActionView::BodyParts::Threaded.new(true, &append_thread_id)
+        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
         parts << '-'
-        parts << ActionView::BodyParts::Threaded.new(true, &append_thread_id)
+        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
       end
 
       @performed_render = true
     end
 
     def future_render(&block)
-      response.template.punctuate_body! ActionView::BodyParts::Threaded.new(true, &block)
+      response.template.punctuate_body! ActionView::BodyParts::ConcurrentBlock.new(&block)
     end
   end
 
@@ -84,16 +91,16 @@ class ThreadedPartTest < ActionController::TestCase
       thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
       assert_equal thread_ids.size, thread_ids.uniq.size
     end
-    assert (elapsed - 1000).abs < 100, elapsed
+    assert (elapsed - 100).abs < 10, elapsed
   end
 end
 
 
 class OpenUriPartTest < ActionController::TestCase
-  class OpenUriPart < ActionView::BodyParts::Threaded
+  class OpenUriPart < ActionView::BodyParts::ConcurrentBlock
     def initialize(url)
       url = URI::Generic === url ? url : URI.parse(url)
-      super(true) { |parts| parts << url.read }
+      super() { |body| body << url.read }
     end
   end
 
@@ -107,7 +114,7 @@ class OpenUriPartTest < ActionController::TestCase
 
     def render_url(url)
       url = URI.parse(url)
-      def url.read; sleep 1; path end
+      def url.read; sleep 0.1; path end
       response.template.punctuate_body! OpenUriPart.new(url)
     end
   end
@@ -120,6 +127,6 @@ class OpenUriPartTest < ActionController::TestCase
     elapsed = Benchmark.ms do
       assert_equal '/foo/bar/baz', @response.body
     end
-    assert (elapsed - 1000).abs < 100, elapsed
+    assert (elapsed - 100).abs < 10, elapsed
   end
 end
-- 
cgit v1.2.3


From 07710fd3e0c5c84521b7929738ba33cea99bc108 Mon Sep 17 00:00:00 2001
From: Mike Gunderloy <MikeG1@larkfarm.com>
Date: Sat, 14 Mar 2009 10:06:00 -0500
Subject: Fix requirements for additional member/collection routes [#2054
 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 actionpack/test/controller/resources_test.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 91066ea893..c807e71cd7 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -175,6 +175,24 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
+  def test_with_collection_actions_and_name_prefix_and_member_action_with_same_name
+    actions = { 'a' => :get }
+
+    with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions, :member => actions do
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.each do |action, method|
+          assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
+        end
+      end
+
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.keys.each do |action|
+          assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
+        end
+      end
+    end
+  end
+
   def test_with_collection_action_and_name_prefix_and_formatted
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
 
@@ -209,6 +227,14 @@ class ResourcesTest < ActionController::TestCase
     end
   end
 
+  def test_with_member_action_and_requirement
+    expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
+  
+    with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
+    end
+  end
+
   def test_member_when_override_paths_for_default_restful_actions_with
     [:put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method }, :path_names => {:new => 'nuevo'} do
-- 
cgit v1.2.3


From 7706b57034e91820cf83445aede57c54ab66ac2d Mon Sep 17 00:00:00 2001
From: misfo <tedwardo2@gmail.com>
Date: Sat, 14 Mar 2009 10:42:02 -0500
Subject: allowed render :file to take Pathnames [#2220 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 actionpack/test/controller/render_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index af623395f0..a52931565d 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -157,6 +157,11 @@ class TestController < ActionController::Base
     render :file => 'test/dot.directory/render_file_with_ivar'
   end
 
+  def render_file_using_pathname
+    @secret = 'in the sauce'
+    render :file => Pathname.new(File.dirname(__FILE__)).join('..', 'fixtures', 'test', 'dot.directory', 'render_file_with_ivar.erb')
+  end
+
   def render_file_from_template
     @secret = 'in the sauce'
     @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
@@ -861,6 +866,11 @@ class RenderTest < ActionController::TestCase
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_file_using_pathname
+    get :render_file_using_pathname
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
   def test_render_file_with_locals
     get :render_file_with_locals
     assert_equal "The secret is in the sauce\n", @response.body
-- 
cgit v1.2.3


From 367049cae69ec535e7105b35f4877167adca1188 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 15 Mar 2009 23:17:31 -0500
Subject: Fix brittle Time.now mock

---
 .../test/controller/session/cookie_store_test.rb     | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
index 9c93ca6539..c406188972 100644
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ b/actionpack/test/controller/session/cookie_store_test.rb
@@ -199,29 +199,17 @@ class CookieStoreTest < ActionController::IntegrationTest
 
     with_test_route_set do
       # First request accesses the session
-      time = Time.local(2008, 4, 24)
-      Time.stubs(:now).returns(time)
-      expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT")
-
       cookies[SessionKey] = SignedBar
 
       get '/set_session_value'
       assert_response :success
+      cookie = headers['Set-Cookie']
 
-      cookie_body = response.body
-      assert_equal "_myapp_session=#{cookie_body}; path=/; expires=#{expected_expiry}; HttpOnly",
-        headers['Set-Cookie']
-
-      # Second request does not access the session
-      time = Time.local(2008, 4, 25)
-      Time.stubs(:now).returns(time)
-      expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT")
-
+      # Second request does not access the session so the
+      # expires header should not be changed
       get '/no_session_access'
       assert_response :success
-
-      assert_equal "_myapp_session=#{cookie_body}; path=/; expires=#{expected_expiry}; HttpOnly",
-        headers['Set-Cookie']
+      assert_equal cookie, headers['Set-Cookie']
     end
   end
 
-- 
cgit v1.2.3


From d0e5417861fad15e9e493a1843f8b54fb7a993ec Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 15 Mar 2009 23:25:12 -0500
Subject: update rack fixture to be ruby 1.9 compat

---
 actionpack/test/controller/integration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index b3f40fbe95..43d2307d34 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class SessionTest < Test::Unit::TestCase
   StubApp = lambda { |env|
-    [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, "Hello, World!"]
+    [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, ["Hello, World!"]]
   }
 
   def setup
-- 
cgit v1.2.3


From 0706de4301bbf12a4c369bd4776ad58affee9ad4 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 15 Mar 2009 23:41:47 -0500
Subject: Better error message to try to figure out why the CI build is failing

---
 actionpack/test/controller/session/cookie_store_test.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
index c406188972..48a961ca34 100644
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ b/actionpack/test/controller/session/cookie_store_test.rb
@@ -209,7 +209,8 @@ class CookieStoreTest < ActionController::IntegrationTest
       # expires header should not be changed
       get '/no_session_access'
       assert_response :success
-      assert_equal cookie, headers['Set-Cookie']
+      assert_equal cookie, headers['Set-Cookie'],
+        "#{unmarshal_session(cookie).inspect} expected but was #{unmarshal_session(headers['Set-Cookie']).inspect}"
     end
   end
 
@@ -224,4 +225,13 @@ class CookieStoreTest < ActionController::IntegrationTest
         yield
       end
     end
+
+    def unmarshal_session(cookie_string)
+      session = Rack::Utils.parse_query(cookie_string, ';,').inject({}) {|h,(k,v)|
+        h[k] = Array === v ? v.first : v
+        h
+      }[SessionKey]
+      verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
+      verifier.verify(session)
+    end
 end
-- 
cgit v1.2.3


From 4185a4a5f5e53b55c9ba3757a837d33fb91f4091 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 15 Mar 2009 23:48:07 -0500
Subject: update rack fixture to be ruby 1.9 compat

---
 actionpack/test/controller/integration_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 43d2307d34..e39a934c24 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -389,9 +389,9 @@ class MetalTest < ActionController::IntegrationTest
   class Poller
     def self.call(env)
       if env["PATH_INFO"] =~ /^\/success/
-        [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, "Hello World!"]
+        [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, ["Hello World!"]]
       else
-        [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, '']
+        [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
       end
     end
   end
-- 
cgit v1.2.3


From 70e3dfb2e9f94396eb6525d13f9adccd3e845c3d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 16 Mar 2009 12:09:34 -0700
Subject: Pare down unit test

---
 actionpack/test/template/body_parts_test.rb | 42 +++++------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 369756cbf5..209f6ec1ff 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -1,57 +1,27 @@
 require 'abstract_unit'
 require 'action_view/body_parts/concurrent_block'
 
-class BodyPartTest < ActionController::TestCase
-  module EdgeSideInclude
-    QUEUE_REDEMPTION_URL = 'http://render.farm/renderings/%s'
-    ESI_INCLUDE_TAG = '<esi:include src="%s" />'
-
-    def self.redemption_tag(receipt)
-      ESI_INCLUDE_TAG % QUEUE_REDEMPTION_URL % receipt
-    end
-
-    class BodyPart
-      def initialize(rendering)
-        @receipt = enqueue(rendering)
-      end
-
-      def to_s
-        EdgeSideInclude.redemption_tag(@receipt)
-      end
-
-      protected
-        # Pretend we sent this rendering off for processing.
-        def enqueue(rendering)
-          rendering.object_id.to_s
-        end
-    end
-  end
+class BodyPartsTest < ActionController::TestCase
+  RENDERINGS = [Object.new, Object.new, Object.new]
 
   class TestController < ActionController::Base
-    RENDERINGS = [Object.new, Object.new, Object.new]
-
     def index
       RENDERINGS.each do |rendering|
-        edge_side_include rendering
+        response.template.punctuate_body! rendering
       end
       @performed_render = true
     end
-
-    def edge_side_include(rendering)
-      response.template.punctuate_body! EdgeSideInclude::BodyPart.new(rendering)
-    end
   end
 
   tests TestController
 
-  def test_queued_parts
+  def test_body_parts
     get :index
-    expected = TestController::RENDERINGS.map { |rendering| EdgeSideInclude.redemption_tag(rendering.object_id) }.join
-    assert_equal expected, @response.body
+    assert_equal RENDERINGS, @response.body_parts
+    assert_equal RENDERINGS.join, @response.body
   end
 end
 
-
 class ConcurrentBlockPartTest < ActionController::TestCase
   class TestController < ActionController::Base
     def index
-- 
cgit v1.2.3


From 0d5b50ee3a6d65471f311980b9b6e49fe4b4a021 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 19 Mar 2009 03:30:01 -0700
Subject: pluginize concurrent block body part

---
 actionpack/test/template/body_parts_test.rb | 80 -----------------------------
 1 file changed, 80 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 209f6ec1ff..4c82b75cdc 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_view/body_parts/concurrent_block'
 
 class BodyPartsTest < ActionController::TestCase
   RENDERINGS = [Object.new, Object.new, Object.new]
@@ -21,82 +20,3 @@ class BodyPartsTest < ActionController::TestCase
     assert_equal RENDERINGS.join, @response.body
   end
 end
-
-class ConcurrentBlockPartTest < ActionController::TestCase
-  class TestController < ActionController::Base
-    def index
-      append_thread_id = lambda do |parts|
-        parts << Thread.current.object_id
-        parts << '::'
-        parts << Time.now.to_i
-        sleep 0.1
-      end
-
-      future_render &append_thread_id
-      response.body_parts << '-'
-
-      future_render &append_thread_id
-      response.body_parts << '-'
-
-      future_render do |parts|
-        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
-        parts << '-'
-        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
-      end
-
-      @performed_render = true
-    end
-
-    def future_render(&block)
-      response.template.punctuate_body! ActionView::BodyParts::ConcurrentBlock.new(&block)
-    end
-  end
-
-  tests TestController
-
-  def test_concurrent_threaded_parts
-    get :index
-
-    elapsed = Benchmark.ms do
-      thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
-      assert_equal thread_ids.size, thread_ids.uniq.size
-    end
-    assert (elapsed - 100).abs < 10, elapsed
-  end
-end
-
-
-class OpenUriPartTest < ActionController::TestCase
-  class OpenUriPart < ActionView::BodyParts::ConcurrentBlock
-    def initialize(url)
-      url = URI::Generic === url ? url : URI.parse(url)
-      super() { |body| body << url.read }
-    end
-  end
-
-  class TestController < ActionController::Base
-    def index
-      render_url 'http://localhost/foo'
-      render_url 'http://localhost/bar'
-      render_url 'http://localhost/baz'
-      @performed_render = true
-    end
-
-    def render_url(url)
-      url = URI.parse(url)
-      def url.read; sleep 0.1; path end
-      response.template.punctuate_body! OpenUriPart.new(url)
-    end
-  end
-
-  tests TestController
-
-  def test_concurrent_open_uri_parts
-    get :index
-
-    elapsed = Benchmark.ms do
-      assert_equal '/foo/bar/baz', @response.body
-    end
-    assert (elapsed - 100).abs < 10, elapsed
-  end
-end
-- 
cgit v1.2.3