zonesync 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaa6c630bddb382ab5b051983a3af48b5d59583a2e6befb51bf4098e3ccbdbb0
-  data.tar.gz: 7005f724efb994e55bc9d581780a8ba5711729ba208b9ef4c8fb77cc48d018bc
+  metadata.gz: c395a08b3c2cc504eecef12cf44298872295adf778a7087128fb009b8709cfd1
+  data.tar.gz: 38f349d9182226d849c1a4a4688328aaa96d64dbda182803aeedffefea7d99e3
 SHA512:
-  metadata.gz: ca2cc5e0fefcbf14efe91cb80b84ef20b485715891d92b8f2cd1f58cb2b6193bf9a7a51e822fa046a516bb275a7c5a5fb98e19d2cb9ae08cee41208434986f9e
-  data.tar.gz: bb66c82041407b2e3d3a57e0c1c381dc9a7ac77fb1d09db52d61892fb76409541a3d5059f916205f00dbf304a71218a0df7f60c6fb995350a1928d8026e8b617
+  metadata.gz: 89364406f0bddc66568e3e908424699d3cc6daeb8a0b51ab7da94338369ae3a3f6be302f3c7439e23c0e771e41d5ebe0155c8cef71ad4dfa16184d2d516554d6
+  data.tar.gz: 282091580a65383b954a6b2da783e591d9f4f289e811ee4bc57dd9b61b004c3d3fdfa06f2f000971611b0924059573fd0000d2cf29e96d716fb2fee747f5c434

data/lib/zonesync/diff.rb

@@ -1,8 +1,6 @@
 # typed: strict
 require "sorbet-runtime"
 
-require "diff/lcs"
-
 module Zonesync
   Operation = T.type_alias { [Symbol, T::Array[Record]] }
 
@@ -16,19 +14,47 @@ module Zonesync
 
     sig { returns(T::Array[[Symbol, T::Array[Record]]]) }
     def call
-      changes = ::Diff::LCS.sdiff(from, to)
-      changes.map do |change|
-        case change.action
-        when "-"
-          [:remove, [change.old_element]]
-        when "!"
-          [:change, [change.old_element, change.new_element]]
-        when "+"
-          [:add, [change.new_element]]
+      # Group records by their primary key (name + type)
+      from_by_key = from.group_by { |r| [r.name, r.type] }
+      to_by_key = to.group_by { |r| [r.name, r.type] }
+
+      operations = []
+
+      # Process all keys that exist in from
+      from_by_key.each do |key, from_records|
+        to_records = to_by_key[key] || []
+
+        if to_records.empty?
+          # All records with this key were removed
+          from_records.each { |r| operations << [:remove, [r]] }
+        elsif from_records.length == 1 && to_records.length == 1
+          # Single record with this key - check if it changed
+          from_record = from_records.first
+          to_record = to_records.first
+
+          unless from_record == to_record
+            operations << [:change, [from_record, to_record]]
+          end
+        else
+          # Multiple records with same name+type, or count mismatch
+          # Use set difference to find what was added/removed
+          removed = from_records - to_records
+          added = to_records - from_records
+
+          removed.each { |r| operations << [:remove, [r]] }
+          added.each { |r| operations << [:add, [r]] }
+        end
+      end
+
+      # Process keys that only exist in to (new records)
+      to_by_key.each do |key, to_records|
+        unless from_by_key.key?(key)
+          to_records.each { |r| operations << [:add, [r]] }
         end
-      end.compact.sort_by do |operation|
-        operation.first
-      end.reverse # perform remove operations first
+      end
+
+      # Sort operations (remove first)
+      operations.sort_by { |op| op.first }.reverse
     end
   end
 end

data/lib/zonesync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zonesync
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/zonesync.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "diff-lcs", "~>1.4"
   spec.add_dependency "thor", "~>1.0"
   spec.add_dependency "treetop", "~>1.6"
   spec.add_dependency "sorbet-runtime"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zonesync
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Micah Geisel
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-10-19 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement