uri 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc19854507809e0f4bf6ae1fa81981c1efe1cd1a136569794d1998a9361ae1e
-  data.tar.gz: 8d95b35877d847fa1f997760b7df2059cf0dfa6644c8a617e4a5abbab029d767
+  metadata.gz: c29481905b99ec405086769e5fce6c32539064d0a2917b23d4dddd8419e4db0d
+  data.tar.gz: 5bbfeac4e030df131451c4847132e360d48f76f9d1e4344f8eba92dd6a07d8d7
 SHA512:
-  metadata.gz: 7ea5bcaba6c135ec0b9c3f6441e5274087c9a8ad399297219e57b6ba03e4c944e113266e6a28964162de21367fa3881b9be7d9aa8ebf37536f5a8474b82a7c19
-  data.tar.gz: 6996e26464dc1e408b82a926db2925d39633cb77d287944c09ed972fbf5eb87f513358439a8293874cfaf384621a4465d6c0fd2539b577c6faed305715453355
+  metadata.gz: da33d741be44959eeb82c761c53a6d4a9483554d08be0ef0939ee146d991aa1117d0d89d3c917ee1ed2b44d39c03cc465de71cb556d24861ffb907053b013034
+  data.tar.gz: 347fc502d30a10cb3f24dc06945780c625dde86737c48e904cff913726385c5a54e5ae0ba8e8036e3c3f1457f8003eea8b7fffe44dd6f3f4481d0ed563fd3289

data/.github/workflows/test.yml

@@ -7,16 +7,20 @@ jobs:
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ '3.0', 2.7, 2.6, 2.5, 2.4, head ]
+        ruby: [ 3.1, '3.0', 2.7, 2.6, 2.5, 2.4, head, truffleruby ]
         os: [ ubuntu-latest, macos-latest ]
+        exclude:
+          - ruby: 2.4
+            os: macos-latest
+          - ruby: 2.5
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
+    - run: bundle install --jobs 4 --retry 3
     - name: Run test
       run: rake test

data/lib/uri/generic.rb

@@ -1123,17 +1123,16 @@ module URI
       base.fragment=(nil)
 
       # RFC2396, Section 5.2, 4)
-      if !authority
-        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
-      else
-        # RFC2396, Section 5.2, 4)
-        base.set_path(rel.path) if rel.path
+      if authority
+        base.set_userinfo(rel.userinfo)
+        base.set_host(rel.host)
+        base.set_port(rel.port || base.default_port)
+        base.set_path(rel.path)
+      elsif base.path && rel.path
+        base.set_path(merge_path(base.path, rel.path))
       end
 
       # RFC2396, Section 5.2, 7)
-      base.set_userinfo(rel.userinfo) if rel.userinfo
-      base.set_host(rel.host)         if rel.host
-      base.set_port(rel.port)         if rel.port
       base.query = rel.query       if rel.query
       base.fragment=(rel.fragment) if rel.fragment
 

data/lib/uri/version.rb

@@ -1,6 +1,6 @@
 module URI
   # :stopdoc:
-  VERSION_CODE = '001102'.freeze
+  VERSION_CODE = '001103'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uri
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Akira Yamada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies: []
 description: URI is a module providing classes to handle Uniform Resource Identifiers
 email:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: URI is a module providing classes to handle Uniform Resource Identifiers