Skip to content

Commit 35a7012

Browse files
Merge pull request #585 from OneBusAway/release-please--branches--main--changes--next
release: 1.1.3
2 parents 76f82c2 + 134a213 commit 35a7012

File tree

7 files changed

+23
-6
lines changed

7 files changed

+23
-6
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.1.2"
2+
".": "1.1.3"
33
}

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## 1.1.3 (2025-10-16)
4+
5+
Full Changelog: [v1.1.2...v1.1.3](https://github.com/OneBusAway/ruby-sdk/compare/v1.1.2...v1.1.3)
6+
7+
### Bug Fixes
8+
9+
* absolutely qualified uris should always override the default ([a1e088f](https://github.com/OneBusAway/ruby-sdk/commit/a1e088fd89b1155765ca359d6dc3a2e9ae2fb67e))
10+
311
## 1.1.2 (2025-10-15)
412

513
Full Changelog: [v1.1.1...v1.1.2](https://github.com/OneBusAway/ruby-sdk/compare/v1.1.1...v1.1.2)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GIT
1111
PATH
1212
remote: .
1313
specs:
14-
onebusaway-sdk (1.1.2)
14+
onebusaway-sdk (1.1.3)
1515
connection_pool
1616

1717
GEM

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ To use this gem, install via Bundler by adding the following to your application
1717
<!-- x-release-please-start-version -->
1818

1919
```ruby
20-
gem "onebusaway-sdk", "~> 1.1.2"
20+
gem "onebusaway-sdk", "~> 1.1.3"
2121
```
2222

2323
<!-- x-release-please-end -->

lib/onebusaway_sdk/internal/util.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,9 @@ def join_parsed_uri(lhs, rhs)
346346
base_path, base_query = lhs.fetch_values(:path, :query)
347347
slashed = base_path.end_with?("/") ? base_path : "#{base_path}/"
348348

349-
parsed_path, parsed_query = parse_uri(rhs.fetch(:path)).fetch_values(:path, :query)
350-
override = URI::Generic.build(**rhs.slice(:scheme, :host, :port), path: parsed_path)
349+
merged = {**parse_uri(rhs.fetch(:path)), **rhs.except(:path, :query)}
350+
parsed_path, parsed_query = merged.fetch_values(:path, :query)
351+
override = URI::Generic.build(**merged.slice(:scheme, :host, :port), path: parsed_path)
351352

352353
joined = URI.join(URI::Generic.build(lhs.except(:path, :query)), slashed, override)
353354
query = deep_merge(

lib/onebusaway_sdk/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module OnebusawaySDK
4-
VERSION = "1.1.2"
4+
VERSION = "1.1.3"
55
end

test/onebusaway_sdk/internal/util_test.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ def test_joining
124124
path: "/c",
125125
query: {"d" => ["e"]}
126126
}
127+
],
128+
[
129+
"h://a.b/c?d=e",
130+
"h://nope",
131+
{
132+
path: "h://a.b/c",
133+
query: {"d" => ["e"]}
134+
}
127135
]
128136
]
129137

0 commit comments

Comments
 (0)