restify 0.3.2.1.b62 → 0.3.2.1.b63

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGMzYTA4ODFiZDdhYTBkMTQyZTA4YTIxNmM5NDcwZmQ0Yjk4MjFkYQ==
+    YWFhOGZjNThlNDZmMzRjNTY5ZmM0MDE5NjFmNGIxZDk2OGRiMGY5MA==
   data.tar.gz: !binary |-
-    ODg4MzU4NWY4ZjRjZGM4N2IyNWM3Nzk3NjY4NjI4ZTVjZjU1MTExOQ==
+    MzFjYTQ3NmExMGU0NDgyNjY1YWU2ZjEyMmZjYzQxZDlkM2ZlZDA1Zg==
 SHA512:
   metadata.gz: !binary |-
-    M2U5M2YyZmQ5MzJmYmE3ODZhY2M2NDRiYTYwMmNiYTc3ZmYzY2VmN2Y0N2Ix
-    NDkxMmIxNDFlOTU3NmRkZmU0ZGRlMmU5NDdjY2UyOWFlN2I1NzgwOGZjZTQw
-    MmIxNzc2M2QzN2Q3ZWNiYmIzNjBhZmUwMjBmYTk4YzljMmRlNmQ=
+    ZDkzZDk1OWZmZjkyNjRjYjVjYmMzMGRiYjVjYzNlYWIxZTVkMDYyZDQ0YzBi
+    ZDFjMjUwNzRkMGJhZmEzNzBlZWU3NWQxNzE0ZjRmZjUyMTkxYjNlNDQ4YWRi
+    ZmUxMTA5YWYyM2U0ZmVlMWFhMzM4MzZiMTJhMzE5OGU2YmNhY2I=
   data.tar.gz: !binary |-
-    ZWYzZjQ1M2ZiMTRiZDIzOTYyMzgzM2ExMDYzODg2YzVlYjM2Yzk1ZjFlMzZi
-    NTc3YjZlMGJiNzcxYWFhNWE0YjBkMTIzNmQzM2Y5OGQ2NzcwNDY1MmEwMGJh
-    ZGI0NTRiN2RlMDgzNzBiMjIwZGRjNjMyNGNiODAwMzFiNjdkOGY=
+    NTI0YTQ2NmIyZTM5MTU4NzM2YTY4MzIwMDZkMjFkOWY5ZjU4NWFmMDk4ODQx
+    MzIxOGYwZTZjNjg0OGY3ZjI4YTEwZDI5MzA4MjVlN2MwZTQxMmUwZmZjZDk1
+    ZTEyNzgxZjM5ZGY0NTRkOWY4ZTY3MjFiMjQ1YmFiNDYxZTBkODU=

data/lib/restify/adapter/celluloid.rb

@@ -16,12 +16,14 @@ module Restify
             body: request.body,
             socket_class: ::Celluloid::IO::TCPSocket
 
-        writer.fulfill Response.new \
-          request,
-          response.uri,
-          response.status.code,
-          response.headers.to_h,
-          response.body.to_s
+        uri     = response.uri
+        status  = response.status.code
+        body    = response.body.to_s
+        headers = response.headers.to_h.each_with_object({}) do |header, hash|
+          hash[header[0].upcase.tr('-', '_')] = header[1]
+        end
+
+        writer.fulfill Response.new request, uri, status, headers, body
       end
 
       def call(request)

data/lib/restify/adapter/typhoeus.rb

@@ -0,0 +1,69 @@
+require 'typhoeus'
+
+module Restify
+  #
+  module Adapter
+    #
+    class Typhoeus
+
+      def initialize
+        @queue = Queue.new
+        @hydra = ::Typhoeus::Hydra.new
+
+        Thread.new do
+          begin
+            loop do
+              while (req = convert(*@queue.pop))
+                @hydra.queue req
+
+                if @queue.size == 0
+                  @hydra.run
+                end
+              end
+            end
+          rescue Exception => e
+            puts "#{self.class}: #{e.message}"
+          end
+        end
+      end
+
+      def queue(request, writer)
+        @queue.push [request, writer]
+      end
+
+      def call(request)
+        Obligation.create do |writer|
+          queue request, writer
+        end
+      end
+
+      private
+
+      def convert(request, writer)
+        req = ::Typhoeus::Request.new \
+          request.uri,
+          method: request.method,
+          headers: request.headers,
+          body: request.body
+
+        req.on_complete do |response|
+          uri    = request.uri
+          status = response.code
+          body   = response.body
+
+          headers = response.headers.each_with_object({}) do |header, hash|
+            hash[header[0].upcase.tr('-', '_')] = header[1]
+          end
+
+          writer.fulfill Response.new request, uri, status, headers, body
+
+          while @queue.size > 0
+            @hydra.queue convert(*@queue.pop(true))
+          end
+        end
+
+        req
+      end
+    end
+  end
+end

data/lib/restify/context.rb

@@ -12,9 +12,8 @@ module Restify
     #
     attr_reader :uri
 
-    def initialize(uri, http)
+    def initialize(uri)
       @uri  = uri.is_a?(Addressable::URI) ? uri : Addressable::URI.parse(uri.to_s)
-      @http = http
     end
 
     def join(uri)
@@ -22,7 +21,7 @@ module Restify
     end
 
     def process(response)
-      context   = Context.new response.uri, @http
+      context   = Context.new response.uri
       processor = Restify::PROCESSORS.find { |p| p.accept? response }
       processor ||= Restify::Processors::Base
 
@@ -30,8 +29,9 @@ module Restify
     end
 
     def request(method, uri, data = nil, opts = {})
-      request = @http.request(method, join(uri), data, opts)
-      request.then do |response|
+      request = Request.new method: method, uri: join(uri), data: data
+
+      Restify.adapter.call(request).then do |response|
         if response.success?
           process response
         else

data/lib/restify.rb

@@ -7,7 +7,6 @@ require 'addressable/template'
 
 #
 module Restify
-  require 'restify/http'
   require 'restify/error'
 
   require 'restify/context'
@@ -27,11 +26,18 @@ module Restify
 
   class << self
     def new(uri, opts = {})
-      Context.new(uri, http).request(:GET, uri)
+      Context.new(uri).request(:GET, uri)
     end
 
-    def http
-      @http ||= HTTP.new
+    def adapter
+      @adapter ||= begin
+        require 'restify/adapter/em'
+        Restify::Adapter::EM.new
+      end
+    end
+
+    def adapter=(adapter)
+      @adapter = adapter
     end
   end
 end

data/spec/restify/processors/json_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restify::Processors::Json do
-  let(:context)  { Restify::Context.new('http://test.host/', nil) }
+  let(:context)  { Restify::Context.new('http://test.host/') }
   let(:response) { double 'response' }
 
   before do

data/spec/restify/relation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restify::Relation do
-  let(:context)  { Restify::Context.new('http://test.host/', nil) }
+  let(:context)  { Restify::Context.new('http://test.host/') }
   let(:pattern)  { '/resource/{id}' }
   let(:relation) { described_class.new context, pattern }
   subject { relation }

data/spec/spec_helper.rb

@@ -10,6 +10,20 @@ end
 
 require 'restify'
 
+case ENV['ADAPTER'].downcase
+  when 'em-http-request'
+    require 'restify/adapter/em'
+    Restify.adapter = Restify::Adapter::EM.new
+  when 'typhoeus'
+    require 'restify/adapter/typhoeus'
+    Restify.adapter = Restify::Adapter::Typhoeus.new
+  when 'celluloid'
+    require 'restify/adapter/celluloid'
+    Restify.adapter = Restify::Adapter::Celluloid.new
+  else
+    raise "Invalid adapter: #{ENV['ADAPTER']}"
+end
+
 require 'eventmachine'
 require 'rspec/collection_matchers'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.3.2.1.b62
+  version: 0.3.2.1.b63
 platform: ruby
 authors:
 - Jan Graichen
@@ -107,9 +107,9 @@ files:
 - lib/restify.rb
 - lib/restify/adapter/celluloid.rb
 - lib/restify/adapter/em.rb
+- lib/restify/adapter/typhoeus.rb
 - lib/restify/context.rb
 - lib/restify/error.rb
-- lib/restify/http.rb
 - lib/restify/link.rb
 - lib/restify/processors/base.rb
 - lib/restify/processors/json.rb

data/lib/restify/http.rb

@@ -1,33 +0,0 @@
-require 'restify/adapter/em'
-
-module Restify
-  # @api private
-  #
-  class HTTP
-    # @api private
-    #
-    def initialize
-      @adapter = self.class.adapter
-    end
-
-    # @api private
-    #
-    # Request given path with given method.
-    #
-    # Returns an obligation that will return a collection or
-    # resource or fail with a response error depending on
-    # response from server.
-    #
-    def request(method, uri, data = nil, _opts = {})
-      request = Request.new method: method, uri: uri, data: data
-
-      @adapter.call(request)
-    end
-
-    class << self
-      def adapter
-        @adapter ||= Restify::Adapter::EM.new
-      end
-    end
-  end
-end