airbrush 0.0.2 → 0.0.3

data/bin/airbrush-example-client

@@ -51,10 +51,30 @@ raise "Source image does not exist: #{OPTIONS[:image]}" unless File.exists?(OPTI
 require 'airbrush'
 
 client = Airbrush::Client.new(OPTIONS[:memcache])
-puts "Sending #{OPTIONS[:image]} for preview processing"
+puts "Sending #{OPTIONS[:image]} for processing"
+
+# previews..
 results = client.process('generate-previews', :previews, :image => File.read(OPTIONS[:image]), :filename => OPTIONS[:image], :sizes => {:small => [300], :large => [600]})
+
 results.each do |k,v|
-  next if k == :original
-  File.open("#{OPTIONS[:output]}-#{k}.jpg", 'w') { |f| f << v[:image] }
-  puts "Saved preview #{OPTIONS[:output]}-#{k}.jpg (#{v[:width]}x#{v[:height]})" if OPTIONS[:verbose]
-end
+   next if k == :original
+   puts v[:format].inspect
+   File.open("#{OPTIONS[:output]}-#{k}.jpg", 'w') { |f| f << v[:image] }
+   puts "Saved preview #{OPTIONS[:output]}-#{k}.jpg (#{v[:width]}x#{v[:height]})" if OPTIONS[:verbose]
+ end
+
+# Exif data..
+results = client.process('exif',:exif_data, :image => File.read(OPTIONS[:image]))
+puts results.inspect
+
+# resized_crop_mask..
+results = client.process('crop-and-resize', 
+                           :resized_crop_mask, 
+                           :image => File.read(OPTIONS[:image]), 
+                           :filename => OPTIONS[:image], 
+                           :crop => {:x => 0, :y => 0, :width => 800, :height => 800 },
+                           :size => { :width => 2890, :height => 1940 })
+
+File.open("#{OPTIONS[:output]}.jpg", 'w'){|f| f << results[:image] }
+puts "Saved resized image #{OPTIONS[:output]}.jpg" if OPTIONS[:verbose]
+

data/config/hoe.rb

@@ -1,8 +1,8 @@
 require 'airbrush/version'
 
-AUTHOR = 'FIXME full name'  # can also be an array of Authors
-EMAIL = "FIXME email"
-DESCRIPTION = "description of gem"
+AUTHOR = ['Marcus Crafter', 'Nick Marfleet']  # can also be an array of Authors
+EMAIL = "nick@whatevernext.org"
+DESCRIPTION = "Distributed image processing server."
 GEM_NAME = 'airbrush' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'airbrush' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
@@ -10,7 +10,7 @@ DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
-RUBYFORGE_USERNAME = "unknown"
+RUBYFORGE_USERNAME = "nickm"
 def rubyforge_username
   unless @config
     begin
@@ -59,7 +59,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [ [ 'starling', '>= 0.9.3' ], [ 'activesupport', '>= 2.0.2' ], [ 'ruby2ruby', '>= 1.1.8' ], [ 'daemons', '>= 1.0.9' ] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [ [ 'starling', '= 0.9.8' ], [ 'activesupport', '= 2.3.5' ], [ 'ruby2ruby', '= 1.2.1' ], [ 'daemons', '= 1.0.10' ] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/airbrush/processors/image/rmagick.rb

@@ -4,6 +4,9 @@ module Airbrush
   module Processors
     module Image
       class Rmagick < ImageProcessor
+        
+        VALID_OUTPUT_FORMATS = ['JPEG', 'PNG', 'JPG', 'GIF']
+        
         filter_params :image # ignore any argument called 'image' in any logging
 
         def resize(image, width, height = nil)
@@ -33,6 +36,18 @@ module Airbrush
           images[:original] = dimensions(image)
           images
         end
+        
+        def exif_data(image)
+          data = Magick::Image.from_blob(image).first.get_exif_by_entry
+          data.inject({}) { |m, exif_entry| m[exif_entry[0]] = exif_entry[1]; m }
+        end
+        
+        def resized_crop_mask(image, crop, size)
+          process image do
+            resize!(size[:width], size[:height])
+            crop!(crop[:x], crop[:y], crop[:width], crop[:height])
+          end
+        end
 
         protected
 
@@ -40,11 +55,16 @@ module Airbrush
             img = Magick::Image.from_blob(image).first
             img.instance_eval &block
             img.ensure_rgb!
-            img.format = 'JPEG' # ensure that resized output is a JPEG
+            img.format = get_format(image) # ensure that resized output is a JPEG
             {
-              :image => img.to_blob, :width => img.columns, :height => img.rows
+              :image => img.to_blob, :width => img.columns, :height => img.rows, :format => img.format
             }
           end
+          
+          def get_format(image_data)
+            current_format = Magick::Image.from_blob(image_data).first.format
+            VALID_OUTPUT_FORMATS.include?(current_format) ? current_format : 'JPEG'
+          end
 
           def dimensions(image_data)
             image = Magick::Image.from_blob(image_data).first
@@ -53,32 +73,19 @@ module Airbrush
 
           def calculate_dimensions(image_data, size)
             image = Magick::Image.from_blob(image_data).first
-            return image.columns, image.rows if clipping_required?(image, size)
+            return image.columns, image.rows unless clipping_required?(image, size)
 
             ratio = image.columns.to_f / image.rows.to_f
 
-            portrait image do
-              return [ size, size.to_f / ratio ]
-            end
-
-            landscape image do
-              return [ ratio * size, size ]
-            end
+            return [ size, size.to_f / ratio ] if ratio > 1 # landscape
+            
+            return [ ratio * size, size ] if ratio < 1      # Portrait
             
-            # Must be a square image.
-            return [ size, size ]
+            return [ size, size ]                           # Square
           end
 
           def clipping_required?(image, size)
-            size > image.columns or size > image.rows
-          end
-
-          def portrait(image, &block)
-            block.call if image.columns > image.rows
-          end
-
-          def landscape(image, &block)
-            block.call if image.columns < image.rows
+            (image.columns > size) || (image.rows > size)
           end
 
       end

data/lib/airbrush/version.rb

@@ -2,7 +2,7 @@ module Airbrush #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/airbrush/processors/image/rmagick_spec.rb

@@ -12,8 +12,10 @@ describe Airbrush::Processors::Image::Rmagick do
     @rm_image.stub!(:change_geometry).and_return
     @rm_image.stub!(:crop!).and_return
     @rm_image.stub!(:crop_resized!).and_return
+    @rm_image.stub!(:resize!).and_return
     @rm_image.stub!(:ensure_rgb!).and_return
     @rm_image.stub!(:to_blob).and_return(@blob)
+    @rm_image.stub!(:format).and_return('JPEG')
     @rm_image.stub!(:format=).and_return('JPEG')
     @rm_image.stub!(:columns).and_return(@columns)
     @rm_image.stub!(:rows).and_return(@rows)
@@ -47,7 +49,7 @@ describe Airbrush::Processors::Image::Rmagick do
 
     it 'should return the raw image data back to the caller' do
       @rm_image.should_receive(:to_blob).and_return('blob')
-      @processor.resize(@image, 300, 200).should == { :image => "blob", :height => 1000, :width => 1500 }
+      @processor.resize(@image, 300, 200).should == { :format => "JPEG", :image => "blob", :height => 1000, :width => 1500 }
     end
 
   end
@@ -70,7 +72,7 @@ describe Airbrush::Processors::Image::Rmagick do
 
     it 'should return the raw image data back to the caller' do
       @rm_image.should_receive(:to_blob).and_return('blob')
-      @processor.crop(@image, 10, 10, 100, 100).should == { :image => "blob", :height => 1000, :width => 1500 }
+      @processor.crop(@image, 10, 10, 100, 100).should == { :format => "JPEG", :image => "blob", :height => 1000, :width => 1500 }
     end
 
   end
@@ -93,7 +95,7 @@ describe Airbrush::Processors::Image::Rmagick do
 
     it 'should return the raw image data back to the caller' do
       @rm_image.should_receive(:to_blob).and_return('blob')
-      @processor.crop_resize(@image, 75, 75).should == { :image => "blob", :height => 1000, :width => 1500 }
+      @processor.crop_resize(@image, 75, 75).should == { :format => "JPEG", :image => "blob", :height => 1000, :width => 1500 }
     end
 
   end
@@ -107,10 +109,56 @@ describe Airbrush::Processors::Image::Rmagick do
 
     it 'should return the raw image data back to the caller' do
       @rm_image.should_receive(:to_blob).twice.and_return('blob')
-      @processor.previews(@image, { :small => [200,100], :large => [500,250] }).should == { :small=> { :image => "blob", :height => 1000, :width => 1500 }, :large=> { :image => "blob", :height => 1000, :width => 1500 }, :original => [1500, 1000] }
+      @processor.previews(@image, { :small => [200,100], :large => [500,250] }).should == {  :small=> { :format => "JPEG", :image => "blob", :height => 1000, :width => 1500 }, :large=> { :format => "JPEG", :image => "blob", :height => 1000, :width => 1500 }, :original => [1500, 1000] }
     end
 
   end
+  
+  describe 'crop_and_resize' do
+    
+    it 'should return an image with the specified sizes' do
+      @processor.resized_crop_mask(@image, {:x => 0, :y => 0, :width => 800, :height => 800 }, { :width => 2890, :height => 1940 }).should == {
+      	:format => "JPEG", :image => "blob", :width => 1500, :height => 1000}
+      
+    end
+    
+    it 'should return an image cropped to the crop marks' do
+      @rm_image.should_receive(:crop!).with(0,20,800,900).once
+      @processor.resized_crop_mask(@image, {:x => 0, :y => 20, :width => 800, :height => 900 }, { :width => 2890, :height => 1940 }).should == {
+      	:format => "JPEG", :image => "blob", :width => 1500, :height => 1000}
+    end 
+
+    it 'should return the raw image data back to the caller' do
+      @rm_image.should_receive(:resize!).with(2890,1940).once
+      @processor.resized_crop_mask(@image, {:x => 0, :y => 0, :width => 800, :height => 800 }, { :width => 2890, :height => 1940 }).should == {
+      	:format => "JPEG", :image => "blob", :width => 1500, :height => 1000}
+    end  
+  end
+  
+  describe "exif_data" do
+    it "should return a hash of exif data for the image" do
+      @rm_image.should_receive(:get_exif_by_entry).once.and_return([["Make", "Canon"], ["ShutterSpeedValue", "189/32"]])
+      @processor.exif_data(@image).should == { "Make" => "Canon", "ShutterSpeedValue" => "189/32" }
+    end
+  end
+   
+  describe "get_format" do
+	
+	Airbrush::Processors::Image::Rmagick::VALID_OUTPUT_FORMATS.each do |valid_format|
+	  	it "should not change the image format if it is a #{valid_format}" do
+			@rm_image.should_receive(:format).and_return(valid_format)
+			@processor.send(:get_format, @rm_image).should == valid_format
+		end
+	end
+
+	it "should change the format to JPEG if a non valid return format is found" do
+		['TIF', 'TIFF', 'PDF'].each do |bad_format|
+			@rm_image.should_receive(:format).and_return(bad_format)
+			@processor.send(:get_format, @rm_image).should == 'JPEG' 
+		end
+	end
+  end
+
 
   describe 'dimension calculation' do
 

metadata

@@ -1,69 +1,100 @@
 --- !ruby/object:Gem::Specification 
 name: airbrush
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
-- FIXME full name
+- Marcus Crafter
+- Nick Marfleet
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 +11:00
+date: 2010-05-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: starling
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.8
-    version: 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
-    version: 
-description: description of gem
-email: FIXME email
+        segments: 
+        - 1
+        - 8
+        - 0
+        version: 1.8.0
+  type: :development
+  version_requirements: *id005
+description: Distributed image processing server.
+email: nick@whatevernext.org
 executables: 
 - airbrush
 - airbrush-example-client
@@ -132,6 +163,8 @@ files:
 - website/template.rhtml
 has_rdoc: true
 homepage: http://airbrush.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -139,23 +172,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: airbrush
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: description of gem
+specification_version: 3
+summary: Distributed image processing server.
 test_files: []