paperclip-facecrop 0.1.0 → 0.1.2

data/.gitignore

@@ -1,4 +1,5 @@
 pkg/*
 *.gem
 Gemfile.lock
+.project
 .bundle

data/lib/face_crop.rb

@@ -20,7 +20,8 @@ module FaceCrop
       # detect
       #
       def detect(file)
-        key = "#{self.class}#{file}"
+        key = "#{self.class}:" + Digest::MD5.hexdigest(File.read(file))
+        
         regions = FaceCrop::Detector::Cache[key] 
         return regions unless regions.nil?
 

data/lib/processor.rb

@@ -19,6 +19,7 @@ module Paperclip
     def initialize(file, options = {}, attachment = nil)
       super(file, options, attachment)
     
+      
       raise "No detectors were defined" if @@detectors.nil?
       
       faces_regions = []
@@ -28,10 +29,12 @@ module Paperclip
         begin
           faces_regions += detector.detect(file.path)
         rescue Exception => e
+          puts e
           Rails.logger.error(e)
         end
       end
       
+      
       x_coords, y_coords, widths, heights = [], [], [], []
     
       faces_regions.each do |region|
@@ -41,6 +44,7 @@ module Paperclip
         heights << region.height
       end
           
+      
       @has_faces = faces_regions.size > 0
      
       if @has_faces
@@ -50,6 +54,7 @@ module Paperclip
         @bottom_right_y = y_coords.max
         
         
+        
         #puts @top_left_x.to_s
         
         # average faces areas
@@ -63,6 +68,8 @@ module Paperclip
         @top_left_x -= average_face_width / 1.2
         @bottom_right_x += average_face_width / 1.2
       
+        
+        
         # new height
         #puts ":::#{@top_left_x}---#{average_face_width}"
         #return
@@ -72,6 +79,8 @@ module Paperclip
 
         calculate_bounds
       
+        
+        
         # if the new area is smaller than the target geometry, it's scaled so the final image isn't resampled
         #
         if @faces_width < @target_geometry.width 
@@ -80,7 +89,13 @@ module Paperclip
           @bottom_right_x += delta_width
           calculate_bounds
         end
-      
+        
+        # scale the image so the cropped image still displays the faces
+        if @faces_width > @target_geometry.width && crop?
+          ratio = @faces_width / @target_geometry.width
+          @faces_height = @target_geometry.height * ratio
+        end
+        
         #raise (@target_geometry.height > 0 and @faces_height < @target_geometry.height).to_s
       
         if (@target_geometry.height > 0 and @faces_height < @target_geometry.height)
@@ -89,7 +104,7 @@ module Paperclip
           @bottom_right_y += delta_height
           calculate_bounds
         end
-      
+        
         @faces_height = @faces_width if @target_geometry.height == 0
       
         @current_geometry = Paperclip::Geometry.new(@faces_width, @faces_height)
@@ -116,11 +131,12 @@ module Paperclip
     
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
       faces_crop = "%dx%d+%d+%d" % [@faces_width, @faces_height, @top_left_x, @top_left_y]
-    
+      
       trans = []
       trans << "-crop" << %["#{faces_crop}"] << "+repage"
       trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
       trans << "-crop" << %["#{crop}"] << "+repage" if crop
+      
       trans
     end
   

data/lib/railtie.rb

@@ -3,7 +3,7 @@ module FaceCrop
     initializer "paperclip-facecrop.extend_has_attachment" do
       raise "Paperclip needed" unless defined?(Paperclip)
       ActiveSupport.on_load :active_record do
-        
+           
         class ActiveRecord::Base
           
           class << self
@@ -14,7 +14,7 @@ module FaceCrop
             
             alias_method_chain :has_attached_file, :face_crop_cache
           end
-        end
+        end        
       end
       
     end

data/paperclip-facecrop.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "paperclip-facecrop"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
   s.authors = ["Borja Martín"]
   s.description = %q{Paperclip processor that is aware of the faces detected on the image so that they don't get cropped or aren't shown too small while generating the thumbnails}
   s.summary = %q{Paperclip processor that is aware of the faces found on the image}

metadata

@@ -1,34 +1,38 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paperclip-facecrop
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.2
 platform: ruby
-authors:
-- Borja Martín
+authors: 
+- "Borja Mart\xC3\xADn"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-17 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: paperclip
-  requirement: &2153665720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153665720
-description: Paperclip processor that is aware of the faces detected on the image
-  so that they don't get cropped or aren't shown too small while generating the thumbnails
+  version_requirements: *id001
+description: Paperclip processor that is aware of the faces detected on the image so that they don't get cropped or aren't shown too small while generating the thumbnails
 email: borjam@dagi3d.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -43,28 +47,33 @@ files:
 - lib/processor.rb
 - lib/railtie.rb
 - paperclip-facecrop.gemspec
+has_rdoc: true
 homepage: http://github.com/dagi3d/paperclip-facecrop
 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
-      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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Paperclip processor that is aware of the faces found on the image
 test_files: []
+