async-http 0.38.3 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b1760cfed4e9eb6e79b2fe7bf4ebb571e2a085557cefaa5b7b1a18ee7b3c2eb
-  data.tar.gz: af402e9434a84120935f2da52eae5ab5911ae92b3bf69bbf475bfe141b83c222
+  metadata.gz: 9d2ae06b181bb3fc7bca37de3c13361d9cf06c033f5ca0a4221cd1afb32108f7
+  data.tar.gz: 2e91385f85f2a2710ea7fa4490b04f01272f7cf525b24581cfe774683eb625a5
 SHA512:
-  metadata.gz: d5bca4bba8aa73d6ea2fe8f0b4af8eeab5345a2c6d713aa228f7ba2c4dda16dfa485de1d59244f46721afda15762b332f20bdca70334c8515329fb3099cd1c87
-  data.tar.gz: 4487836d1943c6429df3fcc7b8158923eaf19f16520dfdcac7c122a792ad9ff45534b1796e31eef22c9056322b7af4dafb68d8f3db8402d39eda8d216656cb10
+  metadata.gz: 0ed6969ab041fd96096c6e445d1fba0774d7de57546c98d1b241a27f46328fae44eb331bff08febb0175457c62f46447070f9eb25afe4c1de84d9786bff99379
+  data.tar.gz: 80b2ad6e10754ed1eb99d244f838f45fa9f8478273ce740ea922ed1abd4a0180d324fe9c4a968f152bbded8ff6f8483ab0fe8e13d4ddeab5f961070a077f3217

data/.travis.yml

@@ -14,7 +14,6 @@ addons:
 
 matrix:
   include:
-    - rvm: 2.3
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6

data/async-http.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.14")
 	spec.add_dependency("async-io", "~> 1.18")
 	
-	spec.add_dependency("http-protocol", "~> 0.17")
+	spec.add_dependency("protocol-http", "~> 0.1.0")
+	spec.add_dependency("protocol-http1", "~> 0.1.0")
+	spec.add_dependency("protocol-http2", "~> 0.1.0")
 	
 	# spec.add_dependency("openssl")
 	

data/lib/async/http/headers.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'http/protocol/headers'
+require 'protocol/http/headers'
 
 module Async
 	module HTTP
-		Headers = ::HTTP::Protocol::Headers
+		Headers = ::Protocol::HTTP::Headers
 	end
 end

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

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'http/protocol/http1/connection'
+require 'protocol/http1'
 
 require_relative 'request'
 require_relative 'response'
@@ -30,7 +30,7 @@ module Async
 	module HTTP
 		module Protocol
 			module HTTP1
-				class Connection < ::HTTP::Protocol::HTTP1::Connection
+				class Connection < ::Protocol::HTTP1::Connection
 					def initialize(stream, version)
 						super(stream)
 						

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

@@ -26,18 +26,18 @@ module Async
 		module Protocol
 			module HTTP2
 				CLIENT_SETTINGS = {
-					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
-					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 256,
-					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
-					::HTTP::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
+					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 256,
+					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
+					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
 				}
 				
 				SERVER_SETTINGS = {
-					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
+					::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
 					# We choose a lower maximum concurrent streams to avoid overloading a single connection/thread.
-					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
-					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
-					::HTTP::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
+					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
+					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
 				}
 				
 				def self.client(stream, settings = CLIENT_SETTINGS)
@@ -60,7 +60,7 @@ module Async
 				
 				module WithPush
 					CLIENT_SETTINGS = HTTP2::CLIENT_SETTINGS.merge(
-						::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
+						::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
 					)
 					
 					def self.client(stream, settings = CLIENT_SETTINGS)

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

@@ -21,19 +21,19 @@
 require_relative 'connection'
 require_relative 'response'
 
-require 'http/protocol/http2/client'
+require 'protocol/http2/client'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				class Client < ::HTTP::Protocol::HTTP2::Client
+				class Client < ::Protocol::HTTP2::Client
 					include Connection
 					
 					def initialize(stream)
 						@stream = stream
 						
-						framer = ::HTTP::Protocol::HTTP2::Framer.new(@stream)
+						framer = ::Protocol::HTTP2::Framer.new(@stream)
 						
 						super(framer)
 					end

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

@@ -128,7 +128,7 @@ module Async
 					
 					def send_response(response)
 						if response.nil?
