http-protocol 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d38445cd1c5486bace349b4df0776d4a65dce709ff478d2d24d315a01d73a19
-  data.tar.gz: d93043c98af222f1c9ec6bb7fe341c8c53ac6225512e18f7cc09d012c7b4f656
+  metadata.gz: d0b91f0480849b41925cf0c8cc1e86b65da69903110b6e59649ac5101d94c0d2
+  data.tar.gz: 19d4d4c7078dc7e7f0561247cdcca4988a9cac781000cf0371dc5b8b1fedf063
 SHA512:
-  metadata.gz: 99414ae8ac5f88258d17d2e3e963ad112e61c744d30b898db419876c8b28208c356d5b185a34b327740e7c92bd85569a547d4adbbe6eb02c6a08cd68abd4253e
-  data.tar.gz: 004dedb83a3d63d795e994b581bbacf417182518f845d7b593cb45b438c17ec2f7af8702104ea36c6f0009c94afffd1539b3157b7461053fe6edb1b05c196c12
+  metadata.gz: e068393e0004d7ecfdc41a5228a7a654f8383946c85556d0b17d98d28c338e6bce89c120cc12841b83d0c42004a179610920d1c1ce3288001d3605a0b5bff2ef
+  data.tar.gz: 508783a720213e14577771aedcb01431b2c22b0eca45454328106b01fef00eab961e52970d1c389b9026c508c7b021fb01f4a72b25c15707c2ac44d52992d138

data/.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+

data/.travis.yml

@@ -3,21 +3,19 @@ sudo: required
 dist: xenial
 cache: bundler
 
-before_script:
-  - gem update --system
-  - gem install bundler
-
 matrix:
   include:
     - rvm: 2.3
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
     - rvm: rbx-3
   allow_failures:
+    - rvm: truffleruby
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx-3

data/http-protocol.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
 	spec.add_dependency "http-hpack", "~> 0.1.0"
 
-	spec.add_development_dependency "bundler", "~> 1.16"
+	spec.add_development_dependency "bundler", ">= 1.16"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

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

@@ -99,14 +99,7 @@ module HTTP
 					
 					write_headers(headers)
 					write_persistent_header(version)
-					
-					if head
-						write_body_head(body)
-					else
-						write_body(body, version == HTTP11)
-					end
-					
-					@stream.flush
+					write_body(body, version == HTTP11, head)
 				end
 				
 				def write_headers(headers)
@@ -192,25 +185,23 @@ module HTTP
 					return chunk
 				end
 				
-				def write_chunk(chunk)
-					if chunk.nil?
-						@stream.write("0\r\n\r\n")
-					elsif !chunk.empty?
-						@stream.write("#{chunk.bytesize.to_s(16).upcase}\r\n")
-						@stream.write(chunk)
-						@stream.write(CRLF)
-						@stream.flush
-					end
-				end
-				
 				def write_empty_body(body)
 					@stream.write("content-length: 0\r\n\r\n")
-					@stream.flush
+					
+					if body
+						body.close if body.respond_to?(:close)
+					end
 				end
 				
-				def write_fixed_length_body(body, length)
+				def write_fixed_length_body(body, length, head)
 					@stream.write("content-length: #{length}\r\n\r\n")
 					
+					if head
+						body.close if body.respond_to?(:close)
+						
+						return
+					end
+					
 					chunk_length = 0
 					body.each do |chunk|
 						chunk_length += chunk.bytesize
@@ -229,9 +220,15 @@ module HTTP
 					end
 				end
 				
-				def write_chunked_body(body)
+				def write_chunked_body(body, head)
 					@stream.write("transfer-encoding: chunked\r\n\r\n")
 					
+					if head
+						body.close if body.respond_to?(:close)
+						
+						return
+					end
+					
 					body.each do |chunk|
 						next if chunk.size == 0
 						
@@ -242,43 +239,37 @@ module HTTP
 					end
 					
 					@stream.write("0\r\n\r\n")
-					@stream.flush
 				end
 				
-				def write_body_and_close(body)
+				def write_body_and_close(body, head)
 					# We can't be persistent because we don't know the data length:
 					@persistent = false
-					
 					@stream.write("\r\n")
 					
-					body.each do |chunk|
-						@stream.write(chunk)
-						@stream.flush
+					if head
+						body.close if body.respond_to?(:close)
+					else
+						body.each do |chunk|
+							@stream.write(chunk)
+							@stream.flush
+						end
 					end
 					
 					@stream.stream.close_write
 				end
 				
-				def write_body(body, chunked = true)
+				def write_body(body, chunked = true, head = false)
 					if body.nil? or body.empty?
 						write_empty_body(body)
 					elsif length = body.length
-						write_fixed_length_body(body, length)
+						write_fixed_length_body(body, length, head)
 					elsif chunked
-						write_chunked_body(body)
-					else
-						write_body_and_close(body)
-					end
-				end
-				
-				def write_body_head(body)
-					if body.nil? or body.empty?
-						@stream.write("content-length: 0\r\n\r\n")
-					elsif length = body.length
-						@stream.write("content-length: #{length}\r\n\r\n")
+						write_chunked_body(body, head)
 					else
-						@stream.write("\r\n")
+						write_body_and_close(body, head)
 					end
+					
+					@stream.flush
 				end
 				
 				def read_chunked_body

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.10.1"
+		VERSION = "0.11.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack
@@ -28,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -127,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides abstractions to handle HTTP1 and HTTP2 protocols.