Merge pull request #1 from wendelscardua/sky-biometry-api

Sky biometry api

Author: wendelscardua

Gemfile

@@ -7,6 +7,8 @@ gem('magickly',
     :ref => 'cd17608a9c4468da1f738815a96dc2a9473fc029')
 #gem 'magickly', :path => '../magickly'
 
+gem 'face'
+
 gem 'excon'
 gem 'faraday'
 
@@ -25,7 +27,7 @@ end
 group :development, :test do
   gem 'rack-test', :require => 'rack/test'
   gem 'rspec'
-
+  gem 'pry'
   gem 'debugger', platforms: :mri_19
   gem 'byebug', platforms: :mri_20
 end
@@ -34,7 +36,3 @@ group :test do
   gem 'webmock', :require => 'webmock/rspec'
   gem 'vcr'
 end
-
-group :production do
-  gem 'newrelic_rpm', :require => false
-end

Gemfile.lock

@@ -25,6 +25,7 @@ GEM
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
+    coderay (1.1.0)
     columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -37,10 +38,15 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    domain_name (0.5.20160128)
+      unf (>= 0.0.5, < 1.0.0)
     dragonfly (0.9.15)
       multi_json (~> 1.0)
       rack
     excon (0.42.1)
+    face (0.1.0)
+      json (>= 1.4.6)
+      rest-client (>= 1.6.1)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     fastimage (1.6.6)
@@ -58,6 +64,8 @@ GEM
       tilt
     hashie (3.3.2)
     highline (1.6.21)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -74,12 +82,14 @@ GEM
     json (1.8.1)
     jwt (1.2.0)
     kgio (2.9.2)
+    method_source (0.8.2)
+    mime-types (2.99)
     mini_portile (0.6.1)
     minitest (5.5.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    newrelic_rpm (3.9.8.273)
+    netrc (0.11.0)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
@@ -88,6 +98,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.5.2)
     rack-attack (4.2.0)
       rack
@@ -99,6 +113,10 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -121,6 +139,9 @@ GEM
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -139,16 +160,20 @@ DEPENDENCIES
   debugger
   dragonfly (~> 0.9)
   excon
+  face
   faraday
   fastimage
   haml
   jeweler
   magickly!
-  newrelic_rpm
+  pry
   rack-attack
   rack-test
   rspec
   sinatra (~> 1.2)
   unicorn
   vcr
   webmock
+
+BUNDLED WITH
+   1.10.6

lib/mustachio.rb

@@ -7,7 +7,7 @@
 
 module Mustachio
 #  FACE_POS_ATTRS = ['center', 'eye_left', 'eye_right', 'mouth_left', 'mouth_center', 'mouth_right', 'nose']
-  REQUIRED_FACE_ATTRS = %w(mouth_left mouth_right nose)
+  REQUIRED_FACE_ATTRS = %w(mouth_center nose)
   FACE_SPAN_SCALE = 2.0
 
   class << self
@@ -72,7 +72,7 @@ def face_data_as_px(file_or_job, width, height)
       # TODO: make more robust by filtering out faces without all data
       new_faces = faces.map do |face|
         face_arr = face.map do |k, v|
-          [k, { 'x' => (v['x'] * (width / 100.0)), 'y' => (v['y'] * (height / 100.0)) }]
+          [k, { 'x' => (v['x'].to_f * (width.to_f / 100.0)), 'y' => (v['y'].to_f * (height.to_f / 100.0)) }]
         end
         Hash[face_arr]
       end

lib/mustachio/app.rb

@@ -9,11 +9,6 @@ class App < Sinatra::Base
     set :static, true
     use Rack::Attack
 
-    configure :production do
-      require 'newrelic_rpm' if ENV['NEW_RELIC_ID']
-    end
-
-
     def redirect_to_canonical_host
       app_host = ENV['MUSTACHIO_APP_DOMAIN']
       if app_host && request.host != app_host

lib/mustachio/factories.rb

@@ -6,7 +6,6 @@
     # resize to smaller than 900px, because Face.com downsizes the image to this anyway
     # TODO move resize inside of Mustachio.face_data
     faces = convert.image.thumb('900x900>').face_data_as_px(width, height)
-
     commands = ['-alpha Background -background Transparent']
     faces.each do |face|
       stache_num = case stache_num_param
@@ -31,7 +30,7 @@
       # 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
+      rotation = 90.0 - (Math.atan(( face['mouth_center']['y'] - face['nose']['y'] ).to_f / ( face['mouth_center']['x'] - face['nose']['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

lib/mustachio/rekognition.rb

@@ -7,61 +7,27 @@ class << self
       REKOGNITION_SECRET = ENV['MUSTACHIO_REKOGNITION_SECRET'] || raise('please set MUSTACHIO_REKOGNITION_SECRET')
 
 
-      def get_response(file, jobs)
-        conn = Faraday.new :url => 'https://rekognition.com' do |faraday|
-          faraday.request :multipart
-          faraday.request :url_encoded
-          faraday.adapter :excon
-        end
-
-        payload = {
-          :api_key       => REKOGNITION_KEY,
-          :api_secret    => REKOGNITION_SECRET,
-          :uploaded_file => Faraday::UploadIO.new(file, content_type(file)),
-          :jobs          => jobs,
-          :name_space    => '',
-          :user_id       => ''
-        }
-
-        conn.post('/func/api/', payload)
-      end
-
-      def json file, jobs = 'face'
-        response = self.get_response(file, jobs)
-        JSON.parse response.body
-      end
-
-      def dims file
-        `identify -format "%wx%h" #{file.path}`.strip.split('x').map(&:to_f)
+      def get_response(file)
+        client = Face.get_client(api_key: REKOGNITION_KEY, api_secret: REKOGNITION_SECRET)
+        client.faces_detect(file: Faraday::UploadIO.new(file, content_type(file)))
       end
 
       def content_type file
         `file -b --mime #{file.path}`.strip.split(/[:;]\s+/)[0]
       end
 
       def validate_response(json)
-        unless json['face_detection']
-          usage = json['usage'] || {}
-          msg = usage['status'] || 'failure.'
-          raise Error.new("Rekognition API: #{msg}")
+        unless json['status'] == 'success'
+          msg = json['status']
+          raise Error.new("SkyBiometry API: #{msg}")
         end
       end
 
       def face_detection file
-        json = self.json file, 'face_part'
+        json = self.get_response file
         self.validate_response(json)
-        width, height = self.dims file
 
-        json['face_detection'].map do |entry|
-          mouth_left, mouth_right, nose = entry.values_at('mouth_l', 'mouth_r', 'nose').map do |dims|
-            {
-              'x' => ((dims['x'].to_f / width) * 100.0),
-              'y' => ((dims['y'].to_f / height) * 100.0)
-            }
-          end
-
-          { 'mouth_left' => mouth_left, 'mouth_right' => mouth_right, 'nose' => nose }
-        end
+        json['photos'].first['tags'].map {|entry| entry.slice('mouth_center', 'nose')}
       end
     end
   end