fingerprintable 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a8d276e78f3b729a591c448b1e901639c0c21de05fa6e1090eb2c44e65c1686
-  data.tar.gz: 32b209a44af07d2f04164e3085a3a41a71ee9d7fe5dfb6092ef8211a38ecced4
+  metadata.gz: 974d5bf19592f7d2d35c604e7f4f5c6b5ad118250a113ca4d6d5c2b3fdc44d8a
+  data.tar.gz: 780b8605200414ccc134278a06bb413823747432c2552380c20433462f0aafaf
 SHA512:
-  metadata.gz: eff34aeaa0d42acf25b9cbce80e413ed0024a11c525ab719a5c6c2a4797b813c664d7c860b6f2c3ad686140fafe431d78be7b58950717e9c12c257c05071cc88
-  data.tar.gz: 22872f8ccf70d43b2729a4e4ede25f66ae8e93eef8449464f46712861281876c0af35a00377d24c88dd4c582651bb61a6fab7052800be24fd629cce276ecb8ec
+  metadata.gz: 98f96e9544657589b1af8a3844d3176d7171ca796dbec1aa0587833b7599b38e7a7d9df69b9df037f1475086eb171c86d14b9029e3754006fc75868aa31bb6c2
+  data.tar.gz: cc8a16d45ea75a4edec6f1c1789736e625bdb39e3f62e8c9eea36bced14fc9c953dadd815fb6f294a6ec527ab9c917b1df3756d0945fc989e8f5bfdda9edad75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fingerprintable (1.0.0)
+    fingerprintable (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/fingerprintable/fingerprinter.rb

@@ -3,7 +3,6 @@
 module Fingerprintable
   class Fingerprinter
     attr_reader :attributes,
-                :cache,
                 :fallback_to_string,
                 :ignore,
                 :object
@@ -21,6 +20,25 @@ module Fingerprintable
       @attributes = ((object.instance_variables | attributes) - ignore).map(&:to_sym).sort
       @cache = cache || {}
       @cache[object] = next_cache_id
+      @fingerprinted = false
+    end
+
+    def cache
+      fingerprint unless @fingerprinted
+      @cache
+    end
+
+    def diff(other_fingerprinter)
+      raise "Passed object (#{other_fingerprinter.class.name}) does not match the fingerprinter object class: #{object.class.name}" if object.class != other_fingerprinter.object.class
+
+      values = object_values_hash
+      other_values = other_fingerprinter.object_values_hash
+
+      (attributes | other_fingerprinter.attributes).reject { |e| values[e] == other_values[e] }
+    end
+
+    def diff?(other_fingerprinter)
+      diff(other_fingerprinter).any?
     end
 
     def deep_convert_and_sort(obj)
@@ -34,7 +52,7 @@ module Fingerprintable
       when Array
         obj.map { |v| deep_convert_and_sort(v) }.sort.to_s
       when Hash
-        Hash[obj.map { |k, v| [k, deep_convert_and_sort(v)] }].sort.to_s
+        Hash[obj.map { |k, v| [deep_convert_and_sort(k), deep_convert_and_sort(v)] }].sort.to_s
       when Module
         obj.name
       else
@@ -44,12 +62,35 @@ module Fingerprintable
 
     def fingerprint
       @fingerprint ||= begin
+        @fingerprinted = true
         Digest::MD5.hexdigest(to_s)
       end
     end
 
+    def object_values_hash
+      @object_values_hash ||= Hash[attributes.map do |attr|
+        [attr, object.instance_variable_get(attr)]
+      end]
+    end
+
     def to_s
-      @to_s ||= deep_convert_and_sort(object_value_hash).to_s
+      @to_s ||= deep_convert_and_sort(object_values_hash).to_s
+    end
+
+    def self.diff(obj1, obj2)
+      f1 =  if obj1.respond_to?(:fingerprinter)
+              obj1.fingerprinter
+            else
+              Fingerprinter.new(object: obj1)
+            end
+
+      f2 =  if obj2.respond_to?(:fingerprinter)
+              obj2.fingerprinter
+            else
+              Fingerprinter.new(object: obj2)
+            end
+
+      f1.diff(f2)
     end
 
     private
@@ -79,11 +120,5 @@ module Fingerprintable
       # "#{SecureRandom.uuid}-#{@cache.count}"
       @cache.count
     end
-
-    def object_value_hash
-      Hash[attributes.map do |attr|
-        [attr, object.instance_variable_get(attr)]
-      end]
-    end
   end
 end

data/lib/fingerprintable/version.rb

@@ -1,3 +1,3 @@
 module Fingerprintable
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fingerprintable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Jackson