uri-whatwg_parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f268e45182363045ad2658cd458e9bd6c1309688889a056ab3c507c1805b41f6
-  data.tar.gz: 842b5a01c0860e9293f5c1b58d71fbd22fbc38de8775488865f2ecd060f5d546
+  metadata.gz: 1836e023e3a156fed4ff343555eb8562c358aea0040f644e1239739f83eff9ee
+  data.tar.gz: c529afc3fb9bc883857312156ed3628ce5d1978cb30edc041a8b7800d4da269c
 SHA512:
-  metadata.gz: df6b26333982d0ab865d4c3b436b6f0b61ba06e2e034c8e8453586bfd5dbffe0493be6bc36b295f4d7ca8511892c454c8b3b178beb387c7e8588290f25cbd462
-  data.tar.gz: ad8179360bcd2b0e963841936978aa04f38075142762114c7fb0a7c7dae459ad54f2e31deaa8cd9e9a16820d34235d9ad89038c6677648fcc40135f0350e5867
+  metadata.gz: dfb4edce987f84e43c1ac6aa5c89b7efca25c65d399caa2635faeedead1706fe55f498cd2d6e65c979c326fc7e80bf78910442fea417836fc497f9c625ab42ed
+  data.tar.gz: d916826be29b6668f8820376a5eb6ebf2545aa8e82945eb4075b1c8acd4e10ba9dbe285c26296f27d0ebc5da41aad7f390148611b786ca4319c5a188e54b8bc5

data/README.md

