has_face 0.0.1 → 0.0.2

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2011 by Mario Visic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/README.md

@@ -126,7 +126,12 @@ The options `allow_blank` and `allow_nil` can also be passed to the matcher:
 it { should validate_has_face_for :avatar, :allow_blank => true }
 ```
 
-### Contributing
+## License
+
+Has face is distributed under a standard MIT license, see LICENSE for
+further information.
+
+## Contributing
 
 Fork on GitHub and after you’ve committed tested patches, send a pull request.
 

data/has_face.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client'
 
   s.add_development_dependency 'rspec',    '>= 2.0'
+  s.add_development_dependency 'sqlite3',  '>= 1.0'
   s.add_development_dependency 'rr',       '>= 1.0'
   s.add_development_dependency 'vcr',      '>= 1.0'
   s.add_development_dependency 'fakeweb',  '>= 1.0'

data/lib/has_face/validator.rb

@@ -13,40 +13,38 @@ module HasFace
       # Skip validation if globally turned off
       return if HasFace.enable_validation == false
 
-      image      = record.send(attr_name)
-      image_path = image.try(:path) if image.respond_to?(:path)
+      image       = record.send(attr_name)
+      @image_path = image.respond_to?(:path) ? image.path : nil
 
       # Skip validation if our image is nil/blank and allow nil/blank is on
       return if (@allow_nil && image.nil?) || (@allow_blank && image.blank?)
 
-      # Add an error if the url is blank
-      return record.errors.add(attr_name, :no_face) if image_path.blank?
+      # Add an error if the image path is blank
+      return record.errors.add(attr_name, :no_face) if @image_path.blank?
 
-      # Get an parse the JSON response
-      params   = { :api_key => HasFace.api_key, :api_secret => HasFace.api_secret, :image => File.new(image_path, 'rb') }
-
-      begin
-        response = RestClient.post(HasFace.detect_url, params)
-      rescue RestClient::Exception => error
-        return handle_request_error(error)
-      end
-
-      json_response = JSON.parse(response.body)
+      # Get the response and parse to JSON
+      raw_response = RestClient.post(HasFace.detect_url, params)
+      response     = JSON.parse(raw_response)
 
       # Error handling for failed responses
-      return handle_api_error(json_response) unless json_response['status'] == 'success'
-
+      return handle_api_error(response) unless response['status'] == 'success'
 
       # Add errors if no tags are present
-      tags = json_response.try(:[], 'photos').try(:first).try(:[], 'tags') || []
+      tags = response.try(:[], 'photos').try(:first).try(:[], 'tags')
       record.errors.add(attr_name, :no_face) if tags.blank?
 
+    rescue RestClient::Exception => error
+      return handle_request_error(error)
     end
 
     protected
 
+    def params
+      { :api_key => HasFace.api_key, :api_secret => HasFace.api_secret, :image => File.new(@image_path, 'r') }
+    end
+
     def handle_api_error(response)
-      error_message = "face.com API Error: \"#{response['error_message']}\" Code: #{response['error_code']}"
+      error_message = %{face.com API Error: "#{response['error_message']}" Code: #{response['error_code']}}
 
       if HasFace.skip_validation_on_error
         Rails.logger.warn error_message if Rails.logger.present?
@@ -57,7 +55,7 @@ module HasFace
     end
 
     def handle_request_error(error)
-      error_message = "has_face HTTP Request Error: \"#{error.message}\""
+      error_message = %{has_face HTTP Request Error: "#{error.message}"}
 
       if HasFace.skip_validation_on_error
         Rails.logger.warn error_message if Rails.logger.present?

data/lib/has_face/version.rb

@@ -1,3 +1,3 @@
 module HasFace
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_helper.rb

@@ -5,9 +5,9 @@ require 'rails'
 require 'active_model'
 require 'active_model/validations'
 require 'active_record'
-require 'lib/has_face'
+require './lib/has_face'
 
-Dir["spec/support/**/*.rb"].each {|f| require f}
+Dir["spec/support/**/*.rb"].each {|f| require "./#{f}"}
 
 VALID_IMAGE_PATH   = 'spec/support/assets/hit.jpg'
 INVALID_IMAGE_PATH = 'spec/support/assets/miss.jpg'

metadata

@@ -1,125 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: has_face
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Mario Visic
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-11 00:00:00 +08:00
+date: 2011-07-24 00:00:00.000000000 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70110405819840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70110405819840
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70110405819420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70110405819420
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70110405818880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70110405818880
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70110405818380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70110405818380
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70110405817920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70110405817920
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70110405817460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70110405817460
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70110405817000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id006
-description: An Active Model validator that uses the face.com API to ensures an image contains a face
-email: 
+  prerelease: false
+  version_requirements: *70110405817000
+description: An Active Model validator that uses the face.com API to ensures an image
+  contains a face
+email:
 - mario@mariovisic.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - has_face.gemspec
@@ -149,38 +130,29 @@ files:
 has_rdoc: true
 homepage: https://github.com/mariovisic/has_face
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: has_face
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easily validate if an image contains faces
-test_files: 
+test_files:
 - spec/has_face/test/matchers_spec.rb
 - spec/has_face/validator_spec.rb
 - spec/spec_helper.rb