uri-whatwg_parser 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2061d819a10365a97f389d9cb70325c87b75c390c4145897ed640c3e4cc85f70
-  data.tar.gz: 905ec3bdd174039fc91ce433f84a079fe12ff93f9ac999f420b08760b3fcee53
+  metadata.gz: 9fbee32c52de5146f74c7ca4bdc26914ba2d0b83de26cbc6880354961ed447c9
+  data.tar.gz: 0a5b14a90fe61b3647edde05f0aba209b56ecdc043f5a4bff77c894edbe73391
 SHA512:
-  metadata.gz: fc4a0d83fb46e959feb1f7990fa1f119428764447c6d4d455ec5287d5823b19eec845ef4b8912ceeffd6233266b3142859a837c7a26e47e20315d64bb5660006
-  data.tar.gz: bd36808311ae2330cd897ba824219d82cff0497d75531441b3679def9ff5ea1969297ccfcbb8cd02b83909a2f7a5c0de7f0d505bb79e1117494544dd3d4b3cfa
+  metadata.gz: e55b7d27284b8772179a4047081def6b28ce4ab0b9923d08fd7b7a27fdebe5f18eb356535fd70498f76f02e5f1c27817906d19104420bb34cf57b47c5791f0cd
+  data.tar.gz: 46efa3674cf7814d5500b07f7ea272e46aeeedbcea02077ff95e3ebd4fee5be73c9e3ebba2885a9a3e421f87dbf13be4214b0da9bcbfdad24df9f9cf75a9f182

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.5
+
+* Remove `ipaddr` dependency
+
 ## 0.1.4
 
 * Support passing `encoding` option

data/lib/uri/whatwg_parser/host_parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "uri/idna"
-require "ipaddr"
 require_relative "parser_helper"
 
 class URI::WhatwgParser
@@ -66,26 +65,128 @@ class URI::WhatwgParser
       output.join(".")
     end
 
-    def parse_ipv6(host)
-      addr = IPAddr.new(host)
-      # NOTE: URL Standard doesn't support `zone_id`.
-      raise ParseError, "invalid IPv6 format" unless addr.zone_id.nil?
-      formatted_addr = (("%.32x" % addr).gsub(/.{4}(?!$)/, '\&:'))
-      "[#{compress_ipv6(formatted_addr)}]"
-    rescue IPAddr::InvalidAddressError
-      raise ParseError, "invalid IPv6 format"
+    def parse_ipv6(input)
+      input = input[1..-2] if input.start_with?("[") && input.end_with?("]")
+      address = Array.new(8, 0)
+      piece_index = 0
+      compress = nil
+      chars = input.chars
+      i = 0
+
+      if chars[i] == ":"
+        raise ParseError, "invalid IPv6 format" unless chars[i + 1] == ":"
+        i += 2
+        compress = piece_index
+      end
+
+      while i < chars.length
+        raise ParseError, "invalid IPv6 format" if piece_index == 8
+
+        if chars[i] == ":"
+          raise ParseError, "invalid IPv6 format" if compress
+          i += 1
+          compress = piece_index
+          next
+        end
+
+        value = 0
+        length = 0
+        while length < 4 && i < chars.length && chars[i].match?(/[0-9A-Fa-f]/)
+          value = value * 16 + chars[i].to_i(16)
+          i += 1
+          length += 1
+        end
+
+        if chars[i] == "."
+          # IPv4-mapped address must be valid and complete, no trailing dot
+          ipv4_piece = chars[i - length, chars.length - (i - length)].join
+          parts = ipv4_piece.split(".")
+          if parts.length != 4 || parts.any? { |p| p.empty? } || ipv4_piece.end_with?(".")
+            raise ParseError, "invalid IPv6 format"
+          end
+
+          ipv4 = parse_ipv4(ipv4_piece)
+          address[piece_index] = (ipv4 >> 16) & 0xFFFF
+          address[piece_index + 1] = ipv4 & 0xFFFF
+          piece_index += 2
+          i = chars.length
+          break
+        end
+
+        raise ParseError, "invalid IPv6 format" if length == 0
+
+        address[piece_index] = value
+        piece_index += 1
+
+        if i < chars.length
+          if chars[i] == ":"
+            i += 1
+          elsif chars[i] != nil
+            raise ParseError, "invalid IPv6 format"
+          end
+        end
+      end
+
+      if compress
+        swaps = piece_index - compress
+        (0...swaps).each do |j|
+          address[7 - j] = address[compress + swaps - 1 - j]
+          address[compress + swaps - 1 - j] = 0
+        end
+      elsif piece_index != 8
+        raise ParseError, "invalid IPv6 format"
+      end
+
+      compress_ipv6(address)
     end
 
-    def compress_ipv6(ip)
-      output = ip.split(":").map { |term| term.sub(/\A0+/, "").empty? ? "0" : term.sub(/\A0+/, "") }.join(":")
-      zeros = output.scan(/:?(?:0+:?){2,}/)
+    def compress_ipv6(address)
+      # Find the longest run of zeros for '::' compression
+      best_base = nil
+      best_len = 0
+      base = nil
+      len = 0
+
+      8.times do |idx|
+        if address[idx] == 0
+          base = idx if base.nil?
+          len += 1
+        else
+          if len > best_len
+            best_base = base
+            best_len = len
+          end
+          base = nil
+          len = 0
+        end
+      end
+
+      if len > best_len
+        best_base = base
+        best_len = len
+      end
+
+      # Only compress if the run is at least two 0s
+      if best_len < 2
+        best_base = nil
+      end
 
-      unless zeros.empty?
-        max = zeros.max_by { |item| item.gsub(":", "").length }
-        output = output.sub(max, "::")
+      # Build the string with '::' for the longest zero run
+      result = []
+      idx = 0
+      while idx < 8
+        if best_base == idx
+          result << "" if idx == 0
+          result << ""
+          idx += best_len
+          result << "" if idx == 8
+          next
+        end
+        result << address[idx].to_s(16)
+        idx += 1
       end
 
-      output
+      "[#{result.join(":").gsub(/:{3,}/, "::")}]"
     end
 
     def parse_opaque_host(host)

data/lib/uri/whatwg_parser/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: uri-whatwg_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yuji Yaginuma
 bindir: exe
 cert_chain: []
-date: 2025-06-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Ruby implementation of the WHATWG URL Living Standard
 test_files: []