pHash 1.1.5 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2NlYjQ5MmIzODI3NmNmN2JjODUzZjE3NTcyYTYyMGM5M2NlODI0Mg==
+    MWZmNjAyM2VhNWJlZDZmMWEyYTVjZmJlNzYzZTkwNDMyNzFmOGNmNA==
   data.tar.gz: !binary |-
-    ZGYzMzkwODk2YTFiZDE4YTY5NDhiNjhkMDkyYzhlNTdhMjhlMWYxYw==
-!binary "U0hBNTEy":
+    MWI5MWY0YWViNDM5MjM2ODYzMDU1MGNlZjBmNTE2YTY1MjE1MjI2MA==
+SHA512:
   metadata.gz: !binary |-
-    YjViZjJmNmE5NGViMTE3MDAzNzVmODdlZGExNTg3MGZhZDFkMTA5NTBmYTI3
-    N2I2NjQ3OTk2M2Y4NGEzNGUxYzU5NzYxYWNlZTIwZjI3ODU0MjgzOTQ2NTVm
-    OThlZWUxMDNkNjFiMjBiODZmNjIyODIzY2JmMTIzYTI5YTAyNDY=
+    YzliZDhmNzk2NDhiZjQzNDBkOTZhMWNlYzdmMTk1ODViYWRiYjZjNDc5MTcy
+    NGQ5OGNiNDkxMjEyNGYyYmUxZjJkNDg5MjFiM2ZlZTkxNmYxOWUwMjc4M2Nk
+    MTYwNGZiYjM2ODBkNDY3ZTA5NWI0ZmMwNDA0NTczYjRkZTVjZDM=
   data.tar.gz: !binary |-
-    Y2MxZGE1MDhlMWY0MjQwMTIzZDVlNDBlMDllNmU3OTY0NzY5NmY0YWE3OTUw
-    YWI5ZmU3MWFhZTI1MmJkZmQ2NjUyMDZlZWQ2NzQ0MTM0MGZhMmRlZjk0ZWE1
-    ZmE2MDFiNWNiYTIyOTM2OTkxNTkzZWM4OGY4NDkxNDIzYzFiNzI=
+    ZmY4ZGU1OWUyZDUzN2RhNGEwODU5YzhkYjA1ZDAyYjIyOTkxMmVkYzU1NjU3
+    YzJiNTk3Y2I0ZjZlODk0YzY5Y2I5YTE5NDAzOWJmMWE4ZTdjNzE2MWEwNGIy
+    MWY2ZjMyN2JlY2EzNTY4YWU3MDEwNThiZjFiNzkwZTcyOTQ0M2I=

data/README.markdown

@@ -61,6 +61,6 @@ Texts:
 
 ## Copyright
 
-Copyright (c) 2011-2014 Ivan Kuchin.
+Copyright (c) 2011-2017 Ivan Kuchin.
 Released under the GPLv3 as required by license of underlying pHash library.
 See LICENSE.txt for details.

data/lib/phash.rb

@@ -7,6 +7,10 @@ module Phash
       @data = data
       @length = length if length
     end
+
+    def inspect
+      "#<#{self.class.name} #{to_s}>"
+    end
   end
 
   class HashData < Data

data/lib/phash/all.rb

@@ -1,3 +1,4 @@
-%w[audio image text video].each do |type|
-  require "phash/#{type}"
-end
+require 'phash/audio'
+require 'phash/image'
+require 'phash/text'
+require 'phash/video'

data/lib/phash/audio.rb

@@ -111,6 +111,11 @@ module Phash
 
   # Class to store audio hash and compare to other
   class AudioHash < HashData
+  private
+
+    def to_s
+      data.read_array_of_type(:uint32, :read_uint32, length).map{ |n| format('%08x', n) }.join(' ')
+    end
   end
 
   # Class to store audio file hash and compare to other

data/lib/phash/image.rb

@@ -45,6 +45,11 @@ module Phash
 
   # Class to store image hash and compare to other
   class ImageHash < HashData
+  private
+
+    def to_s
+      format('%016x', data)
+    end
   end
 
   # Class to store image file hash and compare to other

data/lib/phash/text.rb

@@ -83,6 +83,14 @@ module Phash
 
   # Class to store text hash and compare to other
   class TextHash < HashData
+  private
+
+    def to_s
+      length.times.map do |i|
+        p = TxtHashPoint.new(data + TxtHashPoint.size * i)
+        format('%016x(%i)', p[:hash], p[:index])
+      end.join(' ')
+    end
   end
 
   # Class to store text file hash and compare to other

data/lib/phash/video.rb

@@ -39,6 +39,11 @@ module Phash
 
   # Class to store video hash and compare to other
   class VideoHash < HashData
+  private
+
+    def to_s
+      data.read_array_of_type(:uint64, :read_uint64, length).map{ |n| format('%016x', n) }.join(' ')
+    end
   end
 
   # Class to store video file hash and compare to other

data/pHash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'pHash'
-  s.version     = '1.1.5'
+  s.version     = '1.2.0'
   s.summary     = %q{Use pHash with ruby}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -17,6 +17,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ffi', '~> 1.0'
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.0'
+
+  if Gem::Platform.local.os == 'darwin'
+    s.post_install_message = "pHash library can be installed using macports or brew:
+\tport install pHash
+\tbrew install --without-video-hash homebrew/boneyard/phash"
+  end
 end

data/spec/phash_spec.rb

@@ -1,43 +1,30 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'phash'
 
-describe :Phash do
-  include SpecHelpers
+{
+  Phash::Audio => '*.mp3',
+  Phash::Image => '**/*.{jpg,png}',
+  Phash::Text => '*.txt',
+  Phash::Video => '*.mp4',
+}.each do |klass, glob|
+  describe klass do
+    filenames = Dir.glob(File.join(File.dirname(__FILE__), 'data', glob))
 
-  shared_examples :similarity do
-    it "should return valid similarities" do
-      collection.combination(2) do |a, b|
-        if main_name(a.path) == main_name(b.path)
-          (a % b).should > 0.8
-        else
-          (a % b).should <= 0.5
+    klass.for_paths(filenames).combination(2) do |a, b|
+      similar = a.path.split('-')[0] == b.path.split('-')[0]
+
+      if similar
+        it "finds #{a.path} and #{b.path} similar" do
+          expect(a % b).to be > 0.8
+        end
+      else
+        it "finds #{a.path} and #{b.path} not similar" do
+          expect(a % b).to be <= 0.5
         end
       end
-    end
 
-    it "should return same similarity if swapping instances" do
-      collection.combination(2) do |a, b|
-        (a % b).should == (b % a)
+      it 'returns same result when switching arguments' do
+        expect(a % b).to eq(b % a)
       end
     end
   end
-
-  describe :Audio do
-    let(:collection){ Phash::Audio.for_paths filenames('*.mp3') }
-    include_examples :similarity
-  end
-
-  describe :Image do
-    let(:collection){ Phash::Image.for_paths filenames('**/*.{jpg,png}') }
-    include_examples :similarity
-  end
-
-  describe :Text do
-    let(:collection){ Phash::Text.for_paths filenames('*.txt') }
-    include_examples :similarity
-  end
-
-  # describe :Video do
-  #   let(:collection){ Phash::Video.for_paths filenames('*.mp4') }
-  #   include_examples :similarity
-  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pHash
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,34 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 
 email: 
 executables: []
@@ -110,12 +96,12 @@ files:
 - spec/data/vader-m.mp3
 - spec/data/vader-o.mp3
 - spec/phash_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/toy/pHash
 licenses:
 - GPLv3
 metadata: {}
-post_install_message: 
+post_install_message: ! "pHash library can be installed using macports or brew:\n\tport
+  install pHash\n\tbrew install --without-video-hash homebrew/boneyard/phash"
 rdoc_options: []
 require_paths:
 - lib
@@ -131,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pHash
-rubygems_version: 2.0.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Use pHash with ruby
@@ -177,5 +163,4 @@ test_files:
 - spec/data/vader-m.mp3
 - spec/data/vader-o.mp3
 - spec/phash_spec.rb
-- spec/spec_helper.rb
 has_rdoc: 

data/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rspec'
-require 'phash'
-
-module SpecHelpers
-  def filenames(pattern)
-    data_dir = File.join File.dirname(__FILE__), 'data'
-    Dir.glob(File.join data_dir, pattern)
-  end
-
-  def main_name(path)
-    File.basename(path).split('-', 2).first
-  end
-end