uri-whatwg_parser 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fbee32c52de5146f74c7ca4bdc26914ba2d0b83de26cbc6880354961ed447c9
-  data.tar.gz: 0a5b14a90fe61b3647edde05f0aba209b56ecdc043f5a4bff77c894edbe73391
+  metadata.gz: ff938b4f5dd4b3fa34e438b6b4eed8498b93da3c0b2efad53ab17259376dc745
+  data.tar.gz: 50574a50b4bc9003d95cad80b41ba433849296bc20fe1ef7f512032e66bc2a2b
 SHA512:
-  metadata.gz: e55b7d27284b8772179a4047081def6b28ce4ab0b9923d08fd7b7a27fdebe5f18eb356535fd70498f76f02e5f1c27817906d19104420bb34cf57b47c5791f0cd
-  data.tar.gz: 46efa3674cf7814d5500b07f7ea272e46aeeedbcea02077ff95e3ebd4fee5be73c9e3ebba2885a9a3e421f87dbf13be4214b0da9bcbfdad24df9f9cf75a9f182
+  metadata.gz: da00460b289f008965b15bb943a1d1fd21339ce2224fbb2a9b64997d044a38962982d9f90dbda0886888be35b7eea363476fd3da5a532b6d88453c2cdd07923b
+  data.tar.gz: fb82af80a91e4e5c96caf0d478e3dd2f7f89181f4ad634c0e65fb9e589de2fdeb04fc12cc97c3a1aa2ed98ed0423670d7de05025f7c5c9dda20e5f466469e9e9

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.1.7
+
+* Allow to call `URI.split` multiple times
+* Fix parsing a username without a password
+* Support `#merge` method
+
+## 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/generic.rb

@@ -0,0 +1,14 @@
+require "uri/generic"
+
+module URI
+  class WhatwgParser
+    module Generic
+      def merge(oth)
+        URI::DEFAULT_PARSER.join(self.to_s, oth.to_s)
+      end
+      alias + merge
+    end
+  end
+end
+
+URI::Generic.prepend(URI::WhatwgParser::Generic)

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.7"
   end
 end

data/lib/uri/whatwg_parser.rb

@@ -5,6 +5,7 @@ require_relative "whatwg_parser/error"
 require_relative "whatwg_parser/version"
 require_relative "whatwg_parser/parser_helper"
 require_relative "whatwg_parser/host_parser"
+require_relative "whatwg_parser/generic"
 
 module URI
   class WhatwgParser
@@ -35,11 +36,11 @@ module URI
     end
 
     def parse(uri, base = nil, encoding = Encoding::UTF_8) # :nodoc:
-      reset
       URI.for(*self.split(uri, base, encoding))
     end
 
     def split(uri, base = nil, encoding = Encoding::UTF_8) # :nodoc:
+      reset
       @base = nil
       if base != nil
         ary = split(base, nil, encoding)
@@ -66,7 +67,7 @@ module URI
         @pos += 1
       end
 
-      @parse_result[:userinfo] = "#{@username}:#{@password}" if !@username.nil? || !@password.nil?
+      @parse_result[:userinfo] = [@username, @password].compact.reject(&:empty?).join(":")
       @parse_result[:path] = "/#{@paths.join("/")}" if @paths && !@paths.empty?
 
       @parse_result.values
@@ -126,22 +127,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 +181,10 @@ module URI
       elsif special_url? && c == "\\"
         @state = :relative_slash_state
       else
-        @parse_result[:userinfo] = @base[:userinfo]
+        @username, @password = @base[:userinfo].split(":") if @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 == "?"
@@ -207,7 +208,7 @@ module URI
       elsif c == "/"
         @state = :authority_state
       else
-        @parse_result[:userinfo] = @base[:userinfo]
+        @username, @password = @base[:userinfo].split(":") if @base[:userinfo]
         @parse_result[:host] = @base[:host]
         @parse_result[:port] = @base[:port]
         @state = :path_state
@@ -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,15 +489,26 @@ 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
       @uri[@pos+1..]
     end
+
+    def convert_to_uri(uri)
+      if uri.is_a?(URI::Generic)
+        uri
+      elsif uri = String.try_convert(uri)
+        parse(uri)
+      else
+        raise ArgumentError,
+          "bad argument (expected URI object or URI string)"
+      end
+    end
   end
 end
 

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.7
 platform: ruby
 authors:
 - Yuji Yaginuma
@@ -63,6 +63,7 @@ files:
 - Rakefile
 - lib/uri/whatwg_parser.rb
 - lib/uri/whatwg_parser/error.rb
+- lib/uri/whatwg_parser/generic.rb
 - lib/uri/whatwg_parser/host_parser.rb
 - lib/uri/whatwg_parser/parser_helper.rb
 - lib/uri/whatwg_parser/version.rb