yearbook 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/go.rb

@@ -4,7 +4,10 @@ require 'yearbook'
 include Yearbook
 PIMGS = Dir.glob "#{File.expand_path '../spec/fixtures/images', '__FILE__'}/*.jpg"
 
+=begin
 img = Yearbook::Image.new(PIMGS.first)
 img.write('test.jpg') do |i|
   i.bw
-end
+  i.resize_to_fit 200, 500
+end
+=end

data/lib/yearbook/att_hash.rb

@@ -0,0 +1,15 @@
+require 'delegate'
+class AttHash < SimpleDelegator
+  def initialize
+    @hsh = {}
+    super(@hsh)
+  end
+
+  def method_missing(foo, *args, &blk)
+    if @hsh.respond_to?(foo)
+      @hsh.send(foo, *args, &blk)
+    else
+     @hsh[foo.to_sym] = args
+    end
+  end
+end

data/lib/yearbook/classifier.rb

@@ -0,0 +1,26 @@
+module Yearbook
+  module Classifier
+    
+    DATA_DIR = File.expand_path('../../../data/classifiers', __FILE__ )
+    DATA_FILES = {
+      faces: File.join(DATA_DIR, 'haarcascade_frontalface_default.xml')
+
+    }
+
+
+    # returns an array of detected objects
+    def self.detect_objects(cv_image, object_type)
+      detector = load_detector(object_type.to_sym)
+
+      detector.detect_objects(cv_image)
+    end
+
+
+    def self.load_detector(object_type)
+      fname = DATA_FILES[object_type]
+      puts fname
+      OpenCV::CvHaarClassifierCascade::load( fname )
+    end
+
+  end
+end

data/lib/yearbook/image.rb

@@ -1,62 +1,96 @@
 require 'rmagick'
 require 'hashie'
+require_relative 'att_hash'
+require_relative 'classifier'
 
 
 
-require 'delegate'
-class AttHash < SimpleDelegator
 
-  def initialize
-    @hsh = {}
-    super(@hsh)
-  end
+module Yearbook
+  class Image
 
-  def method_missing(foo, *args, &blk)
-    if @hsh.respond_to?(foo)
-      @hsh.send(foo, *args, &blk)
-    else
-     @hsh[foo.to_sym] = args
+    attr_reader :filename
+    def initialize(fname)
+      @filename = fname
+      @objects = []
     end
-  end
-end
 
 
+    def detect_objects(obj_type)
+      @objects = Classifier.detect_objects(cv_object, obj_type).to_a
+    end
 
-module Yearbook
-  class Image
-
-    def initialize(fname)
-      @magick_image = read_magick_image(fname)
+    def detect_faces
+      detect_objects(:faces)
     end
 
+    def detected_objects
+      @objects
+    end
 
-    def write(out_fname, &blk)
+    def write(base_out_fname, &blk)
       klass = self.class
-      image_out = image_object
 
-      if block_given?
-        h = AttHash.new
-        yield h
+      if @objects.empty?        
+        img_objects = Array(image_object)
+      else
+        img_objects = @objects.map{|o| constitute_from_cv(o, image_object)}
+      end
 
-        
-        image_out = h.inject(image_out) do |img, (foo, args)|
-          klass.send(foo, img, *args)
+      img_objects.each_with_index do |image_out, idx|
+        if block_given?
+          h = AttHash.new
+          yield h
+
+          # transform the image
+          image_out = h.inject(image_out) do |img, (foo, args)|
+            klass.send(foo, img, *args)
+          end
         end
-      end
 
-      klass.output(image_out, out_fname)        
+        if idx == 0
+          out_fname = base_out_fname
+        else
+          out_fname = base_out_fname.sub(/\.(?=\w+$)/, "-#{idx}.")
+        end
+
+        klass.output(image_out, out_fname)
+      end        
     end
 
 
+
+
+
     private
-    def read_magick_image(fname)
-       Magick::Image::read(fname).first
-    end
 
+
+    # defer loading until it is needed
     def image_object
-      @magick_image
+      @magick_image ||= load_magick_image(@filename)
     end
 
+    def cv_object
+      @cv_image ||= load_cv_image(@filename)
+    end
+
+
+
+    def constitute_from_cv(c, img)
+      pixels = img.dispatch(c.x, c.y, c.width, c.height, "RGB")
+
+      return Magick::Image.constitute(c.width, c.height, "RGB", pixels)
+    end
+
+
+    def load_magick_image(fname)
+       Magick::Image::read(fname).first
+    end
+
+
+    def load_cv_image(fname)
+      IplImage::load(fname)
+    end
 
 
     # Image manipulation methods at the class level

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ require 'yearbook'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 
+IMAGE_DIR ||= File.expand_path '../spec/fixtures/images', '__FILE__'
+
+
+
 RSpec.configure do |config|
 
   config.filter_run_excluding skip: true 

data/spec/yearbook_spec.rb

@@ -1,8 +1,59 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe "Yearbook" do
-  it "passes" do
-    expect(1).to eq 1
-  end
-end
+module Yearbook
+  describe Image do
+
+    context 'instance' do 
+      before do 
+        @fname = File.join(IMAGE_DIR, 'bush-george-w.jpg')
+        @image = Image.new(@fname)
+        @tempfile = Tempfile.new 'bush.jpg'
+      end
+
+      after do 
+        @tempfile.unlink
+      end
+
+
+      describe 'initialization' do 
+        it 'should have :filename reader' do 
+          expect(@image.filename).to eq @fname
+        end
+      end
+
+      describe '#detect_faces' do
+        it 'should return an Array' do 
+          expect( @image.detect_faces ).to be_an Array
+        end
+      end
+
+      describe '#write' do
+        it 'should write to disk' do 
+          @image.write(@tempfile.path)
+          expect(@tempfile.size > 10000).to be_true
+        end
+
+        context 'after faces have been detected' do 
+          before do 
+            @image.detect_faces
+          end
 
+          it 'should write each object to disk' do 
+            last_num = @image.detected_objects.count - 1
+            path = @tempfile.path
+            last_path = path.sub(/\.(?=\w+$)/, "-#{last_num}.")
+
+            @image.write(path)
+            expect(File.exists?(last_path)).to be_true
+          end
+
+        end
+      end
+
+
+
+    end
+
+
+  end
+end

data/yearbook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "yearbook"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dannguyen"]
-  s.date = "2013-11-05"
+  s.date = "2013-11-06"
   s.description = "Easy face-cropping"
   s.email = "dansonguyen@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
     "data/classifiers/shameem_haarcascade_eye.xml",
     "go.rb",
     "lib/yearbook.rb",
+    "lib/yearbook/att_hash.rb",
+    "lib/yearbook/classifier.rb",
     "lib/yearbook/image.rb",
     "spec/fixtures/images/bush-george-w.jpg",
     "spec/fixtures/images/obama-barack.jpg",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yearbook
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -178,6 +178,8 @@ files:
 - data/classifiers/shameem_haarcascade_eye.xml
 - go.rb
 - lib/yearbook.rb
+- lib/yearbook/att_hash.rb
+- lib/yearbook/classifier.rb
 - lib/yearbook/image.rb
 - spec/fixtures/images/bush-george-w.jpg
 - spec/fixtures/images/obama-barack.jpg
@@ -203,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 577978153578569035
+      hash: -163145999741884676
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: