request-replay 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c29ee7f631fdfaaddd0bcde2083d204a7123b9
-  data.tar.gz: 9ea9ce6b5e376a5fb7ea32a898b996aed9696b73
+  metadata.gz: 757f765cde5cb73d14e26de907f2bc03322973ee
+  data.tar.gz: 0fa338334b76b3d678a2e676a3fe86e19a1d5cff
 SHA512:
-  metadata.gz: 29ee655a7da33ac820fa14fe8e7af2f517135ff500790437b7cbfb2d2f4f71c188943e73ad834cfdcb723467bd91d56294d075df454b7c8744487c257202dc9b
-  data.tar.gz: 2de2ed416688b4b8d2cbc3a368cabf1b7b7f9587ee736b1ae0b2725bbcd4af4a0dc46059b1b595d7978ea97bcc0222631f7926072ce6e50fdf02a26c5bd6bba9
+  metadata.gz: 3c9a20be6d4bb76253ddebefd6aa54176564d7909b8508e1e7bd02fada6d0e9a7c986f6a678bde351276af31a34c0f4d4a1ab63ada383990369a33062789d19f
+  data.tar.gz: 739d4d94923788d1e27f1f12539c03c7182e1679ed601164e39d655bb2ab147a8061aef27c85ca0fbad557a3ed9af8a54df6d7a0bfe88dc84c93f2fe8a4dabd0

data/CHANGES.md

@@ -1,5 +1,12 @@
 # CHANGES
 
+## request-replay 0.6.1 -- 2013-10-01
+
+* Print error messages to env['rack.errors']
+* Fixed a bug where the underlying Rack app might be modifying
+  the original env, making request-replay cannot reliably rebuild
+  the request.
+
 ## request-replay 0.6.0 -- 2013-10-01
 
 * Added :read_wait option for waiting for the remote server responding.

data/Rakefile

@@ -8,6 +8,6 @@ end
 
 Gemgem.init(dir) do |s|
   s.name    = 'request-replay'
-  s.version = '0.6.0'
+  s.version = '0.6.1'
   %w[bacon muack rack].each{ |g| s.add_development_dependency(g) }
 end

data/lib/request-replay.rb

@@ -34,6 +34,9 @@ class RequestReplay
     sock.close_write
     IO.select([sock], [], [], read_wait) if read_wait
     yield(sock) if block_given?
+  rescue => e
+    @env['rack.errors'].puts("[#{self.class.name}] Error: #{e.inspect}") if
+      @env['rack.errors']
   ensure
     sock.close
   end

data/lib/request-replay/middleware.rb

@@ -8,8 +8,10 @@ class RequestReplay::Middleware
 
   def call env
     # We don't want to read the socket in a thread, so create it in main
-    # thread, and send the data in a thread as we don't care the responses
-    Thread.new(RequestReplay.new(env, @host, @options), &:start)
+    # thread, and send the data in a thread as we don't care the responses.
+    # Also, unfortunately, we need to dup env because other middleware
+    # might be modifying it and make it not able to get the original env.
+    Thread.new(RequestReplay.new(env.dup, @host, @options), &:start)
     @app.call(env)
   end
 end

data/request-replay.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: request-replay 0.6.0 ruby lib
+# stub: request-replay 0.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "request-replay"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]

data/test/test_basic.rb

@@ -40,6 +40,10 @@ describe RequestReplay do
     end
   end
 
+  after do
+    Muack.verify
+  end
+
   should 'GET' do
     verify[request[{'REQUEST_METHOD' => 'GET'}, 'Host' => 'ex.com'], <<-HTTP]
 GET /?q=1 HTTP/1.1\r
@@ -77,19 +81,53 @@ Pork: BEEF\r
     HTTP
   end
 
-  describe RequestReplay::Middleware do
-    app = Rack::Builder.app do
-      use RequestReplay::Middleware, hopt
-      run lambda{ |env| [200, {}, []] }
+  should 'puts error' do
+    any_instance_of(TCPSocket) do |sock|
+      mock(sock).read{ raise 'ERROR' }
+    end
+
+    errors = StringIO.new
+    begin
+      request['rack.errors' => errors].value
+    ensure
+      serv.accept.close
     end
+    errors.string.should.start_with? '[RequestReplay] Error:'
+  end
 
+  describe RequestReplay::Middleware do
     should 'PUT' do
+      app = Rack::Builder.app do
+        use RequestReplay::Middleware, hopt
+        run lambda{ |env| [200, {}, []] }
+      end
+
       app.call(env.merge('REQUEST_METHOD' => 'PUT'))
       sock = serv.accept
       sock.read.should.eq <<-HTTP
 PUT /?q=1 HTTP/1.1\r
 Host: localhost\r
 Pork: BEEF\r
+\r
+      HTTP
+      sock.close
+    end
+
+    should 'retain original env' do
+      app = Rack::Builder.app do
+        use RequestReplay::Middleware, hopt
+        run lambda{ |env|
+          env['PATH_INFO'] = '/bad'
+          [200, {}, []]
+        }
+      end
+
+      app.call(env)
+      sock = serv.accept
+      sock.read.should.eq <<-HTTP
+GET /?q=1 HTTP/1.1\r
+Host: localhost\r
+Pork: BEEF\r
 \r
       HTTP
       sock.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-replay
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)