dragonfly 0.5.7 → 0.6.0

data/spec/dragonfly/configurable_spec.rb

@@ -177,17 +177,32 @@ describe Dragonfly::Configurable do
   end
   
   describe "configuring with a configurer" do
-    it "should allow configuration by a configurer" do
-      cool_configuration = Object.new
-      def cool_configuration.apply_configuration(car)
+    before(:each) do
+      @cool_configuration = Object.new
+      def @cool_configuration.apply_configuration(car, colour=nil)
         car.configure do |c|
-          c.colour = 'vermelho'
+          c.colour = (colour || 'vermelho')
         end
       end
-      @car.configure_with(cool_configuration)
+    end
+    
+    it "should allow configuration by a configurer" do
+      @car.configure_with(@cool_configuration)
       @car.colour.should == 'vermelho'
       @car.top_speed.should == 216
     end
+    
+    it "should pass any args through to the configurer" do
+      @car.configure_with(@cool_configuration, 'preto')
+      @car.colour.should == 'preto'
+    end
+    
+    it "should yield a block for any extra configuration" do
+      @car.configure_with(@cool_configuration) do |c|
+        c.colour = 'branco'
+      end
+      @car.colour.should == 'branco'
+    end
   end
   
-end
+end

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -33,6 +33,7 @@ describe Dragonfly::DataStorage::S3DataStore do
         :secret_access_key => @data_store.secret_access_key
       )
       AWS::S3::Bucket.stub!(:create).with(@data_store.bucket_name)
+      AWS::S3::Service.stub!(:buckets).and_return([])
       AWS::S3::S3Object.stub!(:store).with(anything, anything, @data_store.bucket_name)
       AWS::S3::S3Object.stub!(:value).with(anything, @data_store.bucket_name)
       AWS::S3::S3Object.stub!(:delete).with(anything, @data_store.bucket_name)

data/spec/dragonfly/delegator_spec.rb

@@ -15,6 +15,7 @@ class CarDriver
 end
 
 class LorryDriver
+  include Dragonfly::BelongsToApp
   include Dragonfly::Delegatable
 
   def drive(lorry)
@@ -54,8 +55,12 @@ describe Dragonfly::Delegator do
       lambda{ @delegator.drive }.should raise_error(NoMethodError)
     end
 
-    it "should should return callable_methods as an empty array" do
-      @delegator.callable_methods.should == []
+    it "should should return delegatable_methods as an empty array" do
+      @delegator.delegatable_methods.should == []
+    end
+    
+    it "should return the object registered when registering" do
+      @delegator.register(CarDriver).should be_a(CarDriver)
     end
     
   end
@@ -63,8 +68,9 @@ describe Dragonfly::Delegator do
   describe "after registering a number of classes" do
 
     before(:each) do
-      @delegator.register(CarDriver)
-      @delegator.register(LorryDriver)
+      @delegator.app = Dragonfly::App[:test]
+      @car_driver = @delegator.register(CarDriver)
+      @lorry_driver = @delegator.register(LorryDriver)
     end
 
     it "should raise an error when calling an unknown method" do
@@ -75,21 +81,25 @@ describe Dragonfly::Delegator do
       @delegator.open_boot.should == :open_boot
       @delegator.open_back_doors.should == :open_back_doors
     end
-  
+
+    it "should allow delegating explicitly" do
+      @delegator.delegate(:open_boot).should == :open_boot
+    end
+
     it "should delegate to the last registered when more than one item implements the method" do
       @delegator.drive('fishmonger').should == "Driving lorry fishmonger"
     end
 
     it "should return all the callable methods" do
-      @delegator.callable_methods.sort.should == %w(clean drive open_back_doors open_boot pick_up).map{|m| m.to_method_name }
+      @delegator.delegatable_methods.sort.should == %w(clean drive open_back_doors open_boot pick_up).map{|m| m.to_method_name }
     end
     
     it "should say if if has a callable method (as a string)" do
-      @delegator.has_callable_method?('drive').should be_true
+      @delegator.has_delegatable_method?('drive').should be_true
     end
 
     it "should say if if has a callable method (as a symbol)" do
-      @delegator.has_callable_method?(:drive).should be_true
+      @delegator.has_delegatable_method?(:drive).should be_true
     end
 
     it "should skip methods that throw :unable_to_handle" do
@@ -101,10 +111,11 @@ describe Dragonfly::Delegator do
     end
 
     it "should return registered objects" do
-      objects = @delegator.registered_objects
-      objects.length.should == 2
-      objects[0].should be_a(CarDriver)
-      objects[1].should be_a(LorryDriver)
+      @delegator.registered_objects.should == [@car_driver, @lorry_driver]
+    end
+    
+    it "should set the registered object's app to its own if object should belong to an app" do
+      @lorry_driver.app.should == @delegator.app
     end
     
     it "should enable unregistering classes" do

data/spec/dragonfly/extended_temp_object_spec.rb

@@ -2,72 +2,56 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Dragonfly::ExtendedTempObject do
   
-  it "should raise an error if not configured with an app" do
-    temp_object = Dragonfly::ExtendedTempObject.new('asdf')
-    lambda{
-      temp_object.process(:dummy)
-    }.should raise_error(Dragonfly::ExtendedTempObject::NotConfiguredError)
-  end
-  
   describe "when configured correctly" do
     
     before(:each) do
-      @analyser = mock('analyser', :has_callable_method? => false)
-      @analyser.stub!(:has_callable_method?).with(:width).and_return(true)
-      @processor = mock('processor')
-      @encoder = mock('encoder')
-      @app = mock('app', :analysers => @analyser, :processors => @processor, :encoders => @encoder)
-      @klass = Class.new(Dragonfly::ExtendedTempObject)
-      @klass.app = @app
+      @app = Dragonfly::App[:test]
     end
     
     describe "analysis" do
 
       before(:each) do
-        @object = @klass.new('asdf')
+        analyser_class = Class.new(Dragonfly::Analysis::Base) do
+          def width(temp_object); temp_object.data.size; end
+        end
+        @analyser = @app.register_analyser(analyser_class)
+        @object = Dragonfly::ExtendedTempObject.new('asdf', @app)
       end
       
       it "should respond to something that the analyser responds to" do
-        @analyser.should_receive(:has_callable_method?).with(:some_method).and_return(true)
-        @object.should respond_to(:some_method)
+        @object.should respond_to(:width)
       end
       
       it "should not respond to something that the analyser doesn't respond to" do
-        @analyser.should_receive(:has_callable_method?).with(:some_method).and_return(false)
-        @object.should_not respond_to(:some_method)
+        @object.should_not respond_to(:spaghetti)
       end
 
       it "should delegate the analysis to the analyser" do
-        @analyser.should_receive(:width).with(@object).and_return(4)
         @object.width.should == 4
       end
       
       it "should cache the result so that it doesn't call it a second time" do
         @analyser.should_receive(:width).with(@object).and_return(4)
         @object.width.should == 4
-
         @analyser.should_not_receive(:width)
         @object.width.should == 4
       end
       
       it "should do the analysis again when it has been modified" do
-        @analyser.should_receive(:width).with(@object).and_return(4)
         @object.width.should == 4
-        
         @object.modify_self!('hellothisisnew')
-        
-        @analyser.should_receive(:width).with(@object).and_return(17)
-        @object.width.should == 17
-        
+        @object.width.should == 14
         @analyser.should_not_receive(:width)
-        @object.width.should == 17
+        @object.width.should == 14
       end
       
     end
     
     describe "encoding" do
       before(:each) do
-        @temp_object = @klass.new('abcde')
+        encoder_class = Class.new(Dragonfly::Encoding::Base)
+        @encoder = @app.register_encoder(encoder_class)
+        @temp_object = Dragonfly::ExtendedTempObject.new('abcde', @app)
       end
       
       it "should encode the data and return the new temp object" do

data/spec/dragonfly/processing/{rmagick_processor_spec.rb → r_magick_processor_spec.rb}

@@ -134,7 +134,14 @@ describe Dragonfly::Processing::RMagickProcessor do
       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
@@ -190,80 +197,6 @@ describe Dragonfly::Processing::RMagickProcessor do
       end
     
     end
-
-    describe "text" do
-      before(:each) do
-        @text =  Dragonfly::TempObject.new("mmm")
-      end
-
-      it "should create a text image, defaulted to png" do
-        image = @processor.text(@text)
-        image.should have_width(34)
-        image.should have_height(14)
-        image.should have_format('png')
-      end
-
-      # it "should ignore percent characters used by rmagick"
-
-      describe "padding" do
-        it "1 number shortcut" do
-          image = @processor.text(@text, :padding => '10')
-          image.should have_width(54)
-          image.should have_height(34)
-        end
-        it "2 numbers shortcut" do
-          image = @processor.text(@text, :padding => '10 5')
-          image.should have_width(44)
-          image.should have_height(34)
-        end
-        it "3 numbers shortcut" do
-          image = @processor.text(@text, :padding => '10 5 8')
-          image.should have_width(44)
-          image.should have_height(32)
-        end
-        it "4 numbers shortcut" do
-          image = @processor.text(@text, :padding => '1 2 3 4')
-          image.should have_width(40)
-          image.should have_height(18)
-        end
-        it "should override the general padding declaration with the specific one (e.g. 'padding-left')" do
-          image = @processor.text(@text, :padding => '10', 'padding-left' => 9)
-          image.should have_width(53)
-          image.should have_height(34)
-        end
-        it "should ignore 'px' suffixes" do
-          image = @processor.text(@text, :padding => '1px 2px 3px 4px')
-          image.should have_width(40)
-          image.should have_height(18)
-        end
-        it "bad padding string" do
-          lambda{
-            @processor.text(@text, :padding => '1 2 3 4 5')
-          }.should raise_error(ArgumentError)
-        end
-      end
-    end
-
   end
   
 end
-
-describe Dragonfly::Processing::RMagickProcessor::HashWithCssStyleKeys do
-  before(:each) do
-    @hash = Dragonfly::Processing::RMagickProcessor::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 }
-  end
-end

data/spec/dragonfly/processing/r_magick_text_processor_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Dragonfly::Processing::RMagickTextProcessor do
+  
+  describe "text" do
+    before(:each) do
+      @processor = Dragonfly::Processing::RMagickTextProcessor.new
+      @text =  Dragonfly::TempObject.new("mmm")
+    end
+
+    it "should create a text image, defaulted to png" do
+      image = @processor.text(@text, :font_size => 12)
+      image.should have_width(20..40) # approximate
+      image.should have_height(10..20)
+      image.should have_format('png')
+    end
+
+    # it "should ignore percent characters used by rmagick"
+
+    describe "padding" do
+      before(:each) do
+        no_padding_text = @processor.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 = @processor.text(@text, :padding => '10')
+        image.should have_width(@width + 20)
+        image.should have_height(@height + 20)
+      end
+      it "2 numbers shortcut" do
+        image = @processor.text(@text, :padding => '10 5')
+        image.should have_width(@width + 10)
+        image.should have_height(@height + 20)
+      end
+      it "3 numbers shortcut" do
+        image = @processor.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 = @processor.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 = @processor.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 = @processor.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{
+          @processor.text(@text, :padding => '1 2 3 4 5')
+        }.should raise_error(ArgumentError)
+      end
+    end
+  end
+
+  describe Dragonfly::Processing::RMagickTextProcessor::HashWithCssStyleKeys do
+    before(:each) do
+      @hash = Dragonfly::Processing::RMagickTextProcessor::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 }
+    end
+  end
+
+end

data/spec/dragonfly/temp_object_spec.rb

@@ -4,14 +4,18 @@ describe Dragonfly::TempObject do
   
   ####### Helper Methods #######
 
-  def new_tempfile(data = File.read(SAMPLES_DIR + '/round.gif'))
+  def sample_path(filename)
+    File.dirname(__FILE__) + '/../../samples/' + filename
+  end
+
+  def new_tempfile(data='HELLO')
     tempfile = Tempfile.new('test')
     tempfile.write(data)
     tempfile.rewind
     tempfile
   end
   
-  def new_file(data = File.read(SAMPLES_DIR + '/round.gif'))
+  def new_file(data='HELLO')
     File.open('/tmp/test_file', 'w') do |f|
       f.write(data)
     end
@@ -35,116 +39,149 @@ describe Dragonfly::TempObject do
     }.should raise_error(ArgumentError)
   end
   
-  describe "common behaviour for #each", :shared => true do
-
-    it "should yield 8192 bytes each time" do
-      parts = get_parts(@temp_object)
-      parts[0...-1].each do |part|
-        part.bytesize.should == 8192
-      end
-      parts.last.bytesize.should <= 8192
-    end
-    
-  end
-  
-  describe "configuring #each" do
+  describe "common behaviour", :shared => true do
 
-    it "should yield the number of bytes specified in the class configuration" do
-      temp_object_class = Class.new(Dragonfly::TempObject)
-      temp_object_class.block_size = 3001
-      temp_object = temp_object_class.new(new_tempfile)
-      parts = get_parts(temp_object)
-      parts[0...-1].each do |part|
-        part.length.should == 3001
-      end
-      parts.last.length.should <= 3001
-    end
-
-  end
-  
-  describe "initializing from a string" do
     before(:each) do
-      @gif_string = File.read(SAMPLES_DIR + '/round.gif')
-      @temp_object = Dragonfly::TempObject.new(@gif_string)
+      @temp_object = new_temp_object('HELLO')
     end
+
     describe "data" do
       it "should return the data correctly" do
-        @temp_object.data.should == @gif_string
+        @temp_object.data.should == 'HELLO'
       end
     end
+
     describe "file" do
-      it "should lazily create an unclosed tempfile" do
-        @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should_not be_closed
+      it "should return a readable file" do
+        @temp_object.file.should be_a(File)
       end
       it "should contain the correct data" do
-        @temp_object.file.read.should == @gif_string
+        @temp_object.file.read.should == 'HELLO'
+      end
+      it "should yield a file then close it if a block is given" do
+        @temp_object.file do |f|
+          f.read.should == 'HELLO'
+          f.should_receive :close
+        end
+      end
+      it "should return whatever is returned from the block if a block is given" do
+        @temp_object.file do |f|
+          'doogie'
+        end.should == 'doogie'
       end
     end
-    describe "each" do
-      it "should not create a file" do
-        @temp_object.should_not_receive(:tempfile)
-        @temp_object.each{}
+
+    describe "tempfile" do
+      it "should create a closed tempfile" do
+        @temp_object.tempfile.should be_a(Tempfile)
+        @temp_object.tempfile.should be_closed
+      end
+      it "should contain the correct data" do
+        @temp_object.tempfile.open.read.should == 'HELLO'
       end
-      it_should_behave_like "common behaviour for #each"
     end
-  end
-  
-  describe "initializing from a tempfile" do
-    before(:each) do
-      @gif_string = File.read(SAMPLES_DIR + '/round.gif')
-      @tempfile = new_tempfile(@gif_string)
-      @temp_object = Dragonfly::TempObject.new(@tempfile)
+    
+    describe "path" do
+      it "should return the absolute file path" do
+        @temp_object.path.should == @temp_object.tempfile.path
+      end
     end
-    describe "data" do
-      it "should lazily return the correct data" do
-        @temp_object.data.should == @gif_string
+    
+    describe "size" do
+      it "should return the size in bytes" do
+        @temp_object.size.should == 5
       end
     end
-    describe "file" do
-      it "should return the unclosed tempfile" do
-        @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should_not be_closed
-        @temp_object.file.path.should == @tempfile.path
+
+    describe "to_file" do
+      before(:each) do
+        @filename = 'eggnog.txt'
+        FileUtils.rm(@filename) if File.exists?(@filename)
+      end
+      after(:each) do
+        FileUtils.rm(@filename) if File.exists?(@filename)
+      end
+      it "should write to a file" do
+        @temp_object.to_file(@filename)
+        File.exists?(@filename).should be_true
+      end
+      it "should write the correct data to the file" do
+        @temp_object.to_file(@filename)
+        File.read(@filename).should == 'HELLO'
+      end
+      it "should return a readable file" do
+        file = @temp_object.to_file(@filename)
+        file.should be_a(File)
+        file.read.should == 'HELLO'
       end
     end
+
     describe "each" do
-      it "should not create a data string" do
-        @temp_object.should_not_receive(:data)
-        @temp_object.each{}
+      it "should yield 8192 bytes each time" do
+        temp_object = new_temp_object(File.read(sample_path('round.gif')))
+        parts = get_parts(temp_object)
+        parts[0...-1].each do |part|
+          part.bytesize.should == 8192
+        end
+        parts.last.bytesize.should <= 8192
+      end
+      it "should yield the number of bytes specified in the class configuration" do
+        klass = Class.new(Dragonfly::TempObject)
+        temp_object = new_temp_object(File.read(sample_path('round.gif')), klass)
+        klass.block_size = 3001
+        parts = get_parts(temp_object)
+        parts[0...-1].each do |part|
+          part.length.should == 3001
+        end
+        parts.last.length.should <= 3001
       end
-      it_should_behave_like "common behaviour for #each"
     end
+    
+
   end
   
-  describe "initializing from a file" do
-    before(:each) do
-      @file = File.new(SAMPLES_DIR + '/beach.png')
-      @temp_object = Dragonfly::TempObject.new(@file)
+  describe "initializing from a string" do
+
+    def new_temp_object(data, klass=Dragonfly::TempObject)
+      klass.new(data)
     end
-    after(:each) do
-      @file.close
+
+    it_should_behave_like "common behaviour"
+
+    it "should not create a file when calling each" do
+      temp_object = new_temp_object('HELLO')
+      temp_object.should_not_receive(:tempfile)
+      temp_object.each{}
     end
-    describe "data" do
-      it "should lazily return the correct data" do
-        @temp_object.data.should == @file.read
-      end
+  end
+  
+  describe "initializing from a tempfile" do
+
+    def new_temp_object(data, klass=Dragonfly::TempObject)
+      klass.new(new_tempfile(data))
     end
-    describe "file" do
-      it "should lazily return an unclosed tempfile" do
-        @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should_not be_closed
-      end
-      it "should contain the correct data" do
-        @temp_object.file.read.should == @file.read
-      end
+
+    it_should_behave_like "common behaviour"
+
+    it "should not create a data string when calling each" do
+      temp_object = new_temp_object('HELLO')
+      temp_object.should_not_receive(:data)
+      temp_object.each{}
     end
-    describe "each" do
-      it "should not create a data string" do
-        @temp_object.should_not_receive(:data)
-        @temp_object.each{}
-      end
-      it_should_behave_like "common behaviour for #each"
+  end
+  
+  describe "initializing from a file" do
+
+    def new_temp_object(data, klass=Dragonfly::TempObject)
+      klass.new(new_file(data))
+    end
+
+    it_should_behave_like "common behaviour"
+
+    it "should not create a data string when calling each" do
+      temp_object = new_temp_object('HELLO')
+      temp_object.should_not_receive(:data)
+      temp_object.each{}
     end
   end
   
@@ -164,13 +201,6 @@ describe Dragonfly::TempObject do
     end
   end
   
-  describe "path" do
-    it "should return the absolute file path" do
-      temp_object = Dragonfly::TempObject.new(File.new(SAMPLES_DIR + '/beach.png'))
-      temp_object.path.should == temp_object.file.path
-    end
-  end
-  
   describe "modify_self!" do
 
     before(:each) do
@@ -199,23 +229,10 @@ describe Dragonfly::TempObject do
       @temp_object.modify_self!(@temp_object)
       @temp_object.data.should == 'DATA_ONE'
     end
-    
-  end
-  
-  describe "size" do
-    
-    before(:each) do
-      @gif_string = File.read(SAMPLES_DIR + '/round.gif')
-    end
-    
-    it "should return the size in bytes when initialized with a string" do
-      Dragonfly::TempObject.new(@gif_string).size.should == 61346
-    end
-    it "should return the size in bytes when initialized with a tempfile" do
-      Dragonfly::TempObject.new(new_tempfile(@gif_string)).size.should == 61346
-    end
-    it "should return the size in bytes when initialized with a file" do
-      Dragonfly::TempObject.new(new_file(@gif_string)).size.should == 61346
+    it "should keep the same name" do
+      @temp_object.name = 'billy.bob'
+      @temp_object.modify_self!('WASSUP PUNk')
+      @temp_object.name.should == 'billy.bob'
     end
   end
   
@@ -279,47 +296,5 @@ describe Dragonfly::TempObject do
       @temp_object.basename.should be_nil
     end
   end
-  
-  describe "to_file" do
-    
-    describe "common behaviour for to_file", :shared => true do
-      before(:each) do
-        @filename = 'eggnog.txt'
-        FileUtils.rm(@filename) if File.exists?(@filename)
-      end
-      after(:each) do
-        FileUtils.rm(@filename) if File.exists?(@filename)
-      end
-      it "should write to a file" do
-        @temp_object.to_file(@filename)
-        File.exists?(@filename).should be_true
-      end
-      it "should write the correct data to the file" do
-        @temp_object.to_file(@filename)
-        File.read(@filename).should == 'HELLO'
-      end
-      it "should return a readable file" do
-        file = @temp_object.to_file(@filename)
-        file.should be_a(File)
-        file.read.should == 'HELLO'
-      end
-    end
-    
-    describe "when initialized with a string" do
-      before(:each){ @temp_object = Dragonfly::TempObject.new('HELLO') }
-      it_should_behave_like "common behaviour for to_file"
-    end
-    
-    describe "when initialized with a file" do
-      before(:each){ @temp_object = Dragonfly::TempObject.new(new_tempfile('HELLO')) }
-      it_should_behave_like "common behaviour for to_file"
-    end
-    
-    describe "when initialized with a tempfile" do
-      before(:each){ @temp_object = Dragonfly::TempObject.new(new_file('HELLO')) }
-      it_should_behave_like "common behaviour for to_file"
-    end
 
-  end
-  
-end
+end