restify 1.0.0 → 1.0.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5b0ad969a7b5ab4889aa69bd9c5d0dde4a7e5f
-  data.tar.gz: 57fb5334cfbdba973c5df3569450c18413b3884b
+  metadata.gz: 3b00cff50046f420707ed6d6e8851d74e1392f5f
+  data.tar.gz: fa5553ba030b9ec8bcd2457d4c24a866ad1db293
 SHA512:
-  metadata.gz: 6a8cb08d62f1b91d7087e1e1ae75c0afd4278280c1334e072db3673d8388c341f957362019d81d92aa6832bcd9d04ae6c59ed5f578ef09edea486d497dfc9176
-  data.tar.gz: 78668d83c4b4d6867ab6e25663de52ab5804da8380019bd3bf39f4bacb5f667499c20a421ca0049ef323395da7605b99ee7d2eadb07b1fbb25f2124a1fa27e21
+  metadata.gz: 76ad0f4229b26ba714763793a086ba2cffb62642fa1ebb329037e1b542a5802ace3f29acc1220100488f7010b2eae5963a729d812475d17fa7834e43079a1004
+  data.tar.gz: 32908687b5e5b3234ccc5985cf1184a179d60f5589383482a4dff87abf168f7dbbefe101b4f7a4fcbe0d5ccb10b0b2d5e2c9a46dbae11dfd9cf54ddedb94baae

data/lib/restify/adapter/typhoeus.rb

@@ -3,30 +3,23 @@ require 'typhoeus'
 module Restify
   module Adapter
     class Typhoeus < Base
-      def initialize(**options)
-        @queue   = Queue.new
-        @hydra   = ::Typhoeus::Hydra.new
-        @options = options
+      attr_reader :sync
 
-        Thread.new do
-          begin
-            loop do
-              while (req = convert(*@queue.pop))
-                @hydra.queue req
+      DEFAULT_HEADERS = {
+        'Expect' => '',
+        'Transfer-Encoding' => ''
+      }.freeze
 
-                if @queue.size == 0
-                  @hydra.run
-                end
-              end
-            end
-          rescue Exception => e
-            puts "#{self.class}: #{e.message}"
-          end
-        end
+      def initialize(sync: false, **options)
+        @queue   = Queue.new
+        @sync    = sync
+        @hydra   = ::Typhoeus::Hydra.new(pipelining: true, **options)
+
+        start unless sync?
       end
 
       def sync?
-        @options.fetch :sync, false
+        @sync
       end
 
       def queue(request, writer)
@@ -48,26 +41,47 @@ module Restify
         req = ::Typhoeus::Request.new \
           request.uri,
           method: request.method,
-          headers: request.headers,
+          headers: DEFAULT_HEADERS.merge(request.headers),
           body: request.body
 
-        req.on_complete do |response|
-          uri    = request.uri
-          status = response.code
-          body   = response.body
+        req.on_complete {|response| handle(response, writer, request) }
+        req
+      end
 
-          headers = response.headers.each_with_object({}) do |header, hash|
-            hash[header[0].upcase.tr('-', '_')] = header[1]
-          end
+      def handle(native_response, writer, request)
+        writer.fulfill convert_back(native_response, request)
 
-          writer.fulfill Response.new request, uri, status, headers, body
+        @hydra.queue convert(*@queue.pop(true)) while !@queue.empty?
+      end
 
-          while @queue.size > 0
-            @hydra.queue convert(*@queue.pop(true))
-          end
+      def convert_back(response, request)
+        uri     = request.uri
+        status  = response.code
+        body    = response.body
+        headers = convert_headers(response.headers)
+
+        ::Restify::Response.new(request, uri, status, headers, body)
+      end
+
+      def convert_headers(headers)
+        headers.each_with_object({}) do |header, memo|
+          memo[header[0].upcase.tr('-', '_')] = header[1]
         end
+      end
 
-        req
+      def start
+        Thread.new do
+          loop do
+            begin
+              while (req = convert(*@queue.pop))
+                @hydra.queue req
+                @hydra.run if @queue.empty?
+              end
+            rescue StandardError => e
+              puts "#{self.class}: #{e.message}"
+            end
+          end
+        end
       end
     end
   end

data/lib/restify/resource.rb

@@ -1,26 +1,19 @@
 require 'delegate'
-require 'forwardable'
 
 module Restify
   #
-  class Resource < Delegator
-    extend Forwardable
+  class Resource < SimpleDelegator
 
     # @api private
     #
     def initialize(context, response: nil, data: nil, relations: {})
-      @data      = data
+      super(data)
+
       @context   = context
       @response  = response
       @relations = relations
     end
 
-    # @api private
-    #
-    def __getobj__
-      @data
-    end
-
     # Check if resource has a relation with given name.
     #
     # @param name [String, Symbol] Relation name.
@@ -55,7 +48,7 @@ module Restify
     #
     #   @return [Object] Response data.
     #
-    attr_reader :data
+    alias data __getobj__
 
     # @!method response
     #
@@ -104,7 +97,7 @@ module Restify
     # @api private
     def inspect
       text = {
-        "@data" => @data,
+        "@data" => data,
         "@relations" => @relations
       }.map {|k,v | k + '=' + v.inspect }.join(' ')
 

data/lib/restify/version.rb

@@ -2,8 +2,8 @@ module Restify
   module VERSION
     MAJOR = 1
     MINOR = 0
-    PATCH = 0
-    STAGE = nil
+    PATCH = 1
+    STAGE = :beta1
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 
     def self.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.beta1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -176,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1