Merge pull request #250 from wagenet/close-spec

Close original body to comply with Rack SPEC
rails · Dec 11, 2017 · 986c069 · 986c069
2 parents ec96734 + 1074dbf
commit 986c069
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/lib/web_console/response.rb b/lib/web_console/response.rb
@@ -9,6 +9,9 @@ class Response < Struct.new(:body, :status, :headers)
     def write(content)
       raw_body = Array(body).first.to_s
 
+      # We're done with the original body object, so make sure to close it to comply with the Rack SPEC
+      body.close if body.respond_to?(:close)
+
       if position = raw_body.rindex('</body>')
         raw_body.insert(position, content)
       else

diff --git a/test/web_console/middleware_test.rb b/test/web_console/middleware_test.rb
@@ -13,6 +13,19 @@ def call(env)
         [ status, headers, body ]
       end
 
+      def body
+        @body ||= StringIO.new(<<-HTML.strip_heredoc)
+          <html>
+            <head>
+              <title>Hello world</title>
+            </head>
+            <body>
+              <p id="hello-world">Hello world</p>
+            </body>
+          </html>
+        HTML
+      end
+
       private
 
         def status
@@ -26,19 +39,6 @@ def headers
             {}
           end
         end
-
-        def body
-          Array(<<-HTML.strip_heredoc)
-            <html>
-              <head>
-                <title>Hello world</title>
-              </head>
-              <body>
-                <p id="hello-world">Hello world</p>
-              </body>
-            </html>
-          HTML
-        end
     end
 
     setup do
@@ -84,6 +84,16 @@ def body
       assert_select '#console'
     end
 
+    test 'it closes original body if rendering console' do
+      Thread.current[:__web_console_binding] = binding
+      inner_app = Application.new(response_content_type: Mime[:html]);
+      @app = Middleware.new(inner_app)
+
+      get '/', params: nil
+
+      assert(inner_app.body.closed?, "body should be closed")
+    end
+
     test 'does not render console if response format is empty' do
       Thread.current[:__web_console_binding] = binding
       @app = Middleware.new(Application.new(response_content_type: nil))