uri 0.12.3 → 0.12.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e5eb539bccaa2d0f90ead026894ac1120ef94cffc908cc98450e4fe3e261119
4
- data.tar.gz: f5708e8f3e332c3e05cd39b1147ba732645986599e59952b2ede2d9e2051d3a0
3
+ metadata.gz: 5c43a663680279fb560cd1743d6ddd5c8d856b938381b16c525ca467ca4f53d8
4
+ data.tar.gz: 41bf92949944caad1719afe0b2067d5889104430e938e84e183cfd81e2a048c7
5
5
  SHA512:
6
- metadata.gz: 2f3d2a24d61837a54530718294785ab82a12c28681de29fc5afe8cd0aa70e9ed046c8d023bfec55e0a484ef20aa74601479003d9781ed4ac9f78fb9338ecd937
7
- data.tar.gz: 765df4b7b63d7b102cf22e0ca54a8eef49b3ab3f4bbb5655f4beb003608a2caa3110f4d71f5b5b502b6a17203260dda72c0a16d6bf23a79001de010a3ee7504a
6
+ metadata.gz: '08c726bbfda93cdeeb7236715ca3c81dfcdaa54dc14084ddd1b61802f819311461973f79845ce410d2e2024ee06ea3921afc5fad3d4323afd9006d5ee2311a06'
7
+ data.tar.gz: 60ecac2ccad60019655d96623870256441f8683377ba7f014ea4a6198e3ab9d8387d4a031a1b6e1438cbedcd8f3acd4443b4c48a15c03174fb768aecf4170295
data/lib/uri/generic.rb CHANGED
@@ -1133,17 +1133,16 @@ module URI
1133
1133
  base.fragment=(nil)
1134
1134
 
1135
1135
  # RFC2396, Section 5.2, 4)
1136
- if !authority
1137
- base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
1138
- else
1139
- # RFC2396, Section 5.2, 4)
1140
- base.set_path(rel.path) if rel.path
1136
+ if authority
1137
+ base.set_userinfo(rel.userinfo)
1138
+ base.set_host(rel.host)
1139
+ base.set_port(rel.port || base.default_port)
1140
+ base.set_path(rel.path)
1141
+ elsif base.path && rel.path
1142
+ base.set_path(merge_path(base.path, rel.path))
1141
1143
  end
1142
1144
 
1143
1145
  # RFC2396, Section 5.2, 7)
1144
- base.set_userinfo(rel.userinfo) if rel.userinfo
1145
- base.set_host(rel.host) if rel.host
1146
- base.set_port(rel.port) if rel.port
1147
1146
  base.query = rel.query if rel.query
1148
1147
  base.fragment=(rel.fragment) if rel.fragment
1149
1148
 
data/lib/uri/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module URI
2
2
  # :stopdoc:
3
- VERSION_CODE = '001203'.freeze
3
+ VERSION_CODE = '001204'.freeze
4
4
  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
5
5
  # :startdoc:
6
6
  end
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uri
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.3
4
+ version: 0.12.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Akira Yamada
8
+ autorequire:
8
9
  bindir: exe
9
10
  cert_chain: []
10
- date: 2024-08-27 00:00:00.000000000 Z
11
+ date: 2025-02-26 00:00:00.000000000 Z
11
12
  dependencies: []
12
13
  description: URI is a module providing classes to handle Uniform Resource Identifiers
13
14
  email:
@@ -48,6 +49,7 @@ licenses:
48
49
  metadata:
49
50
  homepage_uri: https://github.com/ruby/uri
50
51
  source_code_uri: https://github.com/ruby/uri
52
+ post_install_message:
51
53
  rdoc_options: []
52
54
  require_paths:
53
55
  - lib
@@ -62,7 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
62
64
  - !ruby/object:Gem::Version
63
65
  version: '0'
64
66
  requirements: []
65
- rubygems_version: 3.6.0.dev
67
+ rubygems_version: 3.4.19
68
+ signing_key:
66
69
  specification_version: 4
67
70
  summary: URI is a module providing classes to handle Uniform Resource Identifiers
68
71
  test_files: []