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

data/lib/rack/client.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-109
+118
 5
 7
 0
@@ -37,35 +37,44 @@ i
 1
 1
 15
-99
+5
 7
 4
-65
+64
+47
 49
+1
+1
+15
+99
+7
 5
+65
+49
+6
 2
 13
 99
 12
 7
-6
-12
 7
+12
 7
+8
 12
 65
 12
 49
-8
+9
 4
 15
 49
-6
+7
 0
 15
 5
 7
-9
+10
 64
 47
 49
@@ -74,7 +83,7 @@ i
 15
 5
 7
-10
+11
 64
 47
 49
@@ -83,7 +92,7 @@ i
 15
 5
 7
-11
+12
 64
 47
 49
@@ -92,7 +101,7 @@ i
 15
 5
 7
-12
+13
 64
 47
 49
@@ -101,7 +110,7 @@ i
 15
 5
 7
-13
+14
 64
 47
 49
@@ -110,7 +119,7 @@ i
 15
 5
 7
-14
+15
 64
 47
 49
@@ -129,7 +138,7 @@ I
 0
 n
 p
-15
+16
 s
 11
 forwardable
@@ -137,6 +146,9 @@ x
 7
 require
 s
+8
+stringio
+s
 3
 uri
 s
@@ -371,12 +383,12 @@ p
 I
 2
 I
-a
-I
 b
 I
 b
 I
+c
+I
 1d
 x
 46
@@ -531,7 +543,7 @@ p
 I
 0
 I
-f
+10
 I
 13
 x
@@ -574,17 +586,17 @@ new
 p
 7
 I
-0
+-1
 I
-e
+f
 I
 4
 I
-f
+10
 I
 14
 I
-10
+11
 I
 38
 x
@@ -603,15 +615,15 @@ p
 I
 2
 I
-7
+8
 I
 b
 I
-9
+a
 I
 25
 I
-e
+f
 I
 30
 x
@@ -627,7 +639,7 @@ p
 I
 2
 I
-6
+7
 I
 1c
 x
@@ -657,7 +669,7 @@ s
 18
 rack/client/parser
 p
-21
+23
 I
 0
 I
@@ -673,33 +685,37 @@ I
 I
 1b
 I
-5
+4
 I
-35
+24
 I
-15
+6
 I
 3e
 I
-17
+16
 I
 47
 I
-19
+18
 I
 50
 I
-1b
+1a
 I
 59
 I
-1d
+1c
 I
 62
 I
-1f
+1e
+I
+6b
+I
+20
 I
-6d
+76
 x
 46
 /Users/ben/code/rack-client/lib/rack/client.rb

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

@@ -2,6 +2,32 @@ module Rack
   module Client
     class Simple < Base
 
+      def self.new(app, *a, &b)
+        app = inject_middleware(app) if middlewares.any?
+
+        super(app, *a, &b)
+      end
+
+      def self.middlewares
+        @middlewares ||= []
+      end
+
+      def self.use(middleware, *args)
+        middlewares << [middleware, args]
+      end
+
+      def self.inject_middleware(app)
+        middlewares = self.middlewares
+
+        Rack::Builder.app do |builder|
+          middlewares.each do |(middleware, args)|
+            builder.use middleware, *args
+          end
+
+          builder.run app
+        end
+      end
+
       class CollapsedResponse < Response
         extend Forwardable
         attr_accessor :response
@@ -57,7 +83,6 @@ module Rack
         end
       end
 
-
       def request_tuple(url, headers = {}, body_or_params = nil, query_params = {}, &block)
         query_hash = Hash === query_params ? query_params : Utils.build_query(query_params)
 
@@ -74,7 +99,13 @@ module Rack
 
       def build_env(request_method, url, headers = {}, body = nil)
         uri = @base_uri.nil? ? URI.parse(url) : @base_uri + url
-        {'HTTP_HOST' => http_host_for(uri)}.merge(super(request_method, uri.to_s, headers, body))
+
+        env = super(request_method, uri.to_s, headers, body)
+
+        env['HTTP_HOST']       ||= http_host_for(uri)
+        env['HTTP_USER_AGENT'] ||= http_user_agent
+
+        env
       end
 
       def http_host_for(uri)
@@ -85,6 +116,9 @@ module Rack
         end
       end
 
+      def http_user_agent
+        "rack-client #{VERSION} (app: #{@app.class})"
+      end
     end
   end
 end

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

@@ -187,156 +187,688 @@ x
 6
 Simple
 i
-138
+196
 5
 66
 99
 7
 0
-45
+7
 1
-2
 65
+5
 49
+2
+4
+15
+99
+7
 3
+7
+4
+65
+5
+49
+2
+4
+15
+99
+7
+5
+7
+6
+65
+5
+49
+2
+4
+15
+99
+7
+7
+7
+8
+65
+5
+49
+2
+4
+15
+99
+7
+9
+45
+10
+11
+65
+49
+12
 3
 13
 99
 12
 7
-4
+13
 12
 7
-5
+14
 12
 65
 12
 49
-6
+2
 4
 15
 49
-4
+13
 0
 15
 99
 7
+15
 7
-7
-8
+16
 65
 67
 49
-9
+17
 0
 49
-10
+18
 4
 15
 7
-11
+19
 64
 7
-12
+20
 64
 7
-13
+21
 64
 7
-14
+22
 64
 7
-15
+23
 64
 35
 5
 56
-16
+24
 50
-17
+25
 0
 15
 7
-18
+26
 64
 7
-19
+27
 64
 35
 2
 56
+28
+50
+25
+0
+15
+99
+7
+29
+7
+30
+65
+67
+49
+17
+0
+49
+18
+4
+15
+99
+7
+31
+7
+32
+65
+67
+49
+17
+0
+49
+18
+4
+15
+99
+7
+33
+7
+34
+65
+67
+49
+17
+0
+49
+18
+4
+15
+99
+7
+35
+7
+36
+65
+67
+49
+17
+0
+49
+18
+4
+15
+99
+7
+37
+7
+38
+65
+67
+49
+17
+0
+49
+18
+4
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+39
+x
+3
+new
+M
+1
+n
+n
+x
+3
+new
+i
+47
+95
+19
+2
+15
+5
+48
+0
+49
+1
+0
+9
+23
+5
+20
+0
+47
+49
+2
+1
+19
+0
+8
+24
+1
+15
 20
+0
+20
+1
+36
+20
+2
+13
+70
+10
+43
+44
+43
+3
+12
+49
+4
+1
+53
+5
+1
+11
+I
+7
+I
+3
+I
+1
+I
+1
+I
+1
+p
+6
+x
+11
+middlewares
+x
+4
+any?
+x
+17
+inject_middleware
+x
+4
+Proc
+x
+14
+__from_block__
+x
+3
+new
+p
+7
+I
+-1
+I
+5
+I
+4
+I
+6
+I
+19
+I
+8
+I
+2f
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+3
+x
+3
+app
+x
+1
+a
+x
+1
+b
+x
+13
+attach_method
+x
+11
+middlewares
+M
+1
+n
+n
+x
+11
+middlewares
+i
+11
+39
+0
+13
+10
+10
+15
+35
+0
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+1
+x
+12
+@middlewares
+p
+5
+I
+-1
+I
+b
+I
+0
+I
+c
+I
+b
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+0
+x
+3
+use
+M
+1
+n
+n
+x
+3
+use
+i
+13
+5
+48
+0
+20
+0
+20
+1
+35
+2
+49
+1
+1
+11
+I
+5
+I
+2
+I
+1
+I
+1
+I
+1
+p
+2
+x
+11
+middlewares
+x
+2
+<<
+p
+5
+I
+-1
+I
+f
+I
+0
+I
+10
+I
+d
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+2
+x
+10
+middleware
+x
+4
+args
+x
+17
+inject_middleware
+M
+1
+n
+n
+x
+17
+inject_middleware
+i
+18
+5
+49
+0
+0
+19
+1
+15
+45
+1
+2
+43
+3
+56
+4
 50
+5
+0
+11
+I
+4
+I
+2
+I
+1
+I
+1
+n
+p
+6
+x
+11
+middlewares
+x
+4
+Rack
+n
+x
+7
+Builder
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+17
+inject_middleware
+i
+22
+57
+19
+0
+15
+21
+1
+1
+56
+0
+50
+1
+0
+15
+20
+0
+21
+1
+0
+49
+2
+1
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+3
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
 17
+inject_middleware
+i
+23
+58
+37
+19
 0
 15
-99
-7
+37
+19
+1
+15
+15
 21
-7
-22
-65
-67
-49
-9
+1
 0
-49
-10
-4
-15
-99
-7
-23
+20
+0
+20
+1
+36
+1
+51
+0
+1
+11
+I
 7
-24
-65
-67
-49
-9
+I
+2
+I
+2
+I
+2
+n
+p
+1
+x
+3
+use
+p
+5
+I
 0
-49
+I
+17
+I
+a
+I
+18
+I
+17
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+2
+x
 10
+middleware
+x
 4
-15
-99
-7
-25
+args
+x
+4
+each
+x
+3
+run
+p
 7
-26
-65
-67
-49
-9
+I
 0
-49
-10
+I
+16
+I
 4
-15
-99
+I
+17
+I
+d
+I
+1b
+I
+16
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+1
+x
 7
-27
+builder
+x
+3
+app
+p
 7
-28
-65
-67
-49
-9
-0
-49
-10
-4
-11
 I
-6
+-1
 I
-0
+13
 I
 0
 I
-0
-n
+14
+I
+7
+I
+16
+I
+12
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
 p
-29
+2
+x
+3
+app
+x
+11
+middlewares
 x
 17
 CollapsedResponse
@@ -602,13 +1134,13 @@ x
 p
 5
 I
-0
+-1
 I
-e
+28
 I
 0
 I
-f
+29
 I
 15
 x
@@ -670,17 +1202,17 @@ collapse!
 p
 7
 I
-0
+-1
 I
-12
+2c
 I
 0
 I
-13
+2d
 I
 d
 I
-14
+2e
 I
 10
 x
@@ -782,7 +1314,7 @@ p
 I
 0
 I
-19
+33
 I
 c
 x
@@ -799,21 +1331,21 @@ each
 p
 9
 I
-0
+-1
 I
-17
+31
 I
 0
 I
-18
+32
 I
 6
 I
-19
+33
 I
 e
 I
-1a
+34
 I
 11
 x
@@ -826,43 +1358,43 @@ p
 I
 2
 I
-6
+20
 I
 b
 I
-7
+21
 I
 13
 I
-9
+23
 I
 20
 I
-a
+24
 I
 28
 I
-b
+25
 I
 30
 I
-9
+23
 I
 35
 I
-c
+26
 I
 41
 I
-e
+28
 I
 4f
 I
-12
+2c
 I
 5d
 I
-17
+31
 I
 6b
 x
@@ -871,9 +1403,6 @@ x
 p
 0
 x
-13
-attach_method
-x
 10
 initialize
 M
@@ -951,17 +1480,17 @@ x
 p
 7
 I
-0
+-1
 I
-1e
+38
 I
 8
 I
-1f
+39
 I
 f
 I
-20
+3a
 I
 24
 x
@@ -1009,7 +1538,7 @@ x
 6
 Simple
 i
-45
+43
 57
 19
 0
@@ -1020,9 +1549,8 @@ i
 20
 0
 47
-49
+101
 1
-0
 7
 2
 20
@@ -1031,9 +1559,8 @@ i
 3
 0
 47
-49
+101
 1
-0
 7
 4
 63
@@ -1046,7 +1573,7 @@ i
 6
 0
 4
-36
+62
 79
 81
 7
@@ -1101,25 +1628,25 @@ p
 I
 0
 I
-23
+3d
 I
 4
 I
-24
+3e
 I
 5
 I
-25
+3f
 I
-f
+e
 I
-26
+40
 I
-1c
+1a
 I
-24
+3e
 I
-2d
+2b
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
@@ -1150,7 +1677,7 @@ x
 6
 Simple
 i
-45
+43
 57
 19
 0
@@ -1161,9 +1688,8 @@ i
 20
 0
 47
-49
+101
 1
-0
 7
 2
 20
@@ -1172,9 +1698,8 @@ i
 3
 0
 47
-49
+101
 1
-0
 7
 4
 63
@@ -1187,7 +1712,7 @@ i
 6
 0
 4
-44
+70
 79
 81
 7
@@ -1242,25 +1767,25 @@ p
 I
 0
 I
-2b
+45
 I
 4
 I
-2c
+46
 I
 5
 I
-2d
+47
 I
-f
+e
 I
-2e
+48
 I
-1c
+1a
 I
-2c
+46
 I
-2d
+2b
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
@@ -1444,7 +1969,7 @@ p
 I
 0
 I
-36
+50
 I
 14
 x
@@ -1465,25 +1990,25 @@ new
 p
 11
 I
-0
+-1
 I
-33
+4d
 I
 24
 I
-34
+4e
 I
 34
 I
-35
+4f
 I
 37
 I
-36
+50
 I
 43
 I
-38
+52
 I
 55
 x
