uri-whatwg_parser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fbee32c52de5146f74c7ca4bdc26914ba2d0b83de26cbc6880354961ed447c9
-  data.tar.gz: 0a5b14a90fe61b3647edde05f0aba209b56ecdc043f5a4bff77c894edbe73391
+  metadata.gz: 712c7079461310fdab82e79bea4491ce91a4a8b26827a338334a0e161520a8c0
+  data.tar.gz: 85871841fdee54a61c942134398bfb85e2e89f798144921464058e4edd2ea8fb
 SHA512:
-  metadata.gz: e55b7d27284b8772179a4047081def6b28ce4ab0b9923d08fd7b7a27fdebe5f18eb356535fd70498f76f02e5f1c27817906d19104420bb34cf57b47c5791f0cd
-  data.tar.gz: 46efa3674cf7814d5500b07f7ea272e46aeeedbcea02077ff95e3ebd4fee5be73c9e3ebba2885a9a3e421f87dbf13be4214b0da9bcbfdad24df9f9cf75a9f182
+  metadata.gz: 42b046952ea2817c3db80edcc69bafbf86822c9b88f23837b4decb9d9693b0044f68b9a74c920707e16ee28121f2c03d6992df300227b32cf62a3995e7af7ee5
+  data.tar.gz: aa9c3d27934eec97f11f579cc2b194b5b88f0d69da5c224cb4ebf6fd13878c8a493a7e3391f7f985674e602629da303364aa49c7ed9b88f0b101b66c304db6d2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.6
+
+* Fix `opaque` part parsing
+* Correctly join multiple paths
+
 ## 0.1.5
 
 * Remove `ipaddr` dependency

data/README.md

@@ -2,9 +2,7 @@
 
 Ruby implementation of the [WHATWG URL Living Standard](https://url.spec.whatwg.org/).
 
-The latest revision that this package implements of the standard is ([24 March 2025](https://url.spec.whatwg.org/commit-snapshots/cc8b776b89a6d92b5cc74581c8d90450d3c1e762/)).
-
-NOTE: Some features haven't been implemented yet. Please see the TODO for details.
+The latest revision that this package implements of the standard is ([18 August 2025](https://url.spec.whatwg.org/commit-snapshots/05a5d834deba31622390ee05a3dcbc22496b7bb5/)).
 
 ## Installation
 

data/lib/uri/whatwg_parser/host_parser.rb

@@ -227,7 +227,7 @@ class URI::WhatwgParser
       validation_error = false
       r = 10
 
-      if str.size >= 2 && (str.start_with?("0x") || str.start_with?("0X"))
+      if str.size >= 2 && str.start_with?("0x", "0X")
         validation_error  = true
         str = str[2..-1]
         r = 16

data/lib/uri/whatwg_parser/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   class WhatwgParser
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/uri/whatwg_parser.rb

@@ -126,22 +126,22 @@ module URI
           @state = :path_or_authority_state
           @pos += 1
         else
-          @parse_result[:path] = nil
+          @parse_result[:opaque] = ""
           @state = :opaque_path_state
         end
       else
         @buffer.clear
-        @pos -= 1
+        @pos = -1
         @state = :no_scheme_state
       end
     end
 
     def no_scheme_state(c)
-      raise ParseError, "scheme is missing" if @base.nil? || !@base[:opaque].nil? && c != "#"
+      raise ParseError, "scheme is missing" if @base.nil? || (!@base[:opaque].nil? && c != "#")
 
       if !@base[:opaque].nil? && c == "#"
         @parse_result[:scheme] = @base[:scheme]
-        @parse_result[:path] = @base[:path]
+        @paths = @base_paths
         @parse_result[:query] = @base[:query]
         @parse_result[:fragment] = nil
         @state = :fragment_state
@@ -180,10 +180,11 @@ module URI
       elsif special_url? && c == "\\"
         @state = :relative_slash_state
       else
+
         @parse_result[:userinfo] = @base[:userinfo]
         @parse_result[:host] = @base[:host]
         @parse_result[:port] = @base[:port]
-        @parse_result[:path] = @base[:path]
+        @paths = @base_paths
         @parse_result[:query] = @base[:query]
 
         if c == "?"
@@ -396,7 +397,6 @@ module URI
       @paths ||= []
 
       if (c.nil? || c == "/") || (special_url? && c == "\/") || (c == "?" || c == "#")
-
         if double_dot_path_segments?(@buffer)
           shorten_url_path
           if c != "/" || (special_url? && c == "\/")
@@ -408,6 +408,7 @@ module URI
           if @parse_result[:scheme] == "file" && @paths.empty? && windows_drive_letter?(@buffer)
             @buffer[1] = ":"
           end
+
           @paths << @buffer
         end
 
@@ -433,13 +434,13 @@ module URI
         @parse_result[:fragment] = nil
         @state = :fragment_state
       elsif c == " "
-        if rest.start_with?("?") || rest.start_with?("#")
-          @parse_result[:path] = @parse_result[:path].to_s + "%20"
+        if rest.start_with?("?", "#")
+          @parse_result[:opaque] += "%20"
         else
-          @parse_result[:path] = @parse_result[:path].to_s + " "
+          @parse_result[:opaque] += " "
         end
       elsif !c.nil?
-        @parse_result[:path] = @parse_result[:path].to_s + percent_encode(c, C0_CONTROL_PERCENT_ENCODE_SET, @encoding)
+        @parse_result[:opaque] += percent_encode(c, C0_CONTROL_PERCENT_ENCODE_SET, @encoding)
       end
     end
 
@@ -488,10 +489,10 @@ module URI
     end
 
     def shorten_url_path
-      return if @parse_result[:path]&.empty?
+      return if @paths.nil?
 
-      return true if @parse_result[:scheme] == "file" && @parse_result[:path]&.length == 1 && normalized_windows_drive_letter?(@parse_result[:path])
-      @parse_result[:path]&.chomp!
+      return true if @parse_result[:scheme] == "file" && @paths.length == 1 && normalized_windows_drive_letter?(@paths.first)
+      @paths.pop
     end
 
     def rest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-whatwg_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yuji Yaginuma