restify 0.1.1.1.b22 → 0.1.1.1.b24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU3OTMyNjA1OTU3NjFlNTc1ODY2MDIzOTE3MjhhNzA5ZDk1MzdlYw==
+    YTcxMzkwODU2OGRjZmRlMzFhNTQ3N2NjNTYwMGQ0ZDk0NDVhMjg1Mw==
   data.tar.gz: !binary |-
-    YjZiMDg0ZTYyZTJmMTQ0YTJlYjc1NDBiNTAwZjM1YmJhODE2MGRlZQ==
+    Y2UzMzYxMTdlZWRkNmY5YzNjNDZhMGFiMDkyZTk5MGVlZjdhNTdmNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTlhMWRhOTM5ODNiYzZlMzk3MmE3YTEwZmI1OTM2OGRlZTNiMWVlNjUwZmVi
-    NzYyMWJhYmYyMzBkZTdmOGJlYTBhNGI3YzYxZjIxNTYyZmQyM2UwYTczNGRh
-    OGIzMzYyZGI5YmFhNjQyOTE1YWM2MTRkYzc3NjYwZWM5YjdjZTU=
+    ZDk5MTI0Zjg4NzMxZjYxMGFmNDU2NTQzNGVmZWRhYTYwMGVjOGFjZmRjNzdk
+    OTNmNGFkOGVmNzYzNDRiOWYyYjcxMDI3YmMwZTMzYzA1N2ZjNjM2Yzg3ZTAy
+    YzZhNDQ1N2ZjZTlhMDM3ZDdhY2U2OGMwM2ZkMDM1NjE5NGIzZGY=
   data.tar.gz: !binary |-
-    OWFjNjc0YWY0ZjJmMWYwMzRlMzA0ZTlkNjFiYmJhN2VkYmIwZjcwOWVlZjBh
-    MGJhNjQ5ZTNiYjBiY2JiMGY2ZmFlZTEwN2Q4OTYzMjYzNDUxODIzODM0NDZl
-    ZGQzY2UxNTJmMzgwNTY3MGE3ZDk0YTYyNzllMTU2ODIzNGNjOTM=
+    OGVkNWFhNWNhODY3NGU2ZWRmOTYwYmY0YzRmOWZmOTJmZTFiYTZiYWJmMzRl
+    ZjRkMWQzY2Y2ZjMwNjIwYTY5OWRlN2YzZWM5N2NmNWY2Y2Q5ZDRiYmNjNTIw
+    MzEyNmM3N2UyMWU2MTIyZDYzNjU0NDZkY2NjMjZlNjY1ZjBkYTk=

data/lib/restify/adapter.rb

@@ -20,26 +20,35 @@ module Restify
         attr_reader :origin
 
         def initialize(origin)
-          @origin = origin
+          @origin   = origin
+          @pipeline = true
         end
 
         def requests
           @requests ||= []
         end
 
-        def call(request, writer)
-          requests << [request, writer]
-          process_next if requests.size == 1
+        def call(request, writer, retried = false)
+          if requests.empty?
+            requests << [request, writer, retried]
+            process_next
+          else
+            requests << [request, writer, retried]
+          end
         end
 
         def connection
           @connection ||= EventMachine::HttpRequest.new(origin)
         end
 
+        def pipeline?
+          @pipeline
+        end
+
         def process_next
           return if requests.empty?
 
-          request, writer = requests.first
+          request, writer, retried = pipeline? ? requests.shift : requests.first
           req = connection.send request.method.downcase,
                                 keepalive: true,
                                 redirects: 3,
@@ -49,7 +58,7 @@ module Restify
                                 head: request.headers
 
           req.callback do
-            requests.shift
+            requests.shift unless pipeline?
 
             writer.fulfill Response.new(
               request,
@@ -67,14 +76,23 @@ module Restify
           end
 
           req.errback do
-            requests.shift
+            requests.shift unless pipeline?
             @connection = nil
 
-            begin
-              raise RuntimeError.new \
-                "(#{req.response_header.status}) #{req.error}"
-            rescue => e
-              writer.reject e
+            if pipeline?
+              EventMachine.next_tick do
+                @pipeline = false
+                call request, writer
+              end
+            elsif !retried
+              EventMachine.next_tick { call request, writer }
+            else
+              begin
+                raise RuntimeError.new \
+                  "(#{req.response_header.status}) #{req.error}"
+              rescue => e
+                writer.reject e
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1.b22
+  version: 0.1.1.1.b24
 platform: ruby
 authors:
 - Jan Graichen