linkhum-url 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2499da4f4ea690201eb85d3f2e8942b90655629e
-  data.tar.gz: c4738dc13d7dab8dba1008b89cce1c09d360fe13
+  metadata.gz: d8aa891eed2cfe43008f162c21df1f7f475d6505
+  data.tar.gz: 08261faca4002474b5632f34a2e0c4feaaa067fc
 SHA512:
-  metadata.gz: c7dc9f9ec8fa62d742ff51a3cdeac046353f83833341f57c76d57b0e726dd54719bb22c70bf969f4109d3fdb08660fb376d7155c0b7e02ef4f24e3c55dc08bb2
-  data.tar.gz: 1359bf86a29b802371fa7411068adda60fb7db20fd7793e533c27620867aac71de6cdc4450f17a68ca8046b56a10ed58fb80585bf235d4b16addac4b1e37ed88
+  metadata.gz: bf51abd8b3e08070bb62627e69d633ad5801ddb061dbb68461313fd9af1a8b20bb87c2ee8dc534d9ec307c295ff8382202cb44c3122067405e73c96a1c8310d0
+  data.tar.gz: 032b83a347f6756256306e2f485d87b83fd42e2f7ed452b7a6af551c3f110496d6ad3186057816cc18c11fa10e88c256d05abe39b0154397d1c1283d92364557

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+0.1.1:
+
+* Handle percent-encoded non-UTF8 query strings: return
+percent-encoded value as human-readable (we have no way of guessing the original encoding);
+
+0.1.0:
+
+* Initial release.

data/README.md

@@ -10,6 +10,8 @@ scenes `addressable` gem is used to handle actual URL parsing.
 This is a sister gem to
 [`linkhum`](https://github.com/zverok/linkhum).
 
+[![Build Status](https://travis-ci.org/squadette/linkhum-url.svg?branch=master)](https://travis-ci.org/squadette/linkhum-url)
+
 ## Usage
 
 `linkhum-url` has only one method: `Linkhum::URL.parse(url)`.  It
@@ -24,19 +26,20 @@ embedding etc.
      => true
     2.3.0 :002 > Linkhum::URL.parse("https://example.org")
      => {:human_readable=>"https://example.org", :url_encoded=>"https://example.org"}
-    2.3.0 :003 > Linkhum::URL.parse("https://пивбар.рф/поиск.html?q=пивбар")
-     => {:human_readable=>"https://пивбар.рф/поиск.html?q=пивбар", :url_encoded=>"https://xn--80abcx8ak.xn--p1ai/%D0%BF%D0%BE%D0%B8%D1%81%D0%BA.html?q=%D0%BF%D0%B8%D0%B2%D0%B1%D0%B0%D1%80"}
+    2.3.0 :003 > Linkhum::URL.parse("https://пивбар-хмель.рф/поиск.html?q=пивбар")
+     => {:human_readable=>"https://пивбар-хмель.рф/поиск.html?q=пивбар", :url_encoded=>"https://xn----7sbcdsn0agvo0d1e.xn--p1ai/%D0%BF%D0%BE%D0%B8%D1%81%D0%BA.html?q=%D0%BF%D0%B8%D0%B2%D0%B1%D0%B0%D1%80"}
     2.3.0 :004 > Linkhum::URL.parse("https://xn--80abcx8ak.xn--p1ai/%D0%BF%D0%BE%D0%B8%D1%81%D0%BA.html?q=%D0%BF%D0%B8%D0%B2%D0%B1%D0%B0%D1%80")
-     => {:human_readable=>"https://пивбар.рф/поиск.html?q=пивбар", :url_encoded=>"https://xn--80abcx8ak.xn--p1ai/%D0%BF%D0%BE%D0%B8%D1%81%D0%BA.html?q=%D0%BF%D0%B8%D0%B2%D0%B1%D0%B0%D1%80"}
+     => {:human_readable=>"https://пивбар-хмель.рф/поиск.html?q=пивбар", :url_encoded=>"https://xn----7sbcdsn0agvo0d1e.xn--p1ai/%D0%BF%D0%BE%D0%B8%D1%81%D0%BA.html?q=%D0%BF%D0%B8%D0%B2%D0%B1%D0%B0%D1%80"}
 
 ## Install
 
     $ sudo apt-get install idn   # Debian/Ubuntu
-    $ brew install libidn        # OS X
+    $ brew install libidn        # Mac OS X
 
     $ gem install linkhum-url
 
 ## License
 
-`linkhum-url` released under MIT License.  Copyright (C) Alexey
-Makhotkin, 2016.
+`linkhum-url` released under MIT License.
+
+Copyright (C) Alexey Makhotkin, 2016.

data/lib/linkhum/url.rb

@@ -29,6 +29,13 @@ module Linkhum
       url_encoded[:path] = Addressable::URI.encode_component(au_path)
 
       human_readable[:query] = Addressable::URI.unencode_component(au.query)
+      if au.query
+        decoded_query = human_readable[:query].dup
+        if !decoded_query.force_encoding(Encoding::UTF_8).valid_encoding?
+          human_readable[:query] = au.query
+        end
+      end
+
       if au.query
         # see above
         au_query = au.query.dup
@@ -49,9 +56,10 @@ module Linkhum
 
     private
     def self.generate_url(parts)
+      userinfo_part = parts[:userinfo] ? "#{parts[:userinfo]}@" : ""
       query_part = parts[:query] ? "?#{parts[:query]}" : ""
       fragment_part = parts[:fragment] ? "##{parts[:fragment]}" : ""
-      "#{parts[:scheme]}://#{parts[:userinfo]}#{parts[:host]}#{parts[:path]}#{query_part}#{fragment_part}"
+      "#{parts[:scheme]}://#{userinfo_part}#{parts[:host]}#{parts[:path]}#{query_part}#{fragment_part}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkhum-url
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexey Makhotkin
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: 'Input URL could be both human-readable and URL-encoded.  Two URLs are
   returned as result: human-readable and URL-encoded'
 email: squadette@gmail.com
@@ -59,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/linkhum-url.rb
@@ -73,9 +102,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="