restify 0.1.0.1.b17 → 0.1.0.1.b18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjllYTM4YTdlZjAzM2ZkODBlMzgzOWNhMGIyZGE4MDAzNDFmMmQzYw==
+    NTY0OWIxYmVlNTE1NzRlZGE3M2QwMTkxNzVjOTJjY2QwMWNkMGNlYw==
   data.tar.gz: !binary |-
-    OGYwZjFmOWY1Y2FjY2Q2OGU2YTljZjM2MzZmMTlmNmFjMWVjZDI5ZA==
+    ZTJkMTE4MzczOTg2N2VjOTY2MTQ4MzgxMDIzYmYwNjQ1NTM4OWIwYQ==
 SHA512:
   metadata.gz: !binary |-
-    YzRlYWM0ODMwZjY5ZTk3ZmRkMDk5NzM1OGJjYzI0ZDIwOGU4NzU5ODE2MTMy
-    YmM4NGM5OWY5NjkxNTExODdhMjg5ZDcwYzk0MjJhMGQxN2Y5MjE3Yzg0NzNm
-    NTBjMzFlMmM0M2FkNGUzMGRmY2Y0MzVkZGFiMTQ1ZGQ1Mzc1M2E=
+    ZjljMDFlY2MzMjI3OTg3ZTgyOTRhZWU5ZDE3M2RjMzE5M2JlOWZiYWU0NjI5
+    Mzk1MjVhNzU3MjJiZDEzN2JhODczYzY0MDI0N2ZmNjkwMTQ0NjM1YzViNjQ1
+    N2VjMjc5NmNmMGM1MTRhZTliYWM2ZTdhZTVlZmI0NjAxMjc2MWU=
   data.tar.gz: !binary |-
-    NTBmY2ZmOTdmM2ZlZjQ2ODc2YmZmMTIxZThlMjIyNzQyZTk1NmRhMzMxY2Q2
-    MjhhZDZkNGVmMDc5Yzc4MjU2MWU1NTE1OTQxODJjZjgzYTI0OGVmODJjZWVj
-    MjYzZmE4Y2Q1MzU3N2RlODYwM2JiNDM2MTQ0NmQyZjllYjliNDc=
+    NjIyMWY3ZGEwY2I1N2I1MWZhYzljMWZiYTkxY2Q4Zjk1ZDJmNWQxMTZhOTUx
+    OGVlYTg3NzI3ZjViNWM2NDhiZTRkZDFlY2MzMzcxOGIzOWEwMTRmYjgyZDNl
+    OTI0MDdhOTI2MjU1MmQ3NWRmMmIzZjhmMjQ4NDU0ZWU4YzRhMWE=

data/lib/restify/adapter.rb

@@ -6,35 +6,103 @@ module Restify
   module Adapter
     #
     class EM
+      class Connection
+        class << self
+          def open(uri)
+            connections[uri.origin] ||= new uri.origin
+          end
 
-      def call(request)
-        Obligation.create do |w|
-          next_tick do
-            conn = ConnectionPool.get(request.uri)
-            req  = conn.send request.method.downcase,
-                             keepalive: true,
-                             redirects: 3,
-                             path: request.uri.normalized_path,
-                             query: request.uri.normalized_query,
-                             body: request.body,
-                             head: request.headers
-
-            req.callback do
-              w.fulfill Response.new(
-                request,
-                req.response_header.status,
-                req.response_header,
-                req.response
-              )
+          def connections
+            @connections ||= {}
+          end
+        end
+
+        attr_reader :origin
+
+        def initialize(origin)
+          @origin   = origin
+          @pipeline = true
+        end
+
+        def requests
+          @requests ||= []
+        end
+
+        def call(request, writer)
+          requests << [request, writer]
+          process_next if requests.size == 1
+        end
+
+        def connection
+          @connection ||= EventMachine::HttpRequest.new(origin)
+        end
+
+        def pipeline?
+          @pipeline
+        end
+
+        def process_next
+          return if requests.empty?
+
+          request, writer = pipeline? ? requests.shift : requests.first
+          req = connection.send request.method.downcase,
+                                keepalive: true,
+                                redirects: 3,
+                                path: request.uri.normalized_path,
+                                query: request.uri.normalized_query,
+                                body: request.body,
+                                head: request.headers
+
+          # puts "REQUEST: #{request} #{pipeline? ? 'w/' : 'w/o'} pipelining"
+
+          req.callback do
+            # puts "SUCCESS: #{request}"
+            requests.shift unless pipeline?
+
+            writer.fulfill Response.new(
+              request,
+              req.response_header.status,
+              req.response_header,
+              req.response
+            )
+
+            if req.response_header['CONNECTION'] == 'close'
+              @connection = nil
+              @pipeline   = false
             end
 
-            req.errback do
-              w.reject RuntimeError.new
+            process_next
+          end
+
+          req.errback do
+            # puts "ERROR: #{request}"
+            @connection = nil
+
+            if pipeline?
+              EventMachine.next_tick do
+                @pipeline = false
+                call request, writer
+              end
+            else
+              begin
+                raise RuntimeError.new \
+                  "(#{req.response_header.status}) #{req.error}"
+              rescue => e
+                writer.reject e
+              end
             end
           end
         end
       end
 
+      def call(request)
+        Obligation.create do |writer|
+          next_tick do
+            Connection.open(request.uri).call(request, writer)
+          end
+        end
+      end
+
       private
 
       def next_tick(&block)
@@ -52,23 +120,6 @@ module Restify
           end
         end unless EventMachine.reactor_running?
       end
-
-      #
-      class ConnectionPool
-        class << self
-          #
-          def get(uri)
-            connections[uri.origin] ||= begin
-              EventMachine::HttpRequest.new(uri.origin)
-            end
-          end
-
-          #
-          def connections
-            @connections ||= {}
-          end
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1.b17
+  version: 0.1.0.1.b18
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obligation