zip-merge 7.0.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a859c92350627feaf0b728b47e735675f19c339d50c6bf709a5c516e6fd252ec
-  data.tar.gz: 54d03cd74d3ec83b9050bdcad173320f5a9c00dd49a657a04f736f92c3ce53bc
+  metadata.gz: 5a9683e713ef24a65e74b003579e4c54bf369859b740dcbd6f56ef788942e858
+  data.tar.gz: 13488970a1b826964bd9bc478c1e85c301e37f88c561127883f04a3bdf419662
 SHA512:
-  metadata.gz: 96e218946eb50b84c11e3d1fff6354626fd44f50d1672e32275aa3eb18e960821566845a0a4fd6adcd1a68a7c2be9d2de6255c2933da91b266105309e3369b20
-  data.tar.gz: 882dadf7d82282213faf7d43691eee6f4382a14eb261c5b4aeb7659db609c9532b1c86a688a5bdd2f0c034a1c1eaf37c8db98f31536f726c65f490488763e4d5
+  metadata.gz: 2d0d142fe3be5c9c838bbe288e5b5ffaeb3a94742bf9a66a1fc7bfc7e6739d903cf469a41786cdfc1a1f30ca7f20edda28877b14a6a78c6345a66aac6c5dc678
+  data.tar.gz: b114ba117f07c46042de4ff98048825e3390b6157ca5e0fa96b8106311bd3e2ee972c9a93c7cb85099d1b5b8fa13e33a350ac89bcda26da9a8ef01449e13a214

data/LICENSE.md

@@ -0,0 +1,13 @@
+# License
+
+This project is made available under the following licenses.
+Choose the option that best fits your use case:
+
+- [AGPL-3.0-only](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/AGPL-3.0-only.md)
+- [PolyForm-Small-Business-1.0.0](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/PolyForm-Small-Business-1.0.0.md)
+
+If none of the above licenses fit your use case, please [contact us](mailto:floss@galtzo.com) to discuss a custom commercial license.
+
+## Copyright Notice
+
+- Required Notice: Copyright (c) 2026 Peter H. Boling

data/README.md

@@ -0,0 +1,307 @@
+<a href="https://github.com/structuredmerge"><img alt="structuredmerge Logo by GitHub" src="https://github.com/structuredmerge.png?size=192" width="14%" align="right"/></a>
+
+# ☯️ Zip::Merge
+
+[![Version][👽versioni]][👽version] [![Ruby Users Forum][✉️ruby-forum-top-img]][✉️ruby-forum] [![GitHub tag (latest SemVer)][⛳️tag-img]][⛳️tag] [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Total downloads][👽dl-ranki]][👽dl-rank] [![CI Current][🚎11-c-wfi]][🚎11-c-wf]
+
+`if ci_badges.map(&:color).detect { it != "green"}` ☝️ [let me know on Discord][✉️discord-invite] or [RubyForum][✉️ruby-forum], as I may have missed the notification.
+
+---
+
+`if ci_badges.map(&:color).all? { it == "green"}` 👇️ send money so I can do more of this. FLOSS maintenance is now my full-time job.
+
+[![Sponsor Me on Github][🖇sponsor-img]][🖇sponsor] [![Liberapay Goal Progress][⛳liberapay-img]][⛳liberapay] [![Donate on PayPal][🖇paypal-img]][🖇paypal] [![Buy me a coffee][🖇buyme-small-img]][🖇buyme] [![Donate at ko-fi.com][🖇kofi-img]][🖇kofi]
+
+<details markdown="1">
+ <summary>👣 How will this project approach the September 2025 hostile takeover of RubyGems? 🚑️</summary>
+
+I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-takeover-of-rubygems-my-thoughts-5hlo).
+
+</details>
+
+## 🌻 Synopsis <a href="https://discord.gg/3qme4XHNKN"><img alt="Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/galtzo-floss/avatar-128px.svg" width="8%" align="right"/></a> <a href="https://ruby-toolbox.com"><img alt="ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5" src="https://logos.galtzo.com/assets/images/ruby-lang/avatar-128px.svg" width="8%" align="right"/></a>
+
+`Zip::Merge` plans ZIP archive merges by member path and raw byte ranges. It is
+a Kaitai-family binary AST integration in the StructuredMerge stack: ZIP
+inventories are represented with TreeHaver ZIP report nodes, and analysis enters
+through a `parser_for(:zip)` Kaitai path. It depends on `binary-merge` for the
+shared binary-family substrate: preservation reports, unsafe diagnostics,
+byte-range ownership, and renderer planning vocabulary.
+It identifies safe preservation cases, unsafe entries, members that need
+structured nested merges, and archive metadata that must be rewritten by a
+renderer.
+
+### Key Features
+
+- Central directory and local header inventory parsing.
+- Kaitai-family binary AST reporting through TreeHaver ZIP structures.
+- Shared binary-family report and diagnostic helpers from `binary-merge`.
+- Member decisions for preserve, add, delete, rewrite, delegate, and reject operations.
+- Nested family dispatch for structured archive members.
+- Raw-preserving renderer for safe unchanged members.
+- Checksum and central-directory update reporting.
+
+## 💡 Info you can shake a stick at
+
+| Tokens to Remember | [![Gem name][⛳️name-img]][⛳️gem-name] [![Gem namespace][⛳️namespace-img]][⛳️gem-namespace] |
+|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Works with MRI Ruby 4 | [![Ruby current Compat][💎ruby-c-i]][🚎11-c-wf]|
+| Support & Community | [![Join Me on Daily.dev's RubyFriends][✉️ruby-friends-img]][✉️ruby-friends] [![Get help from RubyForum][✉️ruby-forum-img]][✉️ruby-forum] [![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite] [![Get help from me on Upwork][👨🏼‍🏫expsup-upwork-img]][👨🏼‍🏫expsup-upwork] [![Get help from me on Codementor][👨🏼‍🏫expsup-codementor-img]][👨🏼‍🏫expsup-codementor] |
+| Source | [![Source on GitLab.com][📜src-gl-img]][📜src-gl] [![Source on CodeBerg.org][📜src-cb-img]][📜src-cb] [![Source on GitHub.com][📜src-gh-img]][📜src-gh] [![The best SHA: dQw4w9WgXcQ!][🧮kloc-img]][🧮kloc] |
+| Documentation | [![Current release on RubyDoc.info][📜docs-cr-rd-img]][🚎yard-current] [![YARD on Galtzo.com][📜docs-head-rd-img]][🚎yard-head] [![Maintainer Blog][🚂maint-blog-img]][🚂maint-blog] [![GitLab Wiki][📜gl-wiki-img]][📜gl-wiki] [![GitHub Wiki][📜gh-wiki-img]][📜gh-wiki] |
+| Compliance | [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Apache license compatibility: Category X][📄license-compat-img]][📄license-compat] [![📄ilo-declaration-img]][📄ilo-declaration] [![Security Policy][🔐security-img]][🔐security] [![Contributor Covenant 2.1][🪇conduct-img]][🪇conduct] [![SemVer 2.0.0][📌semver-img]][📌semver] |
+| Style | [![Enforced Code Style Linter][💎rlts-img]][💎rlts] [![Keep-A-Changelog 1.0.0][📗keep-changelog-img]][📗keep-changelog] [![Gitmoji Commits][📌gitmoji-img]][📌gitmoji] [![Compatibility appraised by: appraisal2][💎appraisal2-img]][💎appraisal2] |
+| Maintainer 🎖️ | [![Follow Me on LinkedIn][💖🖇linkedin-img]][💖🖇linkedin] [![Follow Me on Ruby.Social][💖🐘ruby-mast-img]][💖🐘ruby-mast] [![Follow Me on Bluesky][💖🦋bluesky-img]][💖🦋bluesky] [![Contact Maintainer][🚂maint-contact-img]][🚂maint-contact] [![My technical writing][💖💁🏼‍♂️devto-img]][💖💁🏼‍♂️devto] |
+| `...` 💖 | [![Find Me on WellFound:][💖✌️wellfound-img]][💖✌️wellfound] [![Find Me on CrunchBase][💖💲crunchbase-img]][💖💲crunchbase] [![My LinkTree][💖🌳linktree-img]][💖🌳linktree] [![More About Me][💖💁🏼‍♂️aboutme-img]][💖💁🏼‍♂️aboutme] [🧊][💖🧊berg] [🐙][💖🐙hub] [🛖][💖🛖hut] [🧪][💖🧪lab] |
+
+### Compatibility
+
+Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
+This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
+may be higher than the gem's runtime compatibility floor when legacy Rubies are
+not practical for the current toolchain.
+
+<a href="https://github.com/kettle-dev"><img alt="kettle-dev Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/kettle-dev/avatar-128px.svg" width="14%" align="right"/></a>
+
+The _amazing_ test matrix is powered by the kettle-dev stack.
+
+<details markdown="1">
+<summary>How kettle-dev manages complexity in tests</summary>
+
+| Gem | Source | Role | Total downloads |
+|-----|--------|------|---------------------|
+| [appraisal2](https://clickgems.clickhouse.com/dashboard/appraisal2) | [GitHub](https://github.com/appraisal-rb/appraisal2) | multi-dependency Appraisal matrix generation | [![Total downloads for appraisal2](https://img.shields.io/gem/dt/appraisal2.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/appraisal2) |
+| [appraisal2-rubocop](https://clickgems.clickhouse.com/dashboard/appraisal2-rubocop) | [GitHub](https://github.com/appraisal-rb/appraisal2-rubocop) | RuboCop Appraisal generator integration | [![Total downloads for appraisal2-rubocop](https://img.shields.io/gem/dt/appraisal2-rubocop.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/appraisal2-rubocop) |
+| [kettle-dev](https://clickgems.clickhouse.com/dashboard/kettle-dev) | [GitHub](https://github.com/kettle-dev/kettle-dev) | development, release, and CI workflow tooling | [![Total downloads for kettle-dev](https://img.shields.io/gem/dt/kettle-dev.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/kettle-dev) |
+| [kettle-jem](https://clickgems.clickhouse.com/dashboard/kettle-jem) | [GitHub](https://github.com/kettle-dev/kettle-jem) | Appraisals & CI workflow templates | [![Total downloads for kettle-jem](https://img.shields.io/gem/dt/kettle-jem.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/kettle-jem) |
+| [kettle-soup-cover](https://clickgems.clickhouse.com/dashboard/kettle-soup-cover) | [GitHub](https://github.com/kettle-dev/kettle-soup-cover) | SimpleCov coverage policy and reporting | [![Total downloads for kettle-soup-cover](https://img.shields.io/gem/dt/kettle-soup-cover.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/kettle-soup-cover) |
+| [kettle-test](https://clickgems.clickhouse.com/dashboard/kettle-test) | [GitHub](https://github.com/kettle-dev/kettle-test) | standard test runner and coverage harness | [![Total downloads for kettle-test](https://img.shields.io/gem/dt/kettle-test.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/kettle-test) |
+| [rubocop-lts](https://clickgems.clickhouse.com/dashboard/rubocop-lts) | [GitHub](https://github.com/rubocop-lts/rubocop-lts) | Ruby-version-aware linting | [![Total downloads for rubocop-lts](https://img.shields.io/gem/dt/rubocop-lts.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/rubocop-lts) |
+| [turbo_tests2](https://clickgems.clickhouse.com/dashboard/turbo_tests2) | [GitHub](https://github.com/galtzo-floss/turbo_tests2) | parallel test execution | [![Total downloads for turbo_tests2](https://img.shields.io/gem/dt/turbo_tests2.svg?style=flat-square)](https://clickgems.clickhouse.com/dashboard/turbo_tests2) |
+
+</details>
+
+## ✨ Installation
+
+Install the gem and add to the application's Gemfile by executing:
+
+```console
+bundle add zip-merge
+```
+
+If bundler is not being used to manage dependencies, install the gem by executing:
+
+```console
+gem install zip-merge
+```
+
+## ⚙️ Configuration
+
+`Zip::Merge` works from parsed inventories rather than global settings.
+
+```ruby
+ancestor = Zip::Merge.parse_zip_inventory(ancestor_bytes)
+current = Zip::Merge.parse_zip_inventory(current_bytes)
+incoming = Zip::Merge.parse_zip_inventory(incoming_bytes)
+plan = Zip::Merge.plan_zip_merge(ancestor, current, incoming)
+```
+
+Rendering requires caller-supplied member bytes for added, rewritten, or delegated members.
+
+## 🔧 Basic Usage
+
+```ruby
+require "zip/merge"
+
+zip_parser = TreeHaver.parser_for(:zip, backend_type: :kaitai)
+ancestor = zip_parser.parse(File.binread("base.zip"))
+current = zip_parser.parse(File.binread("ours.zip"))
+incoming = zip_parser.parse(File.binread("theirs.zip"))
+
+plan = Zip::Merge.plan_zip_merge(ancestor, current, incoming)
+plan.member_decisions.each do |decision|
+  puts "#{decision.operation}: #{decision.normalized_path}"
+end
+```
+
+## 🔐 Security
+
+See [SECURITY.md][🔐security].
+
+## 🤝 Contributing
+
+If you need some ideas of where to help, you could work on adding more code coverage,
+or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
+or use the gem and think about how it could be better.
+
+We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
+
+See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
+
+### Code Coverage
+
+<details markdown="1">
+<summary>Coverage service badges</summary>
+
+</details>
+
+## 📌 Versioning
+
+This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
+For most applications, prefer the [Pessimistic Version Constraint][📌pvc] with two digits of precision.
+
+For example:
+
+```ruby
+spec.add_dependency("zip-merge", "~> 7.0")
+```
+
+<details markdown="1">
+<summary>📌 Is "Platform Support" part of the public API? More details inside.</summary>
+
+Dropping support for a platform can be a breaking change for affected users.
+If a release changes supported platforms, it should be called out clearly in the changelog and versioned with that impact in mind.
+
+To get a better understanding of how SemVer is intended to work over a project's lifetime,
+read this article from the creator of SemVer:
+
+- ["Major Version Numbers are Not Sacred"][📌major-versions-not-sacred]
+
+</details>
+
+See [CHANGELOG.md][📌changelog] for a list of releases.
+
+## 📄 License
+
+The gem is available under the following licenses: [AGPL-3.0-only](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/AGPL-3.0-only.md), [PolyForm-Small-Business-1.0.0](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/PolyForm-Small-Business-1.0.0.md).
+See [LICENSE.md][📄license] for details.
+
+If none of the available licenses suit your use case, please [contact us](mailto:floss@galtzo.com) to discuss a custom commercial license.
+
+[⛳liberapay-img]: https://img.shields.io/liberapay/goal/pboling.svg?logo=liberapay&color=a51611&style=flat
+[⛳liberapay-bottom-img]: https://img.shields.io/liberapay/goal/pboling.svg?style=for-the-badge&logo=liberapay&color=a51611
+[⛳liberapay]: https://liberapay.com/pboling/donate
+[🖇sponsor-img]: https://img.shields.io/badge/Sponsor_Me!-pboling.svg?style=social&logo=github
+[🖇sponsor-bottom-img]: https://img.shields.io/badge/Sponsor_Me!-pboling-blue?style=for-the-badge&logo=github
+[🖇sponsor]: https://github.com/sponsors/pboling
+[🖇kofi-img]: https://img.shields.io/badge/ko--fi-%E2%9C%93-a51611.svg?style=flat
+[🖇kofi]: https://ko-fi.com/pboling
+[🖇buyme-small-img]: https://img.shields.io/badge/buy_me_a_coffee-%E2%9C%93-a51611.svg?style=flat
+[🖇buyme-img]: https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20latte&emoji=&slug=pboling&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff
+[🖇buyme]: https://www.buymeacoffee.com/pboling
+[🖇paypal-img]: https://img.shields.io/badge/donate-paypal-a51611.svg?style=flat&logo=paypal
+[🖇paypal-bottom-img]: https://img.shields.io/badge/donate-paypal-a51611.svg?style=for-the-badge&logo=paypal&color=0A0A0A
+[🖇paypal]: https://www.paypal.com/paypalme/peterboling
+[🖇floss-funding.dev]: https://floss-funding.dev
+[🖇floss-funding-gem]: https://github.com/galtzo-floss/floss_funding
+[✉️discord-invite]: https://discord.gg/3qme4XHNKN
+[✉️discord-invite-img-ftb]: https://img.shields.io/discord/1373797679469170758?style=for-the-badge&logo=discord
+[✉️ruby-friends-img]: https://img.shields.io/badge/daily.dev-%F0%9F%92%8E_Ruby_Friends-0A0A0A?style=for-the-badge&logo=dailydotdev&logoColor=white
+[✉️ruby-friends]: https://app.daily.dev/squads/rubyfriends
+[✉️ruby-forum-top-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=flat&logo=discourse&label=Ruby%20Users%20Forum
+[✉️ruby-forum-img]: https://img.shields.io/discourse/topics?server=https%3A%2F%2Fwww.rubyforum.org&style=for-the-badge&logo=discourse&label=Ruby%20Users%20Forum
+[✉️ruby-forum]: https://www.rubyforum.org/tag/structuredmerge
+[✇bundle-group-pattern]: https://gist.github.com/pboling/4564780
+[⛳️gem-namespace]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/zip-merge
+[⛳️namespace-img]: https://img.shields.io/badge/namespace-Zip::Merge-3C2D2D.svg?style=square&logo=ruby&logoColor=white
+[⛳️gem-name]: https://clickgems.clickhouse.com/dashboard/zip-merge
+[⛳️name-img]: https://img.shields.io/badge/name-zip--merge-3C2D2D.svg?style=square&logo=rubygems&logoColor=red
+[⛳️tag-img]: https://img.shields.io/github/tag/structuredmerge/structuredmerge-ruby.svg
+[⛳️tag]: https://github.com/structuredmerge/structuredmerge-ruby/releases
+[🚂maint-blog]: http://www.railsbling.com/tags/zip-merge
+[🚂maint-blog-img]: https://img.shields.io/badge/blog-railsbling-0093D0.svg?style=for-the-badge&logo=rubyonrails&logoColor=orange
+[🚂maint-contact]: http://www.railsbling.com/contact
+[🚂maint-contact-img]: https://img.shields.io/badge/Contact-Maintainer-0093D0.svg?style=flat&logo=rubyonrails&logoColor=red
+[💖🖇linkedin]: http://www.linkedin.com/in/peterboling
+[💖🖇linkedin-img]: https://img.shields.io/badge/LinkedIn-Profile-0B66C2?style=flat&logo=newjapanprowrestling
+[💖✌️wellfound]: https://wellfound.com/u/peter-boling
+[💖✌️wellfound-img]: https://img.shields.io/badge/peter--boling-orange?style=flat&logo=wellfound
+[💖💲crunchbase]: https://www.crunchbase.com/person/peter-boling
+[💖💲crunchbase-img]: https://img.shields.io/badge/peter--boling-purple?style=flat&logo=crunchbase
+[💖🐘ruby-mast]: https://ruby.social/@galtzo
+[💖🐘ruby-mast-img]: https://img.shields.io/mastodon/follow/109447111526622197?domain=https://ruby.social&style=flat&logo=mastodon&label=Ruby%20@galtzo
+[💖🦋bluesky]: https://bsky.app/profile/galtzo.com
+[💖🦋bluesky-img]: https://img.shields.io/badge/@galtzo.com-0285FF?style=flat&logo=bluesky&logoColor=white
+[💖🌳linktree]: https://linktr.ee/galtzo
+[💖🌳linktree-img]: https://img.shields.io/badge/galtzo-purple?style=flat&logo=linktree
+[💖💁🏼‍♂️devto]: https://dev.to/galtzo
+[💖💁🏼‍♂️devto-img]: https://img.shields.io/badge/dev.to-0A0A0A?style=flat&logo=devdotto&logoColor=white
+[💖💁🏼‍♂️aboutme]: https://about.me/peter.boling
+[💖💁🏼‍♂️aboutme-img]: https://img.shields.io/badge/about.me-0A0A0A?style=flat&logo=aboutme&logoColor=white
+[💖🧊berg]: https://codeberg.org/pboling
+[💖🐙hub]: https://github.org/pboling
+[💖🛖hut]: https://sr.ht/~galtzo/
+[💖🧪lab]: https://gitlab.com/pboling
+[👨🏼‍🏫expsup-upwork]: https://www.upwork.com/freelancers/~014942e9b056abdf86?mp_source=share
+[👨🏼‍🏫expsup-upwork-img]: https://img.shields.io/badge/UpWork-13544E?style=for-the-badge&logo=Upwork&logoColor=white
+[👨🏼‍🏫expsup-codementor]: https://www.codementor.io/peterboling?utm_source=github&utm_medium=button&utm_term=peterboling&utm_campaign=github
+[👨🏼‍🏫expsup-codementor-img]: https://img.shields.io/badge/CodeMentor-Get_Help-1abc9c?style=for-the-badge&logo=CodeMentor&logoColor=white
+[🏙️entsup-tidelift]: https://tidelift.com/subscription/pkg/rubygems-zip-merge?utm_source=rubygems-zip-merge&utm_medium=referral&utm_campaign=readme
+[🏙️entsup-tidelift-img]: https://img.shields.io/badge/Tidelift_and_Sonar-Enterprise_Support-FD3456?style=for-the-badge&logo=sonar&logoColor=white
+[🏙️entsup-tidelift-sonar]: https://blog.tidelift.com/tidelift-joins-sonar
+[💁🏼‍♂️peterboling]: http://www.peterboling.com
+[🚂railsbling]: http://www.railsbling.com
+[📜src-gl-img]: https://img.shields.io/badge/GitLab-FBA326?style=for-the-badge&logo=Gitlab&logoColor=orange
+[📜src-gl]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/tree/main/gems/zip-merge
+[📜src-cb-img]: https://img.shields.io/badge/CodeBerg-4893CC?style=for-the-badge&logo=CodeBerg&logoColor=blue
+[📜src-cb]: https://codeberg.org/structuredmerge/structuredmerge-ruby/src/branch/main/gems/zip-merge
+[📜src-gh-img]: https://img.shields.io/badge/GitHub-238636?style=for-the-badge&logo=GitHub&logoColor=green
+[📜src-gh]: https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/zip-merge
+[📜docs-cr-rd-img]: https://img.shields.io/badge/RubyDoc-Current_Release-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
+[📜docs-head-rd-img]: https://img.shields.io/badge/YARD_on_Galtzo.com-HEAD-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
+[📜gl-wiki]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/wikis/home
+[📜gh-wiki]: https://github.com/structuredmerge/structuredmerge-ruby/wiki
+[📜gl-wiki-img]: https://img.shields.io/badge/wiki-gitlab-943CD2.svg?style=for-the-badge&logo=gitlab&logoColor=white
+[📜gh-wiki-img]: https://img.shields.io/badge/wiki-github-943CD2.svg?style=for-the-badge&logo=github&logoColor=white
+[👽dl-rank]: https://clickgems.clickhouse.com/dashboard/zip-merge
+[👽dl-ranki]: https://img.shields.io/gem/dt/zip-merge.svg
+[👽version]: https://clickgems.clickhouse.com/dashboard/zip-merge
+[👽versioni]: https://img.shields.io/gem/v/zip-merge.svg
+[🚎11-c-wf]: https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml
+[🚎11-c-wfi]: https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml/badge.svg
+[💎ruby-c-i]: https://img.shields.io/badge/Ruby-current-CC342D?style=for-the-badge&logo=ruby&logoColor=green
+[🤝gh-issues]: https://github.com/structuredmerge/structuredmerge-ruby/issues
+[🤝gh-pulls]: https://github.com/structuredmerge/structuredmerge-ruby/pulls
+[🤝gl-issues]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/issues
+[🤝gl-pulls]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/merge_requests
+[🤝cb-issues]: https://codeberg.org/structuredmerge/structuredmerge-ruby/issues
+[🤝cb-pulls]: https://codeberg.org/structuredmerge/structuredmerge-ruby/pulls
+[🤝cb-donate]: https://donate.codeberg.org/
+[🤝contributing]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CONTRIBUTING.md
+[🖐contrib-rocks]: https://contrib.rocks
+[🖐contributors]: https://github.com/structuredmerge/structuredmerge-ruby/graphs/contributors
+[🖐contributors-img]: https://contrib.rocks/image?repo=structuredmerge/structuredmerge-ruby
+[🪇conduct]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CODE_OF_CONDUCT.md
+[🪇conduct-img]: https://img.shields.io/badge/Contributor_Covenant-2.1-259D6C.svg
+[📌pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
+[📌semver]: https://semver.org/spec/v2.0.0.html
+[📌semver-img]: https://img.shields.io/badge/semver-2.0.0-259D6C.svg?style=flat
+[📌semver-breaking]: https://github.com/semver/semver/issues/716#issuecomment-869336139
+[📌major-versions-not-sacred]: https://tom.preston-werner.com/2022/05/23/major-version-numbers-are-not-sacred.html
+[📌changelog]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/CHANGELOG.md
+[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
+[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-34495e.svg?style=flat
+[📌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.247-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/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
+[📄license]: LICENSE.md
+[📄license-ref]: LICENSE.md
+[📄license-img]: https://img.shields.io/badge/License-AGPL--3.0--only_OR_PolyForm--Small--Business--1.0.0-259D6C.svg
+[📄license-compat]: https://www.apache.org/legal/resolved.html#category-x
+[📄license-compat-img]: https://img.shields.io/badge/Apache_Incompatible:_Category_X-%E2%9C%97-C0392B.svg?style=flat&logo=Apache
+[📄ilo-declaration]: https://www.ilo.org/declaration/lang--en/index.htm
+[📄ilo-declaration-img]: https://img.shields.io/badge/ILO_Fundamental_Principles-✓-259D6C.svg?style=flat
+[🚎yard-current]: http://rubydoc.info/gems/zip-merge
+[🚎yard-head]: https://zip-merge.galtzo.com
+[💎stone_checksums]: https://github.com/galtzo-floss/stone_checksums
+[💎SHA_checksums]: https://gitlab.com/structuredmerge/structuredmerge-ruby/-/tree/main/checksums
+[💎rlts]: https://github.com/rubocop-lts/rubocop-lts
+[💎rlts-img]: https://img.shields.io/badge/code_style_&_linting-rubocop--lts-34495e.svg?plastic&logo=ruby&logoColor=white
+[💎appraisal2]: https://github.com/appraisal-rb/appraisal2
+[💎appraisal2-img]: https://img.shields.io/badge/appraised_by-appraisal2-34495e.svg?plastic&logo=ruby&logoColor=white
+[💎d-in-dvcs]: https://railsbling.com/posts/dvcs/put_the_d_in_dvcs/

data/lib/zip/merge/backend.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Zip
+  # StructuredMerge ZIP archive merge planning and rendering helpers.
+  module Merge
+    BACKEND_REFERENCE = TreeHaver::KAITAI_STRUCT_BACKEND
+
+    module Backend
+      # TreeHaver language wrapper for ZIP archives parsed through Kaitai-style
+      # binary AST inventory.
+      class Language < TreeHaver::Base::Language
+        def initialize(name = :zip)
+          super(name, backend: :kaitai, options: {})
+        end
+
+        def self.zip
+          new(:zip)
+        end
+      end
+
+      # Parser adapter that exposes the ZIP inventory as the TreeHaver
+      # `parser_for(:zip)` Kaitai backend surface.
+      class Parser < TreeHaver::Base::Parser
+        def parse(source)
+          raise 'Language not set' unless language
+
+          Zip::Merge.parse_zip_inventory(source)
+        end
+
+        def parse_string(_old_tree, source)
+          parse(source)
+        end
+      end
+    end
+
+    def self.register_backend!
+      TreeHaver::BackendRegistry.register(BACKEND_REFERENCE)
+      TreeHaver.register_language(
+        :zip,
+        backend_module: Backend,
+        backend_type: :kaitai,
+        gem_name: 'zip-merge',
+        contract: :kaitai
+      )
+      nil
+    end
+  end
+end

data/lib/zip/merge/version.rb

@@ -2,10 +2,12 @@
 
 module Zip
   module Merge
+    # Version namespace for this gem.
     module Version
-      VERSION = "7.0.0"
+      # Current gem version.
+      VERSION = '7.1.1'
     end
-
-    VERSION = Version::VERSION
+    # Current gem version exposed at the traditional constant location.
+    VERSION = Version::VERSION # Traditional Constant Location
   end
 end

data/lib/zip/merge.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require "stringio"
-require "zlib"
-require "tree_haver"
-require_relative "merge/version"
+require 'stringio'
+require 'zlib'
+require 'tree_haver'
+require_relative 'merge/version'
 
 module Zip
   module Merge
     LOCAL = 0x04034b50
     CENTRAL = 0x02014b50
     EOCD = 0x06054b50
-    DOS_EPOCH = [0, 0, 0x21, 0].pack("C*")
+    DOS_EPOCH = [0, 0, 0x21, 0].pack('C*')
 
     RenderError = Class.new(StandardError) do
       attr_reader :diagnostic
@@ -32,19 +32,21 @@ module Zip
         TreeHaver::ZipArchiveEntry.new(
           path: name,
           normalized_path: normalize_zip_path(name),
-          directory: name.end_with?("/"),
+          directory: name.end_with?('/'),
           compression: compression_name(record[:method]),
           compressed_size: record[:compressed_size],
           uncompressed_size: record[:uncompressed_size],
-          crc32: "%08x" % record[:crc32],
+          crc32: '%08x' % record[:crc32],
           local_header_range: TreeHaver::ByteRange.new(start_byte: record[:local_offset], end_byte: local[:data_start]),
-          data_range: TreeHaver::ByteRange.new(start_byte: local[:data_start], end_byte: local[:data_start] + record[:compressed_size]),
+          data_range: TreeHaver::ByteRange.new(start_byte: local[:data_start],
+                                               end_byte: local[:data_start] + record[:compressed_size]),
           central_directory_range: record[:range]
         )
       end.sort_by { |entry| entry.local_header_range.start_byte }
 
       TreeHaver::ZipFamilyReport.new(
-        archive: TreeHaver::ZipArchiveInfo.new(format: "zip", schema: "zip.ksy", entry_count: entries.length, central_directory_range: central[:range]),
+        archive: TreeHaver::ZipArchiveInfo.new(format: 'zip', schema: 'zip.ksy', entry_count: entries.length,
+                                               central_directory_range: central[:range]),
         entries: entries,
         member_decisions: [],
         unsafe_entries: unsafe_entries(entries, central[:records]),
@@ -71,59 +73,70 @@ module Zip
         incoming_entry = incoming_entries[path]
         if unsafe_by_path[path]
           unsafe = unsafe_by_path[path]
-          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: "reject", disposition: "unsafe", reason: unsafe.reason)
+          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: 'reject',
+                                                                      disposition: 'unsafe', reason: unsafe.reason)
           report.merge_report.diagnostics << diagnostic(unsafe.category, schema_path(path), unsafe.reason)
         elsif current_entry.nil? && incoming_entry
-          decision(report, path, "add", "requires_renderer", "member exists only in incoming archive")
+          decision(report, path, 'add', 'requires_renderer', 'member exists only in incoming archive')
         elsif current_entry && incoming_entry.nil?
-          decision(report, path, "delete", "requires_renderer", "member was removed from incoming archive")
-        elsif ancestor_entry && same_entry?(current_entry, ancestor_entry) && same_entry?(incoming_entry, ancestor_entry)
-          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: "preserve", disposition: "safe", reason: "member is unchanged from ancestor")
+          decision(report, path, 'delete', 'requires_renderer', 'member was removed from incoming archive')
+        elsif ancestor_entry && same_entry?(current_entry,
+                                            ancestor_entry) && same_entry?(incoming_entry, ancestor_entry)
+          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: 'preserve',
+                                                                      disposition: 'safe', reason: 'member is unchanged from ancestor')
           report.merge_report.preserved_ranges.concat([current_entry.local_header_range, current_entry.data_range])
         elsif (family = nested_family(path))
-          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: "delegate", disposition: "requires_renderer", nested_family: family, reason: "structured member can be merged by a nested family before ZIP rendering")
-          report.merge_report.nested_dispatches << TreeHaver::BinaryNestedDispatch.new(schema_path: "#{schema_path(path)}/data", family: family, status: "planned")
+          report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: 'delegate',
+                                                                      disposition: 'requires_renderer', nested_family: family, reason: 'structured member can be merged by a nested family before ZIP rendering')
+          report.merge_report.nested_dispatches << TreeHaver::BinaryNestedDispatch.new(
+            schema_path: "#{schema_path(path)}/data", family: family, status: 'planned'
+          )
           report.merge_report.rewritten_nodes << schema_path(path)
           report.merge_report.checksum_updates << "#{schema_path(path)}/crc32"
         else
-          decision(report, path, "rewrite", "requires_renderer", "member bytes or metadata changed")
+          decision(report, path, 'rewrite', 'requires_renderer', 'member bytes or metadata changed')
           report.merge_report.checksum_updates << "#{schema_path(path)}/crc32"
         end
         report.merge_report.matched_schema_paths << schema_path(path)
       end
       unless report.merge_report.rewritten_nodes.empty? && report.merge_report.checksum_updates.empty?
-        report.merge_report.rewritten_nodes << "/central_directory"
-        report.merge_report.checksum_updates.concat(["/central_directory/size", "/central_directory/offset"])
+        report.merge_report.rewritten_nodes << '/central_directory'
+        report.merge_report.checksum_updates.concat(['/central_directory/size', '/central_directory/offset'])
       end
       report
     end
 
     def render_with_raw_preservation(source:, plan:, member_bytes: {}, compression: 0)
-      raise render_error("unsupported_compression", "/render/options/compression", "unsupported raw-preserving compression method") unless [0, 8].include?(compression)
+      unless [
+        0, 8
+      ].include?(compression)
+        raise render_error('unsupported_compression', '/render/options/compression',
+                           'unsupported raw-preserving compression method')
+      end
 
       source = source.b
       source_inventory = parse_zip_inventory(source)
       central = scan_central_directory(source)
       source_entries = entries_by_path(source_inventory.entries)
       raw_ranges = raw_local_record_ranges(source, source_entries)
-      output = +"".b
+      output = +''.b
       central_records = []
       entries = entries_by_path(plan.entries)
       plan.member_decisions.each do |member|
         entry = entries[member.normalized_path]
         case member.operation
-        when "reject"
-          raise render_error("rejected_member", schema_path(member.normalized_path), member.reason)
-        when "delete"
+        when 'reject'
+          raise render_error('rejected_member', schema_path(member.normalized_path), member.reason)
+        when 'delete'
           next
-        when "preserve"
+        when 'preserve'
           source_entry = source_entries.fetch(member.normalized_path)
           validate_raw_preserve_entry!(source, central, source_entry)
           range = raw_ranges.fetch(member.normalized_path)
           offset = output.bytesize
           output << source.byteslice(range.start_byte...range.end_byte)
           central_records << central_record_from_entry(source_entry, offset)
-        when "add", "rewrite", "delegate"
+        when 'add', 'rewrite', 'delegate'
           content = member_bytes.fetch(member.normalized_path)
           rendered, record = rendered_local_record(entry, content.b, compression, output.bytesize)
           output << rendered
@@ -138,12 +151,14 @@ module Zip
       output << eocd_record(central_records.length, central_size, central_start)
       report = parse_zip_inventory(output)
       merge_report = plan.merge_report
-      merge_report.preserved_ranges = plan.member_decisions.filter_map { |member| raw_ranges[member.normalized_path] if member.operation == "preserve" }
+      merge_report.preserved_ranges = plan.member_decisions.filter_map do |member|
+        raw_ranges[member.normalized_path] if member.operation == 'preserve'
+      end
       [output, report, merge_report]
     end
 
     def new_stored_zip(entries)
-      output = +"".b
+      output = +''.b
       central = []
       entries.keys.sort.each do |name|
         rendered, record = rendered_local_record(path_entry(name, entries[name]), entries[name].b, 0, output.bytesize)
@@ -157,34 +172,38 @@ module Zip
     end
 
     def empty_report
-      TreeHaver::BinaryMergeReport.new(format: "zip", schema: "zip.ksy", matched_schema_paths: [], preserved_ranges: [], rewritten_nodes: [], checksum_updates: [], nested_dispatches: [], diagnostics: [])
+      Binary::Merge.preservation_report(format: 'zip', schema: 'zip.ksy', matched_schema_paths: [],
+                                        preserved_ranges: [])
     end
 
     def scan_central_directory(source)
       eocd = source.bytesize - 22
-      eocd -= 1 while eocd >= 0 && source.byteslice(eocd, 4).unpack1("V") != EOCD
-      raise "missing ZIP end of central directory" if eocd.negative?
-      size = source.byteslice(eocd + 12, 4).unpack1("V")
-      offset = source.byteslice(eocd + 16, 4).unpack1("V")
-      comment_length = source.byteslice(eocd + 20, 2).unpack1("v")
+      eocd -= 1 while eocd >= 0 && source.byteslice(eocd, 4).unpack1('V') != EOCD
+      raise 'missing ZIP end of central directory' if eocd.negative?
+
+      size = source.byteslice(eocd + 12, 4).unpack1('V')
+      offset = source.byteslice(eocd + 16, 4).unpack1('V')
+      comment_length = source.byteslice(eocd + 20, 2).unpack1('v')
       records = {}
       cursor = offset
       while cursor < offset + size
-        raise "unexpected central directory record" unless source.byteslice(cursor, 4).unpack1("V") == CENTRAL
-        name_len = source.byteslice(cursor + 28, 2).unpack1("v")
-        extra_len = source.byteslice(cursor + 30, 2).unpack1("v")
-        comment_len = source.byteslice(cursor + 32, 2).unpack1("v")
+        raise 'unexpected central directory record' unless source.byteslice(cursor, 4).unpack1('V') == CENTRAL
+
+        name_len = source.byteslice(cursor + 28, 2).unpack1('v')
+        extra_len = source.byteslice(cursor + 30, 2).unpack1('v')
+        comment_len = source.byteslice(cursor + 32, 2).unpack1('v')
         name = source.byteslice(cursor + 46, name_len)
         records[name] = {
-          range: TreeHaver::ByteRange.new(start_byte: cursor, end_byte: cursor + 46 + name_len + extra_len + comment_len),
-          flags: source.byteslice(cursor + 8, 2).unpack1("v"),
-          method: source.byteslice(cursor + 10, 2).unpack1("v"),
-          crc32: source.byteslice(cursor + 16, 4).unpack1("V"),
-          compressed_size: source.byteslice(cursor + 20, 4).unpack1("V"),
-          uncompressed_size: source.byteslice(cursor + 24, 4).unpack1("V"),
+          range: TreeHaver::ByteRange.new(start_byte: cursor,
+                                          end_byte: cursor + 46 + name_len + extra_len + comment_len),
+          flags: source.byteslice(cursor + 8, 2).unpack1('v'),
+          method: source.byteslice(cursor + 10, 2).unpack1('v'),
+          crc32: source.byteslice(cursor + 16, 4).unpack1('V'),
+          compressed_size: source.byteslice(cursor + 20, 4).unpack1('V'),
+          uncompressed_size: source.byteslice(cursor + 24, 4).unpack1('V'),
           extra_length: extra_len,
           comment_length: comment_len,
-          local_offset: source.byteslice(cursor + 42, 4).unpack1("V")
+          local_offset: source.byteslice(cursor + 42, 4).unpack1('V')
         }
         cursor = records[name][:range].end_byte
       end
@@ -194,32 +213,67 @@ module Zip
     def scan_local_headers(source, records)
       records.transform_values do |record|
         cursor = record[:local_offset]
-        raise "unexpected ZIP local header" unless source.byteslice(cursor, 4).unpack1("V") == LOCAL
-        name_len = source.byteslice(cursor + 26, 2).unpack1("v")
-        extra_len = source.byteslice(cursor + 28, 2).unpack1("v")
+        raise 'unexpected ZIP local header' unless source.byteslice(cursor, 4).unpack1('V') == LOCAL
+
+        name_len = source.byteslice(cursor + 26, 2).unpack1('v')
+        extra_len = source.byteslice(cursor + 28, 2).unpack1('v')
         { data_start: cursor + 30 + name_len + extra_len, extra_length: extra_len }
       end
     end
 
     def validate_raw_preserve_entry!(source, central, entry)
-      raise render_error("archive_comment", "/archive/comment", "raw-preserving ZIP renderer does not yet preserve archive comments") if central[:archive_comment]
+      if central[:archive_comment]
+        raise render_error('archive_comment', '/archive/comment',
+                           'raw-preserving ZIP renderer does not yet preserve archive comments')
+      end
+
       record = central[:records].fetch(entry.path)
-      raise render_error("encrypted_member", schema_path(entry.normalized_path), "raw-preserving ZIP renderer rejects encrypted member #{entry.normalized_path}") unless (record[:flags] & 0x1).zero?
-      raise render_error("unsupported_compression", schema_path(entry.normalized_path), "raw-preserving ZIP renderer rejects unsupported compression #{entry.compression.inspect}") unless [0, 8].include?(record[:method])
-      raise render_error("central_directory_extra_field", schema_path(entry.normalized_path), "raw-preserving ZIP renderer does not yet preserve central-directory extra fields for #{entry.normalized_path}") unless record[:extra_length].zero?
-      raise render_error("member_comment", schema_path(entry.normalized_path), "raw-preserving ZIP renderer does not yet preserve member comments for #{entry.normalized_path}") unless record[:comment_length].zero?
-      local_extra = source.byteslice(entry.local_header_range.start_byte + 28, 2).unpack1("v")
-      raise render_error("local_header_extra_field", schema_path(entry.normalized_path), "raw-preserving ZIP renderer does not yet preserve local extra fields for #{entry.normalized_path}") unless local_extra.zero?
+      unless (record[:flags] & 0x1).zero?
+        raise render_error('encrypted_member', schema_path(entry.normalized_path),
+                           "raw-preserving ZIP renderer rejects encrypted member #{entry.normalized_path}")
+      end
+      unless [
+        0, 8
+      ].include?(record[:method])
+        raise render_error('unsupported_compression', schema_path(entry.normalized_path),
+                           "raw-preserving ZIP renderer rejects unsupported compression #{entry.compression.inspect}")
+      end
+      unless record[:extra_length].zero?
+        raise render_error('central_directory_extra_field', schema_path(entry.normalized_path),
+                           "raw-preserving ZIP renderer does not yet preserve central-directory extra fields for #{entry.normalized_path}")
+      end
+      unless record[:comment_length].zero?
+        raise render_error('member_comment', schema_path(entry.normalized_path),
+                           "raw-preserving ZIP renderer does not yet preserve member comments for #{entry.normalized_path}")
+      end
+
+      local_extra = source.byteslice(entry.local_header_range.start_byte + 28, 2).unpack1('v')
+      return if local_extra.zero?
+
+      raise render_error('local_header_extra_field', schema_path(entry.normalized_path),
+                         "raw-preserving ZIP renderer does not yet preserve local extra fields for #{entry.normalized_path}")
     end
 
     def unsafe_entries(entries, records)
       seen = {}
       entries.flat_map do |entry|
         list = []
-        list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path, category: "path_traversal", reason: "entry escapes the archive root") if escapes_root?(entry.path)
-        list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path, category: "duplicate_normalized_path", reason: "normalized path collides with an existing entry") if seen[entry.normalized_path] && seen[entry.normalized_path] != entry.path
-        list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path, category: "encrypted_member", reason: "encrypted member cannot be rendered by the default provider") unless (records[entry.path][:flags] & 0x1).zero?
-        list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path, category: "signing_sensitive_member", reason: "signature-bearing member mutation is not enabled") if signing_sensitive?(entry.normalized_path)
+        if escapes_root?(entry.path)
+          list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path,
+                                                category: 'path_traversal', reason: 'entry escapes the archive root')
+        end
+        if seen[entry.normalized_path] && seen[entry.normalized_path] != entry.path
+          list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path,
+                                                category: 'duplicate_normalized_path', reason: 'normalized path collides with an existing entry')
+        end
+        unless (records[entry.path][:flags] & 0x1).zero?
+          list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path,
+                                                category: 'encrypted_member', reason: 'encrypted member cannot be rendered by the default provider')
+        end
+        if signing_sensitive?(entry.normalized_path)
+          list << TreeHaver::ZipUnsafeEntry.new(path: entry.path, normalized_path: entry.normalized_path,
+                                                category: 'signing_sensitive_member', reason: 'signature-bearing member mutation is not enabled')
+        end
         seen[entry.normalized_path] = entry.path
         list
       end
@@ -228,57 +282,79 @@ module Zip
     def rendered_local_record(entry, content, method, offset)
       payload = method == 8 ? Zlib::Deflate.deflate(content) : content
       crc = Zlib.crc32(content)
-      header = [LOCAL, 20, 0, method].pack("Vvvv") + DOS_EPOCH + [crc, payload.bytesize, content.bytesize, entry.path.bytesize, 0].pack("VVVvv") + entry.path
-      [header + payload, { name: entry.path, method: method, crc32: crc, compressed_size: payload.bytesize, uncompressed_size: content.bytesize, offset: offset, flags: 0 }]
+      header = [LOCAL, 20, 0,
+                method].pack('Vvvv') + DOS_EPOCH + [crc, payload.bytesize, content.bytesize, entry.path.bytesize,
+                                                    0].pack('VVVvv') + entry.path
+      [header + payload,
+       { name: entry.path, method: method, crc32: crc, compressed_size: payload.bytesize, uncompressed_size: content.bytesize,
+         offset: offset, flags: 0 }]
     end
 
     def central_directory_record(record)
-      [CENTRAL, 20, 20, record[:flags], record[:method]].pack("Vvvvv") + DOS_EPOCH + [record[:crc32], record[:compressed_size], record[:uncompressed_size], record[:name].bytesize, 0, 0, 0, 0, 0, record[:offset]].pack("VVVvvvvvVV") + record[:name]
+      [CENTRAL, 20, 20, record[:flags],
+       record[:method]].pack('Vvvvv') + DOS_EPOCH + [record[:crc32], record[:compressed_size], record[:uncompressed_size],
+                                                     record[:name].bytesize, 0, 0, 0, 0, 0, record[:offset]].pack('VVVvvvvvVV') + record[:name]
     end
 
     def eocd_record(entries, size, offset)
-      [EOCD, 0, 0, entries, entries, size, offset, 0].pack("VvvvvVVv")
+      [EOCD, 0, 0, entries, entries, size, offset, 0].pack('VvvvvVVv')
     end
 
-    def raw_local_record_ranges(source, entries)
+    def raw_local_record_ranges(_source, entries)
       ordered = entries.values.sort_by { |entry| entry.local_header_range.start_byte }
       ordered.each_with_index.to_h do |entry, index|
         end_byte = ordered[index + 1]&.local_header_range&.start_byte || entry.central_directory_range.start_byte
-        [entry.normalized_path, TreeHaver::ByteRange.new(start_byte: entry.local_header_range.start_byte, end_byte: end_byte)]
+        [entry.normalized_path,
+         TreeHaver::ByteRange.new(start_byte: entry.local_header_range.start_byte, end_byte: end_byte)]
       end
     end
 
     def central_record_from_entry(entry, offset)
-      { name: entry.path, method: entry.compression == "deflate" ? 8 : 0, crc32: entry.crc32.to_i(16), compressed_size: entry.compressed_size, uncompressed_size: entry.uncompressed_size, offset: offset, flags: 0 }
+      { name: entry.path, method: entry.compression == 'deflate' ? 8 : 0, crc32: entry.crc32.to_i(16),
+        compressed_size: entry.compressed_size, uncompressed_size: entry.uncompressed_size, offset: offset, flags: 0 }
     end
 
     def path_entry(name, content)
-      TreeHaver::ZipArchiveEntry.new(path: name, normalized_path: normalize_zip_path(name), directory: name.end_with?("/"), compression: "stored", compressed_size: content.bytesize, uncompressed_size: content.bytesize, crc32: "%08x" % Zlib.crc32(content), local_header_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0), data_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0), central_directory_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0))
+      TreeHaver::ZipArchiveEntry.new(path: name, normalized_path: normalize_zip_path(name),
+                                     directory: name.end_with?('/'), compression: 'stored', compressed_size: content.bytesize, uncompressed_size: content.bytesize, crc32: '%08x' % Zlib.crc32(content), local_header_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0), data_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0), central_directory_range: TreeHaver::ByteRange.new(start_byte: 0, end_byte: 0))
     end
 
     def decision(report, path, operation, disposition, reason)
