dragonfly 0.8.6 → 0.9.0

data/spec/dragonfly/active_model_extensions/spec_helper.rb

@@ -1,11 +1,91 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-begin
-  require 'active_model'
-rescue LoadError => e
-  # When there's NO active_model
-  require File.dirname(__FILE__) + '/active_record_setup'
-else
-  # When there IS active model
-  require File.dirname(__FILE__) + '/active_model_setup'
+require 'spec_helper'
+require 'active_model'
+
+# --------------------------------------------------------------- #
+# MODELS
+# --------------------------------------------------------------- #
+class MyModel
+  
+  # Callbacks
+  extend ActiveModel::Callbacks
+  define_model_callbacks :save, :destroy
+  
+  include ActiveModel::Validations
+  
+  class << self
+    def create!(attrs={})
+      new(attrs).save!
+    end
+    
+    def find(id)
+      new(instances[id])
+    end
+    
+    def instances
+      @instances ||= {}
+    end
+  end
+
+  def initialize(attrs={})
+    attrs.each do |key, value|
+      send("#{key}=", value)
+    end
+  end
+  
+  attr_accessor :id
+  
+  def to_hash
+    self.class::ATTRIBUTES.inject({}) do |hash, attr|
+      hash[attr] = send(attr)
+      hash
+    end
+  end
+  
+  def save
+    _run_save_callbacks {
+      self.id ||= rand(1000)
+      self.class.instances[id] = self.to_hash
+    }
+  end
+  def save!
+    save
+    self
+  end
+  
+  def destroy
+    _run_destroy_callbacks {}
+  end
+end
+
+class Item < MyModel
+  
+  ATTRIBUTES = [
+    :title,
+    :preview_image_uid,
+    :preview_image_some_analyser_method,
+    :preview_image_size,
+    :preview_image_name,
+    :preview_image_blah_blah,
+    :other_image_uid,
+    :yet_another_image_uid,
+    :otra_imagen_uid,
+    :trailer_video_uid,
+    :created_at,
+    :updated_at
+  ]
+  attr_accessor *ATTRIBUTES
+end
+
+class Car < MyModel
+  ATTRIBUTES = [
+    :image_uid,
+    :reliant_image_uid,
+    :type
+  ]
+  attr_accessor *ATTRIBUTES
+end
+
+class Photo < MyModel
+  ATTRIBUTES = [:image_uid]
+  attr_accessor *ATTRIBUTES
 end

data/spec/dragonfly/analyser_spec.rb

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

data/spec/dragonfly/analysis/file_command_analyser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 png_path = File.dirname(__FILE__) + '/../../../samples/egg.png'
 
@@ -36,20 +36,11 @@ describe Dragonfly::Analysis::FileCommandAnalyser do
         @analyser.mime_type(@temp_object)
         @temp_object.instance_eval{@tempfile}.should be_nil
       end
-      
-      {
-        :jpg => 'image/jpeg',
-        :png => 'image/png',
-        :gif => 'image/gif',
-        :tif => 'image/tiff'
-      }.each do |format, mime_type|
-        it "should work properly (without a broken pipe error) for big files of format #{format}" do
-          data = Dragonfly::Generation::ImageMagickGenerator.new.plasma(1000, 1000, format).first
-          temp_object = Dragonfly::TempObject.new(data)
-          @analyser.mime_type(temp_object).should == mime_type
-        end
+      it "should work properly (without a broken pipe error) for big files of format jpg" do
+        data = Dragonfly::ImageMagick::Generator.new.plasma(1000, 1000, :jpg).first
+        temp_object = Dragonfly::TempObject.new(data)
+        @analyser.mime_type(temp_object).should == "image/jpeg"
       end
-      
     end
   
   end

data/spec/dragonfly/app_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'rack/mock'
 
 def request(app, path)
@@ -69,189 +69,21 @@ describe Dragonfly::App do
         other_app.mime_type_for(:mark).should == 'second/one'
       end
     end
-
-    describe "#resolve_mime_type" do
-      before(:each) do
-        @app = test_app
-        @app.analyser.add :format do |temp_object|
-          :png
-        end
-        @app.analyser.add :mime_type do |temp_object|
-          'image/jpeg'
-        end
-        @app.encoder.add do |temp_object|
-          'ENCODED DATA YO'
-        end
-      end
-
-      it "should return the correct mime_type if the temp_object has a format" do
-        temp_object = Dragonfly::TempObject.new("HIMATE", :format => :tiff, :name => 'test.pdf')
-        @app.resolve_mime_type(temp_object).should == 'image/tiff'
-      end
-
-      it "should use the file extension if it has no format" do
-        temp_object = Dragonfly::TempObject.new("HIMATE", :name => 'test.pdf')
-        @app.resolve_mime_type(temp_object).should == 'application/pdf'
-      end
-
-      it "should not use the file extension if it's been switched off (fall back to mime_type analyser)" do
-        @app.infer_mime_type_from_file_ext = false
-        temp_object = Dragonfly::TempObject.new("HIMATE", :name => 'test.pdf')
-        @app.resolve_mime_type(temp_object).should == 'image/jpeg'
-      end
-
-      it "should fall back to the mime_type analyser if the temp_object has no ext" do
-        temp_object = Dragonfly::TempObject.new("HIMATE", :name => 'test')
-        @app.resolve_mime_type(temp_object).should == 'image/jpeg'
-      end
-
-      describe "when the temp_object has no name" do
-
-        before(:each) do
-          @temp_object = Dragonfly::TempObject.new("HIMATE")
-        end
-
-        it "should fall back to the mime_type analyser" do
-          @app.resolve_mime_type(@temp_object).should == 'image/jpeg'
-        end
-
-        it "should fall back to the format analyser if the mime_type analyser doesn't exist" do
-          @app.analyser.functions.delete(:mime_type)
-          @app.resolve_mime_type(@temp_object).should == 'image/png'
-        end
-
-        it "should fall back to the app's fallback mime_type if no mime_type/format analyser exists" do
-          @app.analyser.functions.delete(:mime_type)
-          @app.analyser.functions.delete(:format)
-          @app.resolve_mime_type(@temp_object).should == 'application/octet-stream'
-        end
-
-      end
-
-    end
-
-  end
-
-  describe "without path prefix or DOS protection" do
-    before(:each) do
-      @app = test_app
-      @job = Dragonfly::Job.new(@app).fetch('some_uid')
-      @app.datastore.stub!(:retrieve).with('some_uid').and_return "Hi there"
-      @app.configure{|c| c.protect_from_dos_attacks = false }
-    end
-    it "should correctly respond with the job data" do
-      response = request(@app, "/#{@job.serialize}")
-      response.status.should == 200
-      response.body.should == "Hi there"
-    end
-    it "should generate the correct url" do
-      @app.url_for(@job).should == "/#{@job.serialize}"
-    end
-  end
-
-  describe "url_path_prefix" do
-    before(:each) do
-      @app = test_app
-      @job = Dragonfly::Job.new(@app)
-    end
-    it "should add the path prefix to the url if configured" do
-      @app.url_path_prefix = '/media'
-      @app.url_for(@job).should =~ %r{^/media/\w+$}
-    end
-    it "should add the path prefix to the url if passed in" do
-      @app.url_for(@job, :path_prefix => '/eggs').should =~ %r{^/eggs/\w+$}
-    end
-    it "should favour the passed in one" do
-      @app.url_path_prefix = '/media'
-      @app.url_for(@job, :path_prefix => '/bacon').should =~ %r{^/bacon/\w+$}
-    end
   end
 
-  describe "url_host" do
+  describe "remote_url_for" do
     before(:each) do
       @app = test_app
-      @job = Dragonfly::Job.new(@app)
+      @app.datastore = Object.new
     end
-    it "should add the host to the url if configured" do
-      @app.url_host = 'http://some.server:4000'
-      @app.url_for(@job).should =~ %r{^http://some\.server:4000/\w+$}
-    end
-    it "should add the host to the url if passed in" do
-      @app.url_for(@job, :host => 'https://bungle.com').should =~ %r{^https://bungle\.com/\w+$}
-    end
-    it "should favour the passed in one" do
-      @app.url_host = 'http://some.server:4000'
-      @app.url_for(@job, :host => 'https://smeedy').should =~ %r{^https://smeedy/\w+$}
-    end
-  end
-
-  describe "url_suffix" do
-    before(:each) do
-      @app = test_app
-      @job = Dragonfly::Job.new(@app)
-    end
-    it "should add the suffix to the url if configured" do
-      @app.url_suffix = 'hellodudes'
-      @app.url_for(@job).should =~ /\w+hellodudes$/
-    end
-    it "should add the suffix to the url if passed in" do
-      @app.url_for(@job, :suffix => '/howdy.pardner').should =~ /\w+\/howdy\.pardner$/
-    end
-    it "should favour the passed in one" do
-      @app.url_suffix = 'hellodudes'
-      @app.url_for(@job, :suffix => '/howdy.pardner').should =~ /\w+\/howdy\.pardner$/
-    end
-    it "should accept a proc yielding the job" do
-      @app.url_suffix = proc{|job| job.uid }
-      @job.fetch!('some_uid')
-      @app.url_for(@job).should =~ /\w+some_uid$/
-    end
-  end
-  
-  describe "url params" do
-    before(:each) do
-      @app = test_app
-      @job = Dragonfly::Job.new(@app)
-    end
-    it "should add extra params to the url query string" do
-      @app.url_for(@job, :suffix => '/suffix', :a => 'thing', :b => 'nuther').should =~ /\w+\/suffix\?a=thing&b=nuther$/
-    end
-  end
-
-  describe "Denial of Service protection" do
-    before(:each) do
-      @app = test_app
-      @app.protect_from_dos_attacks = true
-      @job = Dragonfly::Job.new(@app).fetch('some_uid')
-    end
-    it "should generate the correct url" do
-      @app.url_for(@job).should == "/#{@job.serialize}?s=#{@job.sha}"
-    end
-  end
-
-  describe "configuring with saved configurations" do
-    before(:each) do
-      @app = test_app
-    end
-
-    {
-      :imagemagick => Dragonfly::Config::ImageMagick,
-      :image_magick => Dragonfly::Config::ImageMagick,
-      :rmagick => Dragonfly::Config::RMagick,
-      :r_magick => Dragonfly::Config::RMagick,
-      :rails => Dragonfly::Config::Rails,
-      :heroku => Dragonfly::Config::Heroku,
-    }.each do |key, klass|
-      it "should map #{key} to #{klass}" do
-        klass.should_receive(:apply_configuration).with(@app)
-        @app.configure_with(key)
-      end
+    it "should raise an error if the datastore doesn't provide it" do
+      lambda{
+        @app.remote_url_for('some_uid')
+      }.should raise_error(NotImplementedError)
     end
-
-    it "should description" do
-      lambda {
-        @app.configure_with(:eggs)
-      }.should raise_error(ArgumentError)
+    it "should correctly call it if the datastore provides it" do
+      @app.datastore.should_receive(:url_for).with('some_uid', :some => :opts).and_return 'http://egg.head'
+      @app.remote_url_for('some_uid', :some => :opts).should == 'http://egg.head'
     end
   end
 
@@ -270,11 +102,34 @@ describe Dragonfly::App do
     end
     it "should allow storing with extra stuff" do
       @app.datastore.should_receive(:store).with(
-        a_temp_object_with_data("HELLO", :meta => {:egg => :head}),
-        {:option => :blarney}
+        a_temp_object_with_data("HELLO"), :meta => {:egg => :head}, :option => :blarney
       )
       @app.store("HELLO", :meta => {:egg => :head}, :option => :blarney)
     end
   end
 
+  describe "url_for" do
+    before(:each) do
+      @app = test_app
+      @job = @app.fetch('eggs')
+    end
+    it "should give the server url by default" do
+      @app.url_for(@job).should =~ %r{^/\w+$}
+    end
+    it "should allow configuring" do
+      @app.configure do |c|
+        c.define_url do |app, job, opts|
+          "doogies"
+        end
+      end
+      @app.url_for(@job).should == 'doogies'
+    end
+    it "should yield the correct dooberries" do
+      @app.define_url do |app, job, opts|
+        [app, job, opts]
+      end
+      @app.url_for(@job, {'chuddies' => 'margate'}).should == [@app, @job, {'chuddies' => 'margate'}]
+    end
+  end
+
 end

data/spec/dragonfly/configurable_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Dragonfly::Configurable do
 
@@ -30,6 +30,11 @@ describe Dragonfly::Configurable do
       @car.colour.should be_nil
     end
     
+    it "should allow setting to nil" do
+      @car.top_speed = nil
+      @car.top_speed.should be_nil
+    end
+    
     it "should allow specifying configurable attrs as strings" do
       class Bike
         include Dragonfly::Configurable
@@ -61,12 +66,12 @@ describe Dragonfly::Configurable do
   end
   
   describe "getting configuration" do
-    it "should return the configuration as a hash" do
-      @car.configuration.should == {:colour => nil, :top_speed => 216}
+    it "should return the configuration when nothing is set" do
+      @car.configuration.should == {}
     end
-    it "should not allow you to change the configuration via the hash" do
-      @car.configuration[:top_speed] = 555
-      @car.top_speed.should == 216
+    it "should return the configuration when something is set" do
+      @car.top_speed = 10
+      @car.configuration.should == {:top_speed => 10}
     end
   end
   
@@ -79,8 +84,8 @@ describe Dragonfly::Configurable do
       car1.configure{|c| c.colour = 'green'}
       car2 = Car.new
       car2.configure{|c| c.colour = 'yellow'}
-      car1.configuration.should == {:colour => 'green', :top_speed => 216}
-      car2.configuration.should == {:colour => 'yellow', :top_speed => 216}
+      car1.configuration.should == {:colour => 'green'}
+      car2.configuration.should == {:colour => 'yellow'}
     end
   end
   
@@ -153,32 +158,50 @@ describe Dragonfly::Configurable do
   
   describe "nested configurable objects" do
 
-    it "should allow configuring nested configurable objects" do
-
+    before(:each) do
       class NestedThing
         include Dragonfly::Configurable
         configurable_attr :age, 29
+        def some_method(val)
+          @some_thing = val
+        end
+        configuration_method :some_method
+        attr_reader :some_thing
       end
 
       class Car
         def nested_thing
           @nested_thing ||= NestedThing.new
         end
+        nested_configurable :nested_thing
       end
 
       @car.configure do |c|
         c.nested_thing.configure do |nt|
           nt.age = 50
+          nt.some_method('yo')
         end
       end
+    end
 
+    it "should allow configuring nested configurable accessors" do
       @car.nested_thing.age.should == 50
-
     end
 
+    it "should allow configuring nested configurable normal methods" do
+      @car.nested_thing.some_thing.should == 'yo'
+    end
+    
+    it "should not allow configuring directly on the config object" do
+      expect{
+        @car.configure do |c|
+          c.some_method('other')
+        end
+      }.to raise_error(Dragonfly::Configurable::BadConfigAttribute)
+    end
   end
   
-  describe "configuring with a configurer" do
+  describe "configuring with a saved config" do
     before(:each) do
       @cool_configuration = Object.new
       def @cool_configuration.apply_configuration(car, colour=nil)
@@ -188,13 +211,13 @@ describe Dragonfly::Configurable do
       end
     end
     
-    it "should allow configuration by a configurer" do
+    it "should allow configuration by a saved config" 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
+    it "should pass any args through to the saved config" do
       @car.configure_with(@cool_configuration, 'preto')
       @car.colour.should == 'preto'
     end
@@ -210,11 +233,229 @@ describe Dragonfly::Configurable do
       @car.configure_with(@cool_configuration).should == @car
     end
     
-    it "should ask the object which object to configure with if a symbol is given" do
-      @car.should_receive(:configurer_for).with(:cool).and_return(@cool_configuration)
-      @car.configure_with(:cool)
-      @car.colour.should == 'vermelho'
+    describe "using a symbol to specify the config" do
+
+      before(:all) do
+        @rally_config = Object.new
+        Car.register_configuration(:rally, @rally_config)
+        @long_journey_config = Object.new
+        Car.register_configuration(:long_journey){ @long_journey_config }
+        Car.register_configuration(:some_library){ SomeLibrary }
+      end
+
+      it "should map the symbol to the correct configuration" do
+        @rally_config.should_receive(:apply_configuration).with(@car)
+        @car.configure_with(:rally)
+      end
+
+      it "should map the symbol to the correct configuration lazily" do
+        @long_journey_config.should_receive(:apply_configuration).with(@car)
+        @car.configure_with(:long_journey)
+      end
+
+      it "should throw an error if an unknown symbol is passed in" do
+        lambda {
+          @car.configure_with(:eggs)
+        }.should raise_error(ArgumentError)
+      end
+
+      it "should only try to load the library when asked to" do
+        lambda{
+          @car.configure_with(:some_library)
+        }.should raise_error(NameError, /uninitialized constant.*SomeLibrary/)
+      end
     end
+    
   end
   
+  describe "falling back to another config" do
+    before(:each) do
+      @garage = Object.new
+      class << @garage
+        include Dragonfly::Configurable
+        configurable_attr :top_speed, 100
+      end
+      @car.use_as_fallback_config(@garage)
+    end
+    
+    describe "when nothing set" do
+      it "should use its default" do
+        @car.top_speed.should == 216
+      end
+      it "shouldn't affect the fallback config object" do
+        @garage.top_speed.should == 100
+      end
+    end
+    
+    describe "if set" do
+      before(:each) do
+        @car.top_speed = 444
+      end
+      it "should work normally" do
+        @car.top_speed.should == 444
+      end
+      it "shouldn't affect the fallback config object" do
+        @garage.top_speed.should == 100
+      end
+    end
+    
+    describe "both set" do
+      before(:each) do
+        @car.top_speed = 444
+        @garage.top_speed = 3000
+      end
+      it "should prefer its own setting" do
+        @car.top_speed.should == 444
+      end
+      it "shouldn't affect the fallback config object" do
+        @garage.top_speed.should == 3000
+      end
+    end
+    
+    describe "the fallback config is set" do
+      before(:each) do
+        @garage.top_speed = 3000
+      end
+      it "should use the fallback config" do
+        @car.top_speed.should == 3000
+      end
+      it "shouldn't affect the fallback config object" do
+        @garage.top_speed.should == 3000
+      end
+    end
+    
+    describe "falling back multiple levels" do
+      before(:each) do
+        @klass = Class.new
+        @klass.class_eval do
+          include Dragonfly::Configurable
+          configurable_attr :veg, 'carrot'
+        end
+        @a = @klass.new
+        @b = @klass.new
+        @b.use_as_fallback_config(@a)
+        @c = @klass.new
+        @c.use_as_fallback_config(@b)
+      end
+      
+      it "should be the default if nothing set" do
+        @c.veg.should == 'carrot'
+      end
+      
+      it "should fall all the way back to the top one if necessary" do
+        @a.veg = 'turnip'
+        @c.veg.should == 'turnip'
+      end
+      
+      it "should prefer the closer one over the further away one" do
+        @b.veg = 'tatty'
+        @a.veg = 'turnip'
+        @c.veg.should == 'tatty'
+      end
+      
+      it "should work properly with nils" do
+        @a.veg = nil
+        @c.veg = 'broc'
+        @a.veg.should be_nil
+        @b.veg.should be_nil
+        @c.veg.should == 'broc'
+      end
+    end
+    
+    describe "objects with different methods" do
+      before(:each) do
+        @dad = Object.new
+        class << @dad
+          include Dragonfly::Configurable
+        end
+        @kid = Object.new
+        class << @kid
+          include Dragonfly::Configurable
+          configurable_attr :lug, 'default-lug'
+        end
+        @kid.use_as_fallback_config(@dad)
+      end
+
+      it "should not allow setting on the fallback obj directly" do
+        lambda{
+          @dad.lug = 'leg'
+        }.should raise_error(NoMethodError)
+      end
+
+      it "should not have the fallback obj respond to the method" do
+        @dad.should_not respond_to(:lug=)
+      end
+
+      it "should allow configuring through the fallback object even if it doesn't have that method" do
+        @dad.configure do |c|
+          c.lug = 'leg'
+        end
+        @kid.lug.should == 'leg'
+      end
+      
+      it "should work when a grandchild config is added later" do
+        grandkid = Object.new
+        class << grandkid
+          include Dragonfly::Configurable
+          configurable_attr :oogie, 'boogie'
+        end
+        grandkid.use_as_fallback_config(@kid)
+        @dad.configure{|c| c.oogie = 'duggen' }
+        grandkid.oogie.should == 'duggen'
+      end
+
+      it "should allow configuring twice through the fallback object" do
+        @dad.configure{|c| c.lug = 'leg' }
+        @dad.configure{|c| c.lug = 'blug' }
+        @kid.lug.should == 'blug'
+      end
+    end
+    
+    describe "clashing with configurable modules" do
+      before(:each) do
+        @mod = mod = Module.new
+        @mod.module_eval do
+          include Dragonfly::Configurable
+          configurable_attr :team, 'spurs'
+        end
+        @class = Class.new
+        @class.class_eval do
+          include mod
+          include Dragonfly::Configurable
+          configurable_attr :tree, 'elm'
+        end
+      end
+      
+      it "should not override the defaults from the module" do
+        obj = @class.new
+        obj.team.should == 'spurs'
+      end
+      
+      it "should still use its own defaults" do
+        obj = @class.new
+        obj.tree.should == 'elm'
+      end
+      
+      describe "when the configurable_attr is specified in a subclass that doesn't include Configurable" do
+        before(:each) do
+          @subclass = Class.new(@class)
+          @subclass.class_eval do
+            configurable_attr :car, 'mazda'
+            configurable_attr :tree, 'oak'
+          end
+          @obj = @subclass.new
+        end
+
+        it "should still work with default values" do
+          @obj.car.should == 'mazda'
+        end
+
+        it "should override the default from the parent" do
+          @obj.tree.should == 'oak'
+        end
+      end
+
+    end
+    
+  end
 end