dhash-vips 0.1.1.5 → 0.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fff14578bcad5c73887655e363e79dddc3acefe7
-  data.tar.gz: f4633556e075270a05b456e80b367b9be0bf8a6a
+SHA256:
+  metadata.gz: a51cdf1232968a0f4717b6a76ef15a7e4378004fabdc240e472fbaac429c22c7
+  data.tar.gz: e20fc002226f349de7ce4cfd2c5709cbd8198640e6b2445a572abebce3a7b85d
 SHA512:
-  metadata.gz: d3cea61fb131a2737b9e1cb3bcd671ea1e017c8fd2d098e045c6f4cd3463e8621a239ffb7432dacc0196ced7f5060ff1fec8aaf9366d55adc758605df5887966
-  data.tar.gz: 316e06f339504f6eddbce864c2585e55428689444da97c9afdb0e1faa0fe976404412240465944a40411bf7ab624d4ddcb187563fb7d32f4f9b0c7dc2ae4dbec
+  metadata.gz: cd4d7ecb82a95361cd7a1075691a9303c80f18c4b186f37cb348c041f9787d6bdf61e34d39df3d416980aba2b680e98568743c2f1822e8df75838cea8fde3e60
+  data.tar.gz: 297c8b7e8662e97bd051777d2b662504ae15fcfed448bf9248fd8ef941fa320430eba48bb5ff64ad10f890d985c0d7aca337578f033dcfef031b3d52026de276

data/Gemfile

@@ -1,11 +1,12 @@
 source "https://rubygems.org"
-gemspec
 
-gem "byebug", "<11.1.0"   # for Ruby 2.3
 gem "rake"
-gem "minitest"
-gem "rmagick", "~>2.16"
+gem "rmagick"
+gem "dhash", github: "nakilon/dhash"
 gem "phamilie"
-gem "dhash"
 gem "get_process_mem"
 gem "mll"
+gem "minitest"
+gem "byebug", "<11.1.0"   # for Ruby 2.3
+
+gemspec

data/common.rb

@@ -1,20 +1,10 @@
-def download_and_keep image   # returns path
-  require "open-uri"
-  require "digest"
-  File.join(FileUtils.mkdir_p(File.expand_path "images", __dir__()).first, image).tap do |path|
-    open("https://storage.googleapis.com/dhash-vips.nakilon.pro/#{image}") do |link|
-      File.open(path, "wb") do |file|
-        IO.copy_stream link, file
-      end
-    end unless File.exist?(path) && Digest::MD5.file(path) == File.basename(image, ".jpg")
-  end
-end
-
 def download_if_needed path
   require "open-uri"
   require "digest"
   FileUtils.mkdir_p File.dirname path
-  open("https://storage.googleapis.com/dhash-vips.nakilon.pro/#{File.basename path}") do |link|
+  open("http://gems.nakilon.pro.storage.yandexcloud.net/dhash-vips/#{File.basename path}".tap do |url|
+    puts "downloading #{path} from #{url}"
+  end) do |link|
     File.open(path, "wb"){ |file| IO.copy_stream link, file }
   end unless File.exist?(path) && Digest::MD5.file(path) == File.basename(path, File.extname(path))
   path

data/dhash-vips.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "dhash-vips"
-  spec.version       = "0.1.1.5"
+  spec.version       = "0.2.1.0"
   spec.summary       = "dHash and IDHash perceptual image hashing/fingerprinting"
   # spec.homepage      = "https://github.com/nakilon/dhash-vips"
 

data/extconf.rb

@@ -26,8 +26,10 @@ __END__
 
 to test: $ rake clean && rake install
 
+# this unlike using rake is building to current directory
+#   that is vital to be able to require the native extention for benchmarking, etc.
 $ ruby extconf.rb && make clean && make
-$ ruby -rdhash-vips -e "p DHashVips::IDHash.method(:distance3).source_location"
+$ ruby -e "require 'dhash-vips'; p DHashVips::IDHash.method(:distance3).source_location"  # using -r makes bundler mad
 # [".../dhash-vips.rb", 32] # if LoadError
 # [".../dhash-vips.rb", 52] # if native (or 42 with Ruby<2.4)
 

data/lib/dhash-vips.rb

@@ -1,4 +1,5 @@
 require "vips"
+Vips.vector_set false
 
 module DHashVips
 
@@ -9,37 +10,40 @@ module DHashVips
       (a ^ b).to_s(2).count "1"
     end
 
-    def pixelate file, hash_size, kernel = nil
-      image = Vips::Image.new_from_file file, access: :sequential
-      if kernel
-        image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height), kernel: kernel).colourspace("b-w")
+    def pixelate input, hash_size
+      image = if input.is_a? Vips::Image
+        input.thumbnail_image(hash_size + 1, height: hash_size, size: :force)
       else
-        image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height)                ).colourspace("b-w")
+        Vips::Image.thumbnail(input, hash_size + 1, height: hash_size, size: :force)
       end
+      (image.has_alpha? ? image.flatten : image).colourspace("b-w")[0]
     end
 
-    def calculate file, hash_size = 8, kernel = nil
-      image = pixelate file, hash_size, kernel
-
+    def calculate file, hash_size = 8
+      image = pixelate file, hash_size
       image.cast("int").conv([[1, -1]]).crop(1, 0, hash_size, hash_size).>(0)./(255).cast("uchar").to_a.join.to_i(2)
     end
 
   end
 
   module IDHash
-    extend self
 
-    def distance3_ruby a, b
+    def self.distance3_ruby a, b
       ((a ^ b) & (a | b) >> 128).to_s(2).count "1"
     end
     begin
       require_relative "../idhash.#{Gem::Platform.local.os == "darwin" ? "bundle" : "o"}"
     rescue LoadError
-      alias_method :distance3, :distance3_ruby
+      class << self
+        # https://github.com/minitest/minitest/issues/939
+        def distance3 a, b
+          distance3_ruby a, b
+        end
+      end
     else
       # we can't just do `defined? Bignum` because it's defined but deprecated (some internal CONST_DEPRECATED flag)
       if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4")
-        def distance3 a, b
+        def self.distance3 a, b
           if a.is_a?(Bignum) && b.is_a?(Bignum)
             distance3_c a, b
           else
@@ -50,7 +54,7 @@ module DHashVips
         # https://github.com/ruby/ruby/commit/de2f7416d2deb4166d78638a41037cb550d64484#diff-16b196bc6bfe8fba63951420f843cfb4R10
         require "rbconfig/sizeof"
         FIXNUM_MAX = (1 << (8 * RbConfig::SIZEOF["long"] - 2)) - 1
-        def distance3 a, b
+        def self.distance3 a, b
           if a > FIXNUM_MAX && b > FIXNUM_MAX
             distance3_c a, b
           else
@@ -59,7 +63,7 @@ module DHashVips
         end
       end
     end
-    def distance a, b
+    def self.distance a, b
       size_a, size_b = [a, b].map do |x|
         # TODO write a test about possible hash sizes
         #      they were 32 and 128, 124, 120 for MRI 2.0
@@ -71,7 +75,7 @@ module DHashVips
       ((a ^ b) & (a | b) >> 2 * size_a * size_a).to_s(2).count "1"
     end
 
-    @@median = lambda do |array|
+    def self.median array
       h = array.size / 2
       return array[h] if array[h] != array[h - 1]
       right = array.dup
@@ -81,25 +85,28 @@ module DHashVips
       return right.uniq[1] if left.count(left.last) > right.count(right.first)
       left.last
     end
