dragonfly 0.8.6 → 0.9.0

data/spec/dragonfly/data_storage/{data_store_spec.rb → shared_data_store_examples.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
-describe "data_store", :shared => true do
+shared_examples_for "data_store" do
 
   # Using these shared spec requires you to set the inst var @data_store
 
@@ -26,32 +26,33 @@ describe "data_store", :shared => true do
 
   describe "retrieve" do
 
-    describe "without extra info" do
+    describe "without meta" do
       before(:each) do
         uid = @data_store.store(@temp_object)
-        @obj, @extra_info = @data_store.retrieve(uid)
+        @obj, @meta = @data_store.retrieve(uid)
       end
 
       it "should retrieve the stored data" do
         Dragonfly::TempObject.new(@obj).data.should == @temp_object.data
       end
+      
+      it "should return a meta hash (probably empty)" do
+        @meta.should be_a(Hash)
+      end
 
-      it { @extra_info[:name].should be_nil }
-      it { @extra_info[:meta].should be_a(Hash) }
     end
 
-    describe "when extra info is given" do
+    describe "when meta is given" do
       before(:each) do
-        temp_object = Dragonfly::TempObject.new('gollum',
-          :name => 'danny.boy',
-          :meta => {:bitrate => '35'}
-        )
-        @uid = @data_store.store(temp_object)
-        @obj, @extra_info = @data_store.retrieve(@uid)
+        temp_object = Dragonfly::TempObject.new('gollum')
+        @uid = @data_store.store(temp_object, :meta => {:bitrate => '35', :name => 'danny.boy'})
+        @obj, @meta = @data_store.retrieve(@uid)
       end
 
-      it { @extra_info[:name].should == 'danny.boy' }
-      it { @extra_info[:meta].should include_hash(:bitrate => '35') }
+      it "should return the stored meta" do
+        @meta[:bitrate].should == '35'
+        @meta[:name].should == 'danny.boy'
+      end
     end
 
     it "should raise an exception if the data doesn't exist" do

data/spec/dragonfly/function_manager_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
-Spec::Matchers.define :have_keys do |*keys|
+RSpec::Matchers.define :have_keys do |*keys|
   match do |given|
     given.keys.map{|sym| sym.to_s }.sort == keys.map{|sym| sym.to_s }.sort
   end

data/spec/dragonfly/{generation/hash_with_css_style_keys_spec.rb → hash_with_css_style_keys_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Dragonfly::Generation::HashWithCssStyleKeys do
+describe Dragonfly::HashWithCssStyleKeys do
   
   before(:each) do
-    @hash = Dragonfly::Generation::HashWithCssStyleKeys[
+    @hash = Dragonfly::HashWithCssStyleKeys[
       :font_style => 'normal',
       :'font-weight' => 'bold',
       'font_colour' => 'white',

data/spec/dragonfly/{analysis/shared_analyser_spec.rb → image_magick/analyser_spec.rb}

@@ -1,10 +1,13 @@
-# NEEDS:
-#
-# @image
-# @processor
-#
-describe "image analyser methods", :shared => true do
+require 'spec_helper'
+
+describe Dragonfly::ImageMagick::Analyser do
   
+  before(:each) do
+    image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
+    @image = Dragonfly::TempObject.new(File.new(image_path))
+    @analyser = Dragonfly::ImageMagick::Analyser.new
+  end
+
   it "should return the width" do
     @analyser.width(@image).should == 280
   end
@@ -48,4 +51,14 @@ describe "image analyser methods", :shared => true do
     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
+
 end

data/spec/dragonfly/{encoding/image_magick_encoder_spec.rb → image_magick/encoder_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Dragonfly::Encoding::ImageMagickEncoder do
+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::Encoding::ImageMagickEncoder.new
+    @encoder = Dragonfly::ImageMagick::Encoder.new
   end
   
   describe "#encode" do

data/spec/dragonfly/image_magick/generator_spec.rb

@@ -0,0 +1,172 @@
+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 format with whitespace" 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
+
+    it "should blow up with an invalid colour" do
+      lambda{
+        @generator.plain(1,1,'rgb(doogie)')
+      }.should_not raise_error()
+    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
+  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
+  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
+    end
+  end
+
+end

data/spec/dragonfly/{processing/shared_processing_spec.rb → image_magick/processor_spec.rb}

@@ -1,9 +1,12 @@
-# NEEDS:
-#
-# @image
-# @processor
-#
-describe "processing methods", :shared => true do
+require 'spec_helper'
+
+describe Dragonfly::ImageMagick::Processor do
+  
+  before(:each) do
+    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
+    @image = Dragonfly::TempObject.new(File.new(sample_file))
+    @processor = Dragonfly::ImageMagick::Processor.new
+  end
 
   describe "resize" do
 
@@ -110,6 +113,22 @@ describe "processing methods", :shared => true do
       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
 
@@ -170,6 +189,16 @@ describe "processing methods", :shared => true do
 
   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)
@@ -211,5 +240,25 @@ describe "processing methods", :shared => true do
       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
+  end
+  
 end

data/spec/dragonfly/image_magick/utils_spec.rb

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

data/spec/dragonfly/job_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Dragonfly::JobBuilder do
 

data/spec/dragonfly/job_definitions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Dragonfly::JobDefinitions do
 

data/spec/dragonfly/job_endpoint_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 ## General tests for Response go here as it's a pretty simple wrapper around that
 
@@ -7,7 +7,7 @@ describe "Dragonfly::JobEndpoint Rack::Lint tests" do
   before(:each) do
     @app = test_app
     @app.generator.add(:test_data){ "Test Data" }
-    @job = Dragonfly::Job.new(@app).generate(:test_data)
+    @job = @app.generate(:test_data)
     @endpoint = Rack::Lint.new(Dragonfly::JobEndpoint.new(@job))
   end
   
@@ -43,7 +43,7 @@ describe Dragonfly::JobEndpoint do
   before(:each) do
     @app = test_app
     @app.datastore.stub!(:retrieve).with('egg').and_return(["GUNGLE", {:name => 'gung.txt'}])
-    @job = Dragonfly::Job.new(@app).fetch('egg')
+    @job = @app.new_job.fetch('egg')
   end
 
   it "should return a correct response to a successful GET request" do
@@ -169,5 +169,28 @@ describe Dragonfly::JobEndpoint do
       end
     end
   end
+  
+  describe "custom headers" do
+    before(:each) do
+      @app.configure{|c| c.response_headers['This-is'] = 'brill' }
+    end
+    it "should allow specifying custom headers" do
+      make_request(@job).headers['This-is'].should == 'brill'
+    end
+    it "should not interfere with other headers" do
+      make_request(@job).headers['Content-Length'].should == '6'
+    end
+    it "should allow overridding other headers" do
+      @app.response_headers['Cache-Control'] = 'try me'
+      make_request(@job).headers['Cache-Control'].should == 'try me'
+    end
+    it "should allow giving a proc" do
+      @app.response_headers['Cache-Control'] = proc{|job, request|
+        job.basename.reverse.upcase + request['a']
+      }
+      response = make_request(@job, 'QUERY_STRING' => 'a=egg')
+      response['Cache-Control'].should == 'GNUGegg'
+    end
+  end
 
 end