restify 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6cb4e54249171cc430b42e94584d53a8d855dc27
-  data.tar.gz: 021d1ef66172c7a992f7f447ffbe0ac2770421d9
+SHA256:
+  metadata.gz: 83609cc7ae78151c15357d2400a61212e9c1a783a56d9eb2f8bb02b6e678192c
+  data.tar.gz: 8f95a040bf308a60be58985567fca717dff5979c418d19ad0d41d4ae62c24346
 SHA512:
-  metadata.gz: d32a9c6b8978674f26a021f5e29618fe3c75012144697431f79033db6f4a503c0d7de39803dedb20c691c0d3feaa0965a9382de598cf9741d7c9bcb33e63292e
-  data.tar.gz: 8b699331f7a597f3b99ead0a5fe9da59bdec2648244a802798c952cdac430d729a1297e91807657723ed43fd35a04c3b52d95ec8abf93a1364fd2a2f99140af8
+  metadata.gz: 0771f95f1e405ac45c00585db79575bb927e9a860dd26459401b21f0d53947ec04ccb60d4180ef44eb79a4abc05f7707b29e667cbe9af967fd6829a5a0287069
+  data.tar.gz: fbda92689823e54622f27dbf17f98d12048a721780ccbabb51528d893a8dfc73359807b3d3fdb58a7ec1d43561eb95df0d524334566e2672106df90882981861

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.0
+
+* Improve typhoeus adapter to better utilize concurrency
+* Default to new typhoeus adapter
+
 ## 1.2.1
 
 * Fix issue with Ruby 2.2 compatibility

data/README.md

@@ -1,6 +1,6 @@
 # Restify
 
-Restify is an experimental hypermedia REST client that uses parallel, keep-alive and pipelined requests by default.
+Restify is an experimental hypermedia REST client that does parallel, concurrent, keep-alive and pipelined requests by default.
 
 Restify scans Link headers and returned resource for links and relations to other resources, represented as RFC6570 URI Templates, and exposes those to the developer.
 
@@ -10,11 +10,11 @@ Restify is build upon the following libraries:
 
 * [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby)
 * [addressable](https://github.com/sporkmonger/addressable)
-* [em-http-request](https://github.com/igrigorik/em-http-request)
+* [typhoeus](https://github.com/typhoeus/typhoeus)
 
 It has optional HTTP adapters using:
 
-* [typhoeus](https://github.com/typhoeus/typhoeus)
+* [em-http-request](https://github.com/igrigorik/em-http-request)
 
 The HTTP adapters are mostly run in a background thread and may not survive mid-application forks.
 

data/lib/restify/adapter/typhoeus.rb

@@ -13,9 +13,9 @@ module Restify
       }.freeze
 
       def initialize(sync: false, **options)
-        @queue   = Queue.new
         @sync    = sync
         @hydra   = ::Typhoeus::Hydra.new(pipelining: true, **options)
+        @mutex   = Mutex.new
 
         start unless sync?
       end
@@ -24,17 +24,18 @@ module Restify
         @sync
       end
 
-      def queue(request, writer)
-        if sync?
-          @hydra.queue convert request, writer
-          @hydra.run
-        else
-          @queue.push [request, writer]
+      def call_native(request, writer)
+        @mutex.synchronize do
+          @hydra.queue convert(request, writer)
         end
+
+        sync? ? @hydra.run : start
       end
 
-      def call_native(request, writer)
-        queue request, writer
+      def queued?
+        @mutex.synchronize do
+          @hydra.queued_requests.any?
+        end
       end
 
       private
@@ -46,14 +47,11 @@ module Restify
           headers: DEFAULT_HEADERS.merge(request.headers),
           body: request.body
 
-        req.on_complete {|response| handle(response, writer, request) }
-        req
-      end
-
-      def handle(native_response, writer, request)
-        writer.fulfill convert_back(native_response, request)
+        req.on_complete do |response|
+          writer.fulfill convert_back(response, request)
+        end
 
-        @hydra.queue convert(*@queue.pop(true)) until @queue.empty?
+        req
       end
 
       def convert_back(response, request)
@@ -71,15 +69,16 @@ module Restify
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def start
-        Thread.new do
+        thread.run
+      end
+
+      def thread
+        @thread ||= Thread.new do
           loop do
             begin
-              while (req = convert(*@queue.pop))
-                @hydra.queue req
-                @hydra.run if @queue.empty?
-              end
+              Thread.stop unless queued?
+              @hydra.run
             rescue StandardError => e
               puts "#{self.class}: #{e.message}"
             end

data/lib/restify/global.rb

@@ -10,8 +10,8 @@ module Restify
 
     def adapter
       @adapter ||= begin
-        require 'restify/adapter/em'
-        Restify::Adapter::EM.new
+        require 'restify/adapter/typhoeus'
+        Restify::Adapter::Typhoeus.new
       end
     end
 

data/lib/restify/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -39,75 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: An experimental hypermedia REST client.