miso 0.1.1 → 0.2.0

data/Rakefile

@@ -40,7 +40,7 @@ begin
     s.email    = ["eloy@fngtps.com", "manfred@fngtps.com"]
     s.authors  = ["Eloy Duran", "Manfred Stienstra"]
     s.summary  = s.description = "Miso is a unified API for simple image operations commonly used on the web."
-    s.files    = FileList['**/**'] # tmp until we've patched Jeweler to be able to easily add files to defaults
+    s.files   -= %w{ .gitignore .kick }
     s.add_dependency('executioner', '>= 0.2.0')
   end
 rescue LoadError

data/TODO

@@ -1,2 +1,6 @@
-- Add Miso::Image#add(image, 10, 10), which adds another image on top of the image. This should be implemented by the processor as well.
-- Add Miso::Image#watermark(image, :southwest, 10, 10), which uses Miso::Image#add to add an image in one of the corners.
+- Add Miso::Image#add(image, 10, 10), which adds another image on top of the
+  image. This should be implemented by the processor as well.
+- Add Miso::Image#watermark(image, :southwest, 10, 10), which uses
+  Miso::Image#add to add an image in one of the corners.
+- Right now the processors clear the operation buffer after writing, which
+  means it's impossible to write out the same operations to multiple files.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/miso.rb

@@ -2,4 +2,13 @@ module Miso
   autoload :Factory,   'miso/factory'
   autoload :Image,     'miso/image'
   autoload :Processor, 'miso/processor'
+  
+  class MisoError < StandardError; end
+  class NotImplementedError < MisoError; end
+  class UnsupportedFileType < MisoError
+    def initialize(path)
+      ext = File.extname(path)[1..-1]
+      super("Miso does not support file type `#{ext}' of `#{path}'")
+    end
+  end
 end

data/lib/miso/image.rb

@@ -23,6 +23,14 @@ module Miso
       @processor.dimensions
     end
     
+    def width
+      @processor.width
+    end
+    
+    def height
+      @processor.height
+    end
+    
     def write(output_file)
       @processor.write(output_file)
       self.class.new(output_file, @processor.class)

data/lib/miso/processor.rb

@@ -3,8 +3,6 @@ module Miso
     autoload :CoreImage,   'miso/processor/core_image'
     autoload :ImageMagick, 'miso/processor/image_magick'
     
-    class NotImplementedError < StandardError; end
-    
     class << self
       # Sets the default processor class.
       attr_writer :processor_class
@@ -39,7 +37,8 @@ module Miso
     attr_reader :input_file
     
     def initialize(input_file)
-      @input_file = input_file
+      @input_file = File.expand_path(input_file)
+      raise Errno::ENOENT, @input_file unless File.exist?(@input_file)
     end
     
     def crop(width, height)
@@ -57,5 +56,13 @@ module Miso
     def write(output_file)
       raise NotImplementedError, "The class `#{self.class.name}' does not implement #write."
     end
+    
+    def width
+      dimensions.first
+    end
+    
+    def height
+      dimensions.last
+    end
   end
 end

data/lib/miso/processor/core_image.rb

@@ -1,26 +1,101 @@
+# Based on code from HotCocoa and: http://redartisan.com/2007/12/12/attachment-fu-with-core-image
 module Miso
   class Processor
     class CoreImage < Processor
       def self.available?
-        available = $:.any? { |path| File.exist? File.join(path, 'osx/cocoa.rb') }
+        $:.any? { |path| File.exist? File.join(path, 'osx/cocoa.rb') }
+      end
+      
+      def initialize(input_file)
+        super
         require 'osx/cocoa'
-        available
+        reset!
+      end
+      
+      def dimensions
+        @dimensions ||= image.extent.size.to_a
       end
       
       def crop(width, height)
-        # ...
+        scale_width, scale_height = scale(width, height)
+        multiplier = scale_width > scale_height ? scale_width : scale_height
+        transform(multiplier)
+        
+        # find the center and calculate the new bottom right from there
+        x = ((buffer_width.to_f - width.to_f) / 2).round.abs
+        y = ((buffer_height.to_f - height.to_f) / 2).round.abs
+        _crop(x, y, width, height)
       end
       
       def fit(width, height)
-        # ...
+        scale_width, scale_height = scale(width, height)
+        multiplier = scale_width < scale_height ? scale_width : scale_height
+        new_width  = (self.width * multiplier).round
+        new_height = (self.height * multiplier).round
+        
+        transform(multiplier)
+        _crop(0, 0, new_width, new_height)
       end
       
-      def dimensions
-        # ...
+      def write(output_file)
+        bitmap = OSX::NSBitmapImageRep.alloc.initWithCIImage(@buffer)
+        blob = bitmap.representationUsingType_properties(detect_file_type(output_file), nil)
+        blob.writeToFile_atomically(output_file, false)
+        reset!
       end
       
-      def write(output_file)
-        # ...
+      private
+      
+      def image
+        OSX::CIImage.imageWithContentsOfURL(OSX::NSURL.fileURLWithPath(@input_file))
+      end
+      
+      def reset!
+        @buffer = image
+      end
+      
+      def buffer_width
+        @buffer.extent.size.width
+      end
+      
+      def buffer_height
+        @buffer.extent.size.height
+      end
+      
+      def apply_filter(name, options)
+        filter = OSX::CIFilter.filterWithName(name)
+        filter.setDefaults
+        options.merge('inputImage' => @buffer).each do |name, value|
+          filter.setValue_forKey(value, name)
+        end
+        @buffer = filter.valueForKey('outputImage')
+      end
+      
+      def scale(width, height)
+        [width.to_f / buffer_width, height.to_f / buffer_height]
+      end
+      
+      def transform(multiplier)
+        apply_filter 'CILanczosScaleTransform',
+                     'inputScale' => multiplier,
+                     'inputAspectRatio' => 1.0
+      end
+      
+      def _crop(x, y, width, height)
+        apply_filter 'CICrop', 'inputRectangle' => OSX::CIVector.vectorWithX_Y_Z_W(x, y, width, height)
+      end
+      
+      def detect_file_type(path)
+        case File.extname(path)
+        when '.png'
+          OSX::NSPNGFileType
+        when '.jpg'
+          OSX::NSJPEGFileType
+        when '.gif'
+          OSX::NSGIFFileType
+        else
+          raise UnsupportedFileType.new(path)
+        end
       end
     end
   end

data/miso.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{miso}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran", "Manfred Stienstra"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2009-10-21}
   s.description = %q{Miso is a unified API for simple image operations commonly used on the web.}
   s.email = ["eloy@fngtps.com", "manfred@fngtps.com"]
   s.extra_rdoc_files = [
@@ -22,27 +22,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION",
-     "html/classes/Miso.html",
-     "html/classes/Miso/Factory.html",
-     "html/classes/Miso/Image.html",
-     "html/classes/Miso/Processor.html",
-     "html/classes/Miso/Processor/CoreImage.html",
-     "html/classes/Miso/Processor/ImageMagick.html",
-     "html/classes/Miso/Processor/NotImplementedError.html",
-     "html/created.rid",
-     "html/files/LICENSE.html",
-     "html/files/README.html",
-     "html/files/lib/miso/factory_rb.html",
-     "html/files/lib/miso/image_rb.html",
-     "html/files/lib/miso/processor/core_image_rb.html",
-     "html/files/lib/miso/processor/image_magick_rb.html",
-     "html/files/lib/miso/processor_rb.html",
-     "html/files/lib/miso_rb.html",
-     "html/fr_class_index.html",
-     "html/fr_file_index.html",
-     "html/fr_method_index.html",
-     "html/index.html",
-     "html/rdoc-style.css",
      "lib/miso.rb",
      "lib/miso/factory.rb",
      "lib/miso/image.rb",
@@ -50,12 +29,14 @@ Gem::Specification.new do |s|
      "lib/miso/processor/core_image.rb",
      "lib/miso/processor/image_magick.rb",
      "miso.gemspec",
-     "pkg/miso-0.1.0.gem",
      "spec/api/factory_spec.rb",
      "spec/api/image_spec.rb",
+     "spec/api/processor/core_image_spec.rb",
      "spec/api/processor/image_magick_spec.rb",
      "spec/api/processor_spec.rb",
      "spec/fixtures/120x100.png",
+     "spec/functional/processor/core_image_spec.rb",
+     "spec/functional/processor_spec.rb",
      "spec/start.rb"
   ]
   s.homepage = %q{http://github.com/Fingertips/miso}
@@ -66,8 +47,11 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/api/factory_spec.rb",
      "spec/api/image_spec.rb",
+     "spec/api/processor/core_image_spec.rb",
      "spec/api/processor/image_magick_spec.rb",
      "spec/api/processor_spec.rb",
+     "spec/functional/processor/core_image_spec.rb",
+     "spec/functional/processor_spec.rb",
      "spec/start.rb"
   ]
 
