async-http 0.30.4 → 0.31.1

data/lib/async/http/protocol/http11/client.rb

@@ -0,0 +1,36 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'http/protocol/http11/connection'
+
+require_relative '../http1/connection'
+require_relative '../http1/client'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP11
+				class Client < ::HTTP::Protocol::HTTP11::Connection
+					include HTTP1::Connection, HTTP1::Client
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http11/server.rb

@@ -0,0 +1,36 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'http/protocol/http11/connection'
+
+require_relative '../http1/connection'
+require_relative '../http1/server'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP11
+				class Server < ::HTTP::Protocol::HTTP11::Connection
+					include HTTP1::Connection, HTTP1::Server
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http2/client.rb

@@ -34,6 +34,7 @@ module Async
 						@stream = stream
 						
 						framer = ::HTTP::Protocol::HTTP2::Framer.new(@stream)
+						
 						super(framer, *args)
 					end
 					

data/lib/async/http/protocol/http2/connection.rb

@@ -79,7 +79,7 @@ module Async
 					end
 					
 					# Can we use this connection to make requests?
-					def good?
+					def connected?
 						@stream.connected?
 					end
 					

data/lib/async/http/protocol/http2/request.rb

@@ -91,7 +91,7 @@ module Async
 							])
 							
 							if length = response.body.length
-								headers << [[CONTENT_LENGTH, length]]
+								headers << [[::HTTP::Protocol::CONTENT_LENGTH, length]]
 							end
 							
 							headers << response.headers

data/lib/async/http/protocol/http2/server.rb

@@ -34,6 +34,7 @@ module Async
 						@stream = stream
 						
 						framer = ::HTTP::Protocol::HTTP2::Framer.new(stream)
+						
 						super(framer, *args)
 						
 						@requests = Async::Queue.new
@@ -53,7 +54,7 @@ module Async
 						@requests.enqueue nil
 					end
 					
-					def receive_requests
+					def each
 						while request = @requests.dequeue
 							@count += 1
 							

data/lib/async/http/reference.rb

@@ -1,4 +1,4 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,171 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'http/protocol/reference'
+
 module Async
 	module HTTP
-		# A relative reference, excluding any authority.
-		class Reference
-			def initialize(path, query_string, fragment, parameters)
-				@path = path
-				@query_string = query_string
-				@fragment = fragment
-				@parameters = parameters
-			end
-			
-			def self.[] reference
-				if reference.is_a? self
-					return reference
-				else
-					return self.parse(reference)
-				end
-			end
-			
-			# Generate a reference from a path and user parameters. The path may contain a `#fragment` or `?query=parameters`.
-			def self.parse(path = '/', parameters = nil)
-				base, fragment = path.split('#', 2)
-				path, query_string = base.split('?', 2)
-				
-				self.new(path, query_string, fragment, parameters)
-			end
-			
-			# The path component, e.g. /foo/bar/index.html
-			attr :path
-			
-			# The un-parsed query string, e.g. 'x=10&y=20'
-			attr :query_string
-			
-			# A fragment, the part after the '#'
-			attr :fragment
-			
-			# User supplied parameters that will be appended to the query part.
-			attr :parameters
-			
-			def parameters?
-				@parameters and !@parameters.empty?
-			end
-			
-			def query_string?
-				@query_string and !@query_string.empty?
-			end
-			
-			def fragment?
-				@fragment and !@fragment.empty?
-			end
-			
-			def append(buffer)
-				if query_string?
-					buffer << escape_path(@path) << '?' << @query_string
-					buffer << '&' << encode(@parameters) if parameters?
-				else
-					buffer << escape_path(@path)
-					buffer << '?' << encode(@parameters) if parameters?
-				end
-				
-				if fragment?
-					buffer << '#' << escape(@fragment)
-				end
-				
-				return buffer
-			end
-			
-			def to_str
-				append(String.new)
-			end
-			
-			alias to_s to_str
-			
-			def + other
-				other = self.class[other]
-				
-				self.class.new(
-					expand_path(self.path, other.path),
-					other.query_string,
-					other.fragment,
-					other.parameters,
-				)
-			end
-			
-			def [] parameters
-				self.dup(nil, parameters)
-			end
-			
-			def dup(path = nil, parameters = nil)
-				if @parameters
-					if parameters
-						parameters = @parameters.merge(parameters)
-					else
-						parameters = @parameters
-					end
-				end
-				
-				if path
-					path = @path + '/' + path
-				else
-					path = @path
-				end
-				
-				self.class.new(path, @query_string, @fragment, parameters)
-			end
-			
-			private
-			
-			def expand_path(base, relative)
-				if relative.start_with? '/'
-					return relative
-				else
-					path = base.split('/')
-					parts = relative.split('/')
-					
-					parts.each do |part|
-						if part == '..'
-							path.pop
-						else
-							path << part
-						end
-					end
-					
-					return path.join('/')
-				end
-			end
-			
-			# Escapes a generic string, using percent encoding.
-			def escape(string)
-				encoding = string.encoding
-				string.b.gsub(/([^a-zA-Z0-9_.\-]+)/) do |m|
-					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-				end.force_encoding(encoding)
-			end
-			
-			# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
-			NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
-			
-			# Escapes a path
-			def escape_path(path)
-				encoding = path.encoding
-				path.b.gsub(NON_PCHAR) do |m|
-					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-				end.force_encoding(encoding)
-			end
-			
-			# Encodes a hash or array into a query string
-			def encode(value, prefix = nil)
-				case value
-				when Array
-					return value.map {|v|
-						encode(v, "#{prefix}[]")
-					}.join("&")
-				when Hash
-					return value.map {|k, v|
-						encode(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
-					}.reject(&:empty?).join('&')
-				when nil
-					return prefix
-				else
-					raise ArgumentError, "value must be a Hash" if prefix.nil?
-					
-					return "#{prefix}=#{escape(value.to_s)}"
-				end
-			end
-		end
+		Reference = ::HTTP::Protocol::Reference
 	end
 end

data/lib/async/http/server.rb

@@ -23,7 +23,6 @@ require 'async/io/endpoint'
 require_relative 'protocol'
 require_relative 'response'
 
-
 module Async
 	module HTTP
 		class Server < Middleware
@@ -46,7 +45,7 @@ module Async
 				
 				Async.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{protocol}"}
 				
-				protocol.receive_requests do |request|
+				protocol.each do |request|
 					request.remote_address = address
 					# Async.logger.debug(self) {"Incoming request from #{address.inspect}: #{request.method} #{request.path}"}
 					

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.30.4"
+		VERSION = "0.31.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.30.4
+  version: 0.31.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: http-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +159,17 @@ files:
 - lib/async/http/pool.rb
 - lib/async/http/protocol.rb
 - lib/async/http/protocol/http1.rb
+- lib/async/http/protocol/http1/client.rb
+- lib/async/http/protocol/http1/connection.rb
+- lib/async/http/protocol/http1/request.rb
+- lib/async/http/protocol/http1/response.rb
+- lib/async/http/protocol/http1/server.rb
 - lib/async/http/protocol/http10.rb
+- lib/async/http/protocol/http10/client.rb
+- lib/async/http/protocol/http10/server.rb
 - lib/async/http/protocol/http11.rb
+- lib/async/http/protocol/http11/client.rb
+- lib/async/http/protocol/http11/server.rb
 - lib/async/http/protocol/http2.rb
 - lib/async/http/protocol/http2/client.rb
 - lib/async/http/protocol/http2/connection.rb
@@ -198,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A HTTP client and server library.