rack-client 0.3.1.pre.e → 0.3.1.pre.f

data/lib/rack/client/adapter/simple.rbc

@@ -187,7 +187,7 @@ x
 6
 Simple
 i
-124
+138
 5
 66
 99
@@ -311,6 +311,20 @@ i
 49
 10
 4
+15
+99
+7
+27
+7
+28
+65
+67
+49
+9
+0
+49
+10
+4
 11
 I
 6
@@ -322,7 +336,7 @@ I
 0
 n
 p
-27
+29
 x
 17
 CollapsedResponse
@@ -1200,8 +1214,8 @@ x
 4
 to_s
 s
-82
-(url, headers = {}, body_or_params = nil, query_params = {})
+90
+(url, headers = {}, body_or_params = nil, query_params = {}, &block)
             request('
 x
 6
@@ -1506,7 +1520,7 @@ x
 13
 request_tuple
 i
-184
+154
 23
 1
 10
@@ -1547,170 +1561,137 @@ i
 19
 4
 15
-20
-5
-49
-2
-0
-9
-67
-44
-43
-0
-78
-49
-1
-1
-20
-1
-17
-2
-19
-1
-15
-19
-5
-15
-2
-8
-68
-1
-15
 45
 0
-3
+2
 20
-5
+3
 86
-4
+3
 9
-82
+53
 20
-5
+3
 8
-90
+61
 45
+4
 5
-6
 20
-5
+3
 49
-7
+6
 1
 19
-6
+5
 15
 45
+7
 8
-9
 20
 0
 49
-10
+9
 1
 19
-7
+6
 15
 20
 3
 49
-11
+10
 0
 9
-114
+85
 1
 8
-146
+116
 20
-7
+6
 45
-5
-12
+4
+11
 45
-5
-13
+4
+12
 20
-7
+6
 49
-14
+13
 0
 49
-15
+14
 1
-5
-48
-16
+20
+3
 49
-17
+15
 1
 49
-18
+16
 1
 13
 18
 2
 49
-19
+17
 1
 15
 15
 45
 0
-20
+18
 20
 2
 86
-4
+3
 9
-166
+136
 45
-5
-21
+4
+19
 20
 2
 49
-18
+16
 1
 8
-168
+138
 20
 2
 19
-8
+7
 15
 20
-7
+6
 49
-22
+20
 0
 20
 1
 20
-8
+7
 35
 3
 11
 11
 I
-d
+c
 I
-9
+8
 I
 1
 I
 4
 n
 p
-23
+21
 x
 4
 Hash
 x
 16
 new_from_literal
-x
-4
-nil?
 n
 x
 3
@@ -1741,9 +1722,6 @@ x
 18
 parse_nested_query
 x
-12
-query_phrams
-x
 5
 merge
 x
@@ -1758,46 +1736,42 @@ x
 4
 to_s
 p
-17
+15
 I
 0
 I
-3c
-I
-28
-I
 3d
 I
-45
+28
 I
 3e
 I
-5d
+40
 I
 40
 I
-68
+4b
 I
 42
 I
-72
+55
 I
 43
 I
-93
+75
 I
 46
 I
-ab
+8d
 I
 48
 I
-b8
+9a
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
 p
-9
+8
 x
 3
 url
@@ -1814,9 +1788,6 @@ x
 5
 block
 x
-15
-query_or_params
-x
 10
 query_hash
 x
@@ -1836,7 +1807,7 @@ x
 9
 build_env
 i
-64
+89
 23
 2
 10
@@ -1885,12 +1856,34 @@ i
 19
 4
 15
+44
+43
+0
+79
+49
+1
+1
+13
+7
+8
+64
+5
+20
+4
+47
+49
+9
+1
+49
+10
+2
+15
 20
 0
 20
 4
 49
-8
+11
 0
 20
 2
@@ -1898,11 +1891,14 @@ i
 3
 54
 52
-9
+12
 4
+49
+13
+1
 11
 I
-a
+b
 I
 5
 I
@@ -1911,7 +1907,7 @@ I
 4
 n
 p
-10
+14
 x
 4
 Hash
@@ -1934,12 +1930,24 @@ parse
 x
 1
 +
+s
+9
+HTTP_HOST
+x
+13
+http_host_for
+x
+3
+[]=
 x
 4
 to_s
 x
 9
 build_env
+x
+5
+merge
 p
 7
 I
@@ -1955,7 +1963,7 @@ I
 I
 4d
 I
-40
+59
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
@@ -1976,8 +1984,126 @@ body
 x
 3
 uri
+x
+13
+http_host_for
+M
+1
+n
+n
+x
+13
+http_host_for
+i
+49
+20
+0
+49
+0
+0
+7
+1
+20
+0
+49
+2
+0
+47
+49
+0
+0
+63
+2
+49
+3
+1
+9
+43
+20
+0
+49
+4
+0
+20
+0
+49
+2
+0
+35
+2
+7
+1
+64
+49
+5
+1
+8
+48
+20
+0
+49
+4
+0
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+6
+x
+4
+to_s
+s
+1
+:
+x
+4
+port
+x
+8
+include?
+x
+4
+host
+x
+4
+join
+p
+9
+I
+0
+I
+50
+I
+0
+I
+51
+I
+17
+I
+52
+I
+2b
+I
+54
+I
+31
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+1
+x
+3
+uri
 p
-15
+17
 I
 2
 I
@@ -2001,13 +2127,17 @@ I
 I
 60
 I
-3c
+3d
 I
 6e
 I
 4b
 I
 7c
+I
+50
+I
+8a
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb

data/lib/rack/client/handler/net_http.rb

@@ -48,7 +48,7 @@ module Rack
                   when 'PUT'    then Net::HTTP::Put
                   end
 
-          klass.new(request.path, Headers.from(request.env).to_http)
+          klass.new(request.fullpath, Headers.from(request.env).to_http)
         end
 
         def body_for(request)
@@ -72,7 +72,7 @@ module Rack
         def parse_headers(net_response)
           headers = Headers.new
 
-          net_response.each do |(k,v)|
+          net_response.each do |k,v|
             headers.update(k => v)
           end
 

data/lib/rack/client/handler/typhoeus.rb

@@ -45,17 +45,25 @@ module Rack
         end
 
         def process(rack_request)
-          ::Typhoeus::Request.run((rack_request.url).to_s, params_for(rack_request))
+          ::Typhoeus::Request.run((url_for(rack_request)).to_s, params_for(rack_request))
+        end
+
+        def url_for(rack_request)
+          rack_request.url.split('?').first
         end
 
         def params_for(rack_request)
           {
             :method => rack_request.request_method.downcase.to_sym,
             :headers => Headers.from(rack_request.env).to_http,
-            :params => {}
+            :params => query_params_for(rack_request)
           }.merge(body_params_for(rack_request))
         end
 
+        def query_params_for(rack_request)
+          Rack::Utils.parse_nested_query(rack_request.query_string)
+        end
+
         def body_params_for(rack_request)
           unless %w[ HEAD GET ].include? rack_request.request_method
             {:body => rack_request.body.string}

data/lib/rack/client/parser/body_collection.rb

@@ -1,7 +1,7 @@
 module Rack
   module Client
     class BodyCollection
-      instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+      instance_methods.each { |m| undef_method m unless (m =~ /^__/ || m =~ /^object_id$/ ) }
 
       def initialize(&load_with_proc)
         raise ArgumentException, 'BodyCollection must be initialized with a block' unless block_given?

data/lib/rack/client/parser/body_collection.rbc

@@ -318,7 +318,7 @@ x
 14
 BodyCollection
 i
-40
+67
 57
 19
 0
@@ -346,17 +346,44 @@ i
 49
 4
 1
+13
+10
+54
+15
+20
+0
+7
+5
+13
+70
 9
-32
+51
+15
+44
+43
+1
+7
+6
+78
+49
+3
+2
+6
+5
+49
+4
+1
+9
+59
 1
 8
-39
+66
 5
 20
 0
 47
 49
-5
+7
 1
 11
 I
@@ -369,7 +396,7 @@ I
 1
 n
 p
-6
+8
 n
 x
 6
@@ -383,6 +410,10 @@ new
 x
 2
 =~
+n
+s
+11
+^object_id$
 x
 12
 undef_method
@@ -393,7 +424,7 @@ I
 I
 4
 I
-28
+43
 x
 69
 /Users/ben/code/rack-client/lib/rack/client/parser/body_collection.rb

data/lib/rack/client/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Client
-    VERSION = "0.3.1.pre.e"
+    VERSION = "0.3.1.pre.f"
   end
 end