Skip to content

Commit e5ac631

Browse files
committed
🔖 Prepare release v1.1.2
⚡️ 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 5fe97e6 commit e5ac631

36 files changed

+90
-1851
lines changed

CHANGELOG.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ Please file a bug if you notice a violation of semantic versioning.
2020

2121
### Added
2222

23-
- `body_has_mergeable_statements?` private method to check if a block body contains statements that can be signature-matched
24-
- `mergeable_statement?` private method to determine if a node type can generate signatures for merging
25-
- `max_recursion_depth` option (defaults to `Float::INFINITY`) as a safety valve for edge cases
26-
2723
### Changed
2824

2925
### Deprecated
@@ -32,10 +28,25 @@ Please file a bug if you notice a violation of semantic versioning.
3228

3329
### Fixed
3430

35-
- **Fixed infinite recursion** when merging `CallNode` blocks (like `git_source`) that have matching signatures but non-mergeable body content (e.g., just string literals). The fix detects when a block body contains only literals/expressions with no signature-matchable statements and treats the node atomically instead of recursing.
36-
3731
### Security
3832

33+
## [1.1.2] - 2025-12-04
34+
35+
- TAG: [v1.1.2][1.1.2t]
36+
- COVERAGE: 96.66% -- 868/898 lines in 9 files
37+
- BRANCH COVERAGE: 82.84% -- 338/408 branches in 9 files
38+
- 100.00% documented
39+
40+
### Added
41+
42+
- `body_has_mergeable_statements?` private method to check if a block body contains statements that can be signature-matched
43+
- `mergeable_statement?` private method to determine if a node type can generate signatures for merging
44+
- `max_recursion_depth` option (defaults to `Float::INFINITY`) as a safety valve for edge cases
45+
46+
### Fixed
47+
48+
- **Fixed infinite recursion** when merging `CallNode` blocks (like `git_source`) that have matching signatures but non-mergeable body content (e.g., just string literals). The fix detects when a block body contains only literals/expressions with no signature-matchable statements and treats the node atomically instead of recursing.
49+
3950
## [1.1.1] - 2025-12-04
4051

4152
- TAG: [v1.1.1][1.1.1t]
@@ -160,7 +171,9 @@ Please file a bug if you notice a violation of semantic versioning.
160171

161172
- Initial release
162173

163-
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.1...HEAD
174+
[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.2...HEAD
175+
[1.1.2]: https://github.com/kettle-rb/prism-merge/compare/v1.1.1...v1.1.2
176+
[1.1.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.2
164177
[1.1.1]: https://github.com/kettle-rb/prism-merge/compare/v1.1.0...v1.1.1
165178
[1.1.1t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.1
166179
[1.1.0]: https://github.com/kettle-rb/prism-merge/compare/v1.0.3...v1.1.0

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.1)
16+
prism-merge (1.1.2)
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.1)
402+
prism-merge (1.1.2)
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
@@ -1134,7 +1134,7 @@ Thanks for RTFM. ☺️
11341134
[📌gitmoji]: https://gitmoji.dev
11351135
[📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
11361136
[🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
1137-
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.887-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1137+
[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.898-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
11381138
[🔐security]: SECURITY.md
11391139
[🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
11401140
[📄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 17:20:40 2025 by
145+
Generated on Thu Dec 4 17:26:16 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 17:20:40 2025 by
161+
Generated on Thu Dec 4 17:26:16 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>

docs/Prism/Merge/ConflictResolver.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ <h3 class="signature first" id="resolve-instance_method">
852852
</div>
853853

854854
<div id="footer">
855-
Generated on Thu Dec 4 17:20:41 2025 by
855+
Generated on Thu Dec 4 17:26:16 2025 by
856856
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
857857
0.9.37 (ruby-3.4.7).
858858
</div>

docs/Prism/Merge/DebugLogger.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ <h3 class="signature first" id="debug-class_method">
322322
</div>
323323

324324
<div id="footer">
325-
Generated on Thu Dec 4 17:20:40 2025 by
325+
Generated on Thu Dec 4 17:26:16 2025 by
326326
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
327327
0.9.37 (ruby-3.4.7).
328328
</div>

docs/Prism/Merge/DestinationParseError.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ <h2>Constructor Details</h2>
175175
</div>
176176

177177
<div id="footer">
178-
Generated on Thu Dec 4 17:20:40 2025 by
178+
Generated on Thu Dec 4 17:26:16 2025 by
179179
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
180180
0.9.37 (ruby-3.4.7).
181181
</div>

docs/Prism/Merge/Error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ <h2>Direct Known Subclasses</h2>
128128
</div>
129129

130130
<div id="footer">
131-
Generated on Thu Dec 4 17:20:40 2025 by
131+
Generated on Thu Dec 4 17:26:16 2025 by
132132
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
133133
0.9.37 (ruby-3.4.7).
134134
</div>

docs/Prism/Merge/FileAligner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ <h3 class="signature first" id="align-instance_method">
633633
</div>
634634

635635
<div id="footer">
636-
Generated on Thu Dec 4 17:20:40 2025 by
636+
Generated on Thu Dec 4 17:26:16 2025 by
637637
<a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
638638
0.9.37 (ruby-3.4.7).
639639
</div>

0 commit comments

Comments
 (0)