mikehale-rat-hole 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.5 / 2008-12-18
+
+* calculate request_uri = path_info + query_string
+
 === 0.1.4 / 2008-12-18
 
 * update process_server_response hook to include rack_request

data/lib/rat_hole.rb

@@ -6,7 +6,7 @@ require 'util'
 
 class RatHole
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   def initialize(host)
     @host = host
@@ -22,16 +22,17 @@ class RatHole
 
   def call(env)
     Net::HTTP.start(@host) do |http|
-      http.instance_eval{@socket = MethodSpy.new(@socket){|method| method =~ /write/}} if $DEBUG
+      http.instance_eval{@socket = MethodSpy.new(@socket){|method| method =~ /#{ENV['RH_METHOD_SPY_FILTER']}/}} if $DEBUG
 
       env.delete('HTTP_ACCEPT_ENCODING')
       source_request = process_user_request(Rack::Request.new(env))
       source_headers = request_headers(source_request.env)
+      request_uri = "#{source_request.path_info}?#{source_request.query_string}"
 
       if source_request.get?
-        response = http.get(source_request.path_info, source_headers)
+        response = http.get(request_uri, source_headers)
       elsif source_request.post?
-        post = Net::HTTP::Post.new(source_request.path_info, source_headers)
+        post = Net::HTTP::Post.new(request_uri, source_headers)
         class << post
           include HTTPHeaderPatch
         end

data/lib/util.rb

@@ -21,7 +21,6 @@ class MethodSpy
 
   def method_missing(symbol, *args, &block)
     result = @delegate.send(symbol, *args, &block)
-    @block.call if @block
     p [symbol, args, result, block] if @filter && @filter.call(symbol.to_s)
     result
   end

data/rat-hole.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rat-hole}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Hale", "David Bogus"]

data/test/test_rat_hole.rb

@@ -54,15 +54,15 @@ class TestRatHole < Test::Unit::TestCase
     MockRequest.new(@io.written)
   end
 
-  def send_get_request(rack_env={})
+  def send_get_request(rack_env={}, uri='/someuri')
     opts = {:lint=>true}.merge(rack_env)
     rh = RatHole.new('127.0.0.1')
-    Rack::MockRequest.new(rh).get('/someuri', opts)
+    Rack::MockRequest.new(rh).get(uri, opts)
   end
 
-  def send_post_request(body='')
+  def send_post_request(body='', uri='/someuri')
     rh = RatHole.new('127.0.0.1')
-    Rack::MockRequest.new(rh).post('/someuri', {:lint=>true, :input=> body})
+    Rack::MockRequest.new(rh).post(uri, {:lint=>true, :input=> body})
   end
 
   def test_response_unchanged
@@ -160,6 +160,16 @@ class TestRatHole < Test::Unit::TestCase
     assert_equal(expected_headers, proxied_request.headers)
   end
 
+  def test_request_uri
+    mock_server
+    send_get_request({}, '/uri?with=param')
+    assert_equal('/uri?with=param', proxied_request.uri)
+
+    mock_server
+    send_post_request('', '/uri?with=param')
+    assert_equal('/uri?with=param', proxied_request.uri)
+  end
+
   def test_systemic_empty_rathole
     host = 'halethegeek.com'
     app =  EmptyRatHole.new(host)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mikehale-rat-hole
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michael Hale