nokogiri-html-ext 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63aafc92d00db444d3e8d3ec92817ef8246bd8dd7d66d7d3540d9aac2f55f96b
-  data.tar.gz: 904f44d50a9fb46c6383abb3e902c1a4166763778c1fe469696cff96c9d1c8a6
+  metadata.gz: bcf8d54ec9864f58ba4ada5d6c47e191dbc0063249afb256928bf5fc52f5f0e0
+  data.tar.gz: 9c72dacd89707ad6d320e3ed368860b9f58ee73fadb8427a54012fa1c18282a2
 SHA512:
-  metadata.gz: 932fbeed6638155ec3033405ea43bf33f9b513e4e2b129ed62c8ef86b483e942ad894421de908e0a1077dd118383faf609b9da4c974a7a4c8a9ef2678ce3436e
-  data.tar.gz: 073d5a3983516d0bdfd68347ec42474d5c128cef1d7cf5170340d4eea24d334b10dbe5d39acd2fd5462ea1ac3da9b79031d2731db6ea5ad2c8b2fdadcba221b3
+  metadata.gz: e589cf7989b82d9b73d265494c537c098a59236c4314cc758fda219e7b908dd0e9f22cb8ead7834def9ce74d27f223468f5394ee071c8be9df98ea391440623c
+  data.tar.gz: 3ffd78636127f753fde326de3b20b762a6b678583274425d2d6ad35827c305ab10711a40b1ed927251a4e6040ffa6585b9056161979ffdec0052da26fdbb1963

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.2 / 2022-08-20
+
+- Improve handling of escaped and invalid URLs (b0d6c75)
+
 ## v0.2.1 / 2022-08-20
 
 - Handle escaped URLs and invalid URLs (af78837)

data/lib/nokogiri/html_ext/document.rb

@@ -69,13 +69,15 @@ module Nokogiri
       #
       # @return [String]
       def resolve_relative_url(url)
-        unescape(
-          uri_parser.join(*[document.url.strip, base_href, unescape(url)].compact.map { |u| escape(u) })
+        url_str = url.to_s
+
+        uri_parser.unescape(
+          uri_parser.join(*[document.url.strip, base_href, url_str].compact.map { |u| uri_parser.escape(u) })
                     .normalize
                     .to_s
         )
       rescue URI::InvalidComponentError, URI::InvalidURIError
-        unescape(url)
+        url
       end
 
       # Convert the document's relative URLs to absolute URLs.
@@ -99,10 +101,6 @@ module Nokogiri
 
       private
 
-      def escape(url)
-        uri_parser.escape(url.to_s)
-      end
-
       def resolve_relative_urls_for(attributes_map)
         attributes_map.each do |attribute, names|
           xpaths = names.map { |name| "//#{name}[@#{attribute}]" }
@@ -113,10 +111,6 @@ module Nokogiri
         end
       end
 
-      def unescape(url)
-        uri_parser.unescape(url.to_s)
-      end
-
       def uri_parser
         @uri_parser ||= URI::DEFAULT_PARSER
       end

data/lib/nokogiri/html_ext/version.rb

@@ -2,6 +2,6 @@
 
 module Nokogiri
   module HTMLExt
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-html-ext
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Garber
@@ -44,7 +44,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jgarber623/nokogiri-html-ext/issues
-  changelog_uri: https://github.com/jgarber623/nokogiri-html-ext/blob/v0.2.1/CHANGELOG.md
+  changelog_uri: https://github.com/jgarber623/nokogiri-html-ext/blob/v0.2.2/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []