http-protocol 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba0f4a74cb833ca6a7c69171365f88c20bbec3259f772113584925184eaa94d
-  data.tar.gz: 26a7e84575e89fb6df648385919c78d83b97eebdc62964f2236760d9014bdcab
+  metadata.gz: 6a0181ccc138681d1fa437bf49e9760a45d841245baffd0da21e604a8eaab309
+  data.tar.gz: 64cd9dfba7a97c8b0f22a6e5492a4757d331349bc26fc53f5590442ed393576e
 SHA512:
-  metadata.gz: d0e337d55ea940907d52cd94767b2a6a0016a19512b35cbdf8632e96f82ef510d06de7d63e2bafea741d6c37fd0f55966ffcdf3865b1829b107891533b237b4c
-  data.tar.gz: 7c9c8dd1cd2684a8036260cbd847d60e1540450467cc871460a6baa63a9f460906d0c3bf3f0e6494ba6e4db5c0e11273bd0b6fbb356eed4128ee3c9181214846
+  metadata.gz: '02369ca5d469cbc24140bafbd5c1bbd6a0949364139c9c78794ee8e7aa36c55d36937c4f7ea5d60978eb31d9fb539c13f2121ea82aa1bdb45a377e80f73f5254'
+  data.tar.gz: 4d3f147a6491b19f5bdc667bf3f5508836c23e1494091775dd550696df2137272cb829cf1a727e28d16a66c942d7dfa76c704a1531f36f2affec0b038b7d56ae

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

@@ -45,7 +45,7 @@ module HTTP
 					elsif amount >= 0 and amount <= @remote_window.available
 						@remote_window.consume(amount)
 					else
-						raise FlowControlError, "Trying to send #{frame.inspect}, exceeded window size: #{@remote_window.available}"
+						raise FlowControlError, "Trying to send #{frame.length} bytes, exceeded window size: #{@remote_window.available} (#{@remote_window})"
 					end
 				end
 				

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

@@ -40,28 +40,18 @@ module HTTP
 					flag_set?(PADDED)
 				end
 				
-				# We will round up frames to the given length:
-				MODULUS = 0x0F
-				
-				def pack(data, modulus: MODULUS, padding_size: nil, maximum_size: nil)
-					padding_size ||= (MODULUS - data.bytesize) % MODULUS
-					
-					if maximum_size
-						maximum_padding_size = maximum_size - data.bytesize
-						
-						if padding_size > maximum_padding_size
-							padding_size = maximum_padding_size
-						end
-					end
-					
-					if padding_size > 0
+				def pack(data, padding_size: nil, maximum_size: nil)
+					if padding_size
 						set_flags(PADDED)
 						
 						buffer = String.new.b
 						
 						buffer << padding_size.chr
 						buffer << data
-						buffer << "\0" * padding_size
+						
+						if padding_size > 1
+							buffer << "\0" * (padding_size - 1)
+						end
 						
 						super buffer
 					else
@@ -74,7 +64,7 @@ module HTTP
 				def unpack
 					if padded?
 						padding_size = @payload[0].ord
-						data_size = @payload.bytesize - 1 - padding_size
+						data_size = (@payload.bytesize - 1) - padding_size
 						
 						if data_size < 0
 							raise ProtocolError, "Invalid padding length: #{padding_size}"

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

@@ -20,6 +20,7 @@
 
 require_relative 'frame'
 require_relative 'padded'
+require_relative 'continuation_frame'
 
 module HTTP
 	module Protocol

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

@@ -60,6 +60,10 @@ module HTTP
 				def limited?
 					@used > (@capacity / 2)
 				end
+				
+				def to_s
+					"\#<Window #{@used}/#{@capacity}>"
+				end
 			end
 			
 			# The WINDOW_UPDATE frame is used to implement flow control.

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.2.0"
+		VERSION = "0.2.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack