json-merge 1.1.1 → 7.0.0

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: json-merge
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Peter H. Boling
-bindir: exe
+bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -37,296 +37,74 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tree_haver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: ast-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: version_gem
+  name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 7.0.0
   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.9
-- !ruby/object:Gem::Dependency
-  name: kettle-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !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: appraisal2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: kettle-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  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.6
-- !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.2
-  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.2
-- !ruby/object:Gem::Dependency
-  name: gitmoji-regex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  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.3
-description: "☯️ Json::Merge provides smart JSON file merging that understands JSON
-  structure. Perfect for merging strict JSON configuration files like package.json,
-  tsconfig.json (without comments), and other standard JSON files. For JSON with Comments
-  (JSONC) files like devcontainer.json and VS Code settings, use jsonc-merge instead."
+        version: 7.0.0
+description: Portable JSON and JSONC analysis, owner matching, fallback, and merge
+  behavior for Structured Merge.
 email:
-- floss@galtzo.com
+- info@structuredmerge.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
-- README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
+extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
-- README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
 - lib/json-merge.rb
 - lib/json/merge.rb
-- lib/json/merge/conflict_resolver.rb
-- lib/json/merge/debug_logger.rb
-- lib/json/merge/emitter.rb
-- lib/json/merge/file_analysis.rb
-- lib/json/merge/merge_result.rb
-- lib/json/merge/node_wrapper.rb
-- lib/json/merge/object_match_refiner.rb
-- lib/json/merge/smart_merger.rb
 - lib/json/merge/version.rb
-- sig/json/merge.rbs
-homepage: https://github.com/kettle-rb/json-merge
+homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
-- MIT
+- AGPL-3.0-only
+- PolyForm-Small-Business-1.0.0
 metadata:
-  homepage_uri: https://json-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/json-merge/tree/v1.1.1
-  changelog_uri: https://github.com/kettle-rb/json-merge/blob/v1.1.1/CHANGELOG.md
-  bug_tracker_uri: https://github.com/kettle-rb/json-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/json-merge/1.1.1
+  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
+  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
+  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.0.0
   funding_uri: https://github.com/sponsors/pboling
-  wiki_uri: https://github.com/kettle-rb/json-merge/wiki
-  news_uri: https://www.railsbling.com/tags/json-merge
+  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   discord_uri: https://discord.gg/3qme4XHNKN
   rubygems_mfa_required: 'true'
-rdoc_options:
-- "--title"
-- json-merge - ☯️ Intelligent JSON file merging using tree-sitter AST analysis
-- "--main"
-- README.md
-- "--exclude"
-- "^sig/"
-- "--line-numbers"
-- "--inline-source"
-- "--quiet"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
-summary: "☯️ Intelligent JSON file merging using tree-sitter AST analysis"
+summary: Structured Merge JSON analysis and merge for Ruby
 test_files: []

data/CHANGELOG.md

