protocol-http 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5839148e12cf89cbdc454de6155fd7d9a7a515208bdd83ffba741388591dc7
-  data.tar.gz: 58bb3176945607e04975f4132da07900deeda442d8709d0e458cdb4c093c621e
+  metadata.gz: 5bc04ecccff6cd4f16fdc254fcc2b61052f3cd1922d1f2c6b131c2247f3ae725
+  data.tar.gz: aeb44e87fa81e9f545a009de98b2d895d408cd6ce67056f857f1ab5d2f35843f
 SHA512:
-  metadata.gz: 1a71227da852e031044b11bb2a6f6eb7b362129144394eacae489cf7bf14576705ed221eac73b4fa6020a80fb959842719858714f8537b978c35dd1da881454f
-  data.tar.gz: 34ab52b88c502e04b72df8373a23256d3a290efc9cfe933e28d9b4ea87f95242acf1de9a271426cc7eb10fb6e15cb14779be19ebef08855014c542a53ecd3e29
+  metadata.gz: 7de2d5a3d9b7b2548b4258bf549a913f682c0e199bd11d466b50e439a67ce2443138b2bbb27a6da97c57c9b3bd5fa69a70b792f79cddc38c469f832d4ab91e0b
+  data.tar.gz: c54173c864bda0b4a9b6c5e8c282ec60790871a0a1bbbace5a1b53fe6c2a570d214d5f11d32723ee21ef1b5fe0e78ebf73d7dd223addbe424c3f664f805cf75c

data/lib/protocol/http/reference.rb

@@ -24,7 +24,7 @@ require_relative 'url'
 
 module Protocol
 	module HTTP
-		# A relative reference, excluding any authority.
+		# A relative reference, excluding any authority. The path part of an HTTP request.
 		class Reference
 			include Comparable
 			
@@ -116,19 +116,28 @@ module Protocol
 			
 			alias to_s to_str
 			
+			# Merges two references as specified by RFC2396, similar to `URI.join`.
 			def + other
 				other = self.class[other]
 				
 				self.class.new(
-					expand_path(self.path, other.path),
+					expand_path(self.path, other.path, true),
 					other.query_string,
 					other.fragment,
 					other.parameters,
 				)
 			end
 			
-			def dup(path = nil, parameters = nil, merge = true)
-				if merge and @parameters
+			# Just the base path, without any query string, parameters or fragment.
+			def base
+				self.class.new(@path, nil, nil, nil)
+			end
+			
+			# @option path [String] Append the string to this reference similar to `File.join`.
+			# @option parameters [Hash] Append the parameters to this reference.
+			# @option fragment [String] Set the fragment to this value.
+			def with(path: nil, parameters: nil, fragment: @fragment)
+				if @parameters
 					if parameters
 						parameters = @parameters.merge(parameters)
 					else
@@ -137,12 +146,21 @@ module Protocol
 				end
 				
 				if path
-					path = expand_path(@path, path)
+					path = expand_path(@path, path, false)
 				else
 					path = @path
 				end
 				
-				self.class.new(path, @query_string, @fragment, parameters)
+				self.class.new(path, @query_string, fragment, parameters)
+			end
+			
+			# The arguments to this function are legacy, prefer to use `with`.
+			def dup(path = nil, parameters = nil, merge_parameters = true)
+				if merge_parameters
+					with(path: path, parameters: parameters)
+				else
+					self.base.with(path: path, parameters: parameters)
+				end
 			end
 			
 			private
@@ -155,20 +173,26 @@ module Protocol
 				end
 			end
 			
-			def expand_path(base, relative)
+			# @param pop [Boolean] whether to remove the last path component of the base path, to conform to URI merging behaviour, as defined by RFC2396.
+			def expand_path(base, relative, pop = true)
 				if relative.start_with? '/'
 					return relative
 				else
 					path = split(base)
-					# drop the last path element for relative computations, e.g.
-					# /foo/bar/index.html -> /foo/bar/#{relative}
-					path.pop 
+					
+					# RFC2396 Section 5.2:
+					# 6) a) All but the last segment of the base URI's path component is
+					# copied to the buffer.  In other words, any characters after the
+					# last (right-most) slash character, if any, are excluded.
+					path.pop if pop or path.last == ''
 					
 					parts = split(relative)
 					
 					parts.each do |part|
 						if part == '..'
 							path.pop
+						elsif part == '.'
+							# Do nothing.
 						else
 							path << part
 						end

data/lib/protocol/http/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP
-		VERSION = "0.6.0"
+		VERSION = "0.7.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered