dragonfly 0.9.15 → 1.0

data/spec/dragonfly/image_magick/analyser_spec.rb

@@ -1,73 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Analyser do
-
-  before(:each) do
-    @image = Dragonfly::TempObject.new(SAMPLES_DIR.join('beach.png'))
-    @analyser = Dragonfly::ImageMagick::Analyser.new
-  end
-
-  it "should return the width" do
-    @analyser.width(@image).should == 280
-  end
-
-  it "should return the height" do
-    @analyser.height(@image).should == 355
-  end
-
-  it "should return the aspect ratio" do
-    @analyser.aspect_ratio(@image).should == (280.0/355.0)
-  end
-
-  it "should say if it's portrait" do
-    @analyser.portrait?(@image).should be_true
-  end
-
-  it "should say if it's landscape" do
-    @analyser.landscape?(@image).should be_false
-  end
-
-  it "should return the number of colours" do
-    @analyser.number_of_colours(@image).should == 34703
-  end
-
-  it "should return the depth" do
-    @analyser.depth(@image).should == 8
-  end
-
-  it "should return the format" do
-    @analyser.format(@image).should == :png
-  end
-
-  %w(width height aspect_ratio number_of_colours depth format portrait? landscape?).each do |meth|
-    it "should throw unable_to_handle in #{meth.inspect} if it's not an image file" do
-      suppressing_stderr do
-        temp_object = Dragonfly::TempObject.new('blah')
-        lambda{
-          @analyser.send(meth, temp_object)
-        }.should throw_symbol(:unable_to_handle)
-      end
-    end
-  end
-
-  it "should say if it's an image" do
-    @analyser.image?(@image).should == true
-  end
-
-  it "should say if it's not an image" do
-    suppressing_stderr do
-      @analyser.image?(Dragonfly::TempObject.new('blah')).should == false
-    end
-  end
-
-  it "should work for images with spaces in the filename" do
-    image = Dragonfly::TempObject.new(SAMPLES_DIR.join('white pixel.png'))
-    @analyser.width(image).should == 1
-  end
-
-  it "should work (width) for images with capital letter extensions" do
-    image = Dragonfly::TempObject.new(SAMPLES_DIR.join('DSC02119.JPG'))
-    @analyser.width(image).should == 1
-  end
-
-end

data/spec/dragonfly/image_magick/encoder_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Encoder do
-
-  before(:all) do
-    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355, 135KB
-    @image = Dragonfly::TempObject.new(File.new(sample_file))
-    @encoder = Dragonfly::ImageMagick::Encoder.new
-  end
-
-  describe "#encode" do
-
-    it "should encode the image to the correct format" do
-      image = @encoder.encode(@image, :gif)
-      image.should have_format('gif')
-    end
-
-    it "should work with a string argument" do
-      image = @encoder.encode(@image, 'gif')
-      image.should have_format('gif')
-    end
-
-    it "should throw :unable_to_handle if the format is not handleable" do
-      lambda{
-        @encoder.encode(@image, :goofy)
-      }.should throw_symbol(:unable_to_handle)
-    end
-
-    it "should do nothing if the image is already in the correct format" do
-      image = @encoder.encode(@image, :png)
-      image.should == @image
-    end
-
-    it "should allow for extra args" do
-      image = @encoder.encode(@image, :jpg, '-quality 1')
-      image.should have_format('jpeg')
-      image.should have_size('1.45KB')
-    end
-
-    it "should still work even if the image is already in the correct format and args are given" do
-      image = @encoder.encode(@image, :png, '-quality 1')
-      image.should_not == @image
-    end
-  end
-
-end

data/spec/dragonfly/image_magick/generator_spec.rb

@@ -1,178 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Generator do
-
-  before(:each) do
-    @generator = Dragonfly::ImageMagick::Generator.new
-  end
-
-  describe "plain" do
-    describe "of given dimensions and colour" do
-      before(:each) do
-        @image, @meta = @generator.plain(23,12,'white')
-      end
-      it {@image.should have_width(23)}
-      it {@image.should have_height(12)}
-      it {@image.should have_format('png')}
-      it {@meta.should == {:format => :png, :name => 'plain.png'}}
-    end
-
-    it "should cope with colour name format" do
-      image, meta = @generator.plain(1, 1, 'red')
-      image.should have_width(1)
-    end
-
-    it "should cope with rgb format" do
-      image, meta = @generator.plain(1, 1, 'rgb(244,255,1)')
-      image.should have_width(1)
-    end
-
-    it "should cope with rgb percent format" do
-      image, meta = @generator.plain(1, 1, 'rgb(100%,50%,20%)')
-      image.should have_width(1)
-    end
-
-    it "should cope with hex format" do
-      image, meta = @generator.plain(1, 1, '#fdafda')
-      image.should have_width(1)
-    end
-
-    it "should cope with uppercase hex format" do
-      image, meta = @generator.plain(1, 1, '#FDAFDA')
-      image.should have_width(1)
-    end
-
-    it "should cope with shortened hex format" do
-      image, meta = @generator.plain(1, 1, '#fda')
-      image.should have_width(1)
-    end
-
-    it "should cope with 'transparent'" do
-      image, meta = @generator.plain(1, 1, 'transparent')
-      image.should have_width(1)
-    end
-
-    it "should cope with rgba format" do
-      image, meta = @generator.plain(1, 1, 'rgba(25,100,255,0.5)')
-      image.should have_width(1)
-    end
-
-    it "should cope with hsl format" do
-      image, meta = @generator.plain(1, 1, 'hsl(25,100,255)')
-      image.should have_width(1)
-    end
-
-    describe "specifying the format" do
-      before(:each) do
-        @image, @meta = @generator.plain(23, 12, 'white', :format => :gif)
-      end
-      it {@image.should have_format('gif')}
-      it {@meta.should == {:format => :gif, :name => 'plain.gif'}}
-    end
-
-    it "works with string args" do
-      image, meta = @generator.plain(1, 1, 'white', 'format' => 'gif')
-      image.should have_format('gif')
-    end
-  end
-
-  describe "plasma" do
-    describe "of given dimensions" do
-      before(:each) do
-        @image, @meta = @generator.plasma(23,12)
-      end
-      it {@image.should have_width(23)}
-      it {@image.should have_height(12)}
-      it {@image.should have_format('png')}
-      it {@meta.should == {:format => :png, :name => 'plasma.png'}}
-    end
-
-    describe "specifying the format" do
-      before(:each) do
-        @image, @meta = @generator.plasma(23, 12, :gif)
-      end
-      it {@image.should have_format('gif')}
-      it {@meta.should == {:format => :gif, :name => 'plasma.gif'}}
-    end
-
-    it "works with string args" do
-      image, meta = @generator.plasma(1, 1, 'gif')
-      image.should have_format('gif')
-    end
-  end
-
-  describe "text" do
-    before(:each) do
-      @text = "mmm"
-    end
-
-    describe "creating a text image" do
-      before(:each) do
-        @image, @meta = @generator.text(@text, :font_size => 12)
-      end
-      it {@image.should have_width(20..40)} # approximate
-      it {@image.should have_height(10..20)}
-      it {@image.should have_format('png')}
-      it {@meta.should == {:format => :png, :name => 'text.png'}}
-    end
-
-    describe "specifying the format" do
-      before(:each) do
-        @image, @meta = @generator.text(@text, :format => :gif)
-      end
-      it {@image.should have_format('gif')}
-      it {@meta.should == {:format => :gif, :name => 'text.gif'}}
-    end
-
-    describe "padding" do
-      before(:each) do
-        no_padding_text, meta = @generator.text(@text, :font_size => 12)
-        @width = image_properties(no_padding_text)[:width].to_i
-        @height = image_properties(no_padding_text)[:height].to_i
-      end
-      it "1 number shortcut" do
-        image, meta = @generator.text(@text, :padding => '10')
-        image.should have_width(@width + 20)
-        image.should have_height(@height + 20)
-      end
-      it "2 numbers shortcut" do
-        image, meta = @generator.text(@text, :padding => '10 5')
-        image.should have_width(@width + 10)
-        image.should have_height(@height + 20)
-      end
-      it "3 numbers shortcut" do
-        image, meta = @generator.text(@text, :padding => '10 5 8')
-        image.should have_width(@width + 10)
-        image.should have_height(@height + 18)
-      end
-      it "4 numbers shortcut" do
-        image, meta = @generator.text(@text, :padding => '1 2 3 4')
-        image.should have_width(@width + 6)
-        image.should have_height(@height + 4)
-      end
-      it "should override the general padding declaration with the specific one (e.g. 'padding-left')" do
-        image, meta = @generator.text(@text, :padding => '10', 'padding-left' => 9)
-        image.should have_width(@width + 19)
-        image.should have_height(@height + 20)
-      end
-      it "should ignore 'px' suffixes" do
-        image, meta = @generator.text(@text, :padding => '1px 2px 3px 4px')
-        image.should have_width(@width + 6)
-        image.should have_height(@height + 4)
-      end
-      it "bad padding string" do
-        lambda{
-          @generator.text(@text, :padding => '1 2 3 4 5')
-        }.should raise_error(ArgumentError)
-      end
-
-      it "works with string args" do
-        image, meta = @generator.text(@text, 'format' => 'gif', 'padding' => '10')
-        image.should have_format('gif')
-        image.should have_width(@width + 20)
-      end
-    end
-
-  end
-
-end

data/spec/dragonfly/image_magick/processor_spec.rb

@@ -1,293 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Processor do
-
-  before(:each) do
-    @image = Dragonfly::TempObject.new(SAMPLES_DIR.join('beach.png')) # 280x355
-    @processor = Dragonfly::ImageMagick::Processor.new
-  end
-
-  describe "resize" do
-
-    it "should work correctly with xNN" do
-      image = @processor.resize(@image, 'x30')
-      image.should have_width(24)
-      image.should have_height(30)
-    end
-
-    it "should work correctly with NNx" do
-      image = @processor.resize(@image, '30x')
-      image.should have_width(30)
-      image.should have_height(38)
-    end
-
-    it "should work correctly with NNxNN" do
-      image = @processor.resize(@image, '30x30')
-      image.should have_width(24)
-      image.should have_height(30)
-    end
-
-    it "should work correctly with NNxNN!" do
-      image = @processor.resize(@image, '30x30!')
-      image.should have_width(30)
-      image.should have_height(30)
-    end
-
-    it "should work correctly with NNxNN%" do
-      image = @processor.resize(@image, '25x50%')
-      image.should have_width(70)
-      image.should have_height(178)
-    end
-
-    describe "NNxNN>" do
-
-      it "should not resize if the image is smaller than specified" do
-        image = @processor.resize(@image, '1000x1000>')
-        image.should have_width(280)
-        image.should have_height(355)
-      end
-
-      it "should resize if the image is larger than specified" do
-        image = @processor.resize(@image, '30x30>')
-        image.should have_width(24)
-        image.should have_height(30)
-      end
-
-    end
-
-    describe "NNxNN<" do
-
-      it "should not resize if the image is larger than specified" do
-        image = @processor.resize(@image, '10x10<')
-        image.should have_width(280)
-        image.should have_height(355)
-      end
-
-      it "should resize if the image is smaller than specified" do
-        image = @processor.resize(@image, '400x400<')
-        image.should have_width(315)
-        image.should have_height(400)
-      end
-
-    end
-
-  end
-
-  describe "crop" do # Difficult to test here other than dimensions
-
-    it "should not crop if no args given" do
-      image = @processor.crop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-
-    it "should crop using the offset given" do
-      image = @processor.crop(@image, 'x' => '7', 'y' => '12')
-      image.should have_width(273)
-      image.should have_height(343)
-    end
-
-    it "should crop using the dimensions given" do
-      image = @processor.crop(@image, 'width' => '10', 'height' => '20')
-      image.should have_width(10)
-      image.should have_height(20)
-    end
-
-    it "should crop in one dimension if given" do
-      image = @processor.crop(@image, 'width' => '10')
-      image.should have_width(10)
-      image.should have_height(355)
-    end
-
-    it "should take into account the gravity given" do
-      image1 = @processor.crop(@image, 'width' => '10', 'height' => '10', 'gravity' => 'nw')
-      image2 = @processor.crop(@image, 'width' => '10', 'height' => '10', 'gravity' => 'se')
-      image1.should_not equal_image(image2)
-    end
-
-    it "should clip bits of the image outside of the requested crop area when not nw gravity" do
-      # Rmagick was previously throwing an error when the cropping area was outside the image size, when
-      # using a gravity other than nw
-      image = @processor.crop(@image, 'width' => '500', 'height' => '1000', 'x' => '100', 'y' => '200', 'gravity' => 'se')
-      image.should have_width(180)
-      image.should have_height(155)
-    end
-
-    it "should crop twice in a row correctly" do
-      image1 = @processor.crop(@image,  'x' => '10', 'y' => '10', 'width' => '100', 'height' => '100')
-      image2 = @processor.crop(Dragonfly::TempObject.new(image1), 'x' => '0' , 'y' => '0' , 'width' => '50' , 'height' => '50' )
-      image2.should have_width(50)
-      image2.should have_height(50)
-    end
-
-    it "should crop twice in a row while consciously keeping page geometry" do
-      # see http://www.imagemagick.org/Usage/crop/#crop_page
-      # it explains how cropping multiple times without resetting geometry behaves
-      image1 = @processor.crop(@image,  'x' => '10', 'y' => '10', 'width' => '100', 'height' => '100', 'repage' => false)
-      image2 = @processor.crop(Dragonfly::TempObject.new(image1), 'x' => '0' , 'y' => '0' , 'width' => '50' , 'height' => '50')
-      image2.should have_width(40)
-      image2.should have_height(40)
-    end
-
-  end
-
-  describe "greyscale" do
-    it "should not raise an error" do
-      # Bit tricky to test
-      @processor.greyscale(@image)
-    end
-  end
-
-  describe "resize_and_crop" do
-
-    it "should do nothing if no args given" do
-      image = @processor.resize_and_crop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-
-    it "should do nothing if called without width and height" do
-      image = @processor.resize_and_crop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-      image.should eq @image
-    end
-
-    it "should crop to the correct dimensions" do
-      image = @processor.resize_and_crop(@image, 'width' => '100', 'height' => '100')
-      image.should have_width(100)
-      image.should have_height(100)
-    end
-
-    it "should actually resize before cropping" do
-      image1 = @processor.resize_and_crop(@image, 'width' => '100', 'height' => '100')
-      image2 = @processor.crop(@image, 'width' => '100', 'height' => '100', 'gravity' => 'c')
-      image1.should_not equal_image(image2)
-    end
-
-    it "should allow cropping in one dimension" do
-      image = @processor.resize_and_crop(@image, 'width' => '100')
-      image.should have_width(100)
-      image.should have_height(355)
-    end
-
-    it "should take into account the gravity given" do
-      image1 = @processor.resize_and_crop(@image, 'width' => '10', 'height' => '10', 'gravity' => 'nw')
-      image2 = @processor.resize_and_crop(@image, 'width' => '10', 'height' => '10', 'gravity' => 'se')
-      image1.should_not equal_image(image2)
-    end
-
-  end
-
-  describe "rotate" do
-
-    it "should rotate by 90 degrees" do
-      image = @processor.rotate(@image, 90)
-      image.should have_width(355)
-      image.should have_height(280)
-    end
-
-    it "should not rotate given a larger height and the '>' qualifier" do
-      image = @processor.rotate(@image, 90, 'qualifier' => '>')
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-
-    it "should rotate given a larger height and the '<' qualifier" do
-      image = @processor.rotate(@image, 90, 'qualifier' => '<')
-      image.should have_width(355)
-      image.should have_height(280)
-    end
-
-  end
-
-  describe "strip" do
-    it "should strip exif data" do
-      jpg = Dragonfly::TempObject.new(Pathname.new(File.dirname(__FILE__) + '/../../../samples/taj.jpg'))
-      image = @processor.strip(jpg)
-      image.should have_width(300)
-      image.should have_height(300)
-      image.size.should < jpg.size
-    end
-  end
-
-  describe "thumb" do
-    it "should call resize if the correct string given" do
-      @processor.should_receive(:resize).with(@image, '30x40').and_return(image = mock)
-      @processor.thumb(@image, '30x40').should == image
-    end
-    it "should call resize_and_crop if the correct string given" do
-      @processor.should_receive(:resize_and_crop).with(@image, 'width' => '30', 'height' => '40', 'gravity' => 'se').and_return(image = mock)
-      @processor.thumb(@image, '30x40#se').should == image
-    end
-    it "should call crop if x and y given" do
-      @processor.should_receive(:crop).with(@image, 'width' => '30', 'height' => '40', 'x' => '+10', 'y' => '+20', 'gravity' => nil).and_return(image = mock)
-      @processor.thumb(@image, '30x40+10+20').should == image
-    end
-    it "should call crop if just gravity given" do
-      @processor.should_receive(:crop).with(@image, 'width' => '30', 'height' => '40', 'x' => nil, 'y' => nil, 'gravity' => 'sw').and_return(image = mock)
-      @processor.thumb(@image, '30x40sw').should == image
-    end
-    it "should call crop if x, y and gravity given" do
-      @processor.should_receive(:crop).with(@image, 'width' => '30', 'height' => '40', 'x' => '-10', 'y' => '-20', 'gravity' => 'se').and_return(image = mock)
-      @processor.thumb(@image, '30x40-10-20se').should == image
-    end
-    it "should raise an argument error if an unrecognized string is given" do
-      lambda{ @processor.thumb(@image, '30x40#ne!') }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe "auto-orient" do
-    it "should rotate an image according to exif information" do
-      @image = Dragonfly::TempObject.new(SAMPLES_DIR.join('beach.jpg'))
-      @image.should have_width(355)
-      @image.should have_height(280)
-      image = @processor.auto_orient(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-  end
-
-  describe "flip" do
-    it "should flip the image, leaving the same dimensions" do
-      image = @processor.flip(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-  end
-
-  describe "flop" do
-    it "should flop the image, leaving the same dimensions" do
-      image = @processor.flop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-  end
-
-  describe "convert" do
-    it "should allow for general convert commands" do
-      image = @processor.convert(@image, '-scale 56x71')
-      image.should have_width(56)
-      image.should have_height(71)
-    end
-
-    it "should allow for general convert commands with added format" do
-      image, extra = @processor.convert(@image, '-scale 56x71', 'gif')
-      image.should have_width(56)
-      image.should have_height(71)
-      image.should have_format('gif')
-      extra[:format].should == :gif
-    end
-
-    it "should work for commands with parenthesis" do
-      image = @processor.convert(@image, "\\( +clone -sparse-color Barycentric '0,0 black 0,%[fx:h-1] white' -function polynomial 2,-2,0.5 \\) -compose Blur -set option:compose:args 15 -composite")
-      image.should have_width(280)
-    end
-
-    it "should work for files with spaces in the name" do
-      image = Dragonfly::TempObject.new(SAMPLES_DIR.join('white pixel.png'))
-      @processor.convert(image, "-resize 2x2!").should have_width(2)
-    end
-  end
-
-end