@@ -1,122 +0,0 @@
-# Changelog
-
-[![SemVer 2.0.0][📌semver-img]][📌semver] [![Keep-A-Changelog 1.0.0][📗keep-changelog-img]][📗keep-changelog]
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog][📗keep-changelog],
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
-and [yes][📌major-versions-not-sacred], platform and engine support are part of the [public API][📌semver-breaking].
-Please file a bug if you notice a violation of semantic versioning.
-
-[📌semver]: https://semver.org/spec/v2.0.0.html
-[📌semver-img]: https://img.shields.io/badge/semver-2.0.0-FFDD67.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
-[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
-[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-FFDD67.svg?style=flat
-
-## [Unreleased]
-
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
-
-## [1.1.1] - 2026-01-26
-
-- TAG: [v1.1.1][1.1.1t]
-- COVERAGE: 95.72% -- 604/631 lines in 10 files
-- BRANCH COVERAGE: 77.81% -- 235/302 branches in 10 files
-- 96.63% documented
-
-### Added
-
-- ConflictResolver now applies per-node-type preferences via `node_typing`.
-
-### Changed
-
-- ast-merge v4.0.4
-- tree_haver v5.0.2
-
-## [1.1.0] - 2026-01-12
-
-- TAG: [v1.1.0][1.1.0t]
-- COVERAGE: 95.77% -- 589/615 lines in 10 files
-- BRANCH COVERAGE: 78.82% -- 227/288 branches in 10 files
-- 96.63% documented
-
-### Added
-
-- bin/rspec-ffi to run FFI isolated specs
-  - Also bin/rake ffi_specs
-- FFI backend isolation for test suite
-  - Added `bin/rspec-ffi` script to run FFI specs in isolation (before MRI backend loads)
-  - Added `spec/spec_ffi_helper.rb` for FFI-specific test configuration
-  - Updated Rakefile with `ffi_specs` and `remaining_specs` tasks
-  - The `:test` task now runs FFI specs first, then remaining specs
-
-### Changed
-
-- ast-merge v4.0.2
-  - Includes Ast::Merge::EmitterBase
-- tree_haver v5.0.1
-  - Many Backend improvements
-  - Many error handling improvements
-- **Simplified dependency_tags.rb**: Removed redundant debug code
-  - Removed `JSON_MERGE_DEBUG` env var handling (use `TREE_HAVER_DEBUG` instead)
-  - tree_haver's debug output now respects blocked backends via `compute_blocked_backends`
-  - Avoids accidentally loading MRI backend during FFI-only test runs
-
-### Removed
-
-- **Obsolete Tests**: Removed 3 obsolete integration tests
-  - Tests for `add_node_to_result` and `add_wrapper_to_result` methods
-  - These methods don't exist in the `:batch` strategy (ConflictResolver now uses Emitter)
-  - Tests were for old `:node` strategy pattern
-
-### Fixed
-
-- **NodeWrapper signature tests**: Updated tests to expect `:root_object`/`:root_array` for root-level containers
-  - Root-level objects now correctly return `[:root_object, ...]` instead of `[:object, ...]`
-  - Root-level arrays now correctly return `[:root_array]` instead of `[:array, count]`
-  - Added `:parent` method stubs to mock node tests for `root_level_container?` compatibility
-- **ConflictResolver#emit_node**: Fixed handling of pair nodes with object values
-  - When emitting a pair like `"features": {...}`, the value was treated as raw text
-  - Now correctly detects when a pair's value is an object container
-  - Recursively emits object structure using `emit_nested_object_start/end`
-  - Treats arrays as atomic values (emits as raw text)
-  - Prevents double key emission and invalid JSON output in nested merges
-- **ConflictResolver#merge_matched_nodes_to_emitter**: Fixed array handling in merge logic
-  - Arrays are now treated atomically and replaced based on preference setting
-  - Only objects (not arrays) are recursively merged
-  - Fixes potential "expected object key, got number" errors when merging arrays
-  - Arrays like `[1,2,3]` are now correctly replaced with `[4,5]` based on preference
-
-## [1.0.0] - 2026-01-06
-
-- TAG: [v1.0.0][1.0.0t]
-- COVERAGE: 100.00% -- 194/194 lines in 2 files
-- BRANCH COVERAGE: 84.15% -- 69/82 branches in 2 files
-- 96.67% documented
-
-### Added
-
-- Initial release
-
-### Security
-
-[Unreleased]: https://github.com/kettle-rb/json-merge/compare/v1.1.1...HEAD
-[1.1.1]: https://github.com/kettle-rb/json-merge/compare/v1.1.0...v1.1.1
-[1.1.1t]: https://github.com/kettle-rb/json-merge/releases/tag/v1.1.1
-[1.1.0]: https://github.com/kettle-rb/json-merge/compare/v1.0.0...v1.1.0
-[1.1.0t]: https://github.com/kettle-rb/json-merge/releases/tag/v1.1.0
-[1.0.0]: https://github.com/kettle-rb/json-merge/compare/f1cc25b1d9b79c598270e3aa203fa56787e6c6fc...v1.0.0
-[1.0.0t]: https://github.com/kettle-rb/json-merge/tags/v1.0.0

data/CITATION.cff

@@ -1,20 +0,0 @@
-cff-version: 1.2.0
-title: json-merge
-message: >-
-  If you use this work and you want to cite it,
-  then you can use the metadata from this file.
-type: software
-authors:
-  - given-names: Peter Hurn
-    family-names: Boling
-    email: peter@railsbling.com
-    affiliation: railsbling.com
-    orcid: 'https://orcid.org/0009-0008-8519-441X'
-identifiers:
-  - type: url
-    value: 'https://github.com/kettle-rb/json-merge'
-    description: json-merge
-repository-code: 'https://github.com/kettle-rb/json-merge'
-abstract: >-
-  json-merge
-license: See license file

data/CODE_OF_CONDUCT.md

@@ -1,134 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[![Contact Maintainer][🚂maint-contact-img]][🚂maint-contact].
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
-[🚂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