dragonfly 0.9.12 → 0.9.13

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -32,7 +32,7 @@ describe Dragonfly::DataStorage::S3DataStore do
         d.region = 'eu-west-1'
       end
     end
-    
+
   else
 
     BUCKET_NAME = 'test-bucket'
@@ -47,7 +47,7 @@ describe Dragonfly::DataStorage::S3DataStore do
         d.region = 'eu-west-1'
       end
     end
-    
+
   end
 
   it_should_behave_like 'data_store'
@@ -82,14 +82,14 @@ describe Dragonfly::DataStorage::S3DataStore do
       data, meta = @data_store.retrieve(uid)
       data.should == 'eggheads'
     end
-    
+
     it "should work fine when not using the filesystem" do
       @data_store.use_filesystem = false
       temp_object = Dragonfly::TempObject.new('gollum')
       uid = @data_store.store(temp_object)
       @data_store.retrieve(uid).first.should == "gollum"
     end
-    
+
     if enabled # Fog.mock! doesn't act consistently here
       it "should reset the connection and try again if Fog throws a socket EOFError" do
         temp_object = Dragonfly::TempObject.new('gollum')
@@ -128,12 +128,12 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.region = nil
       @data_store.domain.should == 's3.amazonaws.com'
     end
-    
+
     it "should return the correct domain" do
       @data_store.region = 'eu-west-1'
       @data_store.domain.should == 's3-eu-west-1.amazonaws.com'
     end
-    
+
     it "does raise an error if an unknown region is given" do
       @data_store.region = 'latvia-central'
       lambda{
@@ -146,32 +146,32 @@ describe Dragonfly::DataStorage::S3DataStore do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new("Hi guys")
     end
-    
+
     it "should require a bucket name on store" do
       @data_store.bucket_name = nil
       proc{ @data_store.store(@temp_object) }.should raise_error(Dragonfly::Configurable::NotConfigured)
     end
-    
+
     it "should require an access_key_id on store" do
       @data_store.access_key_id = nil
       proc{ @data_store.store(@temp_object) }.should raise_error(Dragonfly::Configurable::NotConfigured)
     end
-    
+
     it "should require a secret access key on store" do
       @data_store.secret_access_key = nil
       proc{ @data_store.store(@temp_object) }.should raise_error(Dragonfly::Configurable::NotConfigured)
     end
-    
+
     it "should require a bucket name on retrieve" do
       @data_store.bucket_name = nil
       proc{ @data_store.retrieve('asdf') }.should raise_error(Dragonfly::Configurable::NotConfigured)
     end
-    
+
     it "should require an access_key_id on retrieve" do
       @data_store.access_key_id = nil
       proc{ @data_store.retrieve('asdf') }.should raise_error(Dragonfly::Configurable::NotConfigured)
     end
-    
+
     it "should require a secret access key on retrieve" do
       @data_store.secret_access_key = nil
       proc{ @data_store.retrieve('asdf') }.should raise_error(Dragonfly::Configurable::NotConfigured)
@@ -183,48 +183,48 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.bucket_name = "dragonfly-test-blah-blah-#{rand(100000000)}"
       @data_store.store(Dragonfly::TempObject.new("asdfj"))
     end
-    
+
     it "should not try to create the bucket on retrieve if it doesn't exist" do
       @data_store.bucket_name = "dragonfly-test-blah-blah-#{rand(100000000)}"
       @data_store.send(:storage).should_not_receive(:put_bucket)
       proc{ @data_store.retrieve("gungle") }.should raise_error(Dragonfly::DataStorage::DataNotFound)
     end
   end
-  
+
   describe "headers" do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new('fjkdlsa')
       @data_store.storage_headers = {'x-amz-foo' => 'biscuithead'}
     end
-    
+
     it "should allow configuring globally" do
       @data_store.storage.should_receive(:put_object).with(BUCKET_NAME, anything, anything,
         hash_including('x-amz-foo' => 'biscuithead')
       )
       @data_store.store(@temp_object)
     end
-    
+
     it "should allow adding per-store" do
       @data_store.storage.should_receive(:put_object).with(BUCKET_NAME, anything, anything,
         hash_including('x-amz-foo' => 'biscuithead', 'hello' => 'there')
       )
       @data_store.store(@temp_object, :headers => {'hello' => 'there'})
     end
-    
+
     it "should let the per-store one take precedence" do
       @data_store.storage.should_receive(:put_object).with(BUCKET_NAME, anything, anything,
         hash_including('x-amz-foo' => 'override!')
       )
       @data_store.store(@temp_object, :headers => {'x-amz-foo' => 'override!'})
     end
-    
+
     it "should not mess with the meta" do
       @data_store.storage.should_receive(:put_object) do |_, __, ___, headers|
         headers['x-amz-meta-extra'].should =~ /^\w+$/
       end
       @data_store.store(@temp_object, :headers => {'hello' => 'there'})
     end
-    
+
     it "should store with the content-type if passed in" do
       @data_store.storage.should_receive(:put_object) do |_, __, ___, headers|
         headers['Content-Type'].should == 'text/plain'
@@ -234,23 +234,23 @@ describe Dragonfly::DataStorage::S3DataStore do
   end
 
   describe "urls for serving directly" do
-    
+
     before(:each) do
       @uid = 'some/path/on/s3'
     end
-    
+
     it "should use the bucket subdomain" do
       @data_store.url_for(@uid).should == "http://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
     end
-    
+
     it "should use the bucket subdomain for other regions too" do
       @data_store.region = 'eu-west-1'
       @data_store.url_for(@uid).should == "http://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
     end
-    
+
     it "should give an expiring url" do
       @data_store.url_for(@uid, :expires => 1301476942).should =~
-        %r{^https://#{@data_store.domain}/#{BUCKET_NAME}/some/path/on/s3\?AWSAccessKeyId=#{@data_store.access_key_id}&Signature=[\w%]+&Expires=1301476942$}
+        %r{^https://#{BUCKET_NAME}\.#{@data_store.domain}/some/path/on/s3\?AWSAccessKeyId=#{@data_store.access_key_id}&Signature=[\w%]+&Expires=1301476942$}
     end
 
     it "should allow for using https" do
@@ -271,7 +271,7 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.url_host = url_host
       @data_store.url_for(@uid).should == "http://#{url_host}/some/path/on/s3"
     end
-    
+
   end
 
 end

data/spec/dragonfly/image_magick/analyser_spec.rb

@@ -1,7 +1,7 @@
 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
@@ -53,7 +53,7 @@ describe Dragonfly::ImageMagick::Analyser do
   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
@@ -64,15 +64,10 @@ describe Dragonfly::ImageMagick::Analyser 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
 
-  it "should work (width) for images with numbers in the format" do
-    image = Dragonfly::TempObject.new(SAMPLES_DIR.join('a.jp2'))
-    @analyser.width(image).should == 1
-  end
-
 end

data/spec/dragonfly/image_magick/encoder_spec.rb

@@ -1,26 +1,31 @@
 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
@@ -31,11 +36,11 @@ describe Dragonfly::ImageMagick::Encoder do
       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

@@ -16,7 +16,7 @@ describe Dragonfly::ImageMagick::Generator do
       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)
@@ -62,12 +62,6 @@ describe Dragonfly::ImageMagick::Generator do
       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)
@@ -75,6 +69,11 @@ describe Dragonfly::ImageMagick::Generator do
       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
@@ -95,6 +94,11 @@ describe Dragonfly::ImageMagick::Generator do
       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
@@ -161,7 +165,14 @@ describe Dragonfly::ImageMagick::Generator do
           @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,7 +1,7 @@
 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
@@ -82,40 +82,40 @@ describe Dragonfly::ImageMagick::Processor do
     end
 
     it "should crop using the offset given" do
-      image = @processor.crop(@image, :x => '7', :y => '12')
+      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 = @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 = @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 = @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 = @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' )
+      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
@@ -123,8 +123,8 @@ describe Dragonfly::ImageMagick::Processor do
     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')
+      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
@@ -154,26 +154,26 @@ describe Dragonfly::ImageMagick::Processor do
     end
 
     it "should crop to the correct dimensions" do
-      image = @processor.resize_and_crop(@image, :width => '100', :height => '100')
+      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 = @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 = @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 = @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
 
@@ -188,13 +188,13 @@ describe Dragonfly::ImageMagick::Processor do
     end
 
     it "should not rotate given a larger height and the '>' qualifier" do
-      image = @processor.rotate(@image, 90, :qualifier => '>')
+      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 = @processor.rotate(@image, 90, 'qualifier' => '<')
       image.should have_width(355)
       image.should have_height(280)
     end
@@ -217,19 +217,19 @@ describe Dragonfly::ImageMagick::Processor do
       @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.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.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.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.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
@@ -263,16 +263,16 @@ describe Dragonfly::ImageMagick::Processor 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, extra = @processor.convert(@image, '-scale 56x71', 'gif')
       image.should have_width(56)
       image.should have_height(71)
       image.should have_format('gif')
@@ -289,5 +289,5 @@ describe Dragonfly::ImageMagick::Processor do
       @processor.convert(image, "-resize 2x2!").should have_width(2)
     end
   end
-  
+
 end