has_face 0.0.3 → 0.1.0

data/README.md

@@ -31,6 +31,7 @@ HasFace.configure do |config|
   config.api_key                  = 'your face.com API key'
   config.api_secret               = 'your face.com API secret'
   config.skip_validation_on_error = false
+  config.transfer_method          = :upload
 end
 ```
 
@@ -92,6 +93,26 @@ end
 If an error does occur then it will be logged as a warning in the log
 for your applications current environment.
 
+## Tranfer Methods
+
+The default behavior is to upload images to the face.com API. This
+allows images that are not publicly accessible to be validated as well,
+has_face also has the option to send the URL of the image to be
+validated instead of uploading the data, to use url transering simply
+set the configuration option:
+
+``` ruby
+HasFace.configure do |config|
+  config.transfer_method = :url
+end
+```
+
+You will also need to set the `ActionController::Base.asset_host` to the
+base URL your images are accessible at. This can be done in your
+`environment.rb` or the environment for your specific environment, eg
+`production.rb` or `staging.rb`.
+
+
 ## Testing has_face
 
 To speed up your test suite, you can disable face validations by setting the
@@ -111,7 +132,6 @@ RSpec.configure do |config|
 end
 ```
 
-
 Once included he matcher can be used:
 
 ``` ruby

data/Rakefile

@@ -1 +1,11 @@
 require 'bundler/gem_tasks'
+require 'rake'
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
+end
+
+task :default => :test

data/lib/generators/has_face/templates/has_face.rb

@@ -2,4 +2,5 @@ HasFace.configure do |config|
   config.api_key                  = 'your face.com API key'
   config.api_secret               = 'your face.com API secret'
   config.skip_validation_on_error = false
+  config.transfer_method          = :upload
 end

data/lib/has_face.rb

@@ -15,7 +15,7 @@ module HasFace
 
   class << self
 
-    configs = [ :api_key, :api_secret, :enable_validation, :detect_url, :skip_validation_on_error ]
+    configs = [ :api_key, :api_secret, :enable_validation, :detect_url, :skip_validation_on_error, :transfer_method ]
 
     configs.each do |config|
       delegate config, "#{config}=", :to => HasFace::Configuration

data/lib/has_face/configuration.rb

@@ -3,6 +3,7 @@ module HasFace
 
     @enable_validation        = true
     @skip_validation_on_error = false
+    @transfer_method          = :upload
     @detect_url               = "http://api.face.com/faces/detect.json"
 
     class << self
@@ -11,6 +12,7 @@ module HasFace
       attr_accessor :api_key
       attr_accessor :api_secret
       attr_accessor :skip_validation_on_error
+      attr_accessor :transfer_method
     end
 
   end

data/lib/has_face/validator.rb

@@ -1,4 +1,5 @@
 require 'rest_client'
+require 'action_controller'
 
 module HasFace
   class Validator < ActiveModel::EachValidator
@@ -15,6 +16,7 @@ module HasFace
 
       image       = record.send(attr_name)
       @image_path = image.respond_to?(:path) ? image.path : nil
+      @image_url  = "#{ActionController::Base.asset_host}#{image.url if image.respond_to?(:url)}"
 
       # Skip validation if our image is nil/blank and allow nil/blank is on
       return if (@allow_nil && image.nil?) || (@allow_blank && image.blank?)
@@ -40,7 +42,11 @@ module HasFace
     protected
 
     def params
-      { :api_key => HasFace.api_key, :api_secret => HasFace.api_secret, :image => File.new(@image_path, 'r') }
+      if HasFace.transfer_method == :url
+        { :api_key => HasFace.api_key, :api_secret => HasFace.api_secret, :urls => @image_url }
+      else
+        { :api_key => HasFace.api_key, :api_secret => HasFace.api_secret, :image => File.new(@image_path, 'r') }
+      end
     end
 
     def handle_api_error(response)

data/lib/has_face/version.rb

@@ -1,3 +1,3 @@
 module HasFace
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/has_face/validator_spec.rb

@@ -144,6 +144,55 @@ describe HasFace::Validator do
 
   end
 
+  context 'using the url transfer method' do
+
+    let(:hit_url)  { 'u/17429266/swoonme/test/hit.jpeg' }
+    let(:miss_url) { 'u/17429266/swoonme/test/miss.jpeg' }
+
+    before :each do
+      ActionController::Base.asset_host = 'http://dl.dropbox.com/'
+      stub(HasFace).transfer_method { :url }
+    end
+
+    context 'when the image is a valid face' do
+
+      before :each do
+        avatar.path = hit_url # Needs to have 'some' value
+        avatar.url  = hit_url
+      end
+
+      it 'should be valid' do
+        VCR.use_cassette('valid url transfer') do
+          user.should be_valid
+        end
+      end
+
+    end
+
+    context 'when the image is not a valid face' do
+
+      before :each do
+        avatar.path = miss_url # Needs to have 'some' value
+        avatar.url  = miss_url
+      end
+
+      it 'should not be valid' do
+        VCR.use_cassette('invalid url transfer') do
+          user.should_not be_valid
+        end
+      end
+
+      it 'should have an error on the image field' do
+        VCR.use_cassette('invalid url transfer') do
+          user.valid?
+          user.errors[:avatar].should == [ "We couldn't see a face in your photo, try taking another one." ]
+        end
+      end
+
+    end
+
+  end
+
   context 'allowing blank' do
 
     context 'when allow blank is true' do

data/spec/support/vcr_cassettes/invalid_url_transfer.yml

@@ -0,0 +1,41 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://api.face.com:80/faces/detect.json
+    body: !!null 
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '161'
+      content-type:
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Sat, 30 Jul 2011 03:45:21 GMT
+      server:
+      - Apache/2.2.16 (Debian) mod_ssl/2.2.16 OpenSSL/0.9.8o
+      content-encoding:
+      - gzip
+      vary:
+      - Accept-Encoding
+      content-length:
+      - '282'
+      content-type:
+      - ! 'application/json; Charset: utf-8'
+    body: !binary |-
+      H4sIAAAAAAAAA0yPy2rDMBBFf8XMtiZ6WYqlVVdddNtlFYIqj20VOzLRmARC
+      /r0qdNHlvcM53HnANmfKBdznA/brAg5mos155tmwHIZr3r7y/RDz6tnumTh2
+      0kpjPCu3nC8rekZYyLM1lXL43nCCFrY0VM3bq8ZBHcc+RGWF7vRoouaRh64b
+      e6sUmrMUxkTkOqId+nHkUSsbAw8DjrqvVHXd0kAzOCF5CzOmaaa/QGH6HX16
+      nlooFGivCcoeI5ZSub2ECcHVnwrWNaqFK64hXdJlAtdZe2xhSWuqNs05/70W
+      pDOlFc+E91rDR6C2Ubx535dGciEarpw2jsvmpRIc/jN1kxLC2l4Y+Xz+AAAA
+      //8DAFXBupBUAQAA
+    http_version: '1.1'

data/spec/support/vcr_cassettes/valid_url_transfer.yml

@@ -0,0 +1,48 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://api.face.com:80/faces/detect.json
+    body: !!null 
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '160'
+      content-type:
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Sat, 30 Jul 2011 03:45:18 GMT
+      server:
+      - Apache/2.2.16 (Debian) mod_ssl/2.2.16 OpenSSL/0.9.8o
+      content-encoding:
+      - gzip
+      vary:
+      - Accept-Encoding
+      content-length:
+      - '588'
+      content-type:
+      - ! 'application/json; Charset: utf-8'
+    body: !binary |-
+      H4sIAAAAAAAAA6xSy47cIBD8lRHXTDAG49cpl+QQKVKk5BavLIyxTYTtkYHs
+      blbz72n8mM3OJZfIBwNdVFc19YIuw+xmi8ofL8gvBpVocO5SVlEVtQa3y3xp
+      5ics57GKfBXFWUILmqZVZB/neRpVFTllXRUN2uGfF9WjM7roFlg+fUgp7RhV
+      WcNyRkWc5l3adILIpmgaIWRc0zhNpSJcqqLNu45IzgopiGhVx3PJCuB61K0b
+      UBlTckaD0v3g9o0T/abZrd2+f/zytf4PLWtOMCE1zzAnNXwgYVFy7if9WzRG
+      odItXkH3YVF2mA20nrwxZ+R1G+Q8nFGvb4dGNCoMFEjkPHV6GRXUOmEsUIxi
+      8sLctuCnV0v9enl3nuaYsVfv+1aqyakFlS/oCZUcxvEMP9B8PSP1rGqjOrcX
+      Gce8WOtJjHm2A5aNbUWkCaZsQxDMY0CMs3fDG5IcZ3SFZAzn9AZ5IyPJcZ4e
+      IJbdQH/34jlO4wOTpICZZqvufHCcJEGnWHYN20DCfufaDuSgp2P9LB5BJiZg
+      dZkNjPU9xTENWXQy5IdhCtqEc4tuPCQ2tOyEXFv/EsbDAoWnPZ6qVVMoFsFG
+      r6Z2c3kgR2HukSwMrjfC2o38gK7Pe88a7NlRGz31/8TS6/X6cIVgWSecB25k
+      vZTKWgB6K/rVgrchWTSEdRR6WnmTosghg3rULsyWkFC1ytVOj6p26gmO0Tfh
+      zidGTp+9OVESxyfCSp6WhJ7ewY0t/sedMMY4BtY4BVF/AAAA//8DAJNIsFo5
+      BAAA
+    http_version: '1.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_face
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-25 00:00:00.000000000 +08:00
-default_executable: 
+date: 2011-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70365406834240 !ruby/object:Gem::Requirement
+  requirement: &70280597718040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365406834240
+  version_requirements: *70280597718040
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70365406833820 !ruby/object:Gem::Requirement
+  requirement: &70280597717560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365406833820
+  version_requirements: *70280597717560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365406833280 !ruby/object:Gem::Requirement
+  requirement: &70280597716920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70365406833280
+  version_requirements: *70280597716920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70365406832780 !ruby/object:Gem::Requirement
+  requirement: &70280597716320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70365406832780
+  version_requirements: *70280597716320
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70365406832320 !ruby/object:Gem::Requirement
+  requirement: &70280597715800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70365406832320
+  version_requirements: *70280597715800
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70365406831860 !ruby/object:Gem::Requirement
+  requirement: &70280597715300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70365406831860
+  version_requirements: *70280597715300
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70365406831400 !ruby/object:Gem::Requirement
+  requirement: &70280597714740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +87,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70365406831400
+  version_requirements: *70280597714740
 description: An Active Model validator that uses the face.com API to ensures an image
   contains a face
 email:
@@ -126,8 +125,9 @@ files:
 - spec/support/vcr_cassettes/invalid_api_key.yml
 - spec/support/vcr_cassettes/invalid_detect_url.yml
 - spec/support/vcr_cassettes/invalid_image.yml
+- spec/support/vcr_cassettes/invalid_url_transfer.yml
 - spec/support/vcr_cassettes/valid_image.yml
-has_rdoc: true
+- spec/support/vcr_cassettes/valid_url_transfer.yml
 homepage: https://github.com/mariovisic/has_face
 licenses: []
 post_install_message: 
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has_face
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Easily validate if an image contains faces
@@ -167,4 +167,6 @@ test_files:
 - spec/support/vcr_cassettes/invalid_api_key.yml
 - spec/support/vcr_cassettes/invalid_detect_url.yml
 - spec/support/vcr_cassettes/invalid_image.yml
+- spec/support/vcr_cassettes/invalid_url_transfer.yml
 - spec/support/vcr_cassettes/valid_image.yml
+- spec/support/vcr_cassettes/valid_url_transfer.yml