protocol-http 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1593ccb0ebfb4ce5ef909963649b47e0d1f8b4b9b89f9f0338566dbf6060faae
-  data.tar.gz: 3277cbdce30d537b66a16d269e06bb5751f018191cf68c986da66dfc6ffbb8a8
+  metadata.gz: 01134dcd19c1c455c4708bb156394142cf7d1c0fad2c77c6215b38be4bf222f1
+  data.tar.gz: 3d5d904768b5db52a90a671334f67e9b1aa94a25fec68104ca51165d448c3a63
 SHA512:
-  metadata.gz: 0f5bf28393d98394e21bc031dcd99f221f5fce66357dabb295b841b1ce36e87675eb8d89b03ac8f9999b04547d436362deb4821a41cb243bd9a8c8f63209afff
-  data.tar.gz: 4eab7664bc1cb4ca1a6cd04b421f1cfba1fa9609ccdd988045b7564946c1f9345e383ef12324806dfeaaeedd2f256adefab885cc4d9d20b31ba91f728a14e2c0
+  metadata.gz: d0ea0d0cafc40fd91c8b4ce519e5ff8de4b11001313e5124deb4ededc17a1c05cf173f695646b4361ee827a925654f4cf454b60d9715e5db67c33ebecf3f0c7b
+  data.tar.gz: 516d31553b772881473ba0008c52e7081a1c274d3c3d000bc5818cd765f9e9cc34aa492d4665660813bbdf2911beae67b7c72b293ea53fed490d07fdba60b7e8

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

@@ -82,10 +82,6 @@ module Protocol
 					@chunks << chunk
 				end
 				
-				def close(error = nil)
-					@chunks << nil
-				end
-				
 				def rewind
 					@index = 0
 				end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+#
+# Copyright, 2020, 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 'rewindable'
+require_relative 'streamable'
+
+module Protocol
+	module HTTP
+		module Body
+			class Cacheable < Rewindable
+				def self.wrap(message, &block)
+					if body = message.body
+						# Create a rewindable body wrapping the message body:
+						rewindable = Rewindable.new(body)
+						
+						# Set the message body to the rewindable body:
+						message.body = rewindable
+						
+						# Wrap the message with the callback:
+						Streamable.wrap(message) do |error|
+							unless error
+								yield message, rewindable.buffered
+							end
+						end
+					else
+						yield message, nil
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 require_relative 'wrapper'
+require_relative 'buffered'
 
 module Protocol
 	module HTTP
@@ -34,6 +35,11 @@ module Protocol
 					@index = 0
 				end
 				
+				# A rewindable body wraps some other body. Convert it to a buffered body 
+				def buffered
+					Buffered.new(@chunks)
+				end
+				
 				def read
 					if @index < @chunks.size
 						chunk = @chunks[@index]

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

@@ -28,7 +28,7 @@ module Protocol
 			# Invokes a callback once the body has finished reading.
 			class Streamable < Wrapper
 				def self.wrap(message, &block)
-					if message and body = message.body
+					if body = message&.body
 						if remaining = body.length
 							remaining = Integer(remaining)
 						end
@@ -58,11 +58,11 @@ module Protocol
 					end
 				end
 				
-				def close(*)
+				def close(error = nil)
 					if @body
 						super
 						
-						@callback.call
+						@callback.call(error)
 						
 						@body = nil
 					end

data/lib/protocol/http/header/cache_control.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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 'split'
+
+module Protocol
+	module HTTP
+		module Header
+			# Header value which is split by newline charaters (e.g. cookies).
+			class CacheControl < Split
+				PRIVATE = 'private'
+				PUBLIC = 'public'
+				MAX_AGE = 'max-age'
+				
+				def initialize(value)
+					super(value.downcase)
+				end
+				
+				def << value
+					super(value.downcase)
+				end
+				
+				def private?
+					self.include?(PRIVATE)
+				end
+				
+				def public?
+					self.include?(PUBLIC)
+				end
+				
+				def max_age
+					if value = self.find{|value| value.start_with?(MAX_AGE)}
+						_, age = value.split('=', 2)
+						
+						return Integer(age)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/protocol/http/headers.rb

@@ -24,6 +24,7 @@ require_relative 'header/split'
 require_relative 'header/multiple'
 require_relative 'header/cookie'
 require_relative 'header/connection'
+require_relative 'header/cache_control'
 
 module Protocol
 	module HTTP
@@ -147,6 +148,7 @@ module Protocol
 				'max-forwards' => false,
 				
 				'connection' => Header::Connection,
+				'cache-control' => Header::CacheControl,
 				
 				# Headers specifically for proxies:
 				'via' => Split,

data/lib/protocol/http/middleware/builder.rb

@@ -51,7 +51,7 @@ module Protocol
 				end
 				
 				def to_app
-					@use.reverse.inject(@app) {|app, use| use.call(app).freeze}
+					@use.reverse.inject(@app) {|app, use| use.call(app)}
 				end
 			end
 			

data/lib/protocol/http/version.rb

@@ -22,6 +22,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.13.1"
+		VERSION = "0.14.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered
@@ -83,6 +83,7 @@ files:
 - lib/protocol/http.rb
 - lib/protocol/http/accept_encoding.rb
 - lib/protocol/http/body/buffered.rb
+- lib/protocol/http/body/cacheable.rb
 - lib/protocol/http/body/deflate.rb
 - lib/protocol/http/body/file.rb
 - lib/protocol/http/body/inflate.rb
@@ -96,6 +97,7 @@ files:
 - lib/protocol/http/cookie.rb
 - lib/protocol/http/error.rb
 - lib/protocol/http/header/authorization.rb
+- lib/protocol/http/header/cache_control.rb
 - lib/protocol/http/header/connection.rb
 - lib/protocol/http/header/cookie.rb
 - lib/protocol/http/header/multiple.rb