similie 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/ext/similie.c

@@ -154,6 +154,18 @@ VALUE rb_image_distance_func(VALUE self, VALUE file1, VALUE file2) {
     return INT2NUM(dist);
 }
 
+VALUE rb_image_phash_func(VALUE self, VALUE file) {
+    IplImage *img;
+    img = cvLoadImage(CSTRING(file), -1);
+    if (!img)
+        rb_raise(rb_eArgError, "Invalid image or unsupported format: %s", CSTRING(file));
+
+    uint64_t phash = image_phash(img);
+    cvReleaseImage(&img);
+
+    return SIZET2NUM(phash);
+}
+
 void Init_similie() {
     VALUE cSimilie = rb_define_class("Similie", rb_cObject);
     rb_define_alloc_func(cSimilie, rb_image_alloc);
@@ -162,4 +174,5 @@ void Init_similie() {
     rb_define_method(cSimilie, "distance",   RUBY_METHOD_FUNC(rb_image_distance),   1);
 
     rb_define_singleton_method(cSimilie, "distance", RUBY_METHOD_FUNC(rb_image_distance_func), 2);
+    rb_define_singleton_method(cSimilie, "phash",    RUBY_METHOD_FUNC(rb_image_phash_func),    1);
 }

data/test/test_basic.rb

@@ -2,16 +2,22 @@ require_relative 'helper'
 
 describe 'Similie image load' do
   it 'should load image' do
-    assert Similie.new(File.join($testdir, 'lena1.jpg'))
+    assert Similie.new(File.join($testdir, 'lena1.png'))
   end
 
   it 'should barf on invalid path' do
-    assert_raises(ArgumentError) { Similie.new(File.join($testdir, 'lena2.jpg')) }
+    assert_raises(ArgumentError) { Similie.new(File.join($testdir, 'foo')) }
   end
 
   it 'should hash image' do
-    img = Similie.new(File.join($testdir, 'lena1.jpg'))
+    img = Similie.new(File.join($testdir, 'lena1.png'))
     assert img
     assert_equal 216455360913932544, img.hash
   end
+
+  it 'should hash image using class method' do
+    hash = Similie.phash(File.join($testdir, 'lena1.png'))
+    assert hash
+    assert_equal 216455360913932544, hash
+  end
 end

data/test/test_distance.rb

@@ -2,15 +2,16 @@ require_relative 'helper'
 
 describe 'Similie image distance' do
   it 'should work for similar images' do
-    images = %w(lena1.jpg lena2.png lena3.png lena4.png lena5.jpg).map {|file| Similie.new(File.join($testdir, file))}
+    images = (1..5).map {|n| Similie.new(File.join($testdir, 'lena%d.png' % n ))}
 
     assert_equal 1, images[0].distance(images[1])
     assert_equal 2, images[1].distance(images[2])
     assert_equal 0, images[2].distance(images[3])
+    assert_equal 1, images[0].distance(images[3])
     assert_equal 6, images[3].distance(images[4])
   end
 
   it 'should work using the singleton method' do
-    assert_equal 6, Similie.distance(File.join($testdir, 'lena4.png'), File.join($testdir, 'lena5.jpg'))
+    assert_equal 6, Similie.distance(File.join($testdir, 'lena4.png'), File.join($testdir, 'lena5.png'))
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bharanee Rathna
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 +10:00
+date: 2011-06-07 00:00:00 +10:00
 default_executable: 
 dependencies: []