@@ -1738,33 +2263,33 @@ to_s
 p
 15
 I
-0
+-1
 I
-3d
+56
 I
 28
 I
-3e
+57
 I
 40
 I
-40
+59
 I
 4b
 I
-42
+5b
 I
 55
 I
-43
+5c
 I
 75
 I
-46
+5f
 I
 8d
 I
-48
+61
 I
 9a
 x
@@ -1807,7 +2332,7 @@ x
 9
 build_env
 i
-89
+135
 23
 2
 10
@@ -1856,58 +2381,104 @@ i
 19
 4
 15
-44
-43
+20
 0
-79
+20
+4
 49
-1
-1
-13
-7
 8
+0
+20
+2
+20
+3
+54
+52
+9
+4
+19
+5
+15
+20
+5
+7
+10
 64
+14
+2
+49
+11
+1
+13
+10
+96
+15
 5
 20
 4
 47
 49
-9
+12
 1
+13
+18
+3
 49
-10
+13
+2
+15
+8
+100
+18
+2
+16
 2
 15
 20
-0
-20
-4
+5
+7
+14
+64
+14
+2
 49
 11
-0
-20
-2
-20
+1
+13
+10
+127
+15
+5
+48
+15
+13
+18
 3
-54
-52
-12
-4
 49
 13
-1
+2
+15
+8
+131
+18
+2
+16
+2
+15
+20
+5
 11
 I
 b
 I
-5
+6
 I
 2
 I
 4
 n
 p
-14
+16
 x
 4
 Hash
@@ -1930,45 +2501,63 @@ parse
 x
 1
 +
+x
+4
+to_s
+x
+9
+build_env
 s
 9
 HTTP_HOST
 x
+2
+[]
+x
 13
 http_host_for
 x
 3
 []=
+s
+15
+HTTP_USER_AGENT
 x
-4
-to_s
-x
-9
-build_env
-x
-5
-merge
+15
+http_user_agent
 p
-7
+13
 I
-0
+-1
 I
-4b
+64
 I
 16
 I
-4c
+65
 I
 30
 I
-4d
+67
 I
-59
+42
+I
+69
+I
+65
+I
+6a
+I
+84
+I
+6c
+I
+87
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
 p
-5
+6
 x
 14
 request_method
@@ -1985,6 +2574,9 @@ x
 3
 uri
 x
+3
+env
+x
 13
 http_host_for
 M
@@ -1995,7 +2587,7 @@ x
 13
 http_host_for
 i
-49
+48
 20
 0
 49
@@ -2009,8 +2601,7 @@ i
 2
 0
 47
-49
-0
+101
 0
 63
 2
@@ -2018,7 +2609,7 @@ i
 3
 1
 9
-43
+42
 20
 0
 49
@@ -2038,7 +2629,7 @@ i
 5
 1
 8
-48
+47
 20
 0
 49
@@ -2077,23 +2668,23 @@ join
 p
 9
 I
-0
+-1
 I
-50
+6f
 I
 0
 I
-51
+70
 I
-17
+16
 I
-52
+71
 I
-2b
+2a
 I
-54
+73
 I
-31
+30
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
@@ -2102,42 +2693,147 @@ p
 x
 3
 uri
+x
+15
+http_user_agent
+M
+1
+n
+n
+x
+15
+http_user_agent
+i
+23
+7
+0
+45
+1
+2
+47
+101
+3
+7
+4
+39
+5
+49
+6
+0
+47
+101
+3
+7
+7
+63
+5
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+8
+s
+12
+rack-client 
+x
+7
+VERSION
+n
+x
+4
+to_s
+s
+7
+ (app: 
+x
+4
+@app
+x
+5
+class
+s
+1
+)
 p
+5
+I
+-1
+I
+77
+I
+0
+I
+78
+I
 17
+x
+61
+/Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb
+p
+0
+p
+27
 I
 2
 I
 5
 I
-1f
+d
 I
-1e
+b
 I
-2d
+18
+I
+f
 I
 23
 I
-44
+13
 I
-2b
+2e
 I
-52
+1f
 I
-33
+4b
 I
-60
+38
+I
+59
 I
 3d
 I
-6e
+70
 I
-4b
+45
 I
-7c
+7e
 I
-50
+4d
+I
+8c
+I
+56
+I
+9a
+I
+64
+I
+a8
+I
+6f
+I
+b6
+I
+77
 I
-8a
+c4
 x
 61
 /Users/ben/code/rack-client/lib/rack/client/adapter/simple.rb