@@ -1,4 +1,4 @@
-# Uri::WhatwgParser
+# URI::WhatwgParser
 
 Ruby implementation of the [WHATWG URL Living Standard](https://url.spec.whatwg.org/).
 
@@ -29,7 +29,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## TODO
 
-* Support passing `base`
 * Support state override
 * Support validations
 * Support encodings other than UTF-8

data/lib/uri/whatwg_parser/host_parser.rb

@@ -9,45 +9,44 @@ class URI::WhatwgParser
     include ParserHelper
 
     FORBIDDEN_HOST_CODE_POINT = ["\x00", "\t", "\x0a", "\x0d", " ", "#", "/", ":", "<", ">", "?", "@", "[", "\\", "]", "^", "|"]
-    FORBIDDEN_DOMAIN_CODE_POINT = FORBIDDEN_HOST_CODE_POINT + C0_CONTROL + ["%"]
+    FORBIDDEN_DOMAIN_CODE_POINT = FORBIDDEN_HOST_CODE_POINT + C0_CONTROL_PERCENT_ENCODE_SET + ["%", "\x7f"]
 
     def parse(input, opaque = false) # :nodoc:
       return if input&.empty?
 
       if input.start_with?("[")
-        raise ParseError unless input.end_with?("]")
+        raise ParseError, "invalid IPv6 format" unless input.end_with?("]")
         return parse_ipv6(input)
       end
 
       return parse_opaque_host(input) if opaque
 
       domain = percent_decode(input)
-      ascii_domain = URI::IDNA.whatwg_to_ascii(domain.force_encoding(Encoding::UTF_8))
+      ascii_domain = domain_to_ascii(domain)
       if ends_in_number?(ascii_domain)
         ipv4 = parse_ipv4(ascii_domain)
         return serialize_ipv4(ipv4)
       end
 
-      raise ParseError if include_forbidden_domain_code_point?(ascii_domain)
       ascii_domain
     rescue URI::IDNA::Error, Encoding::CompatibilityError, ArgumentError => _e
-      raise ParseError
+      raise ParseError, "invalid host value"
     end
 
     private
 
     def parse_ipv4(host)
       parts = host.split(".")
-      raise URI::WhatwgParser::ParseError if parts.size > 4
+      raise URI::WhatwgParser::ParseError, "invalid IPv4 format" if parts.size > 4
       numbers = []
       parts.each do |part|
         value, _validation_error = parse_ipv4_number(part)
         numbers << value
       end
 
-      (numbers.size-1).times {|i| raise URI::WhatwgParser::ParseError if numbers[i] > 255 }
+      (numbers.size-1).times {|i| raise URI::WhatwgParser::ParseError, "invalid IPv4 format" if numbers[i] > 255 }
 
-      raise ParseError if numbers.last >= 256 ** (5 - numbers.size)
+      raise ParseError, "invalid IPv4 format" if numbers.last >= 256 ** (5 - numbers.size)
 
       ipv4 = numbers.pop
       numbers.each_with_index do |number, index|
@@ -68,9 +67,12 @@ class URI::WhatwgParser
     end
 
     def parse_ipv6(host)
-      "[#{IPAddr.new(host).to_s}]"
-    rescue
-      raise ParseError
+      addr = IPAddr.new(host)
+      # NOTE: URL Standard doesn't support `zone_id`.
+      raise ParseError, "invalid IPv6 format" unless addr.zone_id.nil?
+      "[#{addr}]"
+    rescue IPAddr::InvalidAddressError
+      raise ParseError, "invalid IPv6 format"
     end
 
     def parse_opaque_host(host)
@@ -83,15 +85,18 @@ class URI::WhatwgParser
         m[1..2].to_i(16).chr
       end
     rescue ArgumentError
-      raise ParseError
+      raise ParseError, "including invalid value in host"
     end
 
     def ends_in_number?(domain)
-      parts = domain.split(".")
-      return false if parts.size == 0
+      parts = domain.split(".", -1)
+      if parts.last == ""
+        return false if parts.size == 1
+        parts.pop
+      end
 
       last = parts.last
-      return true if last.chars.all? { |c| ascii_digit?(c) }
+      return true if last != "" && last.chars.all? { |c| ascii_digit?(c) }
 
       begin
         parse_ipv4_number(last)
@@ -103,7 +108,7 @@ class URI::WhatwgParser
     end
 
     def parse_ipv4_number(str)
-      raise ParseError if str&.empty?
+      raise ParseError, "invalid IPv4 format" if str&.empty?
 
       validation_error = false
       r = 10
@@ -124,10 +129,19 @@ class URI::WhatwgParser
         output = Integer(str, r)
         return output, validation_error
       rescue ArgumentError
-        raise ParseError
+        raise ParseError, "invalid IPv4 format"
       end
     end
 
+    def domain_to_ascii(domain)
+      ascii_domain = URI::IDNA.whatwg_to_ascii(domain.force_encoding(Encoding::UTF_8), be_strict: false)
+
+      raise ParseError, "including invalid value in host" if include_forbidden_domain_code_point?(ascii_domain)
+      raise ParseError, "host can't be empty" if ascii_domain.empty?
+
+      ascii_domain
+    end
+
     def include_forbidden_domain_code_point?(str)
       str.chars.intersect?(FORBIDDEN_DOMAIN_CODE_POINT)
     end

data/lib/uri/whatwg_parser/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   class WhatwgParser
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/uri/whatwg_parser.rb

@@ -37,12 +37,20 @@ module URI
       {}
     end
 
-    def parse(uri) # :nodoc:
+    def parse(uri, base = nil) # :nodoc:
       reset
-      URI.for(*self.split(uri))
+      URI.for(*self.split(uri, base))
     end
 
-    def split(uri) # :nodoc:
+    def split(uri, base = nil) # :nodoc:
+      @base = nil
+      if base != nil
+        ary = split(base)
+        @base = { scheme: ary[0], userinfo: ary[1], host: ary[2], port: ary[3], registry: ary[4], path: ary[5], opaque: ary[6], query: ary[7], fragment: ary[8]}
+        @base_paths = @paths
+        reset
+      end
+
       uri = uri.dup
       uri.gsub!(/\A[\u0000-\u0020]*/, "")
       uri.gsub!(/[\u0000-\u0020]*\z/, "")
@@ -50,7 +58,7 @@ module URI
       uri.delete!("\n")
       uri.delete!("\r")
 
-      raise ParseError if uri.empty?
+      raise ParseError, "uri can't be empty" if uri.empty? && @base.nil?
 
       @scanner = StringScanner.new(uri)
 
@@ -58,6 +66,11 @@ module URI
         c = @scanner.getch
         send("on_#{@state}", c)
 
+        if @force_continue
+          @force_continue = false
+          next
+        end
+
         break if c.nil? && @scanner.eos?
       end
 
@@ -67,10 +80,21 @@ module URI
       @parse_result.values
     end
 
+    def join(*uris)
+      return parse(uris[0]) if uris.size == 1
+
+      base, input = uris.shift(2)
+      uri = parse(input.to_s, base.to_s)
+      uris.each do |input|
+        uri = parse(input.to_s, uri.to_s)
+      end
+
+      uri
+    end
+
     private
 
     def reset
-      @state = nil
       @scanner = nil
       @buffer = +""
       @at_sign_seen = nil
@@ -80,6 +104,7 @@ module URI
       @username = nil
       @password = nil
       @parse_result = { scheme: nil, userinfo: nil, host: nil, port: nil, registry: nil, path: nil, opaque: nil, query: nil, fragment: nil }
+      @force_continue = false
       @state = :scheme_start_state
     end
 
@@ -88,7 +113,11 @@ module URI
         @buffer += c.downcase
         @state = :scheme_state
       else
-        @scanner.pos -= c.bytesize unless c.nil?
+        if c.nil?
+          @force_continue = true
+        else
+          @scanner.pos -= c.bytesize
+        end
         @state = :no_scheme_state
       end
     end
@@ -102,6 +131,8 @@ module URI
 
         if @parse_result[:scheme] == "file"
           @state = :file_state
+        elsif special_url? && !@base.nil? && @parse_result[:scheme] == @base[:scheme]
+          @state = :special_relative_or_authority_state
         elsif special_url?
           @state = :special_authority_slashes_state
         elsif @scanner.rest.start_with?("/")
@@ -113,22 +144,36 @@ module URI
         end
       else
         @buffer = +""
-        @scanner.pos = 0
+        decrease_pos(c)
         @state = :no_scheme_state
       end
     end
 
     def on_no_scheme_state(c)
-      raise ParseError
+      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]
+        @parse_result[:query] = @base[:query]
+        @parse_result[:fragment] = ""
+        @state = :fragment_state
+      elsif @base[:scheme] != "file"
+        @state = :relative_state
+        decrease_pos(c)
+      else
+        @state = :file_state
+        decrease_pos(c)
+      end
     end
 
     def on_special_relative_or_authority_state(c)
       if c == "/" && @scanner.rest.start_with?("/")
         @state = :special_authority_ignore_slashes_state
-        @scanner.pos += c.bytesize
+        decrease_pos(c)
       else
         @state = :relative_state
-        @scanner.pos -= c.bytesize
+        decrease_pos(c)
       end
     end
 
@@ -137,14 +182,66 @@ module URI
         @state = :authority_state
       else
         @state = :path_state
-        @scanner.pos -= c.bytesize
+        decrease_pos(c)
+      end
+    end
+
+    def on_relative_state(c)
+      @parse_result[:scheme] = @base[:scheme]
+      if c == "/"
+        @state = :relative_slash_state
+      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]
+        @parse_result[:query] = @base[:query]
+
+        if c == "?"
+          @parse_result[:query] = ""
+          @state = :query_state
+        elsif c == "#"
+          @parse_result[:fragment] = ""
+          @state = :fragment_state
+        elsif !c.nil?
+          @parse_result[:query] = nil
+          shorten_url_path
+          @state = :path_state
+          @scanner.pos -= c.bytesize
+        end
+      end
+    end
+
+    def on_relative_slash_state(c)
+      if special_url? && (c == "/" || c == "\\")
+        @state = :special_authority_ignore_slashes_state
+      elsif c == "/"
+        @state = :authority_state
+      else
+        @parse_result[:userinfo] = @base[:userinfo]
+        @parse_result[:host] = @base[:host]
+        @parse_result[:port] = @base[:port]
+        @state = :path_state
+        decrease_pos(c)
       end
     end
 
     def on_special_authority_slashes_state(c)
-      if c != "\\" && c != "/"
+      if c == "/" && @scanner.rest.start_with?("/")
+        @state = :special_authority_ignore_slashes_state
+        @scanner.pos += c.bytesize
+      else
+        @state = :special_authority_ignore_slashes_state
+        decrease_pos(c)
+      end
+    end
+
+    def on_special_authority_ignore_slashes_state(c)
+      if c != "/" && c != "\\"
         @state = :authority_state
-        @scanner.pos -= c.bytesize
+        decrease_pos(c)
       end
     end
 
@@ -169,8 +266,13 @@ module URI
 
         @buffer = +""
       elsif c.nil? || ["/", "?", "#"].include?(c) || (special_url? && c == "\\")
-        raise ParseError if @at_sign_seen && @buffer.empty?
-        @scanner.pos -= (@buffer.bytesize + c&.bytesize.to_i)
+        raise ParseError, "host is missing" if @at_sign_seen && @buffer.empty?
+        if c.nil?
+          @force_continue = true
+          @scanner.pos -= @buffer.bytesize
+        else
+          @scanner.pos -= (@buffer.bytesize + c.bytesize.to_i)
+        end
         @buffer = +""
         @state = :host_state
       else
@@ -180,15 +282,15 @@ module URI
 
     def on_host_state(c)
       if c == ":" && !@inside_brackets
-        raise ParseError if @buffer.empty?
+        raise ParseError, "host is missing" if @buffer.empty?
 
         @parse_result[:host] = @host_parser.parse(@buffer, !special_url?)
         @buffer = +""
         @state = :port_state
       elsif c.nil? || ["/", "?", "#"].include?(c) || (special_url? && c == "\\")
-        @scanner.pos -= c.bytesize unless c.nil?
+        decrease_pos(c)
         if special_url? && @buffer.empty?
-          raise ParseError
+          raise ParseError, "host is missing"
         else
           @parse_result[:host] = @host_parser.parse(@buffer, !special_url?)
           @buffer = +""
@@ -207,20 +309,20 @@ module URI
       elsif c.nil? || ["/", "?", "#"].include?(c) || (special_url? && c == "\\")
         unless @buffer.empty?
           begin
-            port = Integer(@buffer)
-            raise ParseError if port < 0 || port > 65535
+            port = Integer(@buffer, 10)
+            raise ParseError, "port is invalid value" if port < 0 || port > 65535
             @parse_result[:port] = port unless SPECIAL_SCHEME[@parse_result[:scheme]] == port
           rescue ArgumentError
-            raise ParseError
+            raise ParseError, "port is invalid value"
           end
 
           @buffer = +""
         end
 
         @state = :path_start_state
-        @scanner.pos -= c.bytesize unless c.nil?
+        decrease_pos(c)
       else
-        raise ParseError
+        raise ParseError, "port is invalid value"
       end
     end
 
@@ -230,9 +332,28 @@ module URI
 
       if c == "/" || c == "\\"
         @state = :file_slash_state
+      elsif !@base.nil? && @base[:scheme] == "file"
+        @parse_result[:host] = @base[:host]
+        @parse_result[:query] = @base[:query]
+        if c == "?"
+          @parse_result[:query] = ""
+          @state = :query_state
+        elsif c == "#"
+          @parse_result[:fragment] = ""
+          @state = :fragment_state
+        elsif !c.nil?
+          @parse_result[:query] = nil
+          if !starts_with_windows_drive_letter?(@scanner.rest)
+            shorten_url_path
+          else
+            @paths = []
+          end
+          @state = :path_state
+          decrease_pos(c)
+        end
       else
-        @scanner.pos -= c.bytesize unless c.nil?
         @state = :path_state
+        decrease_pos(c)
       end
     end
 
@@ -240,8 +361,14 @@ module URI
       if c == "/" || c == "\\"
         @state = :file_host_state
       else
-        @scanner.pos -= c.bytesize unless c.nil?
+        if !@base.nil? && @base[:scheme] == "file"
+          @parse_result[:host] = @base[:host]
+          if !starts_with_windows_drive_letter?(@scanner.rest) && normalized_windows_drive_letter?(@base_paths[0])
+            @paths[0] += @base_paths[0]
+          end
+        end
         @state = :path_state
+        decrease_pos(c)
       end
     end
 
@@ -361,6 +488,10 @@ module URI
       WINDOWS_DRIVE_LETTER.match?(str)
     end
 
+    def starts_with_windows_drive_letter?(str)
+      STARTS_WITH_wINDOWS_DRIVE_LETTER.match?(str)
+    end
+
     def normalized_windows_drive_letter?(str)
       NORMALIZED_WINDOWS_DRIVE_LETTER.match?(str)
     end
@@ -383,6 +514,14 @@ module URI
       return true if @parse_result[:scheme] == "file" && @parse_result[:path]&.length == 1 && normalized_windows_drive_letter?(@parse_result[:path])
       @parse_result[:path]&.chomp!
     end
+
+    def decrease_pos(c)
+      if c.nil?
+        @force_continue = true
+      else
+        @scanner.pos -= c.bytesize
+      end
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: uri-whatwg_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuji Yaginuma
 bindir: exe
 cert_chain: []
-date: 2025-05-04 00:00:00.000000000 Z
+date: 2025-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan