phashion 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: c79341235f99694415039b6b706bfe48d3d5c425
-  data.tar.gz: 651fa7bba67c389b06b60dc24f73283ff1394397
-!binary "U0hBNTEy":
-  metadata.gz: c47fdc783f464800a1c3b1bd2b4fe93cdcb938ca2ff0e49887bfc1e74305c7d4acca8fb72afbc4cfccacdd76d3b3c0a698999cb0e47d16780b84d4bd1feef0e1
-  data.tar.gz: 73d416a8f6b0393adfaceff857deec9c7d1e33095bc6c0cd0c47782c41acf1bc814cd893ce88bc6b64ae559bfbcae98ffe001795d9652a8327958948ece76f36
+  metadata.gz: !binary |-
+    MDIxY2E0ZDAwODcwMjNhMjk1NzQyMTg5ZmU3NGE3MGYxY2YzMTJjZA==
+  data.tar.gz: !binary |-
+    MDU4NmM0NGQxZmYzMzkxZGQ5ZmYzOTUxYzFhMDk0MjIxYzQ5ZDAzNw==
+SHA512:
+  metadata.gz: !binary |-
+    NTRhZDJjZDFiNGVlZDhjZGQ0ZjgwMGU5OWRiNjA4MTUxMzExNDVhYmM2NGZh
+    MjJkYTYyNDZiZTYyZWU1NmZhODg4ZDMxNDM3ZTA4YTU2Y2YyOTgzZDA0NDVk
+    OGUzNzg4NWVjODI3ZjQ4ODljMjkyNWYxYmNjYTc1NWQwODExNWY=
+  data.tar.gz: !binary |-
+    NjA2NDI5YTdkMjRmNGQ0ZDgwNDAwZGI5NjA0NTEzNThkY2NlZWFkMDUzMWI5
+    ODM3NWRmN2U1YmViYTUwMjA4ZGE3ZjI3OTVkZjBlZjNiZGZkNWFmZmJlNzc4
+    ZjgzOTM0YWIxMzg4NGUyMDFmNDFlM2E2MDU2ODdkMDc5N2I2Mjc=

data/CHANGES.md

@@ -1,5 +1,10 @@
 History
-=========
+=======
+
+1.1.1 
+-----
+* Added Ruby method to call into pHash's Mexican Hat Wavelet funcition (issue #37, Terence Lee / @hone)
+* Removed duplicate version reference
 
 1.1.0
 -----
@@ -9,7 +14,7 @@ History
 
 1.0.8
 ------
-* Renamed the pHashion tar.gz archive as "pHash-0.9.6.tar.gz" to solve/enable install from github 
+* Renamed the pHashion tar.gz archive as "pHash-0.9.6.tar.gz" to solve/enable install from github.
 
 1.0.7
 ------
@@ -27,29 +32,24 @@ History
  
 1.0.5
 -------
-
 * Fix CImg.h compilation problems. [#10]
 
 1.0.4
 -------
-
 * Fix pthread linking on Ubuntu 11.04
 
 1.0.3
 -------
-
 * Update pHash to version 0.9.3 and CImg 1.4.7.
 * Fix a few build issues.
 
 1.0.2
 -------
-
 * Make installation much easier by distributing and building locally all the native dependencies.
   This includes pHash 0.9.0 and CImg 1.3.4.
 
 1.0.1
 -------
-
 * Remove RubyInline, use standard Ruby extension infrastructure.
 * Update duplicate threshold constant based on wider image testing.
 * Make duplicate threshold variable so users can tune it based on their dataset.
@@ -58,5 +58,4 @@ History
 
 1.0.0
 -------
-
-Initial release.
+* Initial release.

data/lib/phashion.rb

@@ -9,8 +9,6 @@
 require 'rbconfig'
 
 module Phashion
-  VERSION = '1.0.8'
-
   class Image
     DEFAULT_DUPE_THRESHOLD = 15
  
@@ -24,6 +22,10 @@ module Phashion
       Phashion.hamming_distance(fingerprint, other.fingerprint)
     end
 
+    def mh_distance_from(other)
+      Phashion.hamming_distance2(mh_fingerprint, other.mh_fingerprint)
+    end
+
     def duplicate?(other, opts={})
       threshold = opts[:threshold] || DEFAULT_DUPE_THRESHOLD
 
@@ -33,6 +35,14 @@ module Phashion
     def fingerprint
       @hash ||= Phashion.image_hash_for(@filename)
     end
+
+    def mh_fingerprint
+      @mh_hash ||= Phashion.mh_hash_for(@filename)
+    end
+  end
+
+  def self.mh_hash_for(filename, alpha = 2.0, lvl = 1.0)
+    _mh_hash_for(filename, alpha, lvl)
   end
 
   def self.so_file

data/lib/phashion/version.rb

@@ -1,3 +1,3 @@
 module Phashion
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/test_phashion.rb

@@ -50,6 +50,25 @@ class TestPhashion < Minitest::Test
     assert_equal expected, rows.first.first
   end
 
+  def test_mh_hash_for
+    jpg = File.dirname(__FILE__) + '/jpg/Broccoli_Super_Food.jpg'
+    png = File.dirname(__FILE__) + '/png/Broccoli_Super_Food.png'
+
+    hash1 = Phashion.mh_hash_for jpg
+    hash2 = Phashion.mh_hash_for png
+
+    assert_kind_of Array, hash1
+    assert_kind_of Array, hash2
+    assert_in_delta 0.100, Phashion.hamming_distance2(hash1, hash2), 0.028
+  end
+
+  def test_mh_distance_from
+    jpg = File.dirname(__FILE__) + '/jpg/Broccoli_Super_Food.jpg'
+    png = File.dirname(__FILE__) + '/png/Broccoli_Super_Food.png'
+
+    assert_in_delta 0.100, Phashion::Image.new(jpg).mh_distance_from(Phashion::Image.new(png)), 0.028
+  end
+
   def test_duplicate_detection
     files = %w(86x86-0a1e.jpeg 86x86-83d6.jpeg 86x86-a855.jpeg)
     images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/jpg/'}#{f}")}
@@ -58,8 +77,6 @@ class TestPhashion < Minitest::Test
     assert_duplicate images[0], images[2]
   end
 
-  
-
   def test_duplicate_detection_2
     files = %w(b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg e7397898a7e395c2524978a5e64de0efabf08290.jpeg)
     images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/jpg/'}#{f}")}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phashion
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple wrapper around the pHash library
@@ -140,4 +140,3 @@ test_files:
 - test/png/grass.png
 - test/png/linux.png
 - test/test_phashion.rb
-has_rdoc: