mustachio 0.2.1 → 0.3.0

data/Gemfile

@@ -1,17 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '~> 1.2.3', :require => 'sinatra/base'
+gem 'sinatra', '~> 1.2', :require => 'sinatra/base'
 gem 'dragonfly', '~> 0.9.0'
-gem 'magickly', '~> 1.1'
+gem 'magickly', '~> 1.2'
+
 gem 'addressable', '~> 2.2.4', :require => 'addressable/uri'
-gem 'haml'
+gem 'haml', '~> 3.0'
 
 gem 'face', '0.0.4'
 gem 'imagesize', '~> 0.1', :require => 'image_size'
 
 group :development do
-  # rake 0.9.0 doesn't work with Jeweler 1.6.0
-  gem 'rake', '~> 0.8.7'
   gem 'jeweler', '~> 1.6'
 end
 

data/Gemfile.lock

@@ -1,59 +1,68 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    columnize (0.3.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    dragonfly (0.9.2)
+    columnize (0.3.6)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    dragonfly (0.9.8)
       rack
     face (0.0.4)
       json (>= 1.4.6)
       rest-client (>= 1.6.1)
     git (1.2.5)
-    haml (3.1.1)
-    httparty (0.7.7)
-      crack (= 0.1.8)
+    haml (3.1.4)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     imagesize (0.1.1)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1)
-    linecache (0.43)
-    linecache19 (0.5.12)
+    json (1.6.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
-    magickly (1.1.3)
+    magickly (1.2.1)
       activesupport (>= 2.0.0)
       addressable (~> 2.2)
-      dragonfly (~> 0.9.1)
+      dragonfly (~> 0.9.5)
       haml (~> 3.0)
-      httparty (~> 0.7.3)
-      sinatra (~> 1.2.1)
-    mime-types (1.16)
-    newrelic_rpm (3.0.1)
-    rack (1.3.0)
-    rack-test (0.6.0)
+      httparty (~> 0.8.1)
+      json (~> 1.5)
+      sinatra (~> 1.2)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    newrelic_rpm (3.3.1)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.8.7)
-    rest-client (1.6.1)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
-    rspec-expectations (2.6.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
+    ruby-debug-base19 (0.11.26)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -63,13 +72,14 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    tilt (1.3.1)
-    vcr (1.10.0)
-    webmock (1.6.4)
-      addressable (> 2.2.5, ~> 2.2)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    vcr (1.11.3)
+    webmock (1.7.8)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -79,16 +89,15 @@ DEPENDENCIES
   addressable (~> 2.2.4)
   dragonfly (~> 0.9.0)
   face (= 0.0.4)
-  haml
+  haml (~> 3.0)
   imagesize (~> 0.1)
   jeweler (~> 1.6)
-  magickly (~> 1.1)
+  magickly (~> 1.2)
   newrelic_rpm
   rack-test
-  rake (~> 0.8.7)
   rspec (~> 2.5)
   ruby-debug
   ruby-debug19
-  sinatra (~> 1.2.3)
+  sinatra (~> 1.2)
   vcr (~> 1.9)
   webmock (~> 1.6)

data/README.md

@@ -1,3 +1,3 @@
-![the queen](http://mustachio.heroku.com/?src=http://www.librarising.com/astrology/celebs/images2/QR/queenelizabethii.jpg)
+![the queen](http://mustachify.me/?src=http://www.librarising.com/astrology/celebs/images2/QR/queenelizabethii.jpg)
 
-http://mustachio.heroku.com/?src=YOUR-IMAGE-URL
+http://mustachify.me/?src=YOUR-IMAGE-URL

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bookmarklet.js

@@ -1,6 +1,6 @@
 // original
 javascript:(function(){
-  var URL = 'http://mustachio.heroku.com/magickly?mustachify=true&src=';
+  var URL = 'http://mustachify.me/magickly?mustachify=true&src=';
   var images = document.getElementsByTagName('img');
   var i;
   for (i = 0; i < images.length; i += 1){
@@ -15,4 +15,4 @@ javascript:(function(){
 })();
 
 // JSMin'd
-javascript:(function(){var URL='http://mustachio.heroku.com/magickly?mustachify=true&src=';var images=document.getElementsByTagName('img');var i;for(i=0;i<images.length;i+=1){var image=images[i];var src=image.getAttribute('src');if(image.src[0]==='/'){image.setAttribute('src',URL+encodeURIComponent(window.location.origin+src));}else if(src.match(/^https?:\/\//)){image.setAttribute('src',URL+encodeURIComponent(src));}}})();
+javascript:(function(){var URL='http://mustachify.me/magickly?mustachify=true&src=';var images=document.getElementsByTagName('img');var i;for(i=0;i<images.length;i+=1){var image=images[i];var src=image.getAttribute('src');if(image.src[0]==='/'){image.setAttribute('src',URL+encodeURIComponent(window.location.origin+src));}else if(src.match(/^https?:\/\//)){image.setAttribute('src',URL+encodeURIComponent(src));}}})();

data/lib/mustachio.rb

@@ -1,89 +1,11 @@
 require 'magickly'
 require 'image_size'
-require 'face'
+require File.join(File.dirname(__FILE__), 'mustachio', 'shortcuts')
 
-Magickly.dragonfly.configure do |c|
-  c.log_commands = true
-  
-  c.analyser.add :face_data do |temp_object|
-    Mustachio.face_client.faces_detect(:file => temp_object.file, :attributes => 'none')['photos'].first
-  end
-  
-  c.analyser.add :face_data_as_px do |temp_object|
-    data = Mustachio.face_client.faces_detect(:file => temp_object.file, :attributes => 'none')['photos'].first # TODO use #face_data
-    
-    new_tags = []
-    data['tags'].map do |face|
-      has_all_attrs = Mustachio::FACE_POS_ATTRS.all? do |pos_attr|
-        if face[pos_attr]
-          face[pos_attr]['x'] *= (data['width'] / 100.0)
-          face[pos_attr]['y'] *= (data['height'] / 100.0)
-          true
-        else
-          # face attribute missing
-          false
-        end
-      end
-      
-      new_tags << face if has_all_attrs
-    end
-    
-    data['tags'] = new_tags
-    data
-  end
-  
-  c.job :mustachify do |stache_num_param|
-    photo_data = @job.face_data_as_px
-    width = photo_data['width']
-    
-    commands = ['-virtual-pixel transparent']
-    photo_data['tags'].each do |face|
-      stache_num = case stache_num_param
-        when true
-          0
-        when 'true'
-          0
-        when 'rand'
-          rand(Mustachio.mustaches.size)
-        else
-          stache_num_param.to_i
-      end
-      
-      mustache = Mustachio.mustaches[stache_num]
-      
-      # perform transform such that the mustache is the height
-      # of the upper lip, and the bottom-center of the stache
-      # is mapped to the center of the mouth
-      rotation = Math.atan(
-        ( face['mouth_right']['y'] - face['mouth_left']['y'] ).to_f /
-        ( face['mouth_right']['x'] - face['mouth_left']['x'] ).to_f
-      ) / Math::PI * 180.0
-      desired_height = Math.sqrt(
-        ( face['nose']['x'] - face['mouth_center']['x'] ).to_f**2 +
-        ( face['nose']['y'] - face['mouth_center']['y'] ).to_f**2
-      )
-      mouth_intersect = mustache['height'] - mustache['mouth_overlap']
-      scale = desired_height / mouth_intersect
-      
-      srt_params = [
-        [ mustache['width'] / 2.0, mouth_intersect - mustache['vert_offset'] ].map{|e| e.to_i }.join(','), # bottom-center of stache
-        scale, # scale
-        rotation, # rotate
-        [ face['mouth_center']['x'], face['mouth_center']['y'] ].map{|e| e.to_i }.join(',') # middle of mouth
-      ]
-      srt_params_str = srt_params.join(' ')
-      
-      commands << "\\( #{mustache['file_path']} +distort SRT '#{srt_params_str}' \\)"
-    end
-    commands << "-flatten"
-    
-    command_str = commands.join(' ')
-    process :convert, command_str
-  end
-end
 
 module Mustachio
   FACE_POS_ATTRS = ['center', 'eye_left', 'eye_right', 'mouth_left', 'mouth_center', 'mouth_right', 'nose']
+  FACE_SPAN_SCALE = 2.0
   
   class << self
     def face_client
@@ -105,7 +27,7 @@ module Mustachio
         stache['vert_offset'] ||= 0
         stache['mouth_overlap'] ||= 0
         
-        stache['file_path'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'public', 'images', 'staches', stache['filename']))
+        stache['file_path'] = File.expand_path(File.join(File.dirname(__FILE__), 'mustachio', 'public', 'images', 'staches', stache['filename']))
         unless stache['width'] && stache['height']
           stache['width'], stache['height'] = ImageSize.new(File.new(stache['file_path'])).get_size
         end
@@ -113,6 +35,81 @@ module Mustachio
       end
       @@mustaches = staches
     end
+    
+    
+    def face_data(file_or_job)
+      file = case file_or_job
+      when Dragonfly::Job
+        file_or_job.temp_object
+      when Dragonfly::TempObject
+        file_or_job.file
+      when File
+        file_or_job
+      else
+        raise ArgumentError, "A #{file_or_job.class} is not a valid argument for #face_data.  Please provide a File or a Dragonfly::Job."
+      end
+
+      face_data = Mustachio.face_client.faces_detect(:file => file, :attributes => 'none')
+      face_data['photos'].first
+    end
+    
+    def face_data_as_px(file_or_job, width=nil, height=nil)
+      data = self.face_data(file_or_job)
+      width ||= data['width']
+      height ||= data['height']
+
+      new_tags = []
+      data['tags'].map do |face|
+        has_all_attrs = FACE_POS_ATTRS.all? do |pos_attr|
+          if face[pos_attr]
+            face[pos_attr]['x'] *= (width / 100.0)
+            face[pos_attr]['y'] *= (height / 100.0)
+            true
+          else # face attribute missing
+            false
+          end
+        end
+
+        new_tags << face if has_all_attrs
+      end
+
+      data['tags'] = new_tags
+      data
+    end
+    
+    def face_span(file_or_job)
+      face_data = self.face_data_as_px(file_or_job)
+      faces = face_data['tags']
+      
+      left_face, right_face = faces.minmax_by{|face| face['center']['x'] }
+      top_face, bottom_face = faces.minmax_by{|face| face['center']['y'] }
+      
+      top = top_face['eye_left']['y']
+      bottom = bottom_face['mouth_center']['y']
+      right = right_face['eye_right']['x']
+      left = left_face['eye_left']['x']
+      width = right - left
+      height = bottom - top
+      
+      # compute adjusted values for padding around face span
+      adj_width = width * FACE_SPAN_SCALE
+      adj_height = height * FACE_SPAN_SCALE
+      adj_top = top - ((adj_height - height) / 2.0)
+      adj_bottom = bottom + ((adj_height - height) / 2.0)
+      adj_right = right + ((adj_width - width) / 2.0)
+      adj_left = left - ((adj_width - width) / 2.0)
+      
+      {
+        :top => adj_top,
+        :bottom => adj_bottom,
+        :right => adj_right,
+        :left => adj_left,
+        :width => adj_width,
+        :height => adj_height,
+        :center_x => (adj_left + adj_right) / 2,
+        :center_y => (adj_top + adj_bottom) / 2
+      }
+    end
   end
   
   

data/lib/mustachio/app.rb

@@ -6,12 +6,19 @@ module Mustachio
     DEMO_IMAGE = 'http://www.librarising.com/astrology/celebs/images2/QR/queenelizabethii.jpg'
     
     set :static, true
-    set :public, 'public'
     
     configure :production do
       require 'newrelic_rpm' if ENV['NEW_RELIC_ID']
     end
     
+    before do
+      app_host = ENV['MUSTACHIO_APP_DOMAIN']
+      if app_host && request.host != app_host
+        request_host_with_port = request.env['HTTP_HOST']
+        redirect request.url.sub(request_host_with_port, app_host), 301
+      end
+    end
+    
     
     get %r{^/(\d+|rand)?$} do |stache_num|
       src = params[:src]

data/lib/mustachio/shortcuts.rb

@@ -0,0 +1,125 @@
+require 'face'
+
+Magickly.dragonfly.configure do |c|
+  # c.log_commands = true
+  
+  c.analyser.add :face_data do |temp_object|
+    Mustachio.face_data(temp_object)
+  end
+  
+  c.analyser.add :face_data_as_px do |temp_object, width, height|
+    Mustachio.face_data_as_px(temp_object, width, height)
+  end
+  
+  c.analyser.add :face_span do |temp_object|
+    Mustachio.face_span(temp_object)
+  end
+  
+  
+  
+  c.job :mustachify do |stache_num_param|
+    width = @job.width
+    height = @job.height
+    # resize to smaller than 900px, because Face.com downsizes the image to this anyway
+    # TODO move resize inside of Mustachio.face_data
+    photo_data = @job.thumb('900x900>').face_data_as_px(width, height)
+    
+    commands = ['-virtual-pixel transparent']
+    photo_data['tags'].each do |face|
+      stache_num = case stache_num_param
+        when true
+          0
+        when 'true'
+          0
+        when 'rand'
+          rand(Mustachio.mustaches.size)
+        else
+          stache_num_param.to_i
+      end
+      
+      mustache = Mustachio.mustaches[stache_num]
+      
+      # perform transform such that the mustache is the height
+      # of the upper lip, and the bottom-center of the stache
+      # is mapped to the center of the mouth
+      rotation = Math.atan(
+        ( face['mouth_right']['y'] - face['mouth_left']['y'] ).to_f /
+        ( face['mouth_right']['x'] - face['mouth_left']['x'] ).to_f
+      ) / Math::PI * 180.0
+      desired_height = Math.sqrt(
+        ( face['nose']['x'] - face['mouth_center']['x'] ).to_f**2 +
+        ( face['nose']['y'] - face['mouth_center']['y'] ).to_f**2
+      )
+      mouth_intersect = mustache['height'] - mustache['mouth_overlap']
+      scale = desired_height / mouth_intersect
+      
+      srt_params = [
+        [ mustache['width'] / 2.0, mouth_intersect - mustache['vert_offset'] ].map{|e| e.to_i }.join(','), # bottom-center of stache
+        scale, # scale
+        rotation, # rotate
+        [ face['mouth_center']['x'], face['mouth_center']['y'] ].map{|e| e.to_i }.join(',') # middle of mouth
+      ]
+      srt_params_str = srt_params.join(' ')
+      
+      commands << "\\( #{mustache['file_path']} +distort SRT '#{srt_params_str}' \\)"
+    end
+    commands << "-flatten"
+    
+    command_str = commands.join(' ')
+    process :convert, command_str
+  end
+  
+  c.job :crop_to_faces do |geometry|
+    thumb_width, thumb_height = geometry.split('x')
+    # raise ArgumentError
+    thumb_width = thumb_width.to_f
+    thumb_height = thumb_height.to_f
+    
+    span = Mustachio.face_span(@job)
+    puts span.inspect
+    scale_x = thumb_width / span[:width]
+    scale_y = thumb_height / span[:height]
+    
+    # TODO
+    # if thumb larger than span
+    # center span and crop
+    # else
+    # resize image so span is smaller than thumb, then crop
+    
+    # center the span in the dimension with the smaller scale
+    if scale_x < scale_y
+      orig_height = @job.height
+      # check if image is tall enough for this scaling
+      if orig_height * scale_x >= thumb_height
+        @scale = scale_x
+        @offset_x = span[:left] * @scale
+      else
+        # image is too short - increase scale to fit height
+        @scale = thumb_height / orig_height.to_f
+        orig_width = @job.width
+        @offset_x = span[:left] * @scale + ((@scale - scale_x) * orig_width / 2.0)
+      end
+      
+      @offset_y = (span[:center_y] * @scale) - (thumb_height / 2)
+    else
+      orig_width = @job.width
+      # check if image is wide enough for this scaling
+      if orig_width * scale_y >= thumb_width
+        @scale = scale_y
+        @offset_y = span[:top] * @scale
+      else
+        # image is too narrow - increase scale to fit width
+        @scale = thumb_width / orig_width.to_f
+        orig_height = @job.height
+        @offset_y = span[:top] * @scale + ((@scale - scale_y) * orig_height / 2.0)
+      end
+      
+      @offset_x = (span[:center_x] * @scale) - (thumb_width / 2)
+    end
+    
+    # round up, to ensure the scaled image fills the thumb area
+    percentage = (@scale * 100).ceil
+    
+    process :convert, "-resize #{percentage}% -extent #{geometry}+#{@offset_x.to_i}+#{@offset_y.to_i}"
+  end
+end