dragonfly 0.8.1 → 0.8.2

data/spec/dragonfly/active_model_extensions/model_spec.rb

@@ -159,7 +159,7 @@ describe Item do
       end
 
       it "should return the url for the data" do
-        @app.should_receive(:url_for).with(an_instance_of(Dragonfly::Job)).and_return('some.url')
+        @app.should_receive(:url_for).with(an_instance_of(Dragonfly::Job), {}).and_return('some.url')
         @item.preview_image.url.should == 'some.url'
       end
 

data/spec/dragonfly/analysis/file_command_analyser_spec.rb

@@ -44,7 +44,7 @@ describe Dragonfly::Analysis::FileCommandAnalyser do
         :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::RMagickGenerator.new.plasma(1000, 1000, format).first
+          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

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -1,27 +1,31 @@
-require 'spec_helper'
-require 'dragonfly/analysis/shared_analyser_spec'
+unless ENV['IGNORE_RMAGICK']
 
-describe Dragonfly::Analysis::RMagickAnalyser do
-  
-  before(:each) do
-    image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
-    @image = Dragonfly::TempObject.new(File.new(image_path))
-    @analyser = Dragonfly::Analysis::RMagickAnalyser.new
-    @analyser.log = Logger.new(LOG_FILE)
-  end
+  require 'spec_helper'
+  require 'dragonfly/analysis/shared_analyser_spec'
+
+  describe Dragonfly::Analysis::RMagickAnalyser do
   
-  describe "when using the filesystem" do
     before(:each) do
-      @analyser.use_filesystem = true
+      image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
+      @image = Dragonfly::TempObject.new(File.new(image_path))
+      @analyser = Dragonfly::Analysis::RMagickAnalyser.new
+      @analyser.log = Logger.new(LOG_FILE)
     end
-    it_should_behave_like "image analyser methods"
-  end
   
-  describe "when not using the filesystem" do
-    before(:each) do
-      @analyser.use_filesystem = false
+    describe "when using the filesystem" do
+      before(:each) do
+        @analyser.use_filesystem = true
+      end
+      it_should_behave_like "image analyser methods"
+    end
+  
+    describe "when not using the filesystem" do
+      before(:each) do
+        @analyser.use_filesystem = false
+      end
+      it_should_behave_like "image analyser methods"
     end
-    it_should_behave_like "image analyser methods"
-  end
   
-end
+  end
+
+end

data/spec/dragonfly/config/r_magick_spec.rb

@@ -1,25 +1,29 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+unless ENV['IGNORE_RMAGICK']
 
-describe Dragonfly::Config::RMagick do
+  require File.dirname(__FILE__) + '/../../spec_helper'
 
-  before(:each) do
-    @app = test_app
-  end
+  describe Dragonfly::Config::RMagick do
 
-  it "should configure all to use the filesystem by default" do
-    @app.configure_with(Dragonfly::Config::RMagick)
-    @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_true
-    @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_true
-    @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_true
-    @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_true
-  end
+    before(:each) do
+      @app = test_app
+    end
+
+    it "should configure all to use the filesystem by default" do
+      @app.configure_with(Dragonfly::Config::RMagick)
+      @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_true
+      @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_true
+      @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_true
+      @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_true
+    end
+
+    it "should configure all not to use the filesystem if requested" do
+      @app.configure_with(Dragonfly::Config::RMagick, :use_filesystem => false)
+      @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_false
+      @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_false
+      @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_false
+      @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_false
+    end
 
-  it "should configure all not to use the filesystem if requested" do
-    @app.configure_with(Dragonfly::Config::RMagick, :use_filesystem => false)
-    @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_false
-    @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_false
-    @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_false
-    @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_false
   end
 
-end
+end

data/spec/dragonfly/core_ext/array_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Array do
+  
+  describe "to_dragonfly_unique_s" do
+    it "should concatenate the to_s's of each of the elements" do
+      [:a, true, 2, 5.2, "hello"].to_dragonfly_unique_s.should == 'atrue25.2hello'
+    end
+    
+    it "should nest arrays" do
+      [:a, [:b, :c], :d].to_dragonfly_unique_s.should == 'abcd'
+    end
+    
+    it "should be empty if empty" do
+      [].to_dragonfly_unique_s.should == ''
+    end
+  end
+  
+end

data/spec/dragonfly/core_ext/hash_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Hash do
+  
+  describe "to_dragonfly_unique_s" do
+    it "should concatenate the to_s's of each of the elements, sorted alphabetically" do
+      {'z' => nil, :a => 4, false => 'ice', 5 => 6.2}.to_dragonfly_unique_s.should == '56.2a4falseicez'
+    end
+
+    it "should nest correctly" do
+      {:m => 1, :a => {:c => 2, :b => 3}, :z => 4}.to_dragonfly_unique_s.should == 'ab3c2m1z4'
+    end
+    
+    it "should be empty if empty" do
+      {}.to_dragonfly_unique_s.should == ''
+    end
+  end
+  
+end

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -1,37 +1,41 @@
-require 'spec_helper'
+unless ENV['IGNORE_RMAGICK']
 
-describe Dragonfly::Encoding::RMagickEncoder do
+  require '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
+    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
+    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 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
-      lambda{
-        @encoder.encode(@image, :goofy)
-      }.should throw_symbol(:unable_to_handle)
-    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
-    end
+      it "should do nothing if the image is already in the correct format" do
+        image = @encoder.encode(@image, :png)
+        image.should == @image
+      end
     
-    it "should work when not using the filesystem" do
-      @encoder.use_filesystem = false
-      image = @encoder.encode(@image, :gif)
-      image.should have_format('gif')
-    end
+      it "should work when not using the filesystem" do
+        @encoder.use_filesystem = false
+        image = @encoder.encode(@image, :gif)
+        image.should have_format('gif')
+      end
 
-  end
+    end
   
+  end
+
 end

data/spec/dragonfly/generation/r_magick_generator_spec.rb

@@ -1,24 +1,28 @@
-require 'spec_helper'
-require 'dragonfly/generation/shared_generator_spec'
+unless ENV['IGNORE_RMAGICK']
 
-describe Dragonfly::Generation::RMagickGenerator do
+  require 'spec_helper'
+  require 'dragonfly/generation/shared_generator_spec'
 
-  before(:each) do
-    @generator = Dragonfly::Generation::RMagickGenerator.new
-  end
+  describe Dragonfly::Generation::RMagickGenerator do
 
-  describe "when using the filesystem" do
     before(:each) do
-      @generator.use_filesystem = true
+      @generator = Dragonfly::Generation::RMagickGenerator.new
+    end
+
+    describe "when using the filesystem" do
+      before(:each) do
+        @generator.use_filesystem = true
+      end
+      it_should_behave_like 'image generator'
     end
-    it_should_behave_like 'image generator'
-  end
   
-  describe "when not using the filesystem" do
-    before(:each) do
-      @generator.use_filesystem = false
+    describe "when not using the filesystem" do
+      before(:each) do
+        @generator.use_filesystem = false
+      end
+      it_should_behave_like 'image generator'
     end
-    it_should_behave_like 'image generator'
-  end
   
-end
+  end
+
+end

data/spec/dragonfly/job_endpoint_spec.rb

@@ -3,11 +3,41 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 ## General tests for Response go here as it's a pretty simple wrapper around that
 
+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)
+    @endpoint = Rack::Lint.new(Dragonfly::JobEndpoint.new(@job))
+  end
+  
+  it "should pass for HEAD requests" do
+    Rack::MockRequest.new(@endpoint).request("HEAD", '')
+  end
+  
+  it "should pass for GET requests" do
+    Rack::MockRequest.new(@endpoint).request("GET", '')
+  end
+  
+  it "should pass for POST requests" do
+    Rack::MockRequest.new(@endpoint).request("POST", '')
+  end
+  
+  it "should pass for PUT requests" do
+    Rack::MockRequest.new(@endpoint).request("PUT", '')
+  end
+  
+  it "should pass for DELETE requests" do
+    Rack::MockRequest.new(@endpoint).request("DELETE", '')
+  end
+end
+
 describe Dragonfly::JobEndpoint do
 
   def make_request(job, opts={})
     endpoint = Dragonfly::JobEndpoint.new(job)
-    Rack::MockRequest.new(endpoint).get('', opts)
+    method = (opts.delete(:method) || :get).to_s.upcase
+    Rack::MockRequest.new(endpoint).request(method, '', opts)
   end
 
   before(:each) do
@@ -16,7 +46,7 @@ describe Dragonfly::JobEndpoint do
     @job = Dragonfly::Job.new(@app).fetch('egg')
   end
 
-  it "should return a correct response if successful" do
+  it "should return a correct response to a successful GET request" do
     response = make_request(@job)
     response.status.should == 200
     response['ETag'].should =~ /^"\w+"$/
@@ -27,6 +57,29 @@ describe Dragonfly::JobEndpoint do
     response.body.should == 'GUNGLE'
   end
 
+  it "should return the correct headers and no content to a successful HEAD request" do
+    response = make_request(@job, :method => :head)
+    response.status.should == 200
+    response['ETag'].should =~ /^"\w+"$/
+    response['Cache-Control'].should == "public, max-age=31536000"
+    response['Content-Type'].should == 'text/plain'
+    response['Content-Length'].should == '6'
+    response['Content-Disposition'].should == 'filename="gung.txt"'
+    response.body.should == ''
+  end
+
+  %w(POST PUT DELETE CUSTOM_METHOD).each do |method|
+    
+    it "should return a 405 error for a #{method} request" do
+      response = make_request(@job, :method => method)
+      response.status.should == 405
+      response['Allow'].should == "GET, HEAD"
+      response['Content-Type'].should == 'text/plain'
+      response.body.should == "#{method} method not allowed"
+    end
+
+  end
+
   it "should return 404 if the datastore raises data not found" do
     @job.should_receive(:apply).and_raise(Dragonfly::DataStorage::DataNotFound)
     response = make_request(@job)
