phashion 1.1.1 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDIxY2E0ZDAwODcwMjNhMjk1NzQyMTg5ZmU3NGE3MGYxY2YzMTJjZA==
-  data.tar.gz: !binary |-
-    MDU4NmM0NGQxZmYzMzkxZGQ5ZmYzOTUxYzFhMDk0MjIxYzQ5ZDAzNw==
+SHA1:
+  metadata.gz: ebac5ae2ba75fbd9e071287286183bdd5b14d693
+  data.tar.gz: b4fd9ec06089d2d47aab777f76947c4d455d6deb
 SHA512:
-  metadata.gz: !binary |-
-    NTRhZDJjZDFiNGVlZDhjZGQ0ZjgwMGU5OWRiNjA4MTUxMzExNDVhYmM2NGZh
-    MjJkYTYyNDZiZTYyZWU1NmZhODg4ZDMxNDM3ZTA4YTU2Y2YyOTgzZDA0NDVk
-    OGUzNzg4NWVjODI3ZjQ4ODljMjkyNWYxYmNjYTc1NWQwODExNWY=
-  data.tar.gz: !binary |-
-    NjA2NDI5YTdkMjRmNGQ0ZDgwNDAwZGI5NjA0NTEzNThkY2NlZWFkMDUzMWI5
-    ODM3NWRmN2U1YmViYTUwMjA4ZGE3ZjI3OTVkZjBlZjNiZGZkNWFmZmJlNzc4
-    ZjgzOTM0YWIxMzg4NGUyMDFmNDFlM2E2MDU2ODdkMDc5N2I2Mjc=
+  metadata.gz: 173f5227fd1e05d9013b3ee00ec3ee5fc7ebae6586e8c806e79eba98facccb2b95aa46d389f5a47e63c17aff2c3194cc0860ec562d01af36809a5913b45933e6
+  data.tar.gz: 558e7a2b6f2c36406a196fd60567f8f51c9ad2f05b177f81456ae30a60b4193e479bd1f083438d4bd6638426c235fb8e8f611a6ed5ce9bb2dde27d4c95d6e93f

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+
+rvm: 
+  - 2.1.4
+
+brefore_install: 
+  - sudo apt-get update
+  - sudo apt-get install libpng-dev libjpeg-dev
+
+script: 
+  - bundle exec rake compile
+  - bundle exec rake test

data/CHANGES.md

@@ -1,6 +1,12 @@
 History
 =======
 
+1.2.0
+-----
+* Added TravisCI testing support (issue #49)
+* Renamed `sqlite_phashion_init` to `sqlite_extension_init` to fixing failing tests (issue #49).
+  See https://github.com/westonplatter/phashion/commit/f821b5f6bb40f438a1ab3f6fcc6f7730366468ae
+
 1.1.1 
 -----
 * Added Ruby method to call into pHash's Mexican Hat Wavelet funcition (issue #37, Terence Lee / @hone)

data/README.md

@@ -1,5 +1,6 @@
 Phashion
 ========
+[![Build Status](https://travis-ci.org/westonplatter/phashion.svg?branch=tests-travisci)](https://travis-ci.org/westonplatter/phashion)
 
 Phashion is a Ruby wrapper around the [pHash library](http://phash.org/), "perceptual hash", which detects duplicate and near-duplicate multimedia files (e.g. images, audio, video, though Phashion currently only supports images.). "Near-duplicates" are images that come from the same source and show essentially the same thing, but may have differences in such features as dimensions, bytesizes, lossy-compression artifacts, and color levels.
 
@@ -32,24 +33,19 @@ Please open a [GitHub issue](https://github.com/westonplatter/phashion/issues/)
 
 ### Prerequisites
 
-- `libpng`
-- `libjpeg`
-- [imagemagick](http://www.imagemagick.org/)
-
-If you're on a Mac, you can use:
+Linux  
+- libjpeg-dev
+- libpng-dev
 
-- [Homebrew](http://brew.sh/), e.g.  `brew install libjpeg`
-- or [Macports](http://www.macports.org/), e.g.  `port install jpeg` .
+Mac 
+- [imagemagick](http://www.imagemagick.org/)
+- libjpeg (Hombrew, `brew install libjpeg`; Macports, `port install jpeg`)
 
 
 #### Common Errors 
-
-
-
-- `ld: library not found for -ljpeg` – You need to install `libjpeg` if you run into this error upon `gem install`:
-
-
-- `.....sh: convert: command not found; sh: gm: command not found` – You need to install [imagemagick](http://www.imagemagick.org/).
+- `ld: library not found for -ljpeg` – Did you install `libjpeg`?
+- `... sh: convert: command not found; sh: gm: command not found` – Did you install [imagemagick](http://www.imagemagick.org/)?
+- `... checking for sqlite3ext.h... *** extconf.rb failed *** ...` – Did you install `libpng-dev` and/or `libjpeg-dev`?
 
 
 Usage
@@ -84,7 +80,7 @@ Optionally, you can set the minimum Hamming distance in the second argument, an
 
 Currently, the maximum Hamming distance between two duplicate images is set at 15. As per [mperham's explanation](http://www.mikeperham.com/2010/05/21/detecting-duplicate-images-with-phashion/):
 
-> A “perceptual hash” is a 64-bit value based on the discrete cosine transform of the image’s frequency spectrum data. Similar images will have hashes that are close in terms of Hamming distance. That is, a binary hash value of 1000 is closer to 0000 than 0011 because it only has one bit different whereas the latter value has two bits different. The duplicate threshold defines how many bits must be different between two hashes for the two associated images to be considered different images. Our testing showed that 15 bits is a good value to start with, it detected all duplicates with a minimum of false positives.
+> A “perceptual hash”is a 64-bit value based on the discrete cosine transform of the image’s frequency spectrum data. Similar images will have hashes that are close in terms of Hamming distance. That is, a binary hash value of 1000 is closer to 0000 than 0011 because it only has one bit different whereas the latter value has two bits different. The duplicate threshold defines how many bits must be different between two hashes for the two associated images to be considered different images. Our testing showed that 15 bits is a good value to start with, it detected all duplicates with a minimum of false positives.
 
 As a reference point, here are the Hamming distances in these test comparisons using [/test/jpg/Broccoli_Super_Food.jpg](https://github.com/westonplatter/phashion/blob/master/test/jpg/Broccoli_Super_Food.jpg) as the source image:
 
@@ -118,12 +114,12 @@ detection of alpha PNG file types.
 Testing
 -------
 
-
 #### To run the test suite:
-
-    bundle
-    rake compile
-    rake
+    
+    $ cd phashion
+    $ bundle install 
+    $ rake compile
+    $ rake test
 
 
 Author

data/lib/phashion.rb

@@ -9,6 +9,9 @@
 require 'rbconfig'
 
 module Phashion
+  TextHashPoint = Struct.new :hash, :index
+  TextMatch = Struct.new :first_index, :second_index, :length
+
   class Image
     DEFAULT_DUPE_THRESHOLD = 15
  

data/lib/phashion/version.rb

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

data/test/test_phashion.rb

@@ -1,8 +1,29 @@
 require 'helper'
 require 'sqlite3'
+require 'tempfile'
 
 class TestPhashion < Minitest::Test
 
+  def test_text_hash
+    matches = Tempfile.open('foo') do |f|
+      100.times { |i|
+        f.write "hello world #{i}"
+      }
+      f.close
+      a = Phashion.texthash_for f.path
+      b = Phashion.texthash_for f.path
+
+      assert_operator a.length, :>, 0
+      assert_operator b.length, :>, 0
+      a.each { |hash| assert_instance_of Phashion::TextHashPoint, hash }
+      b.each { |hash| assert_instance_of Phashion::TextHashPoint, hash }
+
+      Phashion.textmatches_for(a, b)
+    end
+    assert_operator matches.length, :>, 0
+    matches.each { |match| assert_instance_of Phashion::TextMatch, match }
+  end
+
   def split(hash)
     r = hash & 0xFFFFFFFF
     l = (hash >> 32) & 0xFFFFFFFF

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: phashion
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.2
 description: Simple wrapper around the pHash library
@@ -60,8 +60,9 @@ extensions:
 - ext/phashion_ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -99,17 +100,17 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -140,3 +141,4 @@ test_files:
 - test/png/grass.png
 - test/png/linux.png
 - test/test_phashion.rb
+has_rdoc: