dragonfly 0.1.6 → 0.2.1

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -16,14 +16,6 @@ describe Dragonfly::Analysis::RMagickAnalyser do
     @analyser.height(@beach).should == 355
   end
   
-  it "should return the mime type" do
-    @analyser.mime_type(@beach).should == 'image/png'
-  end
-  
-  it "should return nil if it doesn't know the mime type" do
-    @analyser.mime_type(Dragonfly::TempObject.new('asdf')).should be_nil
-  end
-  
   it "should return the number of colours" do
     @analyser.number_of_colours(@beach).should == 34703
   end

data/spec/dragonfly/app_spec.rb

@@ -60,7 +60,7 @@ describe Dragonfly::App do
     it "should return 404 if the datastore raises data not found" do
       @app.url_handler.protect_from_dos_attacks = false
       @app.should_receive(:fetch).and_raise(Dragonfly::DataStorage::DataNotFound)
-      response = make_request(@app, 'hello.png')
+      response = make_request(@app, '/hello.png')
       response.status.should == 404
     end
 
@@ -76,12 +76,12 @@ describe Dragonfly::App do
     end
     it "should use the temp object mime-type" do
       @temp_object.should_receive(:mime_type).and_return 'my/type'
-      response = make_request(@app, 'hello.png')
+      response = make_request(@app, '/hello.png')
       response.headers['Content-Type'].should == 'my/type'
     end
     it "should use the app's fallback mime-type if the temp_object one isn't known" do
       @temp_object.should_receive(:mime_type).and_return nil
-      response = make_request(@app, 'hello.png')
+      response = make_request(@app, '/hello.png')
       response.headers['Content-Type'].should == 'egg/heads'
     end
   end

data/spec/dragonfly/configurable_spec.rb

@@ -165,7 +165,7 @@ describe Dragonfly::Configurable do
       end
 
       @car.configure do |c|
-        c.nested_thing do |nt|
+        c.nested_thing.configure do |nt|
           nt.age = 50
         end
       end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -20,12 +20,12 @@ describe Dragonfly::DataStorage::FileDataStore do
   
   it_should_behave_like 'data_store'
   
+  before(:each) do
+    @temp_object = Dragonfly::TempObject.new('goobydoo')
+  end
+  
   describe "store" do
     
-    before(:each) do
-      @temp_object = Dragonfly::TempObject.new('goobydoo')
-    end
-    
     def it_should_write_to_file(storage_path, temp_object)
       FileUtils.should_receive(:cp).with(temp_object.path, storage_path)
     end
@@ -35,30 +35,15 @@ describe Dragonfly::DataStorage::FileDataStore do
       @data_store.store(@temp_object)
     end
 
-    it "should store the file with a numbered suffix if the filename already exists" do
-      FileUtils.mkdir_p(@file_pattern_prefix)
-      FileUtils.touch("#{@file_pattern_prefix}_file")
-      it_should_write_to_file("#{@file_pattern_prefix}_file_2", @temp_object)
-      @data_store.store(@temp_object)
-    end
-    
-    it "should store the file with an incremented number suffix if the filename already exists" do
-      FileUtils.mkdir_p(@file_pattern_prefix)
-      FileUtils.touch("#{@file_pattern_prefix}_file")
-      FileUtils.touch("#{@file_pattern_prefix}_file_2")
-      it_should_write_to_file("#{@file_pattern_prefix}_file_3", @temp_object)
-      @data_store.store(@temp_object)
-    end
-
     it "should use the temp_object name if it exists" do
       @temp_object.name = 'hello'
       it_should_write_to_file("#{@file_pattern_prefix}_hello", @temp_object)
       @data_store.store(@temp_object)
     end
     
-    it "should use the entire temp_object name including extension if it exists" do
+    it "should strip the extension of the temp_object name" do
       @temp_object.name = 'hello.you.png'
-      it_should_write_to_file("#{@file_pattern_prefix}_hello.you.png", @temp_object)
+      it_should_write_to_file("#{@file_pattern_prefix}_hello.you", @temp_object)
       @data_store.store(@temp_object)
     end
 
@@ -68,40 +53,70 @@ describe Dragonfly::DataStorage::FileDataStore do
       @data_store.store(@temp_object)
     end
 
-    it "should return the filepath without the root of the stored file when a file name is not provided" do
-      @data_store.store(@temp_object).should == "#{@file_pattern_prefix_without_root}_file"
-    end
+    describe "when the filename already exists" do
+
+      it "should store the file with a numbered suffix" do
+        FileUtils.mkdir_p(@file_pattern_prefix)
+        FileUtils.touch("#{@file_pattern_prefix}_file")
+        it_should_write_to_file("#{@file_pattern_prefix}_file_2", @temp_object)
+        @data_store.store(@temp_object)
+      end
     
-    it "should return the filepath without the root of the stored file when a file name is provided" do
-      @temp_object.name = 'hello.you.png'
-      @data_store.store(@temp_object).should == "#{@file_pattern_prefix_without_root}_hello.you"
+      it "should store the file with a numbered suffix taking into account the name" do
+        @temp_object.name = 'hello.png'
+        FileUtils.mkdir_p(@file_pattern_prefix)
+        FileUtils.touch("#{@file_pattern_prefix}_hello")
+        it_should_write_to_file("#{@file_pattern_prefix}_hello_2", @temp_object)
+        @data_store.store(@temp_object)
+      end
+    
+      it "should store the file with an incremented number suffix" do
+        FileUtils.mkdir_p(@file_pattern_prefix)
+        FileUtils.touch("#{@file_pattern_prefix}_file")
+        FileUtils.touch("#{@file_pattern_prefix}_file_2")
+        it_should_write_to_file("#{@file_pattern_prefix}_file_3", @temp_object)
+        @data_store.store(@temp_object)
+      end
+
     end
+
+    describe "return value" do
+
+      it "should return the filepath without the root of the stored file when a file name is not provided" do
+        @data_store.store(@temp_object).should == "#{@file_pattern_prefix_without_root}_file"
+      end
     
+      it "should return the filepath without the root of the stored file when a file name is provided" do
+        @temp_object.name = 'hello.you.png'
+        @data_store.store(@temp_object).should == "#{@file_pattern_prefix_without_root}_hello.you"
+      end
+    
+    end
+
+  end
+  
+  describe "errors" do
+
     it "should raise an error if it can't create a directory" do
       FileUtils.should_receive(:mkdir_p).and_raise(Errno::EACCES)
       lambda{ @data_store.store(@temp_object) }.should raise_error(Dragonfly::DataStorage::UnableToStore)
     end
-    
+  
     it "should raise an error if it can't create a file" do
       FileUtils.should_receive(:cp).and_raise(Errno::EACCES)
       lambda{ @data_store.store(@temp_object) }.should raise_error(Dragonfly::DataStorage::UnableToStore)
     end
-    
+
+  end
+  
+  describe "destroying" do
+  
     it "should prune empty directories when destroying" do
       uid = @data_store.store(@temp_object)
       @data_store.destroy(uid)
       @data_store.root_path.should be_an_empty_directory
     end
-    
-    describe "retrieving" do
-      it "should retrieve the correct file even though the extension isn't given" do
-        @temp_object.name = 'hello.there'
-        uid = @data_store.store(@temp_object)
-        uid.should =~ /_hello$/
-        Dragonfly::TempObject.new(@data_store.retrieve(uid)).data.should == @temp_object.data
-      end
-    end
-    
+
   end
-  
+
 end

data/spec/dragonfly/delegatable_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module M
+  def m; end
+end
+
+class A
+  include Dragonfly::Delegatable
+  def a; end
+end
+
+class B < A
+  include M
+  def b; end
+end
+
+describe Dragonfly::Delegatable do
+  
+  describe "delegatable_methods" do
+    it "should include all methods defined after including, including mixed-in and inherited" do
+      B.new.delegatable_methods.sort.should == %w(a b m)
+    end
+    
+    it "should work the second (cached) time" do
+      b = B.new
+      b.delegatable_methods
+      b.delegatable_methods.sort.should == %w(a b m)
+    end
+    
+  end
+  
+end

data/spec/dragonfly/delegator_spec.rb