@@ -84,3 +68,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<executioner>, [">= 0.2.0"])
   end
 end
+

data/spec/api/factory_spec.rb

@@ -6,7 +6,7 @@ describe "A Miso::Factory instance" do
     
     Miso::Processor.any_instance.stubs(:write)
     
-    @input_file  = '/image.png'
+    @input_file  = fixture_file('120x100.png')
     @output_file = '/output_image.png'
     @image       = Miso::Image.new(@input_file)
     

data/spec/api/image_spec.rb

@@ -13,16 +13,16 @@ describe "Miso::Image, concerning initialization" do
   
   it "should initialize with only a file argument and use the default processor class" do
     Miso::Processor.processor_class = Miso::Processor::ImageMagick
-    image = Miso::Image.new('/image.png')
+    image = Miso::Image.new(fixture_file('120x100.png'))
     
-    image.processor.input_file.should == '/image.png'
+    image.processor.input_file.should == fixture_file('120x100.png')
     image.processor.class.should == Miso::Processor::ImageMagick
   end
   
   it "should initialize with a file and processor class" do
-    image = Miso::Image.new('/image.png', Miso::Processor::ImageMagick)
+    image = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor::ImageMagick)
     
-    image.processor.input_file.should == '/image.png'
+    image.processor.input_file.should == fixture_file('120x100.png')
     image.processor.class.should == Miso::Processor::ImageMagick
   end
 end
@@ -32,7 +32,7 @@ describe "An instance of Miso::Image, concerning forwarding calls to the process
     Miso::Processor.any_instance.stubs(:fit)
     Miso::Processor.any_instance.stubs(:crop)
     
-    @image = Miso::Image.new('/image.png', Miso::Processor)
+    @image = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor)
   end
   
   it "should forward #crop to the processor" do
@@ -58,10 +58,20 @@ describe "An instance of Miso::Image, concerning forwarding calls to the process
     @image.dimensions.should == [123, 456]
   end
   
+  it "should forward #width and #height to the processor and return the result" do
+    @image.processor.expects(:width).returns(123)
+    @image.width.should == 123
+  end
+  
+  it "should forward #height to the processor and return the result" do
+    @image.processor.expects(:height).returns(456)
+    @image.height.should == 456
+  end
+  
   it "should forward #write to the processor and forward its output file to the new instance of Miso::Image" do
-    @image.processor.expects(:write).with('/output_image.png')
-    output_image = @image.write('/output_image.png')
-    output_image.processor.input_file.should == '/output_image.png'
+    @image.processor.expects(:write).with(fixture_file('120x100.png'))
+    output_image = @image.write(fixture_file('120x100.png'))
+    output_image.processor.input_file.should == fixture_file('120x100.png')
   end
 end
 
@@ -70,7 +80,7 @@ describe "An instance of Miso::Image, concerning combined methods" do
     Miso::Processor.any_instance.stubs(:fit)
     Miso::Processor.any_instance.stubs(:crop)
     
-    @image = Miso::Image.new('/image.png', Miso::Processor)
+    @image = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor)
   end
   
   it "should call #fit to scale and preserve aspect ratio, then call #crop" do

data/spec/api/processor/core_image_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../../../start', __FILE__)
+
+begin
+  require 'osx/cocoa'
+  
+  describe "An instance of Miso::Processor::CoreImage" do
+    before do
+      @image_120_x_100 = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor::CoreImage)
+      @output_file = temp_file('temp.png')
+    end
+    
+    it "should crop to specified dimensions" do
+      @image_120_x_100.crop(40, 30).write(@output_file).dimensions.should == [40, 30]
+      @image_120_x_100.crop(40, 33).write(@output_file).dimensions.should == [40, 33]
+    end
+    
+    it "should fit to specified dimensions, conserving the original aspect ratio" do
+      @image_120_x_100.fit(40, 30).write(@output_file).dimensions.should == [36, 30]
+      @image_120_x_100.fit(40, 34).write(@output_file).dimensions.should == [40, 33]
+    end
+    
+    it "should return its dimensions" do
+      @image_120_x_100.dimensions.should == [120, 100]
+    end
+  end
+  
+rescue LoadError
+  warn "[!] Skipping Miso::Processor::CoreImage API spec."
+end

data/spec/api/processor_spec.rb

@@ -35,7 +35,15 @@ describe "Miso::Processor" do
     }.should.raise
   end
   
-  it "should initialize with an input file" do
-    Miso::Processor.new('/image.png').input_file.should == '/image.png'
+  it "should initialize with an input file path" do
+    processor = Miso::Processor.new(fixture_file('120x100.png'))
+    processor.input_file.should == fixture_file('120x100.png')
+  end
+  
+  it "should returns the width and height" do
+    processor = Miso::Processor.new(fixture_file('120x100.png'))
+    processor.stubs(:dimensions).returns([120, 100])
+    processor.width.should == 120
+    processor.height.should == 100
   end
 end

data/spec/functional/processor/core_image_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../../../start', __FILE__)
+
+begin
+  require 'osx/cocoa'
+  
+  describe "Miso::Processor::CoreImage" do
+    it "should check the load paths to see if RubyCocoa is available" do
+      Miso::Processor::CoreImage.should.be.available
+      with_load_path '/tmp', '~/' do
+        Miso::Processor::CoreImage.should.not.be.available
+      end
+    end
+    
+    it "should require osx/cocoa on initialization" do
+      Miso::Processor::CoreImage.any_instance.expects(:require).with('osx/cocoa')
+      Miso::Processor::CoreImage.new(fixture_file('120x100.png'))
+    end
+  end
+  
+  describe "An instance of Miso::Processor::CoreImage" do
+    it "should write the output file with the type inflected from the extension" do
+      { 'png' => 'PNG', 'jpg' => 'JPEG', 'gif' => 'GIF' }.each do |ext, type|
+        Miso::Image.crop(input, output(ext), 100, 100, processor)
+        file_info(output(ext)).should.include type
+      end
+    end
+    
+    it "should raise if it can't inflect the type from the extension" do
+      lambda {
+        Miso::Image.crop(input, output('foo'), 100, 100, processor)
+      }.should.raise Miso::UnsupportedFileType
+    end
+    
+    private
+    
+    def processor;   Miso::Processor::CoreImage  end
+    def input;       fixture_file('120x100.png') end
+    def output(ext); temp_file("temp.#{ext}")    end
+  end
+  
+rescue LoadError
+  warn "[!] Skipping Miso::Processor::CoreImage functional spec."
+end

data/spec/functional/processor_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../../start', __FILE__)
+
+describe "Miso::Processor" do
+  it "should expand and verify the input file path" do
+    raised = false
+    begin
+      Miso::Processor.new('~/image.png')
+    rescue Errno::ENOENT => e
+      raised = true
+      e.message.should.include File.expand_path('~/image.png')
+    end
+    raised.should.be true
+  end
+end