prism-merge 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43aef831e7dd032d7607b541bcc542cb2899514150346632084148b167dc0a5
-  data.tar.gz: 104a80156b7b15d02c8b7f5b237998a4d4c225f22f7d108c46642ddea7e6c51e
+  metadata.gz: '058627bf3c8cc38b58815faddda8774645a25a06f8dd00116fac3c5368cad1f4'
+  data.tar.gz: 75eb6d7b4db6fe1774e45964bada3c2b3396d4d4efb8b5c8813d4f52b07ce120
 SHA512:
-  metadata.gz: 425c404b3e0396b5db166b0c4e2fca941af3f6b6d0727ece8b0cd19bc60f9901883d587dee4a90c43356b6fa4b6b98d841fbf791785fb410662d72df0e7c5d2b
-  data.tar.gz: eb666082134afb97479cd8dd020baa6b8ef45b489d0b8c3a4df8ad6e19e8100d53cba60d48c930d7ed43ce8830bf2ec5b309fc432a24dfb5440c1fa9eb9a9b7f
+  metadata.gz: 84b86d2c1052489cb9deef903966a1f2c5bdb3523efa93e88e5cd3cc7df5bc52838910b328790e6106e6904ae0df9356d3c54b28aa8e724a95f8210ff014d228
+  data.tar.gz: f67161e7e0500d7f1c819a0ba9ec6e459fb46cd3da8a05dfe386c245f0fcfaf56912cb22675d3c4547cd0cc98a66aae26023939f7453c13df16202acd0000a3b

data/CHANGELOG.md

@@ -30,6 +30,22 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.0.3] - 2026-02-22
+
+- TAG: [v2.0.3][2.0.3t]
+- COVERAGE: 98.81% -- 829/839 lines in 12 files
+- BRANCH COVERAGE: 85.71% -- 456/532 branches in 12 files
+- 93.51% documented
+
+### Fixed
+
+- Fix blank lines between blocks being stripped during recursive body merging.
+  `merge_node_body_recursively` assembled its output (opening line, merged body,
+  closing `end`) without emitting the trailing blank line that separates
+  consecutive blocks. `add_node_to_result` already handles this for non-recursive
+  nodes, but the recursive path was missing the same logic. Now emits a trailing
+  blank line after the closing `end` when the source has one.
+
 ## [2.0.2] - 2026-02-22
 
 - TAG: [v2.0.2][2.0.2t]
@@ -338,7 +354,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v2.0.2...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v2.0.3...HEAD
+[2.0.3]: https://github.com/kettle-rb/prism-merge/compare/v2.0.2...v2.0.3
+[2.0.3t]: https://github.com/kettle-rb/prism-merge/releases/tag/v2.0.3
 [2.0.2]: https://github.com/kettle-rb/prism-merge/compare/v2.0.1...v2.0.2
 [2.0.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v2.0.2
 [2.0.1]: https://github.com/kettle-rb/prism-merge/compare/v2.0.0...v2.0.1

data/README.md

@@ -1564,7 +1564,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.833-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.839-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/prism/merge/smart_merger.rb

@@ -1000,6 +1000,17 @@ module Prism
           template_line: (node_preference == :template) ? source_node.location.end_line : nil,
           dest_line: (node_preference == :destination) ? source_node.location.end_line : nil,
         )
+
+        # Add trailing blank line if needed for separation (same logic as add_node_to_result)
+        trailing_line = source_node.location.end_line + 1
+        trailing_content = source_analysis.line_at(trailing_line)
+        if trailing_content && trailing_content.strip.empty?
+          if node_preference == :template
+            @result.add_line("", decision: decision, template_line: trailing_line)
+          else
+            @result.add_line("", decision: decision, dest_line: trailing_line)
+          end
+        end
       end
 
       # Extracts the body content of a node (without declaration and closing 'end').

data/lib/prism/merge/version.rb

@@ -5,7 +5,7 @@ module Prism
     # Version information for Prism::Merge
     module Version
       # Current version of the prism-merge gem
-      VERSION = "2.0.2"
+      VERSION = "2.0.3"
     end
     VERSION = Version::VERSION # traditional location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -314,10 +314,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://prism-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v2.0.2
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v2.0.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v2.0.3
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v2.0.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/2.0.2
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/2.0.3
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/prism-merge/wiki
   news_uri: https://www.railsbling.com/tags/prism-merge