markdown-merge 1.0.0 โ†’ 1.0.1

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/CHANGELOG.md +14 -1
  4. data/README.md +17 -14
  5. data/lib/markdown/merge/version.rb +1 -1
  6. data.tar.gz.sig +0 -0
  7. metadata +5 -5
  8. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9acf350fe99fe21eb039f5b1921b67b3a34f69d02186ca64d5bd48ac73096819
4
- data.tar.gz: 87ee2b867a12495e3e5d92ef17b1de91f946757ead984fe03c164921e3b14336
3
+ metadata.gz: 9f336dc051776f6ace22f40939b74b5e37fcee847553e92d84a7d3a8f0ff0368
4
+ data.tar.gz: 5e96e4bfa2b80b89e763801c699ec0457e6e9a18b59da234487c8ecc3e90b744
5
5
  SHA512:
6
- metadata.gz: 787b4f4719021199155ce78bcebfdecb42a33b883a809b1e17f93ffe88c844b007749cd8ceea6c3a9deabe3e0ad8e7dfcd0ffc78a1ced9683cd1a600a9b20693
7
- data.tar.gz: 8d4787d8d2f882b51a2bd256da055654f42707c4ace34be07558908434ffced53ecc6d0c1ce2881daf44955e1e92aea7e02284e1ae9091af7316e8dce57946f9
6
+ metadata.gz: 8cfbd2dbf52a62c2827f7f1454488be66cc0dcff4049ce73b00cb8b3ea63f02e02fb9f4fc688382fe7667f7aea510416d17cdd31d55cd2e0d23ebc50c164b831
7
+ data.tar.gz: d1b4bde0f1fd811e751b323095d896983b1bdf7314f88931b0afcfde3fbde7f9ea0623b6aca750ed7280978382998c5e2669567a852223a5431c857ec9cbdc57
checksums.yaml.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
30
30
 
31
31
  ### Security
32
32
 
