dhash-vips 0.0.0.1 → 0.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dbc3028fb3c5b856d3d3836e9829f0fe0194104
-  data.tar.gz: 80426a3be479450729ea1e2d8eb1fc2cec0659ea
+  metadata.gz: 91c7be59e88216898e8a6dfa9cb3eeccf88cd9d6
+  data.tar.gz: 76e55f4d301b274ee37a95c236ebe7d884164490
 SHA512:
-  metadata.gz: 28d979ed682861592c339144a71c4a54561cbf6cf4818cd5336425449367551b044e88b1eb3ddda303aa58e8cc23ccb30e7a041448551f2b019e385551a92635
-  data.tar.gz: 306cbfb280c9cfb594990933904ab2f1bc116cb2aefc7b3039cf7bbe8140aa6540511bb317c43d7b8174848809969c3888656a103b9a364f54dc7f8fece7a0ba
+  metadata.gz: 9d6d563744fe3b72502b5827ef072af1b816866e30374b1ff18e312157cc646776c352560e4c3c7ec52b436d5833f3731455d5429b9d0051d0491943b718f860
+  data.tar.gz: 92054de250d05c1a93ffb178c85ccc8ac2132e110869789d2097fe8c8f03c1f4f0c280a1b3b941fa72e10f333d7adac389d10b96deb967387cd0501e01d69fff

data/README.md

@@ -6,19 +6,30 @@ Read "Kind of Like That" blog post (21 January 2013): http://www.hackerfactor.co
 
 It does not automatically detect very shifted crops and rotated images but you may make a wrapper that would call the comparison function iteratively.
 
-This implementation is powered by Vips and was forked from https://github.com/maccman/dhash (by Alex MacCaw) that was using ImageMagick.
+This implementation is powered by Vips and was forked from https://github.com/maccman/dhash that used ImageMagick.
 
 # Installation
 
+    brew install vips
+
+If you have troubles with above, see https://jcupitt.github.io/libvips/install.html  
+Then:
+
     gem install dhash-vips
 
+If you have troubles with the `gem vips` dependency, see https://github.com/jcupitt/ruby-vips  
+
 # Usage
 
-    hash1 = DhashVips.calculate "face-high.jpg"
-    hash2 = DhashVips.calculate "face-low.jpg"
+    hash1 = DhashVips.calculate "photo1.jpg"
+    hash2 = DhashVips.calculate "photo2.jpg"
 
     if 10 > DhashVips.hamming(hash1, hash2)
       puts "Images are very similar"
+    elsif 20 > DhashVips.hamming(hash1, hash2)
+      puts "Images are slightly similar"
     else
-      puts "No match"
+      puts "Images are different"
     end
+
+These `10` and `20` numbers are found empirically and just work enough well for 8-byte hashes.

data/dhash.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "vips"
 
   spec.add_development_dependency "dhash"
-  
+
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-core"
+  spec.add_development_dependency "mll"
 end

data/lib/dhash-vips.rb

@@ -5,24 +5,25 @@ module DhashVips
   extend self
 
   def hamming a, b
-    (a^b).to_s(2).count('1')
+    (a ^ b).to_s(2).count "1"
   end
 
   def calculate file, hash_size = 8
     image = Vips::Image.new_from_file file
     image = image.resize((hash_size + 1).fdiv(image.width), vscale: hash_size.fdiv(image.height)).colourspace "b-w"
 
-    difference = []
+    difference = 0
 
     hash_size.times do |row|
       hash_size.times do |col|
         pixel_left  = image.getpoint(col, row).first
         pixel_right = image.getpoint(col + 1, row).first
-        difference << (pixel_left > pixel_right)
+        difference <<= 1
+        difference += 1 if pixel_left > pixel_right
       end
     end
 
-    difference.map{ |d| d ? 1 : 0 }.join("").to_i(2)
+    difference
   end
 
 end

data/lib/dhash-vips/version.rb

@@ -1,3 +1,3 @@
 module DhashVips
-  VERSION = "0.0.0.1"
+  VERSION = "0.0.0.2"
 end

data/spec/_spec.rb

@@ -1,24 +1,60 @@
 require "dhash-vips"
 
 describe DhashVips do
-  it 'should have similar hashes for low/high of same image' do
-    hash1 = DhashVips.calculate(File.expand_path('../images/face-high.jpg', __FILE__))
-    hash2 = DhashVips.calculate(File.expand_path('../images/face-low.jpg', __FILE__))
 
-    expect(DhashVips.hamming(hash1, hash2)).to be < 3
-  end
+  require "tmpdir"
+  require "fileutils"
+  require "open-uri"
+  require "digest"
+  require "mll"
+  example do |example|
 
-  it 'should have similar hashes for similar images' do
-    hash1 = DhashVips.calculate(File.expand_path('../images/face-high.jpg', __FILE__))
-    hash2 = DhashVips.calculate(File.expand_path('../images/face-with-nose.jpg', __FILE__))
+    images = %w{
+      1d468d064d2e26b5b5de9a0241ef2d4b.jpg
+      92d90b8977f813af803c78107e7f698e.jpg
+      309666c7b45ecbf8f13e85a0bd6b0a4c.jpg
+      3f9f3db06db20d1d9f8188cd753f6ef4.jpg
+      df0a3b93e9412536ee8a11255f974141.jpg
+      679634ff89a31279a39f03e278bc9a01.jpg
+    }   # these images a consecutive pairs of slightly (but enough for nice asserts) silimar images
 
-    expect(DhashVips.hamming(hash1, hash2)).to be < 5
-  end
+    example.metadata[:extra_failure_lines] = []
+    FileUtils.mkdir_p dir = Dir.tmpdir + "/dhash-vips-spec"
+    images.each do |image|
+      "#{dir}/#{image}".tap do |filename|
+        unless File.exist?(filename) && Digest::MD5.file(filename) == File.basename(filename, ".jpg")
+          example.metadata[:extra_failure_lines] << "copying image from web to #{filename}"
+          open("https://storage.googleapis.com/dhash-vips.nakilon.pro/#{image}") do |link|
+            File.open(filename, "wb") do |file|
+              IO.copy_stream link, file
+            end
+          end
+        end
+      end
+    end
 
-  it 'should have identical hashes for identical images' do
-    hash1 = DhashVips.calculate(File.expand_path('../images/face-high.jpg', __FILE__))
-    hash2 = DhashVips.calculate(File.expand_path('../images/face-high.jpg', __FILE__))
+    hashes = images.map &DhashVips.method(:calculate)
+    table = MLL::table[DhashVips.method(:hamming), [hashes], [hashes]]
+    # require "pp"
+    # pp table
+    # [[0, 17, 29, 27, 22, 29],
+    #  [17, 0, 30, 26, 33, 36],
+    #  [29, 30, 0, 18, 39, 30],
+    #  [27, 26, 18, 0, 35, 30],
+    #  [22, 33, 39, 35, 0, 17],
+    #  [29, 36, 30, 30, 17, 0]]
 
-    expect(DhashVips.hamming(hash1, hash2)).to be == 0
+    hashes.size.times.to_a.combination(2) do |i, j|
+      case
+      when i == j
+        expect(table[i][j]).to eq 0
+      when (j - i).abs == 1 && (i + j - 1) % 4 == 0
+        expect(table[i][j]).to be > 0
+        expect(table[i][j]).to be < 19
+      else
+        expect(table[i][j]).to be > 21
+      end
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1
+  version: 0.0.0.2
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vips
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='