snappier 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44e2f17a1206aea3035128b9d17325d26a1deac42391cbb279ff7178734b367
-  data.tar.gz: 3beeaa24a2d05bf6d473a53912cc770bc00a6179fd9e60f9fc45080a52c099a5
+  metadata.gz: b2b91bfac18970f816c688c50f628f2936b4d9542d91cf2fb941bed3e89d20c3
+  data.tar.gz: 9852bc0fc596ee1f8c5e38a56334bdb5c95fae7366325443dc66fd4dfa625053
 SHA512:
-  metadata.gz: '058f1a6f65c067d9a76da692572b46a1f8c2d994939cb78b784766d9edb00ad07985fcbd39823e33bbcbc6454807f873aa1ee026a438839e69f735d0bbca565f'
-  data.tar.gz: d73c327fd27b0e264253f7c4fd81d7dc40caed14c6a6f82a273f8ff9389f271ce5568b03031d691c6afcd9ad365da6ebe9860218230d34f20d2e8ead01f2e4f6
+  metadata.gz: c3735760364dd88d933d8ad919f6c886d27f8a98d400915b649e7aa902ba3392f7f554ee5beac7e000c8540d6049aba39047e9cfe447c83e76ad8c2681ae781e
+  data.tar.gz: 3eef0ad2728221c2390d1770dcd1505ca8650f0b10042f9d8d24f367da9fba82557e9f2b8fadf045708a8df8eb3b07afe3c7a909c7a052ec99afb02510f8d3b0

data/.rubocop.yml

@@ -30,8 +30,14 @@ RSpec/MultipleExpectations:
 RSpec/VerifiedDoubles:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 30
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
 Metrics/MethodLength:
-  Max: 20
+  Max: 30
 
-Metrics/AbcSize:
-  Max: 20
+Metrics/PerceivedComplexity:
+  Max: 15

data/lib/snappier/changes.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Snappier
+  module Changes
+    def self.between(previous_state, current_state)
+      {}.tap { |changes| append_changes(changes, previous_state, current_state) }
+    end
+
+    def self.append_changes(changes, previous_state, current_state, path = [])
+      keys = Set.new(previous_state.keys + current_state.keys)
+
+      keys.each do |key|
+        previous_value = previous_state[key]
+        current_value = current_state[key]
+
+        if previous_value.is_a?(Array) || current_value.is_a?(Array)
+          append_changes_for_collections(changes, previous_value, current_value, path + [key])
+          next
+        end
+
+        if previous_value.is_a?(Hash) || current_value.is_a?(Hash)
+          previous_id = (previous_value || {}).delete("id")
+          current_id = (current_value || {}).delete("id")
+
+          if previous_id || current_id
+            if previous_id == current_id
+              append_changes(changes, previous_value, current_value, path + [key, previous_id])
+            else
+              append_changes(changes, previous_value, {}, path + [key, previous_id])
+              append_changes(changes, {}, current_value, path + [key, current_id])
+            end
+          else
+            append_changes(changes, previous_value, current_value, path + [key])
+          end
+
+          next
+        end
+
+        next if previous_value == current_value
+
+        changes[path + [key]] = [previous_value, current_value]
+      end
+    end
+
+    def self.append_changes_for_collections(changes, previous_collection, current_collection, path)
+      ids = Set.new
+      previous_collection.each { |e| ids << e["id"] if e["id"] }
+      current_collection.each { |e| ids << e["id"] if e["id"] }
+
+      if ids.empty?
+        changes[path] = [previous_collection, current_collection]
+        return
+      end
+
+      ids.each do |id|
+        previous_value = previous_collection.find { |r| r["id"] == id } || {}
+        current_value = current_collection.find { |r| r["id"] == id } || {}
+        previous_value.delete("id")
+        current_value.delete("id")
+
+        append_changes(changes, previous_value, current_value, path + [id])
+      end
+    end
+  end
+end

data/lib/snappier/replay.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "registry"
+require_relative "changes"
 
 module Snappier
   module Replay
@@ -11,7 +12,7 @@ module Snappier
         content = current.delete(:content)
         current[:who] = content.delete("who")
         current[:state] = content.delete("state")
-        current[:changes] = changes(previous_state, current[:state])
+        current[:changes] = Changes.between(previous_state, current[:state])
 
         yield(current)
 
@@ -19,20 +20,6 @@ module Snappier
       end
     end
 
-    def self.changes(previous_state, current_state)
-      changes = {}
-
-      keys = Set.new(previous_state.keys + current_state.keys)
-
-      keys.each do |key|
-        next if previous_state[key] == current_state[key]
-
-        changes[key] = [previous_state[key], current_state[key]]
-      end
-
-      changes
-    end
-
     def self.for_entity(entity)
       self.for(type: entity.class.name, id: entity.id)
     end

data/lib/snappier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snappier
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snappier
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mark Ryall
@@ -38,6 +38,7 @@ files:
 - Rakefile
 - exe/snappier_replay
 - lib/snappier.rb
+- lib/snappier/changes.rb
 - lib/snappier/file_persistence.rb
 - lib/snappier/job.rb
 - lib/snappier/registry.rb