protocol-http 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a49c7a92140dc05ce537c23ddb54a8e5b9c9c610d560459b92fb1d5f69aaef4
-  data.tar.gz: 249972b584e5c4bd0e13d54e88acbbb65a2b361d92dcd06427ed127ec192f2e8
+  metadata.gz: 5af6588e75cd95086183ad1e1d27a4c70d2a59d284b7640cbe3d22b7630c3318
+  data.tar.gz: a03a42a4d0bda22e902a66720d884a53351a298e8637744463e653415ca7e0b5
 SHA512:
-  metadata.gz: 62e4a29eba1014db803d8fbdb944551050540515aa35a9635f3fcbf6bbe40b935c44e6f516c0ef85275d1084f504639060a5c7ca3ac3753fb59a57d733dba027
-  data.tar.gz: 0da73f93d930607d4468327c581ff7bedcc60699603334aed92354fe46b5dee48dd9a20c08973c2de3fde127bcfe2a13efe4f11a89f01a404c42c91f556b2ce8
+  metadata.gz: c8c7ecb9521a14e3f17e471fb3a805bb4b6b58ef29fcddce709e633ab2dd5a2ac3cc1c0673ac45947766ec888caae7c604dc510c920a187b23fe0a66d88d063c
+  data.tar.gz: ee2cd54ee6b2f2a864ad193706c1f46ba116b755da6b31d118224b6c2ada54df331803e9bc36089667a3f105bce14810bb44ae6d2ce1246b5857163ee988f56a

data/lib/protocol/http/body/buffered.rb

@@ -22,6 +22,8 @@
 
 require_relative 'readable'
 
+require 'digest/sha2'
+
 module Protocol
 	module HTTP
 		module Body
@@ -30,9 +32,9 @@ module Protocol
 				# Wraps an array into a buffered body.
 				# @return [Readable, nil] the wrapped body or nil if nil was given.
 				def self.wrap(body)
-					if body.is_a? Readable
+					if body.is_a?(Readable)
 						return body
-					elsif body.is_a? Array
+					elsif body.is_a?(Array)
 						return self.new(body)
 					elsif body.is_a?(String)
 						return self.new([body])
@@ -56,6 +58,11 @@ module Protocol
 					@length = length
 					
 					@index = 0
+					@digest = nil
+				end
+				
+				def digest
+					@digest ||= compute_digest
 				end
 				
 				def finish
@@ -79,6 +86,7 @@ module Protocol
 				end
 				
 				def write(chunk)
+					@digest = nil
 					@chunks << chunk
 				end
 				
@@ -89,6 +97,14 @@ module Protocol
 				def inspect
 					"\#<#{self.class} #{@chunks.size} chunks, #{self.length} bytes>"
 				end
+				
+				private
+				
+				def compute_digest
+					algorithm = Digest::SHA256.new
+					@chunks.each{|chunk| algorithm.update(chunk)}
+					return algorithm.hexdigest
+				end
 			end
 		end
 	end

data/lib/protocol/http/body/head.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Copyright, 2018, 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_relative 'readable'
+
+module Protocol
+	module HTTP
+		module Body
+			class Head < Readable
+				def self.for(body)
+					head = self.new(body.length)
+					
+					body.close
+					
+					return head
+				end
+				
+				def initialize(length)
+					@length = length
+				end
+				
+				def empty?
+					true
+				end
+				
+				def length
+					@length
+				end
+			end
+		end
+	end
+end

data/lib/protocol/http/body/readable.rb

@@ -63,7 +63,6 @@ module Protocol
 				def each
 					while chunk = self.read
 						yield chunk
-						# chunk.clear
 					end
 				ensure
 					self.close($!)
@@ -78,7 +77,11 @@ module Protocol
 						chunk.clear
 					end
 					
-					return buffer
+					if buffer.empty?
+						return nil
+					else
+						return buffer
+					end
 				end
 			end
 		end

data/lib/protocol/http/body/streamable.rb

@@ -28,22 +28,17 @@ module Protocol
 			# Invokes a callback once the body has finished reading.
 			class Streamable < Wrapper
 				def self.wrap(message, &block)
-					if body = message&.body
-						if remaining = body.length
-							remaining = Integer(remaining)
-						end
-						
-						message.body = self.new(message.body, block, remaining)
+					if body = message&.body and !body.empty?
+						message.body = self.new(message.body, block)
 					else
 						yield
 					end
 				end
 				
-				def initialize(body, callback, remaining = nil)
+				def initialize(body, callback)
 					super(body)
 					
 					@callback = callback
-					@remaining = remaining
 				end
 				
 				def finish
@@ -67,18 +62,6 @@ module Protocol
 						@body = nil
 					end
 				end
-				
-				def read
-					if chunk = super
-						@remaining -= chunk.bytesize if @remaining
-					else
-						if @remaining and @remaining > 0
-							raise EOFError, "Expected #{@remaining} more bytes!"
-						end
-					end
-					
-					return chunk
-				end
 			end
 		end
 	end

data/lib/protocol/http/request.rb

@@ -28,11 +28,11 @@ module Protocol
 		class Request
 			prepend Body::Reader
 			
-			def initialize(scheme = nil, authority = nil, method = nil, path = nil, version = nil, headers = [], body = nil, protocol = nil)
+			def initialize(scheme = nil, authority = nil, method = nil, target = nil, version = nil, headers = [], body = nil, protocol = nil)
 				@scheme = scheme
 				@authority = authority
 				@method = method
-				@path = path
+				@target = target
 				@version = version
 				@headers = headers
 				@body = body
@@ -42,7 +42,7 @@ module Protocol
 			attr_accessor :scheme
 			attr_accessor :authority
 			attr_accessor :method
-			attr_accessor :path
+			attr_accessor :target
 			attr_accessor :version
 			attr_accessor :headers
 			attr_accessor :body
@@ -53,6 +53,14 @@ module Protocol
 				connection.call(self)
 			end
 			
+			def path
+				@target
+			end
+			
+			def path= value
+				@target = value
+			end
+			
 			def head?
 				@method == Methods::HEAD
 			end
@@ -72,7 +80,7 @@ module Protocol
 			end
 			
 			def to_s
-				"#{@scheme}://#{@authority}: #{@method} #{@path} #{@version}"
+				"#{@scheme}://#{@authority}: #{@method} #{@target} #{@version}"
 			end
 		end
 	end

data/lib/protocol/http/url.rb

@@ -100,6 +100,7 @@ module Protocol
 				parent[top] = value
 			end
 			
+			# TODO use native C extension from `Trenni::Reference`.
 			def self.decode(string, maximum = 8, symbolize_keys: false)
 				parameters = {}
 				

data/lib/protocol/http/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.14.4"
+		VERSION = "0.15.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered
@@ -85,6 +85,7 @@ files:
 - lib/protocol/http/body/buffered.rb
 - lib/protocol/http/body/deflate.rb
 - lib/protocol/http/body/file.rb
+- lib/protocol/http/body/head.rb
 - lib/protocol/http/body/inflate.rb
 - lib/protocol/http/body/readable.rb
 - lib/protocol/http/body/reader.rb