m2r 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 2.0.2
+
+* Fixed #55 : Rack response body is closed.

data/lib/m2r/rack_handler.rb

@@ -36,6 +36,7 @@ module M2R
       status, headers, body = @app.call(env)
       buffer = ""
       body.each { |part| buffer << part }
+      body.close if body.respond_to?(:close)
       return Response.new.status(status).headers(headers).body(buffer)
     end
 

data/lib/m2r/version.rb

@@ -1,5 +1,5 @@
 module M2R
   # m2r gem version
   # @api public
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/test/unit/connection_test.rb

@@ -44,7 +44,7 @@ module M2R
       assert_equal "uuid 11:conn1 conn2, ddaattaa", msg
     end
 
-    def test_string_replay_non_close
+    def test_string_reply_non_close
       connection = Connection.new(@request_socket, @response_socket)
       connection.reply( stub(sender: 'uuid', conn_id: 'conn1', close?: false), 'ddaattaa')
       assert_equal 0, @sub.recv_string(msg = "")
@@ -52,7 +52,7 @@ module M2R
       assert_equal -1, @sub.recv_string(msg = "", ZMQ::NOBLOCK)
     end
 
-    def test_string_replay_close
+    def test_string_reply_close
       connection = Connection.new(@request_socket, @response_socket)
       connection.reply( stub(sender: 'uuid', conn_id: 'conn1', close?: true), 'ddaattaa')
       assert_equal 0, @sub.recv_string(msg = "")
@@ -61,7 +61,7 @@ module M2R
       assert_equal "uuid 5:conn1, ", msg
     end
 
-    def test_response_replay_non_close
+    def test_response_reply_non_close
       connection = Connection.new(@request_socket, @response_socket)
       connection.reply( stub(sender: 'uuid', conn_id: 'conn1'), mock(to_s: 'ddaattaa', close?: false))
       assert_equal 0, @sub.recv_string(msg = "")
@@ -69,7 +69,7 @@ module M2R
       assert_equal -1, @sub.recv_string(msg = "", ZMQ::NOBLOCK)
     end
 
-    def test_response_replay_close
+    def test_response_reply_close
       connection = Connection.new(@request_socket, @response_socket)
       connection.reply( stub(sender: 'uuid', conn_id: 'conn1'), mock(to_s: 'ddaattaa', close?: true))
       assert_equal 0, @sub.recv_string(msg = "")

data/test/unit/rack_handler_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'm2r/rack_handler'
 require 'm2r/connection_factory'
+require 'tempfile'
 
 class HelloWorld
   def call(env)
@@ -8,6 +9,15 @@ class HelloWorld
   end
 end
 
+class HelloWorldFile
+  def call(env)
+    Thread.current[:tempfile] = t = Tempfile.new("asd")
+    t << "Hello world!\n"
+    t.rewind
+    return [201, {'Content-Type' => 'text/plain'}, t]
+  end
+end
+
 module M2R
   class ConnectionFactory
     class Custom
@@ -48,6 +58,16 @@ module M2R
       assert_equal 200, response.status
     end
 
+    def test_file_closed
+      factory    = stub(:connection)
+      handler    = RackHandler.new(file_app, factory, Request)
+      response   = handler.process(root_request)
+
+      assert_equal "Hello world!\n", response.body
+      assert_equal 201, response.status
+      assert Thread.current[:tempfile].closed?
+    end
+
     def test_custom_connection_factory
       require 'rack/handler/mongrel2'
       handler = ::Rack::Handler::Mongrel2
@@ -72,5 +92,9 @@ module M2R
     def app
       Rack::Lint.new(HelloWorld.new)
     end
+
+    def file_app
+      Rack::Lint.new(HelloWorldFile.new)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: m2r
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -237,6 +237,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -295,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1893655171989557063
+      hash: 2084611234703019484
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -304,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1893655171989557063
+      hash: 2084611234703019484
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23