33
+ ## [1.0.1] - 2026-01-20
34
+
35
+ - TAG: [v1.0.1][1.0.1t]
36
+ - COVERAGE: 93.12% -- 1611/1730 lines in 25 files
37
+ - BRANCH COVERAGE: 81.52% -- 525/644 branches in 25 files
38
+ - 96.92% documented
39
+
40
+ ### Changed
41
+
42
+ - Upgrade to [ast-merge v4.0.3](https://github.com/kettle-rb/ast-merge/releases/tag/v4.0.3)
43
+
33
44
  ## [1.0.0] - 2026-01-19
34
45
 
35
46
  - TAG: [v1.0.0][1.0.0t]
@@ -246,6 +257,8 @@ Please file a bug if you notice a violation of semantic versioning.
246
257
  This fixes freeze block detection for Commonmarker where the TreeHaver wrapper's
247
258
  content methods return empty but the inner node has the actual content.
248
259
 
249
- [Unreleased]: https://github.com/kettle-rb/markdown-merge/compare/v1.0.0...HEAD
260
+ [Unreleased]: https://github.com/kettle-rb/markdown-merge/compare/v1.0.1...HEAD
261
+ [1.0.1]: https://github.com/kettle-rb/markdown-merge/compare/v1.0.0...v1.0.1
262
+ [1.0.1t]: https://github.com/kettle-rb/markdown-merge/releases/tag/v1.0.1
250
263
  [1.0.0]: https://github.com/kettle-rb/markdown-merge/compare/76f2230840b236dd10fdd7baf322c082762dddb0...v1.0.0
251
264
  [1.0.0t]: https://github.com/kettle-rb/markdown-merge/tags/v1.0.0
data/README.md CHANGED
@@ -115,7 +115,7 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
115
115
 
116
116
  | Gem | Version | CI | | Language<br>/ Format | Parser Backend(s) | Description |
117
117
  |------------------------------------------|----------------------------------------------------------------|--------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|-------------|
118
- | [tree_haver][tree_haver] | [![Version][tree_haver-gem-i]][tree_haver-gem] | [![Version][tree_haver-ci-i]][tree_haver-ci] | Multi | MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus, Parslet | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
118
+ | [tree_haver][tree_haver] | [![Version][tree_haver-gem-i]][tree_haver-gem] | [![Version][tree_haver-ci-i]][tree_haver-ci] | Multi | Supported Backends: MRI C, Rust, FFI, Java, Prism, Psych, Commonmarker, Markly, Citrus, Parslet | **Foundation**: Cross-Ruby adapter for parsing libraries (like Faraday for HTTP) |
119
119
  | [ast-merge][ast-merge] | [![Version][ast-merge-gem-i]][ast-merge-gem] | [![Version][ast-merge-ci-i]][ast-merge-ci] | Text | internal | **Infrastructure**: Shared base classes and merge logic for all `*-merge` gems |
120
120
  | [bash-merge][bash-merge] | [![Version][bash-merge-gem-i]][bash-merge-gem] | [![Version][bash-merge-ci-i]][bash-merge-ci] | Bash | [tree-sitter-bash][ts-bash] (via tree_haver) | Smart merge for Bash scripts |
121
121
  | [commonmarker-merge][commonmarker-merge] | [![Version][commonmarker-merge-gem-i]][commonmarker-merge-gem] | [![Version][commonmarker-merge-ci-i]][commonmarker-merge-ci] | Markdown | [Commonmarker][commonmarker] (via tree_haver) | Smart merge for Markdown (CommonMark via comrak Rust) |
@@ -133,18 +133,18 @@ The `*-merge` gem family provides intelligent, AST-based merging for various fil
133
133
 
134
134
  tree_haver supports multiple parsing backends, but not all backends work on all Ruby platforms:
135
135
 
136
- | Platform ๐Ÿ‘‰๏ธ<br> TreeHaver Backend ๐Ÿ‘‡๏ธ | MRI | JRuby | TruffleRuby | Notes |
137
- |------------------------------------------------|:---:|:-----:|:-----------:|-----------------------------------------------------|
138
- | **MRI** ([ruby_tree_sitter][ruby_tree_sitter]) | โœ… | โŒ | โŒ | C extension, MRI only |
139
- | **Rust** ([tree_stump][tree_stump]) | โœ… | โŒ | โŒ | Rust extension via magnus/rb-sys, MRI only |
140
- | **FFI** | โœ… | โœ… | โŒ | TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE` |
141
- | **Java** ([jtreesitter][jtreesitter]) | โŒ | โœ… | โŒ | JRuby only, requires grammar JARs |
142
- | **Prism** | โœ… | โœ… | โœ… | Ruby parsing, stdlib in Ruby 3.4+ |
143
- | **Psych** | โœ… | โœ… | โœ… | YAML parsing, stdlib |
144
- | **Citrus** | โœ… | โœ… | โœ… | Pure Ruby PEG parser, no native dependencies |
145
- | **Parslet** | โœ… | โœ… | โœ… | Pure Ruby PEG parser, no native dependencies |
146
- | **Commonmarker** | โœ… | โŒ | โ“ | Rust extension for Markdown |
147
- | **Markly** | โœ… | โŒ | โ“ | C extension for Markdown |
136
+ | Platform ๐Ÿ‘‰๏ธ<br> TreeHaver Backend ๐Ÿ‘‡๏ธ | MRI | JRuby | TruffleRuby | Notes |
137
+ |-------------------------------------------------|:---:|:-----:|:-----------:|----------------------------------------------------------------------------|
138
+ | **MRI** ([ruby_tree_sitter][ruby_tree_sitter]) | โœ… | โŒ | โŒ | C extension, MRI only |
139
+ | **Rust** ([tree_stump][tree_stump]) | โœ… | โŒ | โŒ | Rust extension via magnus/rb-sys, MRI only |
140
+ | **FFI** ([ffi][ffi]) | โœ… | โœ… | โŒ | TruffleRuby's FFI doesn't support `STRUCT_BY_VALUE` |
141
+ | **Java** ([jtreesitter][jtreesitter]) | โŒ | โœ… | โŒ | JRuby only, requires grammar JARs |
142
+ | **Prism** ([prism][prism]) | โœ… | โœ… | โœ… | Ruby parsing, stdlib in Ruby 3.4+ |
143
+ | **Psych** ([psych][psych]) | โœ… | โœ… | โœ… | YAML parsing, stdlib |
144
+ | **Citrus** ([citrus][citrus]) | โœ… | โœ… | โœ… | Pure Ruby PEG parser, no native dependencies |
145
+ | **Parslet** ([parslet][parslet]) | โœ… | โœ… | โœ… | Pure Ruby PEG parser, no native dependencies |
146
+ | **Commonmarker** ([commonmarker][commonmarker]) | โœ… | โŒ | โ“ | Rust extension for Markdown (via [commonmarker-merge][commonmarker-merge]) |
147
+ | **Markly** ([markly][markly]) | โœ… | โŒ | โ“ | C extension for Markdown (via [markly-merge][markly-merge]) |
148
148
 
149
149
  **Legend**: โœ… = Works, โŒ = Does not work, โ“ = Untested
150
150
 
@@ -238,6 +238,7 @@ tree_haver supports multiple parsing backends, but not all backends work on all
238
238
  [kettle-jem-ci]: https://github.com/kettle-rb/kettle-jem/actions/workflows/current.yml
239
239
  [prism]: https://github.com/ruby/prism
240
240
  [psych]: https://github.com/ruby/psych
241
+ [ffi]: https://github.com/ffi/ffi
241
242
  [ts-json]: https://github.com/tree-sitter/tree-sitter-json
242
243
  [ts-jsonc]: https://gitlab.com/WhyNotHugo/tree-sitter-jsonc
243
244
  [ts-bash]: https://github.com/tree-sitter/tree-sitter-bash
@@ -252,6 +253,8 @@ tree_haver supports multiple parsing backends, but not all backends work on all
252
253
  [ruby_tree_sitter]: https://github.com/Faveod/ruby-tree-sitter
253
254
  [tree_stump]: https://github.com/joker1007/tree_stump
254
255
  [jtreesitter]: https://central.sonatype.com/artifact/io.github.tree-sitter/jtreesitter
256
+ [citrus]: https://github.com/mjackson/citrus
257
+ [parslet]: https://github.com/kschiess/parslet
255
258
 
256
259
  ## ๐Ÿ’ก Info you can shake a stick at
257
260
 
@@ -1065,7 +1068,7 @@ Thanks for RTFM. โ˜บ๏ธ
1065
1068
  [๐Ÿ“Œgitmoji]: https://gitmoji.dev
1066
1069
  [๐Ÿ“Œgitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
1067
1070
  [๐Ÿงฎkloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
1068
- [๐Ÿงฎkloc-img]: https://img.shields.io/badge/KLOC-1.972-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1071
+ [๐Ÿงฎkloc-img]: https://img.shields.io/badge/KLOC-1.730-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
1069
1072
  [๐Ÿ”security]: SECURITY.md
1070
1073
  [๐Ÿ”security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
1071
1074
  [๐Ÿ“„copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year
data/lib/markdown/merge/version.rb CHANGED
@@ -5,7 +5,7 @@ module Markdown
5
5
  # Version information for Markdown::Merge
6
6
  module Version
7
7
  # Current version of the markdown-merge gem
8
- VERSION = "1.0.0"
8
+ VERSION = "1.0.1"
9
9
  end
10
10
  VERSION = Version::VERSION # traditional location
11
11
  end
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: markdown-merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -325,10 +325,10 @@ licenses:
325
325
  - MIT
326
326
  metadata:
327
327
  homepage_uri: https://markdown-merge.galtzo.com/
328
- source_code_uri: https://github.com/kettle-rb/markdown-merge/tree/v1.0.0
329
- changelog_uri: https://github.com/kettle-rb/markdown-merge/blob/v1.0.0/CHANGELOG.md
328
+ source_code_uri: https://github.com/kettle-rb/markdown-merge/tree/v1.0.1
329
+ changelog_uri: https://github.com/kettle-rb/markdown-merge/blob/v1.0.1/CHANGELOG.md
330
330
  bug_tracker_uri: https://github.com/kettle-rb/markdown-merge/issues
331
- documentation_uri: https://www.rubydoc.info/gems/markdown-merge/1.0.0
331
+ documentation_uri: https://www.rubydoc.info/gems/markdown-merge/1.0.1
332
332
  funding_uri: https://github.com/sponsors/pboling
333
333
  wiki_uri: https://github.com/kettle-rb/markdown-merge/wiki
334
334
  news_uri: https://www.railsbling.com/tags/markdown-merge
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
358
358
  - !ruby/object:Gem::Version
359
359
  version: '0'
360
360
  requirements: []
361
- rubygems_version: 4.0.4
361
+ rubygems_version: 4.0.3
362
362
  specification_version: 4
363
363
  summary: "โ˜ฏ๏ธ Ast::Merge-based structure for building Markdown merging tools like markly-merge
364
364
  and commonmarker-merge"
metadata.gz.sig CHANGED
Binary file