phashion 1.0.2 → 1.0.3

data/CHANGES.md

@@ -1,6 +1,12 @@
 History
 =========
 
+1.0.3
+-------
+
+* Update pHash to version 0.9.3 and CImg 1.4.7.
+* Fix a few build issues.
+
 1.0.2
 -------
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Mike Perham
+Copyright (c) 2011 Mike Perham
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,7 +11,7 @@ Installation
 
 You install it just like any other Ruby gem:
 
-gem install phashion
+    gem install phashion
 
 Phashion is somewhat involved to install as it has a few dependencies.  I've wrapped up those
 dependencies into a custom tarball that is built locally just for this gem so you don't have to
@@ -20,6 +20,12 @@ do anything special.  See the code in `ext/phashion_ext` for more details.
 Because of this complexity, it is possible the gem install will fail on your platform.  I've tested
 it on Mac OSX 10.6 and Ubuntu 8.04 but please contact me if you have installation problems.
 
+If you have an error upon install, like:
+
+    ld: library not found for -ljpeg
+
+you need to install libjpeg.  "brew install libjpeg" or "port install jpeg" on OSX.
+
 Usage
 ---------
 

data/Rakefile

@@ -1,24 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "phashion"
-    gem.summary = %Q{Simple wrapper around the pHash library}
-    gem.description = gem.summary
-    gem.email = "mperham@gmail.com"
-    gem.homepage = "http://github.com/mperham/phashion"
-    gem.authors = ["Mike Perham"]
-    gem.add_development_dependency 'rake-compiler', '>= 0.7.0'
-    gem.version = '1.0.2'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -39,7 +21,7 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
+task :test
 
 task :default => :test
 

data/ext/phashion_ext/extconf.rb

@@ -39,7 +39,7 @@ Dir.chdir(HERE) do
     system("cp -f libpHash.a libpHash_gem.a")
     system("cp -f libpHash.la libpHash_gem.la")
   end
-  $LIBS = " -lpHash_gem"
+  $LIBS = " -lpHash_gem -lstdc++ -ljpeg"
 end
 
 create_makefile 'phashion_ext'

data/lib/phashion.rb

@@ -7,7 +7,7 @@
 # int ph_hamming_distance(ulong64 hasha, ulong64 hashb);
 
 module Phashion
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   
   class Image
     SETTINGS = {
@@ -27,7 +27,7 @@ module Phashion
       @hash ||= Phashion.image_hash_for(@filename)
     end
   end
-  
+
 end
 
 require 'phashion_ext'

data/phashion.gemspec

@@ -5,62 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phashion}
-  s.version = "1.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "1.0.3"
   s.authors = ["Mike Perham"]
-  s.date = %q{2010-06-04}
   s.description = %q{Simple wrapper around the pHash library}
   s.email = %q{mperham@gmail.com}
   s.extensions = ["ext/phashion_ext/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGES.md",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "TODO.md",
-     "ext/phashion_ext/extconf.rb",
-     "ext/phashion_ext/pHash-0.9.0.tar.gz",
-     "ext/phashion_ext/phashion_ext.c",
-     "lib/phashion.rb",
-     "phashion.gemspec",
-     "test/86x86-0a1e.jpeg",
-     "test/86x86-83d6.jpeg",
-     "test/86x86-a855.jpeg",
-     "test/avatar.jpg",
-     "test/b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg",
-     "test/df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg",
-     "test/e7397898a7e395c2524978a5e64de0efabf08290.jpeg",
-     "test/helper.rb",
-     "test/test_phashion.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/mperham/phashion}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Simple wrapper around the pHash library}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_phashion.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake-compiler>, [">= 0.7.0"])
-    else
-      s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-    end
-  else
-    s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-  end
+  s.test_files = `git ls-files test`.split("\n")
+  s.add_development_dependency(%q<rake-compiler>, [">= 0.7.0"])
 end
 

data/test/test_phashion.rb

@@ -4,7 +4,7 @@ class TestPhashion < Test::Unit::TestCase
 
   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/'}#{f}")}
+    images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/jpg/'}#{f}")}
     assert_duplicate images[0], images[1]
     assert_duplicate images[1], images[2]
     assert_duplicate images[0], images[2]
@@ -12,7 +12,7 @@ class TestPhashion < Test::Unit::TestCase
 
   def test_duplicate_detection_2
     files = %w(b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg e7397898a7e395c2524978a5e64de0efabf08290.jpeg)
-    images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/'}#{f}")}
+    images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/jpg/'}#{f}")}
     assert_duplicate images[0], images[1]
     assert_duplicate images[1], images[2]
     assert_duplicate images[0], images[2]
@@ -20,12 +20,21 @@ class TestPhashion < Test::Unit::TestCase
 
   def test_not_duplicate
     files = %w(86x86-0a1e.jpeg 86x86-83d6.jpeg 86x86-a855.jpeg avatar.jpg)
-    images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/'}#{f}")}
+    images = files.map {|f| Phashion::Image.new("#{File.dirname(__FILE__) + '/../test/jpg/'}#{f}")}
     assert_not_duplicate images[0], images[3]
     assert_not_duplicate images[1], images[3]
     assert_not_duplicate images[2], images[3]
   end
 
+  def test_multiple_types
+    jpg = Phashion::Image.new(File.dirname(__FILE__) + '/jpg/Broccoli_Super_Food.jpg')
+    png = Phashion::Image.new(File.dirname(__FILE__) + '/png/Broccoli_Super_Food.png')
+    gif = Phashion::Image.new(File.dirname(__FILE__) + '/gif/Broccoli_Super_Food.gif')
+    assert_duplicate jpg, png
+    assert_duplicate gif, png
+    assert_duplicate jpg, gif
+  end
+
   private
 
   def assert_duplicate(a, b)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -37,9 +38,8 @@ executables: []
 
 extensions: 
 - ext/phashion_ext/extconf.rb
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
@@ -49,18 +49,21 @@ files:
 - Rakefile
 - TODO.md
 - ext/phashion_ext/extconf.rb
-- ext/phashion_ext/pHash-0.9.0.tar.gz
+- ext/phashion_ext/pHash-0.9.3.tar.gz
 - ext/phashion_ext/phashion_ext.c
 - lib/phashion.rb
 - phashion.gemspec
-- test/86x86-0a1e.jpeg
-- test/86x86-83d6.jpeg
-- test/86x86-a855.jpeg
-- test/avatar.jpg
-- test/b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg
-- test/df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg
-- test/e7397898a7e395c2524978a5e64de0efabf08290.jpeg
+- test/gif/Broccoli_Super_Food.gif
 - test/helper.rb
+- test/jpg/86x86-0a1e.jpeg
+- test/jpg/86x86-83d6.jpeg
+- test/jpg/86x86-a855.jpeg
+- test/jpg/Broccoli_Super_Food.jpg
+- test/jpg/avatar.jpg
+- test/jpg/b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg
+- test/jpg/df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg
+- test/jpg/e7397898a7e395c2524978a5e64de0efabf08290.jpeg
+- test/png/Broccoli_Super_Food.png
 - test/test_phashion.rb
 has_rdoc: true
 homepage: http://github.com/mperham/phashion
@@ -72,6 +75,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -79,6 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -88,10 +93,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple wrapper around the pHash library
 test_files: 
+- test/gif/Broccoli_Super_Food.gif
 - test/helper.rb
+- test/jpg/86x86-0a1e.jpeg
+- test/jpg/86x86-83d6.jpeg
+- test/jpg/86x86-a855.jpeg
+- test/jpg/Broccoli_Super_Food.jpg
+- test/jpg/avatar.jpg
+- test/jpg/b32aade8c590e2d776c24f35868f0c7a588f51e1.jpeg
+- test/jpg/df9cc82f5b32d7463f36620c61854fde9d939f7f.jpeg
+- test/jpg/e7397898a7e395c2524978a5e64de0efabf08290.jpeg
+- test/png/Broccoli_Super_Food.png
 - test/test_phashion.rb