move face detection logic into Rekognition class

afeld · Oct 10, 2012 · 89cabe7 · 89cabe7
1 parent aec209c
commit 89cabe7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/lib/mustachio.rb b/lib/mustachio.rb
@@ -42,19 +42,7 @@ def setup_rekognition
       require File.join(File.dirname(__FILE__), 'mustachio', 'rekognition')
 
       self.setup_face_detection do |file|
-        json = Rekognition.json file, 'face_part'
+        Mustachio::Rekognition.face_detection file
-        width, height = Rekognition.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
       end
     end
 

diff --git a/lib/mustachio/rekognition.rb b/lib/mustachio/rekognition.rb
@@ -26,6 +26,22 @@ def json file, jobs = 'face'
       def dims file
         `identify -format "%wx%h" #{file.path}`.strip.split('x').map(&:to_f)
       end
+
+      def face_detection file
+        json = self.json file, 'face_part'
+        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
+      end
 
     end
   end