@@ -46,7 +46,7 @@ module Airbrush } end - def dimensions(image) + def dimensions(image_data) image = Magick::Image.from_blob(image_data).first return image.columns, image.rows end lib/airbrush/processors/image/rmagick.rb @@ -47,7 +47,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 == 'blob' + @processor.resize(@image, 300, 200).should == { :image => "blob", :height => 1000, :width => 1500 } end end @@ -70,7 +70,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 == 'blob' + @processor.crop(@image, 10, 10, 100, 100).should == { :image => "blob", :height => 1000, :width => 1500 } end end @@ -93,7 +93,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 == 'blob' + @processor.crop_resize(@image, 75, 75).should == { :image => "blob", :height => 1000, :width => 1500 } end end @@ -107,7 +107,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).twice.and_return('blob') - @processor.previews(@image, { :small => [200,100], :large => [500,250] }).should == { :small => 'blob', :large => '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] } end end spec/airbrush/processors/image/rmagick_spec.rb 493608f58cb4aa4c9c3aab8013f9a484a8b07708 Marcus Crafter crafterm@redartisan.com http://github.com/square-circle-triangle/airbrush/commit/525a02eddcc4de18e52096a619aa5e0ea8742ae2 525a02eddcc4de18e52096a619aa5e0ea8742ae2 2008-07-07T21:36:03-07:00 2008-07-07T21:36:03-07:00 Fix remaining rmagick processor specs following updates to include image sizes and original image size in remote processed commands git-svn-id: svn://svn.sct.com.au/image_server/trunk@105 daa9635f-4444-0410-9b3d-b8c75a019348 9f9f44a58270a383b7805cc2dd89524e1a29f3be Marcus Crafter crafterm@redartisan.com