@@ -0,0 +1,133 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class CarDriver
+  include Dragonfly::Delegatable
+
+  def drive(car)
+    "Driving car #{car}"
+  end
+  def open_boot
+    :open_boot
+  end
+  def clean(car)
+    "Cleaning #{car}"
+  end
+end
+
+class LorryDriver
+  include Dragonfly::Delegatable
+
+  def drive(lorry)
+    "Driving lorry #{lorry}"
+  end
+  def open_back_doors
+    :open_back_doors
+  end
+  def clean(lorry)
+    throw :unable_to_handle
+  end
+  def pick_up(lorry)
+    throw :unable_to_handle
+  end
+end
+
+class BusDriver
+  include Dragonfly::Delegatable
+  include Dragonfly::Configurable
+
+  configurable_attr :height
+
+  def initialize(age); @age = age; end
+  def age; @age; end
+end
+
+describe Dragonfly::Delegator do
+  
+  before(:each) do
+    @delegator = Dragonfly::Delegator.new
+  end
+  
+  describe "when no items have been registered" do
+
+    it "should raise an error when calling an unknown method" do
+      lambda{ @delegator.drive }.should raise_error(NoMethodError)
+    end
+
+    it "should should return callable_methods as an empty array" do
+      @delegator.callable_methods.should == []
+    end
+    
+  end
+
+  describe "after registering a number of classes" do
+
+    before(:each) do
+      @delegator.register(CarDriver)
+      @delegator.register(LorryDriver)
+    end
+
+    it "should raise an error when calling an unknown method" do
+      lambda{ @delegator.swim }.should raise_error(NoMethodError)
+    end
+
+    it "should correctly delegate when only one item implements the method" do
+      @delegator.open_boot.should == :open_boot
+      @delegator.open_back_doors.should == :open_back_doors
+    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)
+    end
+    
+    it "should say if if has a callable method (as a string)" do
+      @delegator.has_callable_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
+    end
+
+    it "should skip methods that throw :unable_to_handle" do
+      @delegator.clean('my car').should == "Cleaning my car"
+    end
+    
+    it "should raise an error if nothing was able to handle it" do
+      lambda{ @delegator.pick_up('my lorry') }.should raise_error(Dragonfly::Delegator::UnableToHandle)
+    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)
+    end
+    
+    it "should enable unregistering classes" do
+      @delegator.unregister(LorryDriver)
+      @delegator.registered_objects.map(&:class).should == [CarDriver]
+    end
+    
+    it "should enable unregistering all" do
+      @delegator.unregister_all
+      @delegator.registered_objects.should == []
+    end
+
+  end
+  
+  describe "configuring on registration" do
+    it "should pass the args on register to the object initializer" do
+      @delegator.register(BusDriver, 43)
+      @delegator.age.should == 43
+    end
+    
+    it "should run configure if a block given" do
+      @delegator.register(BusDriver, 43){|c| c.height = 180 }
+      @delegator.height.should == 180
+    end
+  end
+
+end

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Dragonfly::Encoding::RMagickEncoder do
+  
+  before(:all) do
+    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
+    @image = Dragonfly::TempObject.new(File.new(sample_file))
+    @encoder = Dragonfly::Encoding::RMagickEncoder.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 throw :unable_to_handle if the format is not handleable" do
+      test_string = "I'm a string"
+      catch :unable_to_handle do
+        @encoder.encode(@image, :goofy)
+        test_string = "This line should not happen"
+      end
+      test_string.should == "I'm a string"
+    end
+  end
+  
+end

data/spec/dragonfly/extended_temp_object_spec.rb

@@ -12,11 +12,11 @@ describe Dragonfly::ExtendedTempObject do
   describe "when configured correctly" do
     
     before(:each) do
-      @analyser = mock('analyser', :has_analysis_method? => false)
-      @analyser.stub!(:has_analysis_method?).with(:width).and_return(true)
+      @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', :analyser => @analyser, :processor => @processor, :encoder => @encoder)
+      @app = mock('app', :analysers => @analyser, :processor => @processor, :encoder => @encoder)
       @klass = Class.new(Dragonfly::ExtendedTempObject)
       @klass.app = @app
       @object = @klass.new('asdf')
@@ -25,12 +25,12 @@ describe Dragonfly::ExtendedTempObject do
     describe "analysis" do
       
       it "should respond to something that the analyser responds to" do
-        @analyser.should_receive(:has_analysis_method?).with(:some_method).and_return(true)
+        @analyser.should_receive(:has_callable_method?).with(:some_method).and_return(true)
         @object.should respond_to(:some_method)
       end
       
       it "should not respond to something that the analyser doesn't respond to" do
-        @analyser.should_receive(:has_analysis_method?).with(:some_method).and_return(false)
+        @analyser.should_receive(:has_callable_method?).with(:some_method).and_return(false)
         @object.should_not respond_to(:some_method)
       end
 

data/spec/dragonfly/parameters_spec.rb

@@ -89,7 +89,7 @@ describe Dragonfly::Parameters do
     
     describe "when defaults are not set" do
       it "should return the standard defaults" do
-        parameters = @parameters_class.new
+        parameters = @parameters_class.new_with_defaults
         parameters.processing_method.should be_nil
         parameters.processing_options.should == {}
         parameters.format.should be_nil
@@ -106,15 +106,22 @@ describe Dragonfly::Parameters do
           c.default_encoding = {:bit_rate => 24}
         end
       end
-      it "should return the default if not set on parameters" do
+      it "should not affect .new" do
         parameters = @parameters_class.new
+        parameters.processing_method.should be_nil
+        parameters.processing_options.should == {}
+        parameters.format.should be_nil
+        parameters.encoding.should == {}
+      end
+      it "should return the default if not set on parameters" do
+        parameters = @parameters_class.new_with_defaults
         parameters.processing_method.should == :resize
         parameters.processing_options.should == {:scale => '0.5'}
         parameters.format.should == :png
         parameters.encoding.should == {:bit_rate => 24}
       end
       it "should return the correct parameter if set" do
-        parameters = @parameters_class.new(
+        parameters = @parameters_class.new_with_defaults(
           :processing_method => :yo,
           :processing_options => {:a => 'b'},
           :format => :txt,
@@ -125,35 +132,13 @@ describe Dragonfly::Parameters do
         parameters.format.should == :txt
         parameters.encoding.should == {:ah => :arg}
       end
+      it "should not override nil if explicity set" do
+        @parameters_class.new_with_defaults(:format => nil).format.should be_nil
+      end
     end
     
   end
   
-  describe "validate!" do
-    before(:each) do
-      @parameters = Dragonfly::Parameters.new(standard_attributes)
-    end
-    it "should not raise an error when parameters are ok" do
-      @parameters.validate!
-    end
-    it "should raise an error when the uid is not set" do
-      @parameters.uid = nil
-      lambda{
-        @parameters.validate!
-      }.should raise_error(Dragonfly::Parameters::InvalidParameters)
-    end
-    it "should raise an error when the format is not set" do
-      @parameters.format = nil
-      lambda{
-        @parameters.validate!
-      }.should raise_error(Dragonfly::Parameters::InvalidParameters)
-    end
-    it "should not raise an error when other parameters aren't set" do
-      parameters = Dragonfly::Parameters.new(:uid => 'asdf', :format => :jpg)
-      parameters.validate!
-    end
-  end
-  
   describe "shortcuts" do
     
     before(:each) do
@@ -225,11 +210,15 @@ describe Dragonfly::Parameters do
     end
     
     describe ".from_shortcut" do
-      it "should just be the parameters equivalent of 'hash_from_shortcut'" do
-        @parameters_class.add_shortcut(/^hello.*$/, Symbol) do |processing_method, format, matches|
-          {:processing_method => processing_method, :format => format}
+      before(:each) do
+        @parameters_class.add_shortcut(/^hello.*$/) do |processing_method, matches|
+          {:processing_method => processing_method}
         end
-        @parameters_class.from_shortcut('hellothere', :tif).should == @parameters_class.new(@parameters_class.hash_from_shortcut('hellothere', :tif))
+        @parameters_class.default_format = :tif
+      end
+      it "should just be the parameters equivalent of 'hash_from_shortcut', including defaults" do
+        @parameters_class.from_shortcut('hellothere').should == 
+          @parameters_class.new(@parameters_class.hash_from_shortcut('hellothere').merge(:format => :tif))
       end
     end
     
@@ -239,6 +228,7 @@ describe Dragonfly::Parameters do
     
     before(:each) do
       @parameters_class = Class.new(Dragonfly::Parameters)
+      @parameters_class.default_format = :tif
     end
     
     it "should be the same as 'new' if empty args" do