has_versions 0.6.2 → 0.6.3

data/has_versions.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = "has_versions"
-  s.version = '0.6.2'
+  s.version = '0.6.3'
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Grant Rodgers"]

data/lib/has_versions/version/diff.rb

@@ -1,16 +1,16 @@
 module HasVersions
   module Version
     module Diff
-      def diff(original = parent)
-        diff_fetch(original) do
-          original_snapshot = original.nil? ? {} : original.decoded_snapshot
+      def diff(other = parent)
+        diff_fetch(other) do
+          other_snapshot = other.nil? ? {} : other.decoded_snapshot
 
           output = {}
           decoded_snapshot.each do |attribute, new_value|
-            original_value = original_snapshot[attribute]
+            other_value = other_snapshot[attribute]
 
-            if original_value != new_value
-              output[attribute] = [original_value, new_value]
+            if other_value != new_value
+              output[attribute] = [other_value, new_value]
             end
           end
 
@@ -18,14 +18,12 @@ module HasVersions
         end
       end
 
-      def modified_attributes
-        diff.keys
+      def applied_modifications(other)
+        diff.keys - diff(other).keys
       end
 
-      def different_attributes
-        modified_attributes.select do |attribute|
-          target.send(attribute) != decoded_snapshot[attribute]
-        end
+      def unused_modifications(other)
+        diff.keys & diff(other).keys
       end
 
       def decoded_snapshot
@@ -39,9 +37,9 @@ module HasVersions
       end
 
       private
-        def diff_fetch(original)
+        def diff_fetch(other)
           @diff_cache ||= {}
-          @diff_cache[original] ||= yield
+          @diff_cache[other] ||= yield
         end
     end
   end

data/test/has_versions/version/diff_test.rb

@@ -45,18 +45,14 @@ module HasVersions
         assert_equal({'name' => [nil, 'decoded: bar'], 'weight' => [nil, 'decoded: 4.3']}, diff)
       end
 
-      def test_modified_attributes
+      def test_modifications
         target = DiffRecord.new
-        version = DiffRecord.version_model.new(target: target, snapshot: {'name' => 'joe', 'weight' => '129'})
-
-        assert_equal version.snapshot.keys, version.modified_attributes
-      end
-
-      def test_different_attributes
-        target = DiffRecord.new(name: 'decoded: sam', color: 'decoded: green', weight: 'decoded: 129')
-        version = DiffRecord.version_model.new(target: target, snapshot: {'name' => 'joe', 'weight' => '129'})
-
-        assert_equal ['name'], version.different_attributes
+        parent = DiffRecord.version_model.new(target: target, snapshot: {'color' => 'green', 'name' => 'joe', 'weight' => '50'})
+        version = DiffRecord.version_model.new(target: target, parent: parent, snapshot: {'color' => 'green', 'name' => 'sam', 'weight' => '129'})
+        other = DiffRecord.version_model.new(target: target, snapshot: {'color' => 'blue', 'name' => 'sam', 'weight' => '100'})
+      
+        assert_equal ['name'], version.applied_modifications(other)
+        assert_equal ['weight'], version.unused_modifications(other)
       end
 
       def test_decoded_snapshot

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_versions
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport