async-http 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35d727fb4d1811ad0ddea60170aef62f60084759c1c2d0f658e335f3496be4d
-  data.tar.gz: 58004aea432052f2979346a359ad55f2d098f9fa1d9f03e4f89bd08474ced951
+  metadata.gz: 2072bc1fb01520b26bddf0efe77da35d52ec5c7312042b3da68a0729b17c4285
+  data.tar.gz: 528be9e64f5e28e00f1ed906fa88e1d6ca479be15e9f87a891b4e534f8aaa33a
 SHA512:
-  metadata.gz: cee0898153224018a6d9a6b04b5da0635895c59aeb3f37fe5ee3fa20260529a887ee73398afa34ec98ab443a5699d0506bf40fab54123705c1f336ff7e381d72
-  data.tar.gz: fb39c47f2edb32732b16d8a8ac3cd8158f6f78212d4dae6af2201eedc24b6bdf30085a1670b4040fb23f384b51efdf9fcaa4b09994a25c86004da9672a4104e2
+  metadata.gz: f396ab427ec9c93960515d5d94c0505d1750c132d69c126572c475e45e9e8206fd36e33df1b48d31e992fc342803d8c03db79a1806468fa8e04c93505e5f90ae
+  data.tar.gz: 46f7e9c650c278f5a04349cf357cfbe57e7da0ef756ab2f695e55d20bb5e5f505722af7ce547e2a397c2a0fbac3a2cff6a8c3cc5288de913e270d435282e70d2

data/async-http.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.6")
 	spec.add_dependency("async-io", "~> 1.16")
 	
-	spec.add_dependency("http-protocol", "~> 0.5.0")
+	spec.add_dependency("http-protocol", "~> 0.6.0")
 	
 	# spec.add_dependency("openssl")
 	

data/lib/async/http/protocol/http1.rb

@@ -18,10 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'http10'
-require_relative 'http11'
-
-require_relative '../pool'
+require_relative 'http1/client'
+require_relative 'http1/server'
 
 module Async
 	module HTTP
@@ -29,26 +27,12 @@ module Async
 			# A server that supports both HTTP1.0 and HTTP1.1 semantics by detecting the version of the request.
 			module HTTP1
 				def self.client(*args)
-					HTTP11.client(*args)
+					Client.new(*args)
 				end
 				
 				def self.server(*args)
-					HTTP11.server(*args)
+					Server.new(*args)
 				end
-				# 
-				# def create_handler(version)
-				# 	if klass = HANDLERS[version]
-				# 		klass.server(@stream)
-				# 	else
-				# 		raise RuntimeError, "Unsupported protocol version #{version}"
-				# 	end
-				# end
-				# 
-				# def receive_requests(&block)
-				# 	method, path, version = self.peek_line.split(/\s+/, 3)
-				# 
-				# 	create_handler(version).receive_requests(&block)
-				# end
 			end
 		end
 	end

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

@@ -18,14 +18,13 @@
 # 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 'connection'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP1
-				module Client
+				class Client < Connection
 					# Used by the client to send requests to the remote server.
 					def call(request)
 						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}

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

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'http/protocol/http1/connection'
+
 require_relative 'request'
 require_relative 'response'
 
@@ -28,7 +30,7 @@ module Async
 	module HTTP
 		module Protocol
 			module HTTP1
-				module Connection
+				class Connection < ::HTTP::Protocol::HTTP1::Connection
 					CRLF = "\r\n"
 					
 					attr :stream

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

@@ -18,21 +18,20 @@
 # 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 'connection'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP1
-				module Server
+				class Server < Connection
 					def next_request
 						# The default is true.
 						return nil unless @persistent
 						
 						request = Request.new(self)
 						
-						unless persistent?(request.headers)
+						unless persistent?(request.version, request.headers)
 							@persistent = false
 						end
 						

data/lib/async/http/protocol/http10.rb

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'http10/client'
-require_relative 'http10/server'
+require_relative 'http1'
 
 module Async
 	module HTTP
@@ -28,11 +27,11 @@ module Async
 				VERSION = "HTTP/1.0"
 				
 				def self.client(stream)
-					Client.new(stream)
+					HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(stream)
-					Server.new(stream)
+					HTTP1::Server.new(stream, VERSION)
 				end
 			end
 		end

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

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'http11/client'
-require_relative 'http11/server'
+require_relative 'http1'
 
 module Async
 	module HTTP
@@ -28,11 +27,11 @@ module Async
 				VERSION = "HTTP/1.1"
 				
 				def self.client(stream)
-					Client.new(stream)
+					HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(stream)
-					Server.new(stream)
+					HTTP1::Server.new(stream, VERSION)
 				end
 			end
 		end

data/lib/async/http/protocol/https.rb

@@ -18,7 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'http1'
+require_relative 'http10'
+require_relative 'http11'
+
 require_relative 'http2'
 
 require_relative '../pool'

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.32.0"
+		VERSION = "0.33.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,11 +165,7 @@ files:
 - 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

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

@@ -1,36 +0,0 @@
-# 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/http10/connection'
-
-require_relative '../http1/connection'
-require_relative '../http1/client'
-
-module Async
-	module HTTP
-		module Protocol
-			module HTTP10
-				class Client < ::HTTP::Protocol::HTTP10::Connection
-					include HTTP1::Connection, HTTP1::Client
-				end
-			end
-		end
-	end
-end

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

@@ -1,36 +0,0 @@
-# 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/http10/connection'
-
-require_relative '../http1/connection'
-require_relative '../http1/server'
-
-module Async
-	module HTTP
-		module Protocol
-			module HTTP10
-				class Server < ::HTTP::Protocol::HTTP10::Connection
-					include HTTP1::Connection, HTTP1::Server
-				end
-			end
-		end
-	end
-end

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

@@ -1,36 +0,0 @@
-# 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

@@ -1,36 +0,0 @@
-# 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