-      report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: operation, disposition: disposition, reason: reason)
+      report.member_decisions << TreeHaver::ZipMemberDecision.new(normalized_path: path, operation: operation,
+                                                                  disposition: disposition, reason: reason)
       report.merge_report.rewritten_nodes << schema_path(path)
     end
 
     def normalize_zip_path(path)
-      path.tr("\\", "/").split("/").each_with_object([]) { |part, stack| part == ".." ? stack.pop : stack << part unless part == "." }.join("/")
+      path.tr('\\', '/').split('/').each_with_object([]) do |part, stack|
+        unless part == '.'
+          part == '..' ? stack.pop : stack << part
+        end
+      end.join('/')
     end
 
     def compression_name(method)
       case method
-      when 0 then "stored"
-      when 8 then "deflate"
+      when 0 then 'stored'
+      when 8 then 'deflate'
       else "method-#{method}"
       end
     end
 
     def escapes_root?(path)
-      path.start_with?("/") || path.tr("\\", "/").split("/").then { |parts| depth = 0; parts.any? { |part| part == ".." ? (depth -= 1) : (depth += 1 unless part == "."); depth.negative? } }
+      path.start_with?('/') || path.tr('\\', '/').split('/').then do |parts|
+        depth = 0
+        parts.any? do |part|
+          part == '..' ? (depth -= 1) : (depth += 1 unless part == '.')
+          depth.negative?
+        end
+      end
     end
 
     def signing_sensitive?(path)
-      path.upcase.start_with?("META-INF/") && [".RSA", ".DSA", ".EC", ".SF"].any? { |suffix| path.upcase.end_with?(suffix) }
+      path.upcase.start_with?('META-INF/') && ['.RSA', '.DSA', '.EC', '.SF'].any? do |suffix|
+        path.upcase.end_with?(suffix)
+      end
     end
 
     def same_entry?(left, right)
@@ -290,10 +366,11 @@ module Zip
     end
 
     def nested_family(path)
-      return "markdown" if path.match?(/\.m(?:d|arkdown)\z/i)
-      return "json" if path.end_with?(".json")
-      return "yaml" if path.match?(/\.ya?ml\z/i)
-      return "xml" if path.end_with?(".xml")
+      return 'markdown' if path.match?(/\.m(?:d|arkdown)\z/i)
+      return 'json' if path.end_with?('.json')
+      return 'yaml' if path.match?(/\.ya?ml\z/i)
+
+      'xml' if path.end_with?('.xml')
     end
 
     def schema_path(path)
@@ -301,7 +378,7 @@ module Zip
     end
 
     def diagnostic(category, schema_path, message)
-      TreeHaver::BinaryDiagnostic.new(severity: "error", category: category, message: message, schema_path: schema_path)
+      Binary::Merge.unsafe_diagnostic(schema_path: schema_path, byte_range: nil, message: message, category: category)
     end
 
     def render_error(category, schema_path, message)
