uri-whatwg_parser 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 712c7079461310fdab82e79bea4491ce91a4a8b26827a338334a0e161520a8c0
-  data.tar.gz: 85871841fdee54a61c942134398bfb85e2e89f798144921464058e4edd2ea8fb
+  metadata.gz: 4463680cf6d13f3daf3513549ebe358f7b45484888704bbefffcecbb1790b8c7
+  data.tar.gz: b5ec5b9ad687c53f71f2fa21bcb049215dfff6ecdcb8305594f569ba86c0b210
 SHA512:
-  metadata.gz: 42b046952ea2817c3db80edcc69bafbf86822c9b88f23837b4decb9d9693b0044f68b9a74c920707e16ee28121f2c03d6992df300227b32cf62a3995e7af7ee5
-  data.tar.gz: aa9c3d27934eec97f11f579cc2b194b5b88f0d69da5c224cb4ebf6fd13878c8a493a7e3391f7f985674e602629da303364aa49c7ed9b88f0b101b66c304db6d2
+  metadata.gz: 3ff5fd142e640d265e4d3bd11174e7658732430055d45cce16364bc783c85f7f642d3654d9621e2fa198d63f8e82959fa5d4588d611f6c3e3c3f2d46f382df9e
+  data.tar.gz: b389a5a39685d81ce3ade458b1d61746e9b0dca6e227b73658fe6c04910f20908a1669fd884c5e445bb401edc1db3915e21d15bdec8acf1b441c9c9b3e7e65d8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.1.8
+
+* Support `.build` method
+* Support setter methods
+
+## 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

data/README.md

@@ -2,7 +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 ([18 August 2025](https://url.spec.whatwg.org/commit-snapshots/05a5d834deba31622390ee05a3dcbc22496b7bb5/)).
+The latest revision that this package implements of the standard is ([30 October 2025](https://url.spec.whatwg.org/commit-snapshots/52526653e848c5a56598c84aa4bc8ac9025fb66b/)).
 
 ## Installation
 

data/lib/uri/whatwg_parser/generic.rb

@@ -0,0 +1,135 @@
+require "uri/generic"
+
+module URI
+  class WhatwgParser
+    module Generic
+      def initialize(scheme,
+                     userinfo, host, port, registry,
+                     path, opaque,
+                     query,
+                     fragment,
+                     parser = DEFAULT_PARSER,
+                     arg_check = false)
+        @scheme = nil
+        @user = nil
+        @password = nil
+        @host = nil
+        @port = nil
+        @path = nil
+        @query = nil
+        @opaque = nil
+        @fragment = nil
+        @parser = parser == DEFAULT_PARSER ? nil : parser
+
+        self.set_scheme(scheme)
+        self.set_host(host)
+        self.set_port(port)
+        self.set_userinfo(userinfo)
+        self.set_path(path)
+        self.query = query
+        self.set_opaque(opaque)
+        self.fragment=(fragment)
+
+        self.set_path("") if !@path && !@opaque
+        DEFAULT_PARSER.parse(to_s) if arg_check
+
+        if registry
+          raise InvalidURIError,
+            "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)"
+        end
+
+        @scheme&.freeze
+        self.set_port(self.default_port) if self.default_port && !@port
+      end
+
+
+      def merge(oth)
+        URI::DEFAULT_PARSER.join(self.to_s, oth.to_s)
+      end
+      alias + merge
+
+      def check_scheme(v)
+        self.set_scheme(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_user(v)
+        if @opaque
+          raise InvalidURIError, "cannot set user with opaque"
+        end
+
+        return v unless v
+
+        self.set_user(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_password(v, user = @user)
+        if @opaque
+          raise InvalidURIError, "cannot set password with opaque"
+        end
+        return v unless v
+
+        if !user
+          raise InvalidURIError, "password component depends user component"
+        end
+
+        self.set_password(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_host(v)
+        return v unless v
+
+        if @opaque
+          raise InvalidURIError, "cannot set host with registry or opaque"
+        end
+
+        self.set_host(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_port(v)
+        return v unless v
+
+        if @opaque
+          raise InvalidURIError, "cannot set port with registry or opaque"
+        end
+
+        self.set_port(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_path(v)
+        return v unless v
+
+        if @opaque
+          raise InvalidURIError, "path conflicts with opaque"
+        end
+
+        self.set_path(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+
+      def check_opaque(v)
+        return v unless v
+
+        if @host || @port || @user || @path
+          raise InvalidURIError, "cannot set opaque with host, port, userinfo or path"
+        end
+
+        self.set_opaque(v)
+        DEFAULT_PARSER.parse(to_s)
+        true
+      end
+    end
+  end
+end
+
+URI::Generic.prepend(URI::WhatwgParser::Generic)

data/lib/uri/whatwg_parser/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   class WhatwgParser
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   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
@@ -180,8 +181,7 @@ 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]
         @paths = @base_paths
@@ -208,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
@@ -498,6 +498,17 @@ module URI
     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.6
+  version: 0.1.8
 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