request-replay 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757f765cde5cb73d14e26de907f2bc03322973ee
-  data.tar.gz: 0fa338334b76b3d678a2e676a3fe86e19a1d5cff
+  metadata.gz: 82468210714a1dd60ceadcd91e95752c0e85ce85
+  data.tar.gz: 906d7755d38d5a0748707068bc1f31d7c34beadb
 SHA512:
-  metadata.gz: 3c9a20be6d4bb76253ddebefd6aa54176564d7909b8508e1e7bd02fada6d0e9a7c986f6a678bde351276af31a34c0f4d4a1ab63ada383990369a33062789d19f
-  data.tar.gz: 739d4d94923788d1e27f1f12539c03c7182e1679ed601164e39d655bb2ab147a8061aef27c85ca0fbad557a3ed9af8a54df6d7a0bfe88dc84c93f2fe8a4dabd0
+  metadata.gz: cf7b7b776083558e322f502a0de20cccf7dc51e4cd14f0be2a8eddfd8316fe3748add3a749ac336f50567e6c33755da185b8a2bd52618d2ef706a521f9f691e3
+  data.tar.gz: f61d88e1673fb50cc512e87b8702dc2ddeb51bf6e7976a90ecf3982033c1f243d477299eb5fe1b4db6dc199da29f773091af90dcaf39262d367cf1eabd5cc17b

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## request-replay 0.6.2 -- 2013-10-01
+
+* Added :rewrite_env option for rewriting env for specific use.
+
 ## request-replay 0.6.1 -- 2013-10-01
 
 * Print error messages to env['rack.errors']

data/README.md

@@ -31,28 +31,15 @@ overwrite in the original request.
 ``` ruby
 require 'request-replay'
 use RequestReplay::Middleware, 'localhost:8080',
-                               :add_headers => {'Host' => 'example.com'},
-                               :read_wait   => 5
-run lambda{ |env| [200, {}, [env.inspect]] }
-```
-
-It's effectively the same as:
-
-``` ruby
-require 'request-replay'
-use Class.new{
-  def initialize app, host, options={}
-    @app, @host, @options = app, host, options
-  end
-
-  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)
-    @app.call(env)
-  end
-}, 'localhost:8080', :add_headers => {'Host' => 'example.com'},
-                     :read_wait   => 5
+    :add_headers => {'Host' => 'example.com'},
+    :read_wait   => 5,
+    # We could also rewrite the env
+    :rewrite_env => lambda{ |env|
+                      if env['HTTP_HOST'].start_with?('api.')
+                        env['PATH_INFO'] = "/api/#{env['PATH_INFO']}"
+                      end
+                      env
+                    }
 run lambda{ |env| [200, {}, [env.inspect]] }
 ```
 

data/Rakefile

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

data/lib/request-replay/middleware.rb

@@ -7,11 +7,17 @@ class RequestReplay::Middleware
   end
 
   def call env
+    # Unfortunately, we need to dup env because other middleware might be
+    # modifying it and make RequestReplay not able to get the original env.
+    rr_env = if rewrite = @options[:rewrite_env]
+               rewrite.call(env.dup)
+             else
+              env.dup
+             end
+
     # 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.
-    # 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)
+    Thread.new(RequestReplay.new(rr_env, @host, @options), &:start)
     @app.call(env)
   end
 end

data/request-replay.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: request-replay 0.6.1 ruby lib
+# stub: request-replay 0.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "request-replay"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   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

@@ -15,14 +15,14 @@ require 'request-replay'
 require 'rack'
 
 describe RequestReplay do
-  host = 'localhost'
+  host = 'localhost'.freeze
   port = 1024 + rand(2**16 - 1024)
   serv = TCPServer.new('localhost', port)
-  hopt = "#{host}:#{port}"
+  hopt = "#{host}:#{port}".freeze
   env  = {'REQUEST_METHOD' => 'GET',
           'PATH_INFO' => '/', 'QUERY_STRING' => 'q=1',
           'HTTP_HOST' => 'localhost',
-          'HTTP_PORK' => 'BEEF'     }
+          'HTTP_PORK' => 'BEEF'     }.freeze
 
   verify = lambda do |response, expected|
     sock = serv.accept
@@ -103,17 +103,22 @@ Pork: BEEF\r
       end
 
       app.call(env.merge('REQUEST_METHOD' => 'PUT'))
-      sock = serv.accept
-      sock.read.should.eq <<-HTTP
+      begin
+        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
+      ensure
+        sock.close
+      end
     end
 
     should 'retain original env' do
+      e = env.dup
+
       app = Rack::Builder.app do
         use RequestReplay::Middleware, hopt
         run lambda{ |env|
@@ -122,15 +127,43 @@ Pork: BEEF\r
         }
       end
 
-      app.call(env)
-      sock = serv.accept
-      sock.read.should.eq <<-HTTP
+      app.call(e)
+      begin
+        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
+      ensure
+        sock.close
+      end
+    end
+
+    should 'rewrite_env' do
+      app = Rack::Builder.app do
+        use RequestReplay::Middleware, hopt, :rewrite_env => lambda{ |env|
+          if env['HTTP_HOST'].start_with?('api.')
+            env['PATH_INFO'] = "/api#{env['PATH_INFO']}"
+          end
+          env
+        }, :add_headers => {'Host' => 'eg.com'}
+        run lambda{ |env| [200, {}, []] }
+      end
+
+      app.call(env.merge('HTTP_HOST' => 'api.localhost'))
+      begin
+        sock = serv.accept
+        sock.read.should.eq <<-HTTP
+GET /api/?q=1 HTTP/1.1\r
+Host: eg.com\r
+Pork: BEEF\r
+\r
+      HTTP
+      ensure
+        sock.close
+      end
     end
   end
 end

metadata

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