miso 0.2.4 → 0.3.0

data/README

@@ -7,8 +7,8 @@ to plug in your own backend.
 A unified API is helpful when you run your code on a number of different boxes
 and architectures. For instance, you could develop your web application on your
 Mac with the Core Image backend [1] and deploy to your Linux server with an
-ImageMagick backend. You could even have the API talk to your custom
-distributed image processing backend.
+ImageMagick/GraphicsMagick backend. You could even have the API talk to your
+custom distributed image processing backend.
 
 [1] Note how this means you will never have to install ImageMagick again (;
 
@@ -50,15 +50,20 @@ But wait, there is more! Read the API documentation for more goodies.
 
 : SUPPORTED BACKENDS
 
-Currently supported backends are: Core Image and ImageMagick, because those
-are the ones we use. If you want to contribute backends we're happy to
-accept patches!
+Currently supported backends are: Core Image, ImageMagick, and GraphicsMagick,
+because those are the ones we, and our contributors use. If you want to
+contribute backends we're happy to accept patches!
+
+
+: CONTRIBUTORS
+
+~> GraphicsMagick * Paul Vaillant (> http://github.com/pvaillant <)
 
 
 : ENDORSEMENTS
 
-  @garyyuen: ‘miso with indian flavors. seems ok.’
-  @Oracl: ‘@veganza I love miso! :)’
+   @garyyuen: ‘miso with indian flavors. seems ok.’
+      @Oracl: ‘@veganza I love miso! :)’
   @lehudgins: ‘ok fine. Miso totally does go kinda bad after a year.’
-  Wikipedia: ‘High in protein and rich in vitamins and minerals, miso played an
-              important nutritional role in feudal Japan.’
+   Wikipedia: ‘High in protein and rich in vitamins and minerals, miso played
+               an important nutritional role in feudal Japan.’

data/Rakefile

@@ -42,7 +42,7 @@ begin
     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.2.0')
+    s.add_dependency('executioner', '>= 0.3.0')
   end
 rescue LoadError
 end

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/miso/processor.rb

@@ -1,7 +1,8 @@
 module Miso
   class Processor
-    autoload :CoreImage,   'miso/processor/core_image'
-    autoload :ImageMagick, 'miso/processor/image_magick'
+    autoload :CoreImage,      'miso/processor/core_image'
+    autoload :GraphicsMagick, 'miso/processor/graphics_magick'
+    autoload :ImageMagick,    'miso/processor/image_magick'
     
     class << self
       # Sets the default processor class.
@@ -26,7 +27,7 @@ module Miso
       # When no explicit processor_class is set this list is iterated, from
       # first to last, and the first available processor on the machine is used.
       def processor_classes
-        @processor_classes ||= [CoreImage, ImageMagick]
+        @processor_classes ||= [CoreImage, GraphicsMagick, ImageMagick]
       end
       
       def available?
@@ -65,4 +66,4 @@ module Miso
       dimensions.last
     end
   end
-end
+end

data/lib/miso/processor/graphics_magick.rb

@@ -0,0 +1,20 @@
+module Miso
+  class Processor
+    class GraphicsMagick < ImageMagick
+      def self.available?
+        !find_executable('gm').nil?
+      end
+      
+      executable :gm
+      
+      def identify(input_file)
+        gm "identify '#{input_file}'"
+      end
+      
+      def convert(source_path, output_path, options)
+        ensure_output_directory(output_path)
+        gm "convert '#{source_path}' #{options} '#{output_path}'"
+      end
+    end
+  end
+end

data/lib/miso/processor/image_magick.rb

@@ -1,6 +1,6 @@
 begin
   require 'rubygems'
-  gem 'executioner', '>= 0.2'
+  gem 'executioner', '>= 0.3'
 rescue LoadError
 end
 require 'executioner'

data/miso.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{miso}
-  s.version = "0.2.4"
+  s.version = "0.3.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-12-10}
+  s.date = %q{2009-12-29}
   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 = [
@@ -27,15 +27,16 @@ Gem::Specification.new do |s|
      "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/core_image_spec.rb",
-     "spec/api/processor/image_magick_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"
@@ -48,10 +49,10 @@ 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/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"
@@ -70,4 +71,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<executioner>, [">= 0.2.0"])
   end
 end
-

data/spec/api/processors_spec.rb

@@ -0,0 +1,28 @@
+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/graphics_magick_spec.rb

@@ -0,0 +1,15 @@
+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/start.rb

@@ -10,6 +10,7 @@ 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__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miso
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +01:00
+date: 2009-12-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,15 +45,16 @@ files:
 - 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/core_image_spec.rb
-- spec/api/processor/image_magick_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
@@ -88,10 +89,10 @@ summary: Miso is a unified API for simple image operations commonly used on the
 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/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

data/spec/api/processor/core_image_spec.rb

@@ -1,29 +0,0 @@
-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/image_magick_spec.rb

@@ -1,22 +0,0 @@
-require File.expand_path('../../../start', __FILE__)
-
-describe "An instance of Miso::Processor::ImageMagick" do
-  before do
-    @image_120_x_100 = Miso::Image.new(fixture_file('120x100.png'), Miso::Processor::ImageMagick)
-    @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