From c75aef38ed4679739a06dcb5e0e716877630bdc2 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 9 Dec 2018 18:06:21 -0600 Subject: [PATCH] set diff: fix obsolete_{added,removed} not including changed items. --- app/logical/set_diff.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/logical/set_diff.rb b/app/logical/set_diff.rb index 52558ef99..c70fd92b6 100644 --- a/app/logical/set_diff.rb +++ b/app/logical/set_diff.rb @@ -1,18 +1,18 @@ class SetDiff - attr_reader :added, :removed, :obsolete_added, :obsolete_removed, :changed, :unchanged + attr_reader :additions, :removals, :added, :removed, :obsolete_added, :obsolete_removed, :changed, :unchanged def initialize(new, old, latest) new, old, latest = new.to_a, old.to_a, latest.to_a - @added, @removed, @changed = changes(new, old) + @additions = new - old + @removals = old - new @unchanged = new & old - @obsolete_added = added - latest - @obsolete_removed = removed & latest + @obsolete_added = additions - latest + @obsolete_removed = removals & latest + @added, @removed, @changed = changes(additions, removals) end - def changes(new, old) - added = new - old - removed = old - new + def changes(added, removed) changed = [] removed.each do |removal|