uv-rays 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e3a19099c48894d72cc8564ebc6ba7064f0e29
-  data.tar.gz: de7efbff60dcd1a46422a7f0ac5c6987c304f878
+  metadata.gz: c507e6f1bbe2ce62f99bbf41b609e08bef817d67
+  data.tar.gz: 1bf6c856840ccfcd93e1ee1b9a83c15aaae391f0
 SHA512:
-  metadata.gz: b18f154b1a634972ac6a44d0e9bd0469449a11ffceeb1ba8576b23135b24573917cec7e2f9b585816ca5f0a3241b9041f9cf5b4075e83cb2419b5ecf67c06464
-  data.tar.gz: ad62948fc3168d392e5e22cfa74da92689811947fcc632982b3706b34b44909cb6823f3a9fe6f00e73859b4cb643c9b9e6a4dd2e9e871e4d426089759fbe3cc5
+  metadata.gz: 63fe644aff1ded42bd47669e6eab04815d8869c78c5e6a84010dfd8c1ec32cc9e2fce46ac8aacdd58219a3c782da758c7899f366e267971c209c4305734ed9f1
+  data.tar.gz: 419e10addcc8a7354f163c8d00355930bed4f894a14669723b476921eb7da030f40081f50a0f236d41331bf08bee88b3cdd3d5bcf5c7cab84bf47b100694c0bd

data/lib/handsoap/http/drivers/libuv_driver.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true, encoding: ASCII-8BIT
+
+module Handsoap
+    module Http
+        module Drivers
+            class LibuvDriver < AbstractDriver
+                def self.load!
+                    require 'uv-rays'
+                end
+
+                def send_http_request_async(request)
+                    endp = ::UV::HttpEndpoint.new(request.url)
+
+                    if request.username && request.password
+                        request.headers['Authorization'] = [request.username, request.password]
+                    end
+
+                    req = endp.request(request.http_method, {
+                        headers: request.headers,
+                        body: request.body
+                    })
+
+                    deferred = ::Handsoap::Deferred.new
+                    req.then do |resp|
+                        # Downcase headers and convert values to arrays
+                        headers = Hash[resp.map { |k, v| [k.to_s.downcase, Array(v)] }]
+                        http_response = parse_http_part(headers, resp.body, resp.status)
+                        deferred.trigger_callback http_response
+                    end
+                    req.catch do |err|
+                        deferred.trigger_errback err
+                    end
+                    deferred
+                end
+            end
+        end
+    end
+end

data/lib/httpi/adapter/libuv.rb

@@ -0,0 +1,50 @@
+require 'httpi'
+
+module HTTPI; end
+module HTTPI::Adapter; end
+class HTTPI::Adapter::Libuv < HTTPI::Adapter::Base
+    register :libuv, deps: %w(uv-rays)
+
+    def initialize(request)
+        @request = request
+        @client = ::UV::HttpEndpoint.new request.url
+    end
+
+    attr_reader :client
+
+    def request(method)
+        @client.inactivity_timeout = @request.read_timeout if @request.read_timeout && @request.read_timeout > 0
+
+        req = {
+            path: @request.url,
+            headers: @request.headers,
+            body: @request.body
+        }
+
+        auth = @request.auth
+        type = auth.type
+        if auth.type
+            creds = auth.credentials
+
+            case auth.type
+            when :basic
+                req[:headers][:Authorization] = creds
+            when :digest
+                req[:digest] = {
+                    user: creds[0],
+                    password: creds[1]
+                }
+            when :ntlm
+                req[:ntlm] = {
+                    username: creds[0],
+                    password: creds[1],
+                    domain: creds[2] || ''
+                }
+            end
+        end
+
+        # Use co-routines to make non-blocking requests
+        response = co @client.request(method, req)
+        ::HTTPI::Response.new(response.status, response, response.body)
+    end
+end

data/lib/uv-rays/http/parser.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'active_support/hash_with_indifferent_access'
+
 module UV
     module Http
-        class Headers < Hash
+        class Headers < ::ActiveSupport::HashWithIndifferentAccess
             # The HTTP version returned
             attr_accessor :http_version
 
@@ -79,27 +81,29 @@ module UV
             end
 
             def on_header_field(parser, data)
-                @header = data.to_sym
+                @header = data
             end
 
             def on_header_value(parser, data)
                 case @header
-                when :"Set-Cookie"
+                when 'Set-Cookie'
                     @request.set_cookie(data)
 
-                when :Connection
+                when 'Connection'
                     # Overwrite the default
                     @close_connection = data == 'close'
 
-                when :"Transfer-Encoding"
+                when 'Transfer-Encoding'
                     # If chunked we'll buffer streaming data for notification
                     @chunked = data == 'chunked'
 
                 end
 
+                # Duplicate headers we'll place into an array
                 current = @headers[@header]
                 if current
-                    @headers[@header] = "#{current}, #{data}"
+                    arr = @headers[@header] = Array(current)
+                    arr << data
                 else
                     @headers[@header] = data
                 end
@@ -146,7 +150,7 @@ module UV
             def eof
                 return if @request.nil?
 
-                if @headers_complete && (@headers[:'Content-Length'].nil? || @request.method == :head)
+                if @headers_complete && (@headers['Content-Length'].nil? || @request.method == :head)
                     on_message_complete(nil)
                 else
                     # Reject if this is a partial response

data/lib/uv-rays/http/request.rb

@@ -31,14 +31,21 @@ module UV
             def initialize(endpoint, options)
                 super(endpoint.thread, endpoint.thread.defer)
 
-                @path = options[:path]
-                @method = options[:method]
-
                 @host = endpoint.host
                 @port = endpoint.port
+                @encoded_host = endpoint.encoded_host
+
+                path = options[:path]
+                if path.is_a?(::URI)
+                    @path = path.to_s.split(@encoded_host)[1] || '/'
+                else
+                    @path = path
+                end
+
+                @method = options[:method]
                 @cookiejar = endpoint.cookiejar
                 @middleware = endpoint.middleware
-                @uri = "#{endpoint.scheme}://#{encode_host(@host, @port)}#{@path}"
+                @uri = "#{endpoint.scheme}://#{@encoded_host}#{@path}"
                 endpoint = nil
 
                 @options = options
@@ -179,14 +186,6 @@ module UV
             protected
 
 
-            def encode_host(host, port)
-                if port.nil? || port == 80 || port == 443
-                    host
-                else
-                    host + ":#{port}"
-                end
-            end
-
             def build_request
                 head = @options[:headers] ? munge_header_keys(@options[:headers]) : {}
 
@@ -203,7 +202,7 @@ module UV
                 end
 
                 # Set the Host header if it hasn't been specified already
-                head['host'] ||= encode_host(@host, @port)
+                head['host'] ||= @encoded_host
 
                 # Set the User-Agent if it hasn't been specified
                 if !head.key?('user-agent')

data/lib/uv-rays/http_endpoint.rb

@@ -94,9 +94,13 @@ module UV
             @tls_options = options[:tls_options] || {}
             @inactivity_timeout = options[:inactivity_timeout] || 10000
 
-            uri = URI.parse host
+            uri = host.is_a?(::URI) ? host : ::URI.parse(host)
             @port = uri.port
             @host = uri.host
+
+            default_port = uri.port == uri.default_port
+            @encoded_host = default_port ? @host : "#{@host}:#{@port}"
+
             @scheme = uri.scheme
             @tls = @scheme == 'https'
             @cookiejar = CookieJar.new
@@ -104,9 +108,9 @@ module UV
         end
 
 
-        attr_reader :inactivity_timeout, :thread
-        attr_reader :tls_options, :port, :host, :tls, :scheme
-        attr_reader :cookiejar, :middleware
+        attr_accessor :inactivity_timeout
+        attr_reader :tls_options, :port, :host, :tls, :scheme, :encoded_host
+        attr_reader :cookiejar, :middleware, :thread
 
 
         def get(options = {});     request(:get,     options); end
@@ -120,7 +124,7 @@ module UV
 
         def request(method, options = {})
             options = @options.merge(options)
-            options[:method] = method
+            options[:method] = method.to_sym
 
             # Setup the request with callbacks
             request = Http::Request.new(self, options)

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.1.3'
+    VERSION = '2.2.0'
 end

data/spec/http_endpoint_spec.rb

@@ -218,6 +218,30 @@ describe UV::HttpEndpoint do
 			expect(@response.body).to eq('y')
 		end
 
+		it "should send a request then receive a response using httpi" do
+			require 'httpi/adapter/libuv'
+			HTTPI.adapter = :libuv
+
+			@reactor.run { |reactor|
+				tcp = UV.start_server '127.0.0.1', 3250, HttpServer
+
+				begin
+					request = HTTPI::Request.new("http://127.0.0.1:3250/whatwhat")
+					@response = HTTPI.get(request)
+				rescue => e
+					@general_failure << e
+				ensure
+					tcp.close
+					@reactor.stop
+				end
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@response.headers["Content-type"]).to eq('text/html')
+			expect(@response.code).to eq(200)
+			expect(@response.raw_body).to eq('y')
+		end
+
 		it 'should be garbage collected', mri_only: true do
 			require 'weakref'
 			require 'objspace'

data/uv-rays.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency     'parse-cron', '~> 0.1'  # CRON calculations
     gem.add_runtime_dependency     'addressable', '~> 2.4' # URI parser
     gem.add_runtime_dependency     'http-parser', '~> 1.2' # HTTP tokeniser
+    gem.add_runtime_dependency     'activesupport', '>= 4', '< 6'
 
     # HTTP authentication helpers
     gem.add_runtime_dependency     'rubyntlm', '~> 0.6'
@@ -29,6 +30,7 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'rspec', '~> 3.5'
     gem.add_development_dependency 'rake', '~> 11.2'
     gem.add_development_dependency 'yard', '~> 0.9'
+    gem.add_development_dependency 'httpi', '~> 2.4.2'
 
     gem.files = Dir["{lib}/**/*"] + %w(Rakefile uv-rays.gemspec README.md LICENSE)
     gem.test_files = Dir["spec/**/*"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -122,6 +122,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: httpi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 description: Opinionated abstractions for Libuv
 email:
 - steve@cotag.me
@@ -204,6 +238,8 @@ files:
 - README.md
 - Rakefile
 - lib/faraday/adapter/libuv.rb
+- lib/handsoap/http/drivers/libuv_driver.rb
+- lib/httpi/adapter/libuv.rb
 - lib/uv-rays.rb
 - lib/uv-rays/abstract_tokenizer.rb
 - lib/uv-rays/buffered_tokenizer.rb