@@ -100,7 +153,7 @@ describe Dragonfly::JobEndpoint do
         response['Content-Disposition'].should be_nil
       end
     end
-    
+
     describe "content disposition" do
       it "should use the app's configured content-disposition" do
         @app.content_disposition = :attachment

data/spec/dragonfly/job_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Matchers
 Spec::Matchers.define :match_steps do |steps|
@@ -530,7 +530,7 @@ describe Dragonfly::Job do
   describe "serialization" do
     before(:each) do
       @app = test_app
-      @job = Dragonfly::Job.new(@app).fetch('mumma').process(:resize, '1x50')
+      @job = Dragonfly::Job.new(@app).fetch('uid').process(:resize_and_crop, :width => 270, :height => 92, :gravity => 'n')
     end
     it "should serialize itself" do
       @job.serialize.should =~ /^\w{1,}$/
@@ -539,6 +539,14 @@ describe Dragonfly::Job do
       new_job = Dragonfly::Job.deserialize(@job.serialize, @app)
       new_job.to_a.should == @job.to_a
     end
+    it "should correctly deserialize a string serialized with ruby 1.8.7" do
+      job = Dragonfly::Job.deserialize('BAhbB1sHOgZmSSIIdWlkBjoGRVRbCDoGcDoUcmVzaXplX2FuZF9jcm9wewg6CndpZHRoaQIOAToLaGVpZ2h0aWE6DGdyYXZpdHlJIgZuBjsGVA', @app)
+      job.to_a.should == @job.to_a
+    end
+    it "should correctly deserialize a string serialized with ruby 1.9.2" do
+      job = Dragonfly::Job.deserialize('BAhbB1sHOgZmIgh1aWRbCDoGcDoUcmVzaXplX2FuZF9jcm9wewg6CndpZHRoaQIOAToLaGVpZ2h0aWE6DGdyYXZpdHkiBm4', @app)
+      job.to_a.should == @job.to_a
+    end
   end
 
   describe "to_app" do
@@ -608,6 +616,32 @@ describe Dragonfly::Job do
     end
   end
 
+  describe "to_unique_s" do
+    it "should use the arrays of args to create the string" do
+      job = test_app.fetch('uid').process(:gug, 4, :some => 'arg', :and => 'more')
+      job.to_unique_s.should == 'fuidpgug4andmoresomearg'
+    end
+  end
+
+  describe "sha" do
+    before(:each) do
+      @app = test_app
+      @job = @app.fetch('eggs')
+    end
+    
+    it "should be of the correct format" do
+      @job.sha.should =~ /^\w{8}$/
+    end
+    
+    it "should be the same for the same job steps" do
+      @app.fetch('eggs').sha.should == @job.sha
+    end
+    
+    it "should be different for different jobs" do
+      @app.fetch('figs').sha.should_not == @job.sha
+    end
+  end
+
   describe "validate_sha!" do
     before(:each) do
       @app = test_app

data/spec/dragonfly/processing/r_magick_processor_spec.rb

@@ -1,26 +1,30 @@
-require 'spec_helper'
-require 'dragonfly/processing/shared_processing_spec'
+unless ENV['IGNORE_RMAGICK']
 
-describe Dragonfly::Processing::RMagickProcessor do
-  
-  before(:each) do
-    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
-    @image = Dragonfly::TempObject.new(File.new(sample_file))
-    @processor = Dragonfly::Processing::RMagickProcessor.new
-  end
+  require 'spec_helper'
+  require 'dragonfly/processing/shared_processing_spec'
 
-  describe "when using the filesystem" do
+  describe Dragonfly::Processing::RMagickProcessor do
+  
     before(:each) do
-      @processor.use_filesystem = true
+      sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
+      @image = Dragonfly::TempObject.new(File.new(sample_file))
+      @processor = Dragonfly::Processing::RMagickProcessor.new
     end
-    it_should_behave_like "processing methods"
-  end
 
-  describe "when not using the filesystem" do
-    before(:each) do
-      @processor.use_filesystem = false
+    describe "when using the filesystem" do
+      before(:each) do
+        @processor.use_filesystem = true
+      end
+      it_should_behave_like "processing methods"
+    end
+
+    describe "when not using the filesystem" do
+      before(:each) do
+        @processor.use_filesystem = false
+      end
+      it_should_behave_like "processing methods"
     end
-    it_should_behave_like "processing methods"
-  end
 
+  end
+  
 end