@@ -309,3 +386,8 @@ module Zip
     end
   end
 end
+
+require 'binary/merge'
+require_relative 'merge/backend'
+
+Zip::Merge.register_backend!

data/lib/zip-merge.rb

@@ -1,3 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "zip/merge"
+require_relative 'zip/merge'
+require 'version_gem'
+require_relative 'zip/merge/version'
+
+Zip::Merge::Version.class_eval do
+  extend VersionGem::Basic
+end

data/sig/zip/merge.rbs

@@ -0,0 +1,8 @@
+module Zip
+  module Merge
+    module Version
+      VERSION: String
+    end
+    VERSION: String
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: zip-merge
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Peter H. Boling
-bindir: bin
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -37,46 +37,297 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: binary-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.1
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
-description: Portable ZIP inventory, planning, nested dispatch, and raw-preservation
-  rendering helpers for Structured Merge.
+        version: 7.1.1
+- !ruby/object:Gem::Dependency
+  name: version_gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+- !ruby/object:Gem::Dependency
+  name: kettle-dev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.17
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.17
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: require_bench
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: anonymous_loader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: appraisal2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: kettle-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
+- !ruby/object:Gem::Dependency
+  name: turbo_tests2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: stone_checksums
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: gitmoji-regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+description: "☯️ Portable ZIP inventory, planning, nested dispatch, and raw-preservation
+  rendering helpers for Structured Merge."
 email:
-- info@structuredmerge.org
+- floss@galtzo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - lib/zip-merge.rb
 - lib/zip/merge.rb
+- lib/zip/merge/backend.rb
 - lib/zip/merge/version.rb
+- sig/zip/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
 - AGPL-3.0-only
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.0.0
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/zip-merge/7.0.0
+  documentation_uri: https://www.rubydoc.info/gems/zip-merge/7.1.1
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
+  news_uri: https://www.railsbling.com/tags/zip-merge
   discord_uri: https://discord.gg/3qme4XHNKN
+  mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
   rubygems_mfa_required: 'true'
-rdoc_options: []
+rdoc_options:
+- "--title"
+- zip-merge - ☯️ Structured Merge ZIP merge planning and rendering helpers for Ruby
+- "--main"
+- README.md
+- "--exclude"
+- "^sig/"
+- "--line-numbers"
+- "--inline-source"
+- "--quiet"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -90,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.17
 specification_version: 4
-summary: Structured Merge ZIP merge planning and rendering helpers for Ruby
+summary: "☯️ Structured Merge ZIP merge planning and rendering helpers for Ruby"
 test_files: []