Skip to content

Commit 92d6f8e

Browse files
committed
🔖 Prepare release v1.1.5
⚡️ A message from a fellow meat-based-AI ⚡️ - [❤️] Finely-crafted open-source tools like prism-merge (& many more) require time and effort. - [❤️] Though I adore my work, it lacks financial sustainability. - [❤️] Please, help me continue enhancing your tools by becoming a sponsor: - [💲] https://liberapay.com/pboling/donate - [💲] https://github.com/sponsors/pboling
1 parent 8986d99 commit 92d6f8e

37 files changed

+92
-927
lines changed

CHANGELOG.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,30 @@ Please file a bug if you notice a violation of semantic versioning.
2222

2323
### Changed
2424

25-
- **Recursive merge now preserves freeze blocks**: When recursively merging nested block bodies (e.g., `Gem::Specification.new do ... end`), freeze blocks inside the body are now properly preserved. Previously, nested mergers were created with `freeze_token: nil`, causing freeze blocks to be lost.
26-
2725
### Deprecated
2826

2927
### Removed
3028

3129
### Fixed
3230

31+
### Security
32+
33+
## [1.1.5] - 2025-12-04
34+
35+
- TAG: [v1.1.5][1.1.5t]
36+
- COVERAGE: 98.26% -- 906/922 lines in 9 files
37+
- BRANCH COVERAGE: 87.27% -- 384/440 branches in 9 files
38+
- 100.00% documented
39+
40+
### Changed
41+
42+
- **Recursive merge now preserves freeze blocks**: When recursively merging nested block bodies (e.g., `Gem::Specification.new do ... end`), freeze blocks inside the body are now properly preserved. Previously, nested mergers were created with `freeze_token: nil`, causing freeze blocks to be lost.
43+
44+
### Fixed
45+
3346
- **Fixed freeze blocks lost in nested block bodies**: Freeze blocks inside class, module, or call-with-block bodies were being lost during recursive merge. The fix passes `freeze_token` to nested mergers and ensures `extract_node_body` includes leading comments/freeze markers that appear between the node's opening line and the first statement.
3447
- **Fixed duplicate freeze markers in output**: Freeze/unfreeze marker comments were incorrectly attached as leading comments to subsequent nodes, causing duplicate markers in merged output. These markers are now filtered from leading comments since they belong to FreezeNode boundaries.
3548

36-
### Security
37-
3849
## [1.1.4] - 2025-12-04
3950

4051
- TAG: [v1.1.4][1.1.4t]
@@ -212,7 +223,9 @@ Please file a bug if you notice a violation of semantic versioning.
212223

213224
- Initial release
214225

215-
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.4...HEAD
226+
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.5...HEAD
227+
[1.1.5]: https://github.com/kettle-rb/prism-merge/compare/v1.1.4...v1.1.5
228+
[1.1.5t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.5
216229
[1.1.4]: https://github.com/kettle-rb/prism-merge/compare/v1.1.3...v1.1.4
217230
[1.1.4t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.4
218231
[1.1.3]: https://github.com/kettle-rb/prism-merge/compare/v1.1.2...v1.1.3

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GIT
1313
PATH
1414
remote: .
1515
specs:
16-
prism-merge (1.1.4)
16+
prism-merge (1.1.5)
1717
prism (~> 1.6)
1818
version_gem (~> 1.1, >= 1.1.9)
1919

@@ -399,7 +399,7 @@ CHECKSUMS
399399
prawn (2.5.0) sha256=f4e20e3b4f30bf5b9ae37dad15eb421831594553aa930b2391b0fa0a99c43cb6
400400
prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
401401
prism (1.6.0) sha256=bfc0281a81718c4872346bc858dc84abd3a60cae78336c65ad35c8fbff641c6b
402-
prism-merge (1.1.4)
402+
prism-merge (1.1.5)
403403
psych (5.2.6) sha256=814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e
404404
public_suffix (7.0.0) sha256=f7090b5beb0e56f9f10d79eed4d5fbe551b3b425da65877e075dad47a6a1b095
405405
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ Thanks for RTFM. ☺️
11941194
[📌gitmoji]: https://gitmoji.dev
11951195
[📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
11961196
[🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
1197-
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.918-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1197+
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.922-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
11981198
[🔐security]: SECURITY.md
11991199
[🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
12001200
[📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

docs/Prism.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ <h5 class="example_title"><div class='inline'><p>With debug information</p>
142142
</div>
143143

144144
<div id="footer">
145-
Generated on Thu Dec 4 23:30:54 2025 by
145+
Generated on Thu Dec 4 23:45:40 2025 by
146146
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
147147
0.9.37 (ruby-3.4.7).
148148
</div>

docs/Prism/Merge.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ <h2>
158158
</div>
159159

160160
<div id="footer">
161-
Generated on Thu Dec 4 23:30:54 2025 by
161+
Generated on Thu Dec 4 23:45:40 2025 by
162162
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
163163
0.9.37 (ruby-3.4.7).
164164
</div>

0 commit comments

Comments
 (0)