miso 0.3.3 → 0.4.0

data/lib/miso/factory.rb

@@ -44,6 +44,11 @@ module Miso
       self
     end
     
+    def auto_orient
+      @operations << [:auto_orient, []]
+      self
+    end
+    
     def apply(input_file, output_file)
       image = Image.new(input_file, @processor_class)
       @operations.each { |method, args| image.send(method, *args) }

data/lib/miso/image.rb

@@ -19,6 +19,11 @@ module Miso
       return self
     end
     
+    def auto_orient
+      @processor.auto_orient
+      return self
+    end
+    
     def dimensions
       @processor.dimensions
     end
@@ -52,6 +57,10 @@ module Miso
       new(input_file, processor_class).fit(width, height).write(output_file)
     end
     
+    def self.auto_orient(input_file, output_file, processor_class = nil)
+      new(input_file, processor_class).auto_orient.write(output_file)
+    end
+    
     def self.dimensions(input_file, processor_class = nil)
       new(input_file, processor_class).dimensions
     end

data/lib/miso/processor.rb

@@ -50,6 +50,10 @@ module Miso
       raise NotImplementedError, "The class `#{self.class.name}' does not implement #fit."
     end
     
+    def auto_orient
+      raise NotImplementedError, "The class `#{self.class.name}' does not implement #auto_orient."
+    end
+    
     def dimensions
       raise NotImplementedError, "The class `#{self.class.name}' does not implement #dimensions."
     end

data/lib/miso/processor/image_magick.rb

@@ -22,6 +22,10 @@ module Miso
         operations << "-resize #{width}x#{height}"
       end
       
+      def auto_orient
+        operations << "-auto-orient"
+      end
+      
       def dimensions
         if info = identify(input_file) and match = /\s(\d+)x(\d+)\+/.match(info)
           match.to_a[1..2].map { |d| d.to_i }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: miso
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2011-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,6 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - README
-- Rakefile
-- TODO
-- VERSION
 - lib/miso.rb
 - lib/miso/factory.rb
 - lib/miso/image.rb
@@ -60,24 +57,14 @@ files:
 - lib/miso/processor/core_image.rb
 - lib/miso/processor/graphics_magick.rb
 - lib/miso/processor/image_magick.rb
-- miso.gemspec
-- spec/api/factory_spec.rb
-- spec/api/image_spec.rb
-- spec/api/processor_spec.rb
-- spec/api/processors_spec.rb
-- spec/fixtures/120x100.png
-- spec/functional/processor/core_image_spec.rb
-- spec/functional/processor/graphics_magick_spec.rb
-- spec/functional/processor/image_magick_spec.rb
-- spec/functional/processor_spec.rb
-- spec/start.rb
+- TODO
 has_rdoc: true
 homepage: http://github.com/Fingertips/miso
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -101,17 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Miso is a unified API for simple image operations commonly used on the web.
-test_files: 
-- spec/api/factory_spec.rb
-- spec/api/image_spec.rb
-- spec/api/processor_spec.rb
-- spec/api/processors_spec.rb
-- spec/functional/processor/core_image_spec.rb
-- spec/functional/processor/graphics_magick_spec.rb
-- spec/functional/processor/image_magick_spec.rb
-- spec/functional/processor_spec.rb
-- spec/start.rb
+test_files: []
+

data/Rakefile

@@ -1,56 +0,0 @@
-require 'rubygems'
-require 'rake/rdoctask'
-
-desc "Run all specs by default"
-task :default => :spec
-
-namespace :spec do
-  desc "Run all API specs"
-  task :api do
-    Dir[File.dirname(__FILE__) + '/spec/api/**/*_spec.rb'].each do |file|
-      load file
-    end
-  end
-  
-  desc "Run all functional specs"
-  task :functional do
-    Dir[File.dirname(__FILE__) + '/spec/functional/*_spec.rb'].each do |file|
-      load file
-    end
-  end
-end
-
-desc "Run all specs"
-task :spec do
-  sh "ruby -r #{Dir.glob('spec/**/*_spec.rb').join(' -r ')} -e ''"
-end
-
-namespace :docs do
-  Rake::RDocTask.new(:generate) do |rd|
-    rd.main = "README"
-    rd.rdoc_files.include("README", "LICENSE", "lib/**/*.rb")
-    rd.options << "--all" << "--charset" << "utf-8"
-  end
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name     = "miso"
-    s.homepage = "http://github.com/Fingertips/miso"
-    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   -= %w{ .gitignore .kick }
-    s.add_dependency('executioner', '>= 0.3.0')
-  end
-rescue LoadError
-end
- 
-begin
-  require 'jewelry_portfolio/tasks'
-  JewelryPortfolio::Tasks.new do |p|
-    p.account = 'Fingertips'
-  end
-rescue LoadError
-end

data/VERSION

@@ -1 +0,0 @@
-0.3.3

data/miso.gemspec

@@ -1,75 +0,0 @@
-# Generated by jeweler
-# 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.3.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eloy Duran", "Manfred Stienstra"]
-  s.date = %q{2010-08-17}
-  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 = [
-    "LICENSE",
-     "README",
-     "TODO"
-  ]
-  s.files = [
-    "LICENSE",
-     "README",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "lib/miso.rb",
-     "lib/miso/factory.rb",
-     "lib/miso/image.rb",
-     "lib/miso/processor.rb",
-     "lib/miso/processor/core_image.rb",
-     "lib/miso/processor/graphics_magick.rb",
-     "lib/miso/processor/image_magick.rb",
-     "miso.gemspec",
-     "spec/api/factory_spec.rb",
-     "spec/api/image_spec.rb",
-     "spec/api/processor_spec.rb",
-     "spec/api/processors_spec.rb",
-     "spec/fixtures/120x100.png",
-     "spec/functional/processor/core_image_spec.rb",
-     "spec/functional/processor/graphics_magick_spec.rb",
-     "spec/functional/processor/image_magick_spec.rb",
-     "spec/functional/processor_spec.rb",
-     "spec/start.rb"
-  ]
-  s.homepage = %q{http://github.com/Fingertips/miso}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Miso is a unified API for simple image operations commonly used on the web.}
-  s.test_files = [
-    "spec/api/factory_spec.rb",
-     "spec/api/image_spec.rb",
-     "spec/api/processor_spec.rb",
-     "spec/api/processors_spec.rb",
-     "spec/functional/processor/core_image_spec.rb",
-     "spec/functional/processor/graphics_magick_spec.rb",
-     "spec/functional/processor/image_magick_spec.rb",
-     "spec/functional/processor_spec.rb",
-     "spec/start.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<executioner>, [">= 0.3.0"])
-    else
-      s.add_dependency(%q<executioner>, [">= 0.3.0"])
-    end
-  else
-    s.add_dependency(%q<executioner>, [">= 0.3.0"])
-  end
-end
-

data/spec/api/factory_spec.rb

@@ -1,31 +0,0 @@
-require File.expand_path('../../start', __FILE__)
-
-describe "A Miso::Factory instance" do
-  before do
-    Miso::Processor.processor_class = Miso::Processor
-    
-    Miso::Processor.any_instance.stubs(:write)
-    
-    @input_file  = fixture_file('120x100.png')
-    @output_file = '/output_image.png'
-    @image       = Miso::Image.new(@input_file)
-    
-    Miso::Image.stubs(:new).with(@input_file, Miso::Processor).returns(@image)
-    Miso::Image.stubs(:new).with(@output_file, Miso::Processor)
-    
-    @factory = Miso::Factory.new
-  end
-  
-  after do
-    Miso::Processor.processor_class = nil
-  end
-  
-  it "should store operations that are to be applied later on" do
-    @factory.crop(123, 456).fit(123, 456)
-    
-    @image.expects(:crop).with(123, 456)
-    @image.expects(:fit).with(123, 456)
-    
-    @factory.apply(@input_file, @output_file)
-  end
-end

data/spec/api/image_spec.rb

@@ -1,129 +0,0 @@
-require File.expand_path('../../start', __FILE__)
-
-describe "Miso::Image, concerning initialization" do
-  class FakeProcessor; end
-  
-  before do
-    Miso::Processor.processor_class = nil
-  end
-  
-  after do
-    Miso::Processor.processor_class = nil
-  end
-  
-  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(fixture_file('120x100.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(fixture_file('120x100.png'), Miso::Processor::ImageMagick)
-    
-    image.processor.input_file.should == fixture_file('120x100.png')
-    image.processor.class.should == Miso::Processor::ImageMagick
-  end
-end
-
-describe "An instance of Miso::Image, concerning forwarding calls to the processor" do
-  before do
-    Miso::Processor.any_instance.stubs(:fit)
-    Miso::Processor.any_instance.stubs(:crop)
-    
-    @image = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor)
-  end
-  
-  it "should forward #crop to the processor" do
-    @image.processor.expects(:crop).with(123, 456)
-    @image.crop(123, 456)
-  end
-  
-  it "should return self when calling #crop" do
-    @image.crop(123, 456).should.be @image
-  end
-  
-  it "should forward #fit to the processor" do
-    @image.processor.expects(:fit).with(123, 456)
-    @image.fit(123, 456)
-  end
-  
-  it "should return self instance when calling #fit" do
-    @image.fit(123, 456).should.be @image
-  end
-  
-  it "should forward #dimensions to the processor and return the result" do
-    @image.processor.expects(:dimensions).returns([123, 456])
-    @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(fixture_file('120x100.png'))
-    output_image = @image.write(fixture_file('120x100.png'))
-    output_image.processor.input_file.should == fixture_file('120x100.png')
-  end
-end
-
-describe "An instance of Miso::Image, concerning combined methods" do
-  before do
-    Miso::Processor.any_instance.stubs(:fit)
-    Miso::Processor.any_instance.stubs(:crop)
-    
-    @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
-    @image.expects(:fit).with(123, 456).returns(@image)
-    @image.expects(:crop).with(123, 456).returns(@image)
-    
-    @image.crop_fitting(123, 456)
-  end
-  
-  it "should return self when calling #crop_fitting" do
-    @image.crop_fitting(123, 456).should.be @image
-  end
-end
-
-describe "Miso::Image, concerning shortcut class methods" do
-  before do
-    @input_file = fixture_file('120x100.png')
-    @output_file = temp_file('cropped_to_40x30.png')
-    @image = Miso::Image.new(@input_file, Miso::Processor)
-    
-    Miso::Image.stubs(:new).with(@input_file, nil).returns(@image)
-  end
-  
-  it "should crop to specified dimensions" do
-    @image.expects(:crop).with(40, 30).returns(@image)
-    @image.expects(:write).with(@output_file)
-    
-    Miso::Image.crop(@input_file, @output_file, 40, 30)
-  end
-  
-  it "should fit to specified dimensions, conserving the original aspect ratio" do
-    @image.expects(:fit).with(40, 30).returns(@image)
-    @image.expects(:write).with(@output_file)
-    
-    Miso::Image.fit(@input_file, @output_file, 40, 30)
-  end
-  
-  it "should return its dimensions" do
-    @image.expects(:dimensions).returns([120, 100])
-    Miso::Image.dimensions(@input_file).should == [120, 100]
-  end
-  
-  it "should make a factory" do
-    Miso::Image.factory.should.be.a.kind_of(Miso::Factory)
-  end
-end

data/spec/api/processor_spec.rb

@@ -1,49 +0,0 @@
-require File.expand_path('../../start', __FILE__)
-
-describe "Miso::Processor" do
-  before do
-    Miso::Processor.processor_class = nil
-  end
-  
-  after do
-    Miso::Processor.processor_class = nil
-  end
-  
-  it "should assign the processor class to use" do
-    Miso::Processor.processor_class = Miso::Processor::ImageMagick
-    Miso::Processor.processor_class.should.be Miso::Processor::ImageMagick
-  end
-  
-  it "should find the first available processor class" do
-    Miso::Processor.processor_classes = [
-      stub(:available? => false),
-      stub(:available? => true),
-      stub(:available? => false)
-    ]
-    
-    Miso::Processor.processor_class.should.be Miso::Processor.processor_classes[1]
-  end
-  
-  it "should raise if no available processor class is found" do
-    Miso::Processor.processor_classes = [
-      stub(:available? => false),
-      stub(:available? => false)
-    ]
-    
-    lambda {
-      Miso::Processor.processor_class
-    }.should.raise
-  end
-  
-  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/api/processors_spec.rb

@@ -1,28 +0,0 @@
-require File.expand_path('../../start', __FILE__)
-
-Miso::Processor.processor_classes.each do |processor|
-  if processor.available?
-    describe "An instance of #{processor.name}" do
-      before do
-        @image_120_x_100 = Miso::Image.new(fixture_file('120x100.png'), processor)
-        @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
-  else
-    warn "[!] Skipping #{processor.name} api spec."
-  end
-end

data/spec/functional/processor/core_image_spec.rb

@@ -1,55 +0,0 @@
-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
-      ext_and_type = {
-        'png'  => 'PNG' ,
-        'jpg'  => 'JPEG',
-        'jpeg' => 'JPEG',
-        'gif'  => 'GIF' ,
-        'tif'  => 'TIFF',
-        'tiff' => 'TIFF',
-        'bmp'  => 'bitmap'
-      }
-
-      ext_and_type.each { |k, v| ext_and_type[k.upcase] = v }
-      
-      ext_and_type.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/graphics_magick_spec.rb

@@ -1,15 +0,0 @@
-require File.expand_path('../../../start', __FILE__)
-
-if Executioner::ClassMethods.find_executable('gm')
-  describe "Miso::Processor::GraphicsMagick" do
-    it "should check the load paths to see if GraphicsMagick is available" do
-      Miso::Processor::GraphicsMagick.should.be.available
-      
-      Miso::Processor::GraphicsMagick.stubs(:find_executable).returns(nil)
-      Miso::Processor::GraphicsMagick.should.not.be.available
-    end
-  end
-  
-else
-  warn "[!] Skipping Miso::Processor::GraphicsMagick functional spec."
-end

data/spec/functional/processor/image_magick_spec.rb

@@ -1,15 +0,0 @@
-require File.expand_path('../../../start', __FILE__)
-
-if Executioner::ClassMethods.find_executable('convert')
-  describe "Miso::Processor::ImageMagick" do
-    it "should check the load paths to see if ImageMagick is available" do
-      Miso::Processor::ImageMagick.should.be.available
-      
-      Miso::Processor::ImageMagick.stubs(:find_executable).returns(nil)
-      Miso::Processor::ImageMagick.should.not.be.available
-    end
-  end
-  
-else
-  warn "[!] Skipping Miso::Processor::ImageMagick functional spec."
-end

data/spec/functional/processor_spec.rb

@@ -1,14 +0,0 @@
-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

data/spec/start.rb

@@ -1,45 +0,0 @@
-require 'rubygems' rescue LoadError
-require 'test/spec'
-require 'mocha'
-
-require 'fileutils'
-
-$:.unshift(File.expand_path('../../lib', __FILE__))
-
-require 'miso'
-require 'miso/processor'
-require 'miso/processor/core_image'
-require 'miso/processor/image_magick'
-require 'miso/processor/graphics_magick'
-
-class Test::Unit::TestCase
-  TMP_DIR = File.expand_path('../tmp', __FILE__)
-  
-  def setup
-    FileUtils.mkdir_p(TMP_DIR)
-  end
-  
-  def teardown
-    FileUtils.rm_rf(TMP_DIR)
-  end
-  
-  def fixture_file(name)
-    File.expand_path("../fixtures/#{name}", __FILE__)
-  end
-  
-  def temp_file(filename)
-    File.join(TMP_DIR, filename)
-  end
-  
-  def with_load_path(*load_path)
-    before = $:.dup
-    $:.replace load_path
-    yield
-  ensure
-    $:.replace before
-  end
-  
-  def file_info(path)
-    `/usr/bin/env file '#{path}'`.split(':').last.strip
-  end
-end