uri-whatwg_parser 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3c073b711f9600fd66938070b1cc254a1067b684437f27038a69bc65076c9c
-  data.tar.gz: fe833972e0fe8265958d94a97b127983bca064cd29f554c78fb1c2459be008f9
+  metadata.gz: 340c89cc9b0c80699547d7daa0a33c3c081250ebee1dd1178a36ee288a484a22
+  data.tar.gz: 961034f93393490c76ad015aea1524b27b5955ef38112892d50b2a1e15a3ac50
 SHA512:
-  metadata.gz: 541f8b1b1d02b2ac2f16b4af59e5fe3b02e01b2f291529b2698590d01dfc6e1da528926920af1dad8c2d21a11437030356859b30d6e972d2fd3e54aad04cd89a
-  data.tar.gz: 639c0241664afd68d4f0f4c2cea36e71f484cb53215fc12bb89e65749626e1769e9a777420201468e7863a624afe62a0bb8839776a9e565252a35211c845dbf4
+  metadata.gz: 987525847dbe6f04d4a2a4c3c8e338d57ebd964d4312528bc16e5e515ba7460922c3fedf08a4151227dbd1fbca11be4af38db6db53e1d741992460fd89c86bd0
+  data.tar.gz: 12eae3fe44a8136aa66a55d1aa7e12b172980ae96470f890e34e721fae4c1f3f23155ff1a2e1db305ce2f239cdf239a7db43fe5feb153eb11f3f230c09fd77a4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.1
+
+* Fix a bug of parsing Windows drive letter
+* Correctly set a password when a username is nil
+* Fix setter methods behavior with `URI object created by `build` method
+
 ## 0.3.0
 
 * Fix several incorrect parsing processes

data/README.md

@@ -1,5 +1,4 @@
 # URI::WhatwgParser
-
 Ruby implementation of the [WHATWG URL Living Standard](https://url.spec.whatwg.org/).
 
 The latest revision that this package implements of the standard is [14 April 2026](https://url.spec.whatwg.org/commit-snapshots/b11d73b8caefe90403afe19210db05acba897722/)
@@ -27,10 +26,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## TODO
-
-* Support validations
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/y-yagi/uri-whatwg_parser.

data/lib/uri/whatwg_parser/generic.rb

@@ -6,7 +6,7 @@ module URI
       def initialize(scheme, userinfo, host, port, registry, path, opaque, query, fragment, parser = DEFAULT_PARSER, arg_check = false)
         @parsed_by_whatwg_parser = parser.is_a?(URI::WhatwgParser)
         unless parser.is_a?(URI::WhatwgParser)
-          return super(scheme, userinfo, host, port, registry, path, opaque, query, fragment)
+          return super(scheme, userinfo, host, port, registry, path, opaque, query, fragment, URI::RFC3986_PARSER, arg_check)
         end
 
         @scheme = nil
@@ -26,7 +26,7 @@ module URI
         self.set_port(port)
         self.set_userinfo(userinfo)
         self.set_path(path)
-        self.query = query
+        @query = query
         self.set_opaque(opaque)
         @fragment = fragment
         @raw_path = parser&.path

data/lib/uri/whatwg_parser/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   class WhatwgParser
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/uri/whatwg_parser.rb

@@ -25,7 +25,7 @@ module URI
 
     WINDOWS_DRIVE_LETTER = Regexp.new("\\A([a-zA-Z][:|])\\z")
     NORMALIZED_WINDOWS_DRIVE_LETTER = Regexp.new("\\A([a-zA-Z][:])\\z")
-    STARTS_WITH_WINDOWS_DRIVE_LETTER = Regexp.new("\\A([a-zA-Z][:|])(?:[/\\?#])?\\z")
+    FILE_OTHERWISE_CODE_POINTS = Set["/", "\\", "?", "#"]
 
     VALID_SIGNS_FOR_SCHEME = Set["+", "-", "."]
     DELIMITER_SIGNS = Set["/", "?", "#"]
@@ -96,7 +96,11 @@ module URI
         @pos += 1
       end
 
-      userinfo = [@username, @password].compact.reject(&:empty?).join(":")
+      if @password
+        userinfo = "#{@username}:#{@password}"
+      else
+        userinfo = @username
+      end
       if @path
         if @path.is_a?(Array)
           path = "/#{@path.join("/")}"
@@ -235,7 +239,7 @@ module URI
         @special_url = special_url?(@base[:scheme])
         @path = @base_path
         @parse_result[:query] = @base[:query]
-        @parse_result[:fragment] = nil
+        @parse_result[:fragment] = +""
         @state = :fragment_state
       elsif @base[:scheme] != "file"
         @state = :relative_state
@@ -280,10 +284,10 @@ module URI
         @parse_result[:query] = @base[:query]
 
         if c == "?"
-          @parse_result[:query] = nil
+          @parse_result[:query] = +""
           @state = :query_state
         elsif c == "#"
-          @parse_result[:fragment] = nil
+          @parse_result[:fragment] = +""
           @state = :fragment_state
         elsif !c.nil?
           @parse_result[:query] = nil
@@ -394,7 +398,7 @@ module URI
         @buffer << c
       elsif c.nil? || DELIMITER_SIGNS.include?(c) || (@special_url && c == "\\") || @state_override
         unless @buffer.empty?
-          port = Integer(@buffer, 10)
+          port = @buffer.to_i
           raise ParseError, "port is invalid value" if port < 0 || port > 65535
           if SPECIAL_SCHEME[@parse_result[:scheme]] == port
             @parse_result[:port] = nil
@@ -409,7 +413,6 @@ module URI
           end
         end
 
-        raise ParseError, "port is invalid value" if @state_override
         @state = :path_start_state
         @pos -= 1
       else
@@ -421,17 +424,17 @@ module URI
       @parse_result[:scheme] = "file"
       @special_url = true
       @parse_result[:host] = nil
-
       if c == "/" || c == "\\"
         @state = :file_slash_state
       elsif !@base.nil? && @base[:scheme] == "file"
         @parse_result[:host] = @base[:host]
+        @path = @base_path
         @parse_result[:query] = @base[:query]
         if c == "?"
-          @parse_result[:query] = nil
+          @parse_result[:query] = +""
           @state = :query_state
         elsif c == "#"
-          @parse_result[:fragment] = nil
+          @parse_result[:fragment] = +""
           @state = :fragment_state
         elsif !c.nil?
           @parse_result[:query] = nil
@@ -456,10 +459,8 @@ module URI
         if !@base.nil? && @base[:scheme] == "file"
           @parse_result[:host] = @base[:host]
           if !starts_with_windows_drive_letter?(rest) && @base_path && normalized_windows_drive_letter?(@base_path[0])
-            if @path.nil?
-              @path ||= []
-              @path[0] = @base_path[0]
-            end
+            @path = [] if @path.nil?
+            @path << @base_path[0]
           end
         end
         @state = :path_state
@@ -501,8 +502,10 @@ module URI
         @pos -= 1 if c != "/" && c != "\\"
         @state = :path_state
       elsif !@state_override && c == "?"
+        @parse_result[:query] = +""
         @state = :query_state
       elsif !@state_override && c == "#"
+        @parse_result[:fragment] = +""
         @state = :fragment_state
       elsif c != nil
         @pos -= 1 if c != "/"
@@ -536,10 +539,10 @@ module URI
         @buffer = +""
 
         if c == "?"
-          @parse_result[:query] = nil
+          @parse_result[:query] = +""
           @state = :query_state
         elsif c == "#"
-          @parse_result[:fragment] = nil
+          @parse_result[:fragment] = +""
           @state = :fragment_state
         end
       else
@@ -549,10 +552,10 @@ module URI
 
     def opaque_path_state(c)
       if c == "?"
-        @parse_result[:query] = nil
+        @parse_result[:query] = +""
         @state = :query_state
       elsif c == "#"
-        @parse_result[:fragment] = nil
+        @parse_result[:fragment] = +""
         @state = :fragment_state
       elsif c == " "
         first_of_rest = @input_chars[@pos + 1]
@@ -591,7 +594,9 @@ module URI
     end
 
     def starts_with_windows_drive_letter?(str)
-      STARTS_WITH_WINDOWS_DRIVE_LETTER.match?(str)
+      return false if str.length < 2
+      return false unless windows_drive_letter?(str[0, 2])
+      str.length == 2 || FILE_OTHERWISE_CODE_POINTS.include?(str[2])
     end
 
     def normalized_windows_drive_letter?(str)
@@ -621,7 +626,7 @@ module URI
     end
 
     def rest
-      @input_chars[@pos + 1..]&.join
+      @input_chars[@pos..]&.join
     end
 
     def convert_to_uri(uri)

metadata

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