-							@stream.send_headers(nil, NO_RESPONSE, ::HTTP::Protocol::HTTP2::END_STREAM)
+							@stream.send_headers(nil, NO_RESPONSE, ::Protocol::HTTP2::END_STREAM)
 						elsif response.body?
 							pseudo_headers = [
 								[STATUS, response.status],
@@ -150,7 +150,7 @@ module Async
 								[STATUS, response.status],
 							], response.headers)
 							
-							@stream.send_headers(nil, headers, ::HTTP::Protocol::HTTP2::END_STREAM)
+							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
 						end
 					end
 				end

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

@@ -148,7 +148,7 @@ module Async
 						)
 						
 						if request.body.nil?
-							@stream.send_headers(nil, headers, ::HTTP::Protocol::HTTP2::END_STREAM)
+							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
 						else
 							begin
 								@stream.send_headers(nil, headers)

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

@@ -22,19 +22,19 @@ require_relative 'connection'
 require_relative 'request'
 require_relative 'promise'
 
-require 'http/protocol/http2/server'
+require 'protocol/http2/server'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				class Server < ::HTTP::Protocol::HTTP2::Server
+				class Server < ::Protocol::HTTP2::Server
 					include Connection
 					
 					def initialize(stream)
 						@stream = stream
 						
-						framer = ::HTTP::Protocol::HTTP2::Framer.new(stream)
+						framer = ::Protocol::HTTP2::Framer.new(stream)
 						
 						super(framer)
 						
@@ -63,7 +63,7 @@ module Async
 							response = begin
 								response = yield(request)
 							rescue
-								request.stream.send_reset_stream(::HTTP::Protocol::HTTP2::INTERNAL_ERROR)
+								request.stream.send_reset_stream(::Protocol::HTTP2::INTERNAL_ERROR)
 								
 								Async.logger.error(request) {$!}
 							else

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

@@ -18,13 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'http/protocol/http2/stream'
+require 'protocol/http2/stream'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				class Stream < ::HTTP::Protocol::HTTP2::Stream
+				class Stream < ::Protocol::HTTP2::Stream
 					def initialize(delegate, *args)
 						super(*args)
 						
@@ -80,7 +80,7 @@ module Async
 							
 							# @body.read above might take a while and a stream reset might be received in the mean time.
 							unless closed?
-								send_data(nil, ::HTTP::Protocol::HTTP2::END_STREAM)
+								send_data(nil, ::Protocol::HTTP2::END_STREAM)
 							end
 							
 							return false

data/lib/async/http/reference.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'http/protocol/reference'
+require 'protocol/http/reference'
 
 module Async
 	module HTTP
-		Reference = ::HTTP::Protocol::Reference
+		Reference = ::Protocol::HTTP::Reference
 	end
 end

data/lib/async/http/statistics.rb

@@ -87,7 +87,7 @@ module Async
 					@first_chunk_time ||= Clock.now
 					
 					if chunk
-						@sent += chunk.length
+						@sent += chunk.bytesize
 					end
 					
 					return chunk

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.38.3"
+		VERSION = "0.39.0"
 	end
 end

data/tasks/server.rake

@@ -22,17 +22,17 @@ task :google do
 		peer = endpoint.connect
 		stream = Async::IO::Stream.new(peer)
 		
-		framer = ::HTTP::Protocol::HTTP2::Framer.new(stream)
-		client = ::HTTP::Protocol::HTTP2::Client.new(framer)
+		framer = ::Protocol::HTTP2::Framer.new(stream)
+		client = ::Protocol::HTTP2::Client.new(framer)
 		
 		client.send_connection_preface
 		
-		stream = ::HTTP::Protocol::HTTP2::Stream.new(client)
+		stream = ::Protocol::HTTP2::Stream.new(client)
 		
 		client.read_frame
 		client.read_frame
 		
-		stream.send_headers(nil, [[':method', 'GET'], [':authority', 'www.google.com'], [':path', '/']], ::HTTP::Protocol::HTTP2::END_STREAM)
+		stream.send_headers(nil, [[':method', 'GET'], [':authority', 'www.google.com'], [':path', '/']], ::Protocol::HTTP2::END_STREAM)
 		
 		binding.pry
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.38.3
+  version: 0.39.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -39,19 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
-  name: http-protocol
+  name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: protocol-http1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: protocol-http2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A HTTP client and server library.