http-protocol 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1648aa911c5bb62d7da0d85545dbf1de8a6c2bb3deb7da34bdb1a1b2a7a62ebb
-  data.tar.gz: ed8606f2c1e33439481e1512328ea65f346e2bc18116251f545aadec76a3e422
+  metadata.gz: 6a7da4c00bbe6c3eeb8c56f46f4d4e78ff133f360b11396229b620873c33c35b
+  data.tar.gz: b822849d7f1614eab1a469d446569ac5456a7b3921f2fa2402a89deb2fdc2a88
 SHA512:
-  metadata.gz: 7d235ba93875ef76ab55412a919e540b867b01f0793ddb17b159567ac608e42b72def6b52be7dab494802bb6ee8f4cf510a73a7a8a66287c0fefb8b973a15d42
-  data.tar.gz: 2a600cc9274d9d23452b785156aa753cbed209f241e225d6bcf2aba8ccd451a8c84636b77366d7aea52072fb724dbcddc22ce21a37fc28991593ef55e4a7a114
+  metadata.gz: 9e3856fed9a60a1793b0dbcfc08d860b8e5a1b1d4a12b383cd64bee0775851068a18f56fd6c2c3d3afc5d60dda0810e93e5d45d579c603431196f81b5aef3df2
+  data.tar.gz: 2fdb86e2258946bf0b92c15358817a56bea6b640f091f11903c1455f7f5fd5fa272d31135818612d661d7c9160eb765e5113b49867c15c1e575f5c0731dd2b8b

data/lib/http/protocol/reference.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'url'
+
 module HTTP
 	module Protocol
 		# A relative reference, excluding any authority.
@@ -71,15 +73,15 @@ module HTTP
 			
 			def append(buffer)
 				if query_string?
-					buffer << escape_path(@path) << '?' << @query_string
-					buffer << '&' << encode(@parameters) if parameters?
+					buffer << URL.escape_path(@path) << '?' << @query_string
+					buffer << '&' << URL.encode(@parameters) if parameters?
 				else
-					buffer << escape_path(@path)
-					buffer << '?' << encode(@parameters) if parameters?
+					buffer << URL.escape_path(@path)
+					buffer << '?' << URL.encode(@parameters) if parameters?
 				end
 				
 				if fragment?
-					buffer << '#' << escape(@fragment)
+					buffer << '#' << URL.escape(@fragment)
 				end
 				
 				return buffer
@@ -144,45 +146,6 @@ module HTTP
 					return path.join('/')
 				end
 			end
-			
-			# Escapes a generic string, using percent encoding.
-			def escape(string)
-				encoding = string.encoding
-				string.b.gsub(/([^a-zA-Z0-9_.\-]+)/) do |m|
-					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-				end.force_encoding(encoding)
-			end
-			
-			# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
-			NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
-			
-			# Escapes a path
-			def escape_path(path)
-				encoding = path.encoding
-				path.b.gsub(NON_PCHAR) do |m|
-					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-				end.force_encoding(encoding)
-			end
-			
-			# Encodes a hash or array into a query string
-			def encode(value, prefix = nil)
-				case value
-				when Array
-					return value.map {|v|
-						encode(v, "#{prefix}[]")
-					}.join("&")
-				when Hash
-					return value.map {|k, v|
-						encode(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
-					}.reject(&:empty?).join('&')
-				when nil
-					return prefix
-				else
-					raise ArgumentError, "value must be a Hash" if prefix.nil?
-					
-					return "#{prefix}=#{escape(value.to_s)}"
-				end
-			end
 		end
 	end
 end

data/lib/http/protocol/url.rb

@@ -0,0 +1,118 @@
+# 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.
+
+module HTTP
+	module Protocol
+		module URL
+			# Escapes a generic string, using percent encoding.
+			def self.escape(string, encoding = string.encoding)
+				string.b.gsub(/([^a-zA-Z0-9_.\-]+)/) do |m|
+					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
+				end.force_encoding(encoding)
+			end
+			
+			def self.unescape(string, encoding = string.encoding)
+				string.b.gsub(/%(\h\h)/) do |hex|
+					Integer(hex, 16).chr
+				end.force_encoding(encoding)
+			end
+			
+			# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
+			NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
+			
+			# Escapes a path
+			def self.escape_path(path)
+				encoding = path.encoding
+				path.b.gsub(NON_PCHAR) do |m|
+					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
+				end.force_encoding(encoding)
+			end
+			
+			# Encodes a hash or array into a query string
+			def self.encode(value, prefix = nil)
+				case value
+				when Array
+					return value.map {|v|
+						self.encode(v, "#{prefix}[]")
+					}.join("&")
+				when Hash
+					return value.map {|k, v|
+						self.encode(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
+					}.reject(&:empty?).join('&')
+				when nil
+					return prefix
+				else
+					raise ArgumentError, "value must be a Hash" if prefix.nil?
+					
+					return "#{prefix}=#{escape(value.to_s)}"
+				end
+			end
+			
+			def self.scan(string)
+				# TODO Ruby 2.6 doesn't require `.each`
+				string.split('&').each do |assignment|
+					key, value = assignment.split('=', 2)
+					
+					yield unescape(key), unescape(value)
+				end
+			end
+			
+			def self.split(name)
+				name.scan(/([^\[]+)|(?:\[(.*?)\])/).flatten!.compact!
+			end
+			
+			def self.assign(name, value, parent)
+				top, *middle = self.split(name)
+				
+				yield(top, middle) if block_given?
+				
+				middle.each_with_index do |key, index|
+					if key.empty?
+						parent = (parent[top] ||= Array.new)
+						top = parent.size
+						
+						if nested = middle[index+1] and last = parent.last
+							top -= 1 unless last.include?(nested)
+						end
+					else
+						parent = (parent[top] ||= Hash.new)
+						top = key
+					end
+				end
+				
+				parent[top] = value
+			end
+			
+			def self.decode(string, maximum = 8)
+				parameters = {}
+				
+				self.scan(string) do |key, value|
+					self.assign(key, value, parameters) do |top, middle|
+						if maximum and middle.count > maximum
+							raise ArgumentError, "Key length exceeded limit!"
+						end
+					end
+				end
+				
+				return parameters
+			end
+		end
+	end
+end

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.12.2"
+		VERSION = "0.13.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack
@@ -123,6 +123,7 @@ files:
 - lib/http/protocol/http2/window_update_frame.rb
 - lib/http/protocol/methods.rb
 - lib/http/protocol/reference.rb
+- lib/http/protocol/url.rb
 - lib/http/protocol/version.rb
 homepage: https://github.com/socketry/http-protocol
 licenses: []
@@ -142,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Provides abstractions to handle HTTP1 and HTTP2 protocols.