dragonfly 0.7.7 → 0.8.0

data/spec/dragonfly/generation/image_magick_generator_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'dragonfly/generation/shared_generator_spec'
+
+describe Dragonfly::Generation::ImageMagickGenerator do
+
+  before(:each) do
+    @generator = Dragonfly::Generation::ImageMagickGenerator.new
+  end
+
+  it_should_behave_like 'image generator'
+
+end

data/spec/dragonfly/generation/r_magick_generator_spec.rb

@@ -1,135 +1,24 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
+require 'dragonfly/generation/shared_generator_spec'
 
 describe Dragonfly::Generation::RMagickGenerator do
 
-  describe "plasma" do
-    before(:each) do
-      @generator = Dragonfly::Generation::RMagickGenerator.new
-    end
-
-    describe "generating an image with the given dimensions" do
-      before(:each) do
-        @image, @extra = @generator.plasma(23,12)
-      end
-      it {@image.should have_width(23)}
-      it {@image.should have_height(12)}
-      it {@image.should have_format('png')}
-      it {@extra.should == {:format => :png, :name => 'plasma.png'}}
-    end
-
-    describe "specifying the format" do
-      before(:each) do
-        @image, @extra = @generator.plasma(23, 12, :gif)
-      end
-      it {@image.should have_format('gif')}
-      it {@extra.should == {:format => :gif, :name => 'plasma.gif'}}
-    end
-
-    describe "when not using the filesystem" do
-      it "should still work" do
-        @generator.use_filesystem = false
-        image, extra = @generator.plasma(4, 6)
-        image.should have_width(4)
-      end
-    end
+  before(:each) do
+    @generator = Dragonfly::Generation::RMagickGenerator.new
   end
 
-  describe "text" do
+  describe "when using the filesystem" do
     before(:each) do
-      @generator = Dragonfly::Generation::RMagickGenerator.new
-      @text = "mmm"
-    end
-
-    describe "creating a text image" do
-      before(:each) do
-        @image, @extra = @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 {@extra.should == {:format => :png, :name => 'text.png'}}
-    end
-
-    describe "specifying the format" do
-      before(:each) do
-        @image, @extra = @generator.text(@text, :format => :gif)
-      end
-      it {@image.should have_format('gif')}
-      it {@extra.should == {:format => :gif, :name => 'text.gif'}}
-    end
-
-    describe "when not using the filesystem" do
-      it "should still work" do
-        @generator.use_filesystem = false
-        image, extra = @generator.text(@text, :font_size => 12)
-        image.should have_width(20..40)
-      end
-    end
-
-    # it "should ignore percent characters used by rmagick"
-
-    describe "padding" do
-      before(:each) do
-        no_padding_text, extra = @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, extra = @generator.text(@text, :padding => '10')
-        image.should have_width(@width + 20)
-        image.should have_height(@height + 20)
-      end
-      it "2 numbers shortcut" do
-        image, extra = @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, extra = @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, extra = @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, extra = @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, extra = @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
+      @generator.use_filesystem = true
     end
+    it_should_behave_like 'image generator'
   end
-
-  describe Dragonfly::Generation::RMagickGenerator::HashWithCssStyleKeys do
+  
+  describe "when not using the filesystem" do
     before(:each) do
-      @hash = Dragonfly::Generation::RMagickGenerator::HashWithCssStyleKeys[
-        :font_style => 'normal',
-        :'font-weight' => 'bold',
-        'font_colour' => 'white',
-        'font-size' => 23,
-        :hello => 'there'
-      ]
-    end
-    describe "accessing using underscore symbol style" do
-      it{ @hash[:font_style].should == 'normal' }
-      it{ @hash[:font_weight].should == 'bold' }
-      it{ @hash[:font_colour].should == 'white' }
-      it{ @hash[:font_size].should == 23 }
-      it{ @hash[:hello].should == 'there' }
-      it{ @hash[:non_existent_key].should be_nil }
+      @generator.use_filesystem = false
     end
+    it_should_behave_like 'image generator'
   end
-
+  
 end

data/spec/dragonfly/generation/shared_generator_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+# Needs: @generator
+describe "image generator", :shared => true do
+  
+  describe "generating an image with the given dimensions" do
+    before(:each) do
+      @image, @extra = @generator.plasma(23,12)
+    end
+    it {@image.should have_width(23)}
+    it {@image.should have_height(12)}
+    it {@image.should have_format('png')}
+    it {@extra.should == {:format => :png, :name => 'plasma.png'}}
+  end
+
+  describe "specifying the format" do
+    before(:each) do
+      @image, @extra = @generator.plasma(23, 12, :gif)
+    end
+    it {@image.should have_format('gif')}
+    it {@extra.should == {:format => :gif, :name => 'plasma.gif'}}
+  end
+
+  describe "text" do
+    before(:each) do
+      @text = "mmm"
+    end
+
+    describe "creating a text image" do
+      before(:each) do
+        @image, @extra = @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 {@extra.should == {:format => :png, :name => 'text.png'}}
+    end
+
+    describe "specifying the format" do
+      before(:each) do
+        @image, @extra = @generator.text(@text, :format => :gif)
+      end
+      it {@image.should have_format('gif')}
+      it {@extra.should == {:format => :gif, :name => 'text.gif'}}
+    end
+
+    describe "padding" do
+      before(:each) do
+        no_padding_text, extra = @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, extra = @generator.text(@text, :padding => '10')
+        image.should have_width(@width + 20)
+        image.should have_height(@height + 20)
+      end
+      it "2 numbers shortcut" do
+        image, extra = @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, extra = @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, extra = @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, extra = @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, extra = @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
+    end
+  end
+
+end

data/spec/dragonfly/image_magick_utils_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Dragonfly::ImageMagickUtils do
+
+  before(:each) do
+    @obj = Object.new
+    @obj.extend(Dragonfly::ImageMagickUtils)
+  end
+  
+  it "should raise an error if the identify command isn't found" do
+    lambda{
+      @obj.send(:run, "non-existent-command")
+    }.should raise_error(Dragonfly::ImageMagickUtils::ShellCommandFailed)
+  end
+
+end

data/spec/dragonfly/processing/image_magick_processor_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'dragonfly/processing/shared_processing_spec'
+
+describe Dragonfly::Processing::ImageMagickProcessor do
+  
+  before(:each) do
+    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
+    @image = Dragonfly::TempObject.new(File.new(sample_file))
+    @processor = Dragonfly::Processing::ImageMagickProcessor.new
+  end
+
+  it_should_behave_like "processing methods"
+  
+  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
+  end
+  
+end

data/spec/dragonfly/processing/r_magick_processor_spec.rb

@@ -1,218 +1,8 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
+require 'dragonfly/processing/shared_processing_spec'
 
 describe Dragonfly::Processing::RMagickProcessor do
   
-  describe "processing methods", :shared => true do
-
-    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 == 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
-
-    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 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 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 == 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 "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 "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
-
-  end
-
   before(:each) do
     sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
     @image = Dragonfly::TempObject.new(File.new(sample_file))