-    fail unless 2 == @@median[[1, 2, 2, 2, 2, 2, 3]]
-    fail unless 3 == @@median[[1, 2, 2, 2, 2, 3, 3]]
-    fail unless 3 == @@median[[1, 1, 2, 2, 3, 3, 3]]
-    fail unless 2 == @@median[[1, 1, 1, 2, 3, 3, 3]]
-    fail unless 2 == @@median[[1, 1, 2, 2, 2, 2, 3]]
-    fail unless 2 == @@median[[1, 2, 2, 2, 2, 3]]
-    fail unless 3 == @@median[[1, 2, 2, 3, 3, 3]]
-    fail unless 1 == @@median[[1, 1, 1]]
-    fail unless 1 == @@median[[1, 1]]
+    private_class_method :median
+    fail unless 2 == median([1, 2, 2, 2, 2, 2, 3])
+    fail unless 3 == median([1, 2, 2, 2, 2, 3, 3])
+    fail unless 3 == median([1, 1, 2, 2, 3, 3, 3])
+    fail unless 2 == median([1, 1, 1, 2, 3, 3, 3])
+    fail unless 2 == median([1, 1, 2, 2, 2, 2, 3])
+    fail unless 2 == median([1, 2, 2, 2, 2, 3])
+    fail unless 3 == median([1, 2, 2, 3, 3, 3])
+    fail unless 1 == median([1, 1, 1])
+    fail unless 1 == median([1, 1])
 
-    def fingerprint filename, power = 3
+    def self.fingerprint input, power = 3
       size = 2 ** power
-      image = Vips::Image.new_from_file filename, access: :sequential
-      image = image.resize(size.fdiv(image.width), vscale: size.fdiv(image.height)).colourspace("b-w").flatten
-
-      array = image.to_a.map &:flatten
+      image = if input.is_a? Vips::Image
+        input.thumbnail_image(size, height: size, size: :force)
+      else
+        Vips::Image.thumbnail(input, size, height: size, size: :force)
+      end
+      array = (image.has_alpha? ? image.flatten : image).flatten.colourspace("b-w")[0].to_enum.map &:flatten
       d1, i1, d2, i2 = [array, array.transpose].flat_map do |a|
-        d = a.zip(a.rotate(1)).flat_map{ |r1, r2| r1.zip(r2).map{ |i,j| i - j } }
-        m = @@median.call d.map(&:abs).sort
+        d = a.zip(a.rotate(1)).flat_map{ |r1, r2| r1.zip(r2).map{ |i, j| i - j } }
+        m = median d.map(&:abs).sort
         [
           d.map{ |c| c     <  0 ? 1 : 0 }.join.to_i(2),
           d.map{ |c| c.abs >= m ? 1 : 0 }.join.to_i(2),

data/test.rb

@@ -1,11 +1,12 @@
 require "minitest/autorun"
 
-require "dhash-vips"
+require_relative "lib/dhash-vips"
 
 # TODO tests about `fingerprint(4)`
 
 [
-  [DHashVips::DHash, :hamming, :calculate, 2, 23, 18, 50, 4],
+  [DHashVips::DHash, :hamming, :calculate, 2, 23, 9, 53, 7],
+
     # vips-8.9.1-Tue Jan 28 13:05:46 UTC 2020
     # [[0, 14, 26, 27, 31, 27, 32, 28, 43, 43, 34, 37, 37, 34, 35, 42],
     #  [14, 0, 28, 25, 39, 35, 32, 32, 43, 43, 38, 41, 41, 38, 37, 50],
@@ -23,7 +24,63 @@ require "dhash-vips"
     #  [34, 38, 32, 35, 33, 29, 32, 36, 31, 31, 26, 25, 19, 0, 21, 26],
     #  [35, 37, 27, 26, 40, 34, 23, 27, 28, 28, 29, 30, 26, 21, 0, 23],
     #  [42, 50, 36, 33, 31, 27, 34, 34, 27, 27, 18, 19, 23, 26, 23, 0]]
-  [DHashVips::IDHash, :distance, :fingerprint, 6, 22, 23, 65, 0],
+
+    # vips-8.11.3-Wed Aug 11 09:29:27 UTC 2021
+    # [[0, 17, 25, 30, 30, 26, 35, 30, 42, 42, 35, 32, 36, 32, 34, 42],
+    #  [17, 0, 28, 27, 39, 35, 32, 29, 43, 43, 38, 39, 43, 37, 37, 49],
+    #  [25, 28, 0, 13, 35, 41, 28, 29, 41, 41, 38, 35, 33, 31, 27, 37],
+    #  [30, 27, 13, 0, 36, 36, 31, 34, 38, 38, 35, 32, 40, 34, 26, 32],
+    #  [30, 39, 35, 36, 0, 16, 35, 34, 40, 40, 31, 26, 28, 34, 40, 30],
+    #  [26, 35, 41, 36, 16, 0, 41, 44, 38, 38, 23, 28, 26, 30, 34, 24],
+    #  [35, 32, 28, 31, 35, 41, 0, 11, 27, 27, 38, 35, 33, 33, 21, 35],
+    #  [30, 29, 29, 34, 34, 44, 11, 0, 28, 28, 37, 32, 36, 40, 30, 38],
+    #  [42, 43, 41, 38, 40, 38, 27, 28, 0, 0, 33, 34, 30, 32, 28, 30],
+    #  [42, 43, 41, 38, 40, 38, 27, 28, 0, 0, 33, 34, 30, 32, 28, 30],
+    #  [35, 38, 38, 35, 31, 23, 38, 37, 33, 33, 0, 11, 23, 27, 31, 17],
+    #  [32, 39, 35, 32, 26, 28, 35, 32, 34, 34, 11, 0, 24, 26, 30, 20],
+    #  [36, 43, 33, 40, 28, 26, 33, 36, 30, 30, 23, 24, 0, 20, 26, 22],
+    #  [32, 37, 31, 34, 34, 30, 33, 40, 32, 32, 27, 26, 20, 0, 20, 26],
+    #  [34, 37, 27, 26, 40, 34, 21, 30, 28, 28, 31, 30, 26, 20, 0, 24],
+    #  [42, 49, 37, 32, 30, 24, 35, 38, 30, 30, 17, 20, 22, 26, 24, 0]]
+
+    # v0.1.2.0
+    # [[0, 18, 25, 27, 28, 25, 33, 31, 39, 40, 33, 35, 32, 28, 36, 47],
+    #  [18, 0, 31, 25, 34, 33, 33, 33, 39, 38, 37, 43, 40, 36, 40, 53],
+    #  [25, 31, 0, 16, 31, 38, 26, 32, 42, 41, 36, 38, 31, 31, 31, 32],
+    #  [27, 25, 16, 0, 35, 36, 26, 32, 38, 37, 34, 34, 41, 37, 27, 34],
+    #  [28, 34, 31, 35, 0, 17, 39, 37, 41, 44, 31, 27, 26, 32, 32, 33],
+    #  [25, 33, 38, 36, 17, 0, 46, 40, 38, 39, 24, 28, 25, 31, 25, 30],
+    #  [33, 33, 26, 26, 39, 46, 0, 10, 26, 25, 34, 32, 31, 35, 33, 30],
+    #  [31, 33, 32, 32, 37, 40, 10, 0, 26, 27, 34, 32, 33, 33, 33, 34],
+    #  [39, 39, 42, 38, 41, 38, 26, 26, 0, 3, 36, 34, 35, 33, 37, 28],
+    #  [40, 38, 41, 37, 44, 39, 25, 27, 3, 0, 35, 35, 36, 36, 36, 27],
+    #  [33, 37, 36, 34, 31, 24, 34, 34, 36, 35, 0, 10, 23, 31, 23, 22],
+    #  [35, 43, 38, 34, 27, 28, 32, 32, 34, 35, 10, 0, 23, 29, 23, 20],
+    #  [32, 40, 31, 41, 26, 25, 31, 33, 35, 36, 23, 23, 0, 20, 24, 21],
+    #  [28, 36, 31, 37, 32, 31, 35, 33, 33, 36, 31, 29, 20, 0, 20, 25],
+    #  [36, 40, 31, 27, 32, 25, 33, 33, 37, 36, 23, 23, 24, 20, 0, 17],
+    #  [47, 53, 32, 34, 33, 30, 30, 34, 28, 27, 22, 20, 21, 25, 17, 0]]
+
+    # v0.2.0.0
+    # [[0, 18, 26, 28, 28, 24, 35, 31, 42, 42, 32, 34, 33, 29, 35, 40],
+    #  [18, 0, 30, 24, 38, 34, 33, 33, 44, 42, 38, 42, 41, 37, 37, 50],
+    #  [26, 30, 0, 16, 34, 38, 29, 35, 42, 40, 36, 38, 31, 31, 31, 36],
+    #  [28, 24, 16, 0, 36, 36, 31, 35, 40, 38, 34, 34, 41, 37, 27, 34],
+    #  [28, 38, 34, 36, 0, 14, 35, 33, 40, 42, 32, 26, 27, 33, 35, 28],
+    #  [24, 34, 38, 36, 14, 0, 43, 39, 38, 40, 24, 28, 25, 31, 29, 28],
+    #  [35, 33, 29, 31, 35, 43, 0, 8, 27, 25, 35, 33, 32, 32, 28, 31],
+    #  [31, 33, 35, 35, 33, 39, 8, 0, 27, 27, 35, 33, 34, 34, 28, 33],
+    #  [42, 44, 42, 40, 40, 38, 27, 27, 0, 2, 34, 32, 31, 33, 31, 28],
+    #  [42, 42, 40, 38, 42, 40, 25, 27, 2, 0, 34, 34, 33, 35, 31, 28],
+    #  [32, 38, 36, 34, 32, 24, 35, 35, 34, 34, 0, 10, 23, 31, 25, 18],
+    #  [34, 42, 38, 34, 26, 28, 33, 33, 32, 34, 10, 0, 23, 29, 25, 16],
+    #  [33, 41, 31, 41, 27, 25, 32, 34, 31, 33, 23, 23, 0, 20, 24, 19],
+    #  [29, 37, 31, 37, 33, 31, 32, 34, 33, 35, 31, 29, 20, 0, 22, 27],
+    #  [35, 37, 31, 27, 35, 29, 28, 28, 31, 31, 25, 25, 24, 22, 0, 23],
+    #  [40, 50, 36, 34, 28, 28, 31, 33, 28, 28, 18, 16, 19, 27, 23, 0]]
+
+  [DHashVips::IDHash, :distance, :fingerprint, 8, 21, 23, 72, 0],
+
     # vips-8.9.1-Tue Jan 28 13:05:46 UTC 2020
     # [[0, 16, 32, 35, 57, 45, 51, 50, 48, 47, 54, 48, 60, 50, 47, 56],
     #  [16, 0, 30, 34, 58, 47, 55, 56, 47, 50, 57, 49, 62, 52, 52, 61],
@@ -41,9 +98,67 @@ require "dhash-vips"
     #  [50, 52, 44, 40, 43, 42, 45, 45, 47, 49, 36, 30, 20, 0, 35, 39],
     #  [47, 52, 49, 41, 47, 43, 44, 41, 41, 44, 38, 37, 23, 35, 0, 19],
     #  [56, 61, 49, 51, 48, 42, 47, 42, 46, 43, 25, 27, 28, 39, 19, 0]]
+
+    # vips-8.11.3-Wed Aug 11 09:29:27 UTC 2021
+    # [[0, 17, 30, 35, 55, 46, 51, 54, 48, 46, 57, 48, 59, 52, 49, 54],
+    #  [17, 0, 30, 37, 57, 46, 54, 55, 46, 49, 60, 50, 61, 54, 51, 58],
+    #  [30, 30, 0, 12, 46, 57, 47, 42, 66, 59, 44, 37, 49, 44, 48, 49],
+    #  [35, 37, 12, 0, 54, 67, 44, 41, 58, 53, 48, 41, 56, 42, 46, 48],
+    #  [55, 57, 46, 54, 0, 23, 45, 43, 65, 63, 48, 48, 34, 42, 48, 47],
+    #  [46, 46, 57, 67, 23, 0, 57, 56, 51, 50, 42, 48, 37, 38, 46, 40],
+    #  [51, 54, 47, 44, 45, 57, 0, 6, 33, 34, 49, 43, 49, 41, 45, 47],
+    #  [54, 55, 42, 41, 43, 56, 6, 0, 40, 39, 51, 50, 49, 40, 44, 44],
+    #  [48, 46, 66, 58, 65, 51, 33, 40, 0, 10, 47, 53, 48, 46, 40, 46],
+    #  [46, 49, 59, 53, 63, 50, 34, 39, 10, 0, 50, 57, 50, 49, 40, 43],
+    #  [57, 60, 44, 48, 48, 42, 49, 51, 47, 50, 0, 9, 33, 32, 40, 23],
+    #  [48, 50, 37, 41, 48, 48, 43, 50, 53, 57, 9, 0, 28, 27, 38, 28],
+    #  [59, 61, 49, 56, 34, 37, 49, 49, 48, 50, 33, 28, 0, 21, 24, 27],
+    #  [52, 54, 44, 42, 42, 38, 41, 40, 46, 49, 32, 27, 21, 0, 36, 35],
+    #  [49, 51, 48, 46, 48, 46, 45, 44, 40, 40, 40, 38, 24, 36, 0, 21],
+    #  [54, 58, 49, 48, 47, 40, 47, 44, 46, 43, 23, 28, 27, 35, 21, 0]]
+
+    # v0.1.2.0
+    # [[0, 17, 34, 40, 53, 43, 53, 52, 47, 47, 56, 44, 54, 51, 47, 57],
+    #  [17, 0, 35, 33, 56, 45, 56, 52, 48, 49, 58, 49, 64, 57, 53, 58],
+    #  [34, 35, 0, 8, 51, 57, 45, 40, 57, 54, 47, 40, 49, 47, 47, 48],
+    #  [40, 33, 8, 0, 56, 62, 44, 40, 53, 47, 50, 41, 53, 41, 42, 47],
+    #  [53, 56, 51, 56, 0, 21, 41, 48, 72, 65, 46, 47, 36, 43, 43, 43],
+    #  [43, 45, 57, 62, 21, 0, 54, 56, 61, 60, 41, 47, 38, 39, 43, 39],
+    #  [53, 56, 45, 44, 41, 54, 0, 12, 39, 40, 47, 44, 44, 38, 48, 41],
+    #  [52, 52, 40, 40, 48, 56, 12, 0, 35, 36, 51, 50, 47, 39, 41, 43],
+    #  [47, 48, 57, 53, 72, 61, 39, 35, 0, 11, 53, 53, 57, 48, 42, 51],
+    #  [47, 49, 54, 47, 65, 60, 40, 36, 11, 0, 50, 54, 51, 49, 45, 47],
+    #  [56, 58, 47, 50, 46, 41, 47, 51, 53, 50, 0, 13, 32, 36, 38, 23],
+    #  [44, 49, 40, 41, 47, 47, 44, 50, 53, 54, 13, 0, 28, 30, 35, 27],
+    #  [54, 64, 49, 53, 36, 38, 44, 47, 57, 51, 32, 28, 0, 21, 24, 28],
+    #  [51, 57, 47, 41, 43, 39, 38, 39, 48, 49, 36, 30, 21, 0, 31, 35],
+    #  [47, 53, 47, 42, 43, 43, 48, 41, 42, 45, 38, 35, 24, 31, 0, 19],
+    #  [57, 58, 48, 47, 43, 39, 41, 43, 51, 47, 23, 27, 28, 35, 19, 0]]
+
+    # v0.2.0.0
+    # [[0, 17, 34, 40, 53, 43, 53, 52, 47, 47, 56, 44, 54, 51, 47, 57],
+    #  [17, 0, 35, 33, 56, 45, 56, 52, 48, 49, 58, 49, 64, 57, 53, 58],
+    #  [34, 35, 0, 8, 51, 57, 45, 40, 57, 54, 47, 40, 49, 47, 47, 48],
+    #  [40, 33, 8, 0, 56, 62, 44, 40, 53, 47, 50, 41, 53, 41, 42, 47],
+    #  [53, 56, 51, 56, 0, 21, 41, 48, 72, 65, 46, 47, 36, 43, 43, 43],
+    #  [43, 45, 57, 62, 21, 0, 54, 56, 61, 60, 41, 47, 38, 39, 43, 39],
+    #  [53, 56, 45, 44, 41, 54, 0, 12, 39, 40, 47, 44, 44, 38, 48, 41],
+    #  [52, 52, 40, 40, 48, 56, 12, 0, 35, 36, 51, 50, 47, 39, 41, 43],
+    #  [47, 48, 57, 53, 72, 61, 39, 35, 0, 11, 53, 53, 57, 48, 42, 51],
+    #  [47, 49, 54, 47, 65, 60, 40, 36, 11, 0, 50, 54, 51, 49, 45, 47],
+    #  [56, 58, 47, 50, 46, 41, 47, 51, 53, 50, 0, 13, 32, 36, 38, 23],
+    #  [44, 49, 40, 41, 47, 47, 44, 50, 53, 54, 13, 0, 28, 30, 35, 27],
+    #  [54, 64, 49, 53, 36, 38, 44, 47, 57, 51, 32, 28, 0, 21, 24, 28],
+    #  [51, 57, 47, 41, 43, 39, 38, 39, 48, 49, 36, 30, 21, 0, 31, 35],
+    #  [47, 53, 47, 42, 43, 43, 48, 41, 42, 45, 38, 35, 24, 31, 0, 19],
+    #  [57, 58, 48, 47, 43, 39, 41, 43, 51, 47, 23, 27, 28, 35, 19, 0]]
+
 ].each do |lib, dm, calc, min_similar, max_similar, min_not_similar, max_not_similar, bw_exceptional|
 
   describe lib do
+    require "fileutils"
+    require "digest"
+    require "mll"
 
     # these are false positive by idhash
     # 6d97739b4a08f965dc9239dd24382e96.jpg
@@ -62,25 +177,21 @@ require "dhash-vips"
       [ %w{
         71662d4d4029a3b41d47d5baf681ab9a.jpg ad8a37f872956666c3077a3e9e737984.jpg
       }, bw_exceptional, bw_exceptional], # these are the same photo but of different size and colorspace
-    ].each do |images, min, max|
-
-      require "fileutils"
-      require "digest"
-      require "mll"
+    ].each do |_images, min, max|
 
       require_relative "common"
-      images = images.map &method(:download_and_keep)
+      images = _images.map{ |_| download_if_needed "test_images/#{_}" }
 
       hashes = images.map &lib.method(calc)
       table = MLL::table[lib.method(dm), [hashes], [hashes]]
 
-      require "pp"
-      STDERR.puts ""
-      PP.pp table, STDERR
-      STDERR.puts ""
+      # STDERR.puts ""
+      # require "pp"
+      # PP.pp table, STDERR
+      # STDERR.puts ""
 
       hashes.size.times.to_a.repeated_combination(2) do |i, j|
-        it do
+        it "#{_images[i]} #{_images[j]}" do
           case
           when i == j
             assert_predicate table[i][j], :zero?
@@ -96,6 +207,19 @@ require "dhash-vips"
 
     end
 
+    it "accepts Vips::Image" do
+      # https://github.com/libvips/ruby-vips/issues/349
+      lib.public_send calc, Vips::Image.new_from_buffer("GIF89a\x01\x00\x01\x00\x80\x01\x00\xFF\xFF\xFF\x00\x00\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02D\x01\x00;", "")
+    end
+
   end
 
 end
+
+describe DHashVips::IDHash do
+  it "does not call distance3_ruby" do
+    DHashVips::IDHash.stub :distance3_ruby, ->*{fail} do
+      assert_equal 0, DHashVips::IDHash.distance3((2<<256)-1, (2<<256)-1)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.1.1.5
+  version: 0.2.1.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips
@@ -71,8 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: dHash and IDHash perceptual image hashing/fingerprinting