linkhum-url 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8c7762ad429c30b01e5fef3c0f00bf6fb0d707
-  data.tar.gz: e683f0f660e842ddb534b1700dc227ec54285563
+  metadata.gz: '0399dffb1cce6eee486039ef1d8415ebb2a1347f'
+  data.tar.gz: 265d932f96994dec962cd2aae4ad45e0b57ff169
 SHA512:
-  metadata.gz: 7c6376e51aeb013b235862e2b5585d60203e4c72f17a48ac06a8d3a0d1c6bd87c6a87c3a2d4cc66042289a21301c757e31a4075b2133ef2c6e4f606e671dbfd4
-  data.tar.gz: 5c5e6600911f6f95554a9768d54819e229fb2c46f6122cc73ba644a5f0b2e14b6d67cfad19b07dcb8b4be2e26d70d110dbe0101f6f1f0e110f3de8bb004d1ae9
+  metadata.gz: 5632e26868294c54e6f87aeb8b27a3649932eeaa57c2f44ac4eb5b16a72876c5ec0683faa773f7245c53f63589f10f92e9128999b2abb9efe2819d3e4819758e
+  data.tar.gz: 6beccc5cdb476b11184d915750f9bd18fec1f5e7e4d4a13e1af28697a0645fb55c7a2549d7423fdeb8d5b70a90f7f44f30e3a4b88c5b2457a51a6a9b08449632

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.1.4:
+
+* Handle URLs with hashtags in query strings (tnx @markiz);
+
 0.1.3:
 
 * Handle IDNs which begin with ASCII;

data/lib/linkhum/url.rb

@@ -20,18 +20,17 @@ module Linkhum
       url_encoded[:port] = au.port ? ":#{au.port}" : ""
       human_readable[:port] = url_encoded[:port]
 
-      human_readable[:path] = Addressable::URI.unencode_component(au.path)
+      human_readable[:path] = unencode_component(au.path, false)
       # this code handles bug in Addressable::URI (up to 2.5.0), which
       # converts paths to Unicode NFKC (it should only do that for
       # hostnames).  Patch to Addressable::URI pending.
       au_path = au.path.dup
       if au_path =~ /\A[\x00-\x7F]*\z/
-        au_path = Addressable::URI.unencode_component(au_path)
+        au_path = unencode_component(au_path)
       end
       au_path.force_encoding(Encoding::ASCII_8BIT)
-      url_encoded[:path] = Addressable::URI.encode_component(au_path)
-
-      human_readable[:query] = Addressable::URI.unencode_component(au.query)
+      url_encoded[:path] = encode_component(au_path)
+      human_readable[:query] = unencode_component(au.query, false)
       if au.query
         decoded_query = human_readable[:query].dup
         if !decoded_query.force_encoding(Encoding::UTF_8).valid_encoding?
@@ -43,11 +42,11 @@ module Linkhum
         # see above
         au_query = au.query.dup
         if au_query =~ /\A[\x00-\x7F]*\z/
-          au_query = Addressable::URI.unencode_component(au_query)
+          au_query = unencode_component(au_query)
         end
         au_query.force_encoding(Encoding::ASCII_8BIT)
       end
-      url_encoded[:query] = Addressable::URI.encode_component(au_query)
+      url_encoded[:query] = encode_component(au_query)
 
       # fragments do not need to be encoded
       human_readable[:fragment] = au.fragment
@@ -64,5 +63,16 @@ module Linkhum
       fragment_part = parts[:fragment] ? "##{parts[:fragment]}" : ""
       "#{parts[:scheme]}://#{userinfo_part}#{parts[:host]}#{parts[:port]}#{parts[:path]}#{query_part}#{fragment_part}"
     end
+
+    def self.encode_component(string, skip_percent_sign = true)
+      chars_to_keep_unencoded = Addressable::URI::CharacterClasses::RESERVED + Addressable::URI::CharacterClasses::UNRESERVED
+      chars_to_keep_unencoded << '\\%' if skip_percent_sign
+      Addressable::URI.encode_component(string, chars_to_keep_unencoded)
+    end
+
+    def self.unencode_component(string, skip_special_chars = true)
+      chars_to_keep_encoded = skip_special_chars ? "%#" : ""
+      Addressable::URI.unencode_component(string, String, chars_to_keep_encoded)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkhum-url
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexey Makhotkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Linkhum-URL creates both URL-encoded and readable versions of URLs