trenni 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '081ca65498a2ec0527b25ce54a105bc8e19341a0'
-  data.tar.gz: 224372fa6f3c9715858d8b1c700a050c33cf226c
+  metadata.gz: f537bf7c125e2f4e23c5e6ab5126d15370ee4e9a
+  data.tar.gz: c73fe7e8da34eaab7ab8be0ceec116181d06e462
 SHA512:
-  metadata.gz: 3235d940fbf6eff830ab88623dc46fae3f92c6a31b20f2f37f28cac9f9f304cfdc7eb3a1d8eb0692bc5578aac09ffeb72763b3d594e51b08c4d8cb51b2aca300
-  data.tar.gz: 9d47d3e2feb3e03b42a9abf43430113c0aef7e1e4d25bc23aaafd2c2119d620810cc1bb10a50cc92f545a605abcfce918544f91d48d05a6a3641b675e4d8a8f2
+  metadata.gz: d6355020eedd0017f3c8f5c578df1eb38ae59503e054556f6799a34f4ad51b794b531e552b123cf9a03e6e244db7d13dea52028ce4d3bad1d950cfe92678effb
+  data.tar.gz: f51f05a10d786b7250939e372efc31c878b6e18f507b707f92b2b11d42da5913ec62adae781a847650083f7c37da5493a8bbc3bce18da3f6879e2c74bc382447

data/lib/trenni/uri.rb

@@ -64,13 +64,13 @@ module Trenni
 		private
 		
 		# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
-		NON_PCHAR = /([^ a-zA-Z0-9\-\.~!$&'()*+,;=:@\/]+)/.freeze
+		NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
 		
 		def escape_path(path)
 			encoding = path.encoding
 			path.b.gsub(NON_PCHAR) do |m|
 				'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-			end.tr(' ', '+').force_encoding(encoding)
+			end.force_encoding(encoding)
 		end
 		
 		# Escapes a generic string, using percent encoding.

data/lib/trenni/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Trenni
-	VERSION = "3.1.1"
+	VERSION = "3.1.2"
 end

data/spec/trenni/uri_spec.rb

@@ -25,7 +25,13 @@ require 'trenni/uri'
 RSpec.describe Trenni::URI do
 	describe Trenni::URI('path with spaces/image.jpg') do
 		it "encodes whitespace" do
-			expect(subject.to_s).to be == "path+with+spaces/image.jpg"
+			expect(subject.to_s).to be == "path%20with%20spaces/image.jpg"
+		end
+	end
+	
+	describe Trenni::URI('path_with_underscores/image.jpg') do
+		it "doesn't touch underscores" do
+			expect(subject.to_s).to be == "path_with_underscores/image.jpg"
 		end
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Samuel Williams