dragonfly 0.9.0 → 0.9.1

data/History.md

@@ -1,3 +1,14 @@
+0.9.1 (2011-05-11)
+==================
+Features
+--------
+- Added reflection methods `app.processor_methods`, `app.generator_methods` and `app.job_methods`
+
+Fixes
+-----
+- Improved performance of `resize_and_crop` method, using imagemagick built-in '^' operator
+- Improved server security validations
+
 0.9.0 (2011-04-27)
 ==================
 Features

data/README.md

@@ -12,7 +12,7 @@ For the lazy Rails user...
 **Gemfile**:
 
     gem 'rack-cache', :require => 'rack/cache'
-    gem 'dragonfly', '~>0.9.0'
+    gem 'dragonfly', '~>0.9.1'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2011-04-27}
+  s.date = %q{2011-05-11}
   s.description = %q{Dragonfly is a framework that enables on-the-fly processing for any content type.
   It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.}
   s.email = %q{mark@new-bamboo.co.uk}
@@ -172,6 +172,7 @@ Gem::Specification.new do |s|
     "spec/support/argument_matchers.rb",
     "spec/support/image_matchers.rb",
     "spec/support/simple_matchers.rb",
+    "spec/test_imagemagick.ru",
     "yard/handlers/configurable_attr_handler.rb",
     "yard/setup.rb",
     "yard/templates/default/fulldoc/html/css/common.css",

data/extra_docs/Configuration.md

@@ -81,6 +81,11 @@ Where is configuration done?
 In Rails, it should be done in an initializer, e.g. 'config/initializers/dragonfly.rb'.
 Otherwise it should be done anywhere where general setup is done, early on.
 
+Reflecting on configuration
+---------------------------
+There are a few methods you can call on the `app` to see what processors etc. are registered: `processor_methods`, `generator_methods`
+and `job_methods`.
+
 Saved configurations
 ====================
 Saved configurations are useful if you often configure the app the same way.

data/extra_docs/DataStorage.md

@@ -83,7 +83,7 @@ To configure with the {Dragonfly::DataStorage::S3DataStore S3DataStore}:
 
     app.datastore = Dragonfly::DataStorage::S3DataStore.new
 
-    app.datastore.configure do |d|
+    app.datastore.configure do |c|
       c.bucket_name = 'my_bucket'
       c.access_key_id = 'salfjasd34u23'
       c.secret_access_key = '8u2u3rhkhfo23...'

data/extra_docs/Heroku.md

@@ -6,7 +6,7 @@ The default configuration won't work out of the box for Heroku, because
 - Heroku doesn't allow saving files to the filesystem (although it does use tempfiles)
 - We won't need {http://tomayko.com/src/rack-cache/ Rack::Cache} on Heroku because it already uses the caching proxy {http://varnish.projects.linpro.no/ Varnish}, which we can make use of
 
-Instead of the normal {Dragonfly::DataStorage::FileDataStore FileDataStore}, we can use the {Dragonfly::DataStorage::S3DataStore S3DataStore}.
+Instead of the normal {file:DataStorage#File\_datastore FileDataStore}, we can use the {file:DataStorage#S3\_datastore S3DataStore}.
 
 Assuming you have an S3 account set up...
 
@@ -45,5 +45,5 @@ Now you can benefit from super-fast images served straight from Heroku's cache!
 
 **NOTE**: HEROKU'S CACHE IS CLEARED EVERY TIME YOU DEPLOY!!!
 
-If this is an issue, you may want to look into storing thumbnails on S3 (see {file:ExampleUseCases}), or maybe an after-deploy hook for hitting specific Dragonfly urls you want to cache, etc.
+If this is an issue, you may want to look into storing thumbnails on S3 (see {file:ServingRemotely}), or maybe an after-deploy hook for hitting specific Dragonfly urls you want to cache, etc.
 It won't be a problem for most sites though.

data/extra_docs/ImageMagick.md

@@ -124,3 +124,13 @@ You can use `padding-top`, `padding-left`, etc., as well as the standard css sho
 
 An alternative for `:font_family` is `:font` (see {http://www.imagemagick.org/script/command-line-options.php#font}), which could be a complete filename.
 Available fonts are those available on your system.
+
+Configuration
+-------------
+There are some options that can be set, e.g. if the imagemagick convert command can't be found:
+
+    app.configure do |c|
+      c.convert_command = "/opt/local/bin/convert"          # defaults to "convert"
+      c.identify_command = "/opt/local/bin/convert"         # defaults to "convert"
+      c.log_commands = true                                 # defaults to false
+    end

data/extra_docs/Models.md

@@ -208,6 +208,11 @@ Validations
 The property argument of `validates_property` will generally be one of the registered analyser properties as described in {file:Analysers.md Analysers}.
 However it would actually work for arbitrary properties, including those of non-dragonfly model attributes.
 
+`validates_property` can also take a proc for the message, yielding the actual value and the model
+
+    validates_property :width, :of => :cover_image, :in => (0..400),
+                               :message => proc{|actual, model| "Unlucky #{model.title} - was #{actual}" }
+
 Name and extension
 ------------------
 If the object assigned is a file, or responds to `original_filename` (as is the case with file uploads in Rails, etc.), then `name` will be set.

data/extra_docs/Rails2.md

@@ -25,11 +25,11 @@ config/initializers/dragonfly.rb:
 
 environment.rb:
 
-    config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images, '/media'
+    config.middleware.insert 0, 'Dragonfly::Middleware', :images, '/media'
     config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
       :verbose     => true,
-      :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
-      :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
+      :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"),
+      :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
     }
 
 Gems

data/extra_docs/Rails3.md

@@ -26,14 +26,14 @@ application.rb:
     config.middleware.insert 0, 'Dragonfly::Middleware', :images
     config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
       :verbose     => true,
-      :metastore   => "file:#{Rails.root}/tmp/dragonfly/cache/meta",
-      :entitystore => "file:#{Rails.root}/tmp/dragonfly/cache/body"
+      :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"),
+      :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
     }
 
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.0'
+    gem 'dragonfly', '~>0.9.1'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/lib/dragonfly/app.rb

@@ -145,6 +145,19 @@ module Dragonfly
       end
     end
     
+    # Reflection
+    def processor_methods
+      processor.functions.keys
+    end
+    
+    def generator_methods
+      generator.functions.keys
+    end
+    
+    def job_methods
+      job_definitions.definition_names
+    end
+    
     # Deprecated methods
     def url_path_prefix=(thing)
       raise NoMethodError, "url_path_prefix is deprecated - please use url_format, e.g. url_format = '/media/:job/:basename.:format' - see docs for more details"

data/lib/dragonfly/data_storage.rb

@@ -2,8 +2,9 @@ module Dragonfly
   module DataStorage
 
     # Exceptions
-    class DataNotFound < StandardError; end
-    class UnableToStore < StandardError; end
+    class BadUID < RuntimeError; end
+    class DataNotFound < RuntimeError; end
+    class UnableToStore < RuntimeError; end
 
   end
 end

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -6,7 +6,6 @@ module Dragonfly
     class FileDataStore
 
       # Exceptions
-      class BadUID < RuntimeError; end
       class UnableToFormUrl < RuntimeError; end
 
       include Configurable
@@ -139,7 +138,7 @@ module Dragonfly
       end
 
       def validate_uid!(uid)
-        raise BadUID, "tried to fetch uid #{uid.inspect} - perhaps due to a malicious user" if uid['..']
+        raise BadUID, "tried to retrieve uid #{uid.inspect}" if uid.blank? || uid['../']
       end
 
     end

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -37,12 +37,14 @@ module Dragonfly
         headers = opts[:headers] || {}
         uid = opts[:path] || generate_uid(meta[:name] || temp_object.original_filename || 'file')
         
-        if use_filesystem
-          temp_object.file do |f|
-            storage.put_object(bucket_name, uid, f, full_storage_headers(headers, meta))
+        rescuing_socket_errors do
+          if use_filesystem
+            temp_object.file do |f|
+              storage.put_object(bucket_name, uid, f, full_storage_headers(headers, meta))
+            end
+          else
+            storage.put_object(bucket_name, uid, temp_object.data, full_storage_headers(headers, meta))
           end
-        else
-          storage.put_object(bucket_name, uid, temp_object.data, full_storage_headers(headers, meta))
         end
         
         uid
@@ -50,7 +52,7 @@ module Dragonfly
 
       def retrieve(uid)
         ensure_configured
-        response = storage.get_object(bucket_name, uid)
+        response = rescuing_socket_errors{ storage.get_object(bucket_name, uid) }
         [
           response.body,
           parse_s3_metadata(response.headers)
@@ -60,7 +62,7 @@ module Dragonfly
       end
 
       def destroy(uid)
-        storage.delete_object(bucket_name, uid)
+        rescuing_socket_errors{ storage.delete_object(bucket_name, uid) }
       rescue Excon::Errors::NotFound => e
         raise DataNotFound, "#{e} - #{uid}"
       end
@@ -87,7 +89,7 @@ module Dragonfly
       end
 
       def bucket_exists?
-        storage.get_bucket_location(bucket_name)
+        rescuing_socket_errors{ storage.get_bucket_location(bucket_name) }
         true
       rescue Excon::Errors::NotFound => e
         false
@@ -106,7 +108,7 @@ module Dragonfly
 
       def ensure_bucket_initialized
         unless @bucket_initialized
-          storage.put_bucket(bucket_name, 'LocationConstraint' => region) unless bucket_exists?
+          rescuing_socket_errors{ storage.put_bucket(bucket_name, 'LocationConstraint' => region) } unless bucket_exists?
           @bucket_initialized = true
         end
       end
@@ -134,6 +136,13 @@ module Dragonfly
         REGIONS.keys
       end
 
+      def rescuing_socket_errors(&block)
+        yield
+      rescue Excon::Errors::SocketError => e
+        storage.reload
+        yield
+      end
+
     end
 
   end

data/lib/dragonfly/image_magick/processor.rb

@@ -35,8 +35,9 @@ module Dragonfly
         y       = "#{opts[:y] || 0}"
         y = '+' + y unless y[/^[+-]/]
         repage  = opts[:repage] == false ? '' : '+repage'
+        resize  = opts[:resize]
     
-        convert(temp_object, "-crop #{width}x#{height}#{x}#{y}#{" -gravity #{gravity}" if gravity} #{repage}")
+        convert(temp_object, "#{"-resize #{resize} " if resize}#{"-gravity #{gravity} " if gravity}-crop #{width}x#{height}#{x}#{y} #{repage}")
       end
       
       def flip(temp_object)
@@ -53,20 +54,18 @@ module Dragonfly
       alias grayscale greyscale
       
       def resize_and_crop(temp_object, opts={})
-        attrs          = identify(temp_object)
-        current_width  = attrs[:width].to_i
-        current_height = attrs[:height].to_i
-        
-        width   = opts[:width]  ? opts[:width].to_i  : current_width
-        height  = opts[:height] ? opts[:height].to_i : current_height
-        gravity = opts[:gravity] || 'c'
-
-        if width != current_width || height != current_height
-          scale = [width.to_f / current_width, height.to_f / current_height].max
-          temp_object = TempObject.new(resize(temp_object, "#{(scale * current_width).ceil}x#{(scale * current_height).ceil}"))
+        if !opts[:width] && !opts[:height]
+          return temp_object
+        elsif !opts[:width] || !opts[:height]
+          attrs          = identify(temp_object)
+          opts[:width]   ||= attrs[:width]
+          opts[:height]  ||= attrs[:height]
         end
 
-        crop(temp_object, :width => width, :height => height, :gravity => gravity)
+        opts[:gravity] ||= 'c'
+
+        opts[:resize]  = "#{opts[:width]}x#{opts[:height]}^^"
+        crop(temp_object, opts)
       end
       
       def rotate(temp_object, amount, opts={})

data/lib/dragonfly/job_definitions.rb

@@ -17,6 +17,10 @@ module Dragonfly
         jd[name].build!(self, *args)
       end
     end
+    
+    def definition_names
+      job_definitions.keys
+    end
 
     private
 

data/lib/dragonfly/rails/images.rb

@@ -19,8 +19,8 @@ begin
   require 'rack/cache'
   Rails.application.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
     :verbose     => true,
-    :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded because Windows
-    :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")  # has problems with spaces
+    :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+    :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
   }
 rescue LoadError => e  
   app.log.warn("Warning: couldn't find rack-cache for caching dragonfly content")

data/lib/dragonfly/response.rb

@@ -24,7 +24,7 @@ module Dragonfly
         job.apply
         [200, success_headers, job.result]
       end
-    rescue DataStorage::DataNotFound => e
+    rescue DataStorage::DataNotFound, DataStorage::BadUID => e
       app.log.warn(e.message)
       [404, {"Content-Type" => 'text/plain'}, ['Not found']]
     end

data/lib/dragonfly/server.rb

@@ -1,9 +1,14 @@
 module Dragonfly
   class Server
 
+    # Exceptions
+    class JobNotAllowed < RuntimeError; end
+
     include Loggable
     include Configurable
     
+    configurable_attr :allow_fetch_file, false
+    configurable_attr :allow_fetch_url, false
     configurable_attr :dragonfly_url, '/dragonfly'
     configurable_attr :protect_from_dos_attacks, false
     configurable_attr :url_format, '/:job/:basename.:format'
@@ -28,6 +33,7 @@ module Dragonfly
         dragonfly_response
       elsif (params = url_mapper.params_for(env["PATH_INFO"], env["QUERY_STRING"])) && params['job']
         job = Job.deserialize(params['job'], app)
+        validate_job!(job)
         job.validate_sha!(params['sha']) if protect_from_dos_attacks
         response = Response.new(job, env)
         catch(:halt) do
@@ -39,13 +45,16 @@ module Dragonfly
       else
         [404, {'Content-Type' => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
       end
-    rescue Serializer::BadString, Job::InvalidArray => e
-      log.warn(e.message)
-      [404, {'Content-Type' => 'text/plain'}, ['Not found']]
     rescue Job::NoSHAGiven => e
       [400, {"Content-Type" => 'text/plain'}, ["You need to give a SHA parameter"]]
     rescue Job::IncorrectSHA => e
       [400, {"Content-Type" => 'text/plain'}, ["The SHA parameter you gave (#{e}) is incorrect"]]
+    rescue JobNotAllowed => e
+      log.warn(e.message)
+      [403, {"Content-Type" => 'text/plain'}, ["Forbidden"]]
+    rescue Serializer::BadString, Job::InvalidArray => e
+      log.warn(e.message)
+      [404, {'Content-Type' => 'text/plain'}, ['Not found']]
     end
 
     def url_for(job, opts={})
@@ -99,5 +108,12 @@ module Dragonfly
       ]
     end
 
+    def validate_job!(job)
+      if job.fetch_file_step && !allow_fetch_file ||
+         job.fetch_url_step && !allow_fetch_url
+        raise JobNotAllowed, "Dragonfly Server doesn't allow requesting job with steps #{job.steps.inspect}"
+      end
+    end
+
   end
 end

data/spec/dragonfly/app_spec.rb

@@ -132,4 +132,24 @@ describe Dragonfly::App do
     end
   end
 
+  describe "reflection methods" do
+    before(:each) do
+      @app = test_app.configure do |c|
+        c.processor.add(:milk){}
+        c.generator.add(:butter){}
+        c.job(:bacon){}
+      end
+      
+    end
+    it "should return processor methods" do
+      @app.processor_methods.should == [:milk]
+    end
+    it "should return generator methods" do
+      @app.generator_methods.should == [:butter]
+    end
+    it "should return job methods" do
+      @app.job_methods.should == [:bacon]
+    end
+  end
+
 end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -168,10 +168,16 @@ describe Dragonfly::DataStorage::FileDataStore do
       meta.should == {:dog => 'food'}
     end
     
-    it "should raise an error if the file path has .. in it" do
+    it "should raise a BadUID error if the file path has ../ in it" do
       expect{
         @data_store.retrieve('jelly_beans/../are/good')
-      }.to raise_error(Dragonfly::DataStorage::FileDataStore::BadUID)
+      }.to raise_error(Dragonfly::DataStorage::BadUID)
+    end
+
+    it "should not raise a BadUID error if the file path has .. but not ../ in it" do
+      expect{
+        @data_store.retrieve('jelly_beans..good')
+      }.to raise_error(Dragonfly::DataStorage::DataNotFound)
     end
   end
   
@@ -199,10 +205,10 @@ describe Dragonfly::DataStorage::FileDataStore do
       File.exist?("#{@data_store.root_path}/#{uid}.extra").should be_false
     end
 
-    it "should raise an error if the file path has .. in it" do
+    it "should raise an error if the file path has ../ in it" do
       expect{
         @data_store.destroy('jelly_beans/../are/good')
-      }.to raise_error(Dragonfly::DataStorage::FileDataStore::BadUID)
+      }.to raise_error(Dragonfly::DataStorage::BadUID)
     end
   end
 

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -89,25 +89,40 @@ describe Dragonfly::DataStorage::S3DataStore do
       uid = @data_store.store(temp_object)
       @data_store.retrieve(uid).first.should == "gollum"
     end
-  end
-
-  if enabled # Fog.mock! doesn't work consistently with real one here
     
-    describe "destroy" do
-      before(:each) do
-        @temp_object = Dragonfly::TempObject.new('gollum')
+    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')
+        @data_store.storage.should_receive(:put_object).exactly(:once).and_raise(Excon::Errors::SocketError.new(EOFError.new))
+        @data_store.storage.should_receive(:put_object).with(BUCKET_NAME, anything, anything, hash_including)
+        @data_store.store(temp_object)
       end
-      it "should raise an error if the data doesn't exist on destroy" do
-        uid = @data_store.store(@temp_object)
-        @data_store.destroy(uid)
-        lambda{
-          @data_store.destroy(uid)
-        }.should raise_error(Dragonfly::DataStorage::DataNotFound)
+
+      it "should just let it raise if Fog throws a socket EOFError again" do
+        temp_object = Dragonfly::TempObject.new('gollum')
+        @data_store.storage.should_receive(:put_object).and_raise(Excon::Errors::SocketError.new(EOFError.new))
+        @data_store.storage.should_receive(:put_object).and_raise(Excon::Errors::SocketError.new(EOFError.new))
+        expect{
+          @data_store.store(temp_object)
+        }.to raise_error(Excon::Errors::SocketError)
       end
     end
-    
   end
 
+  # Doesn't appear to raise anything right now
+  # describe "destroy" do
+  #   before(:each) do
+  #     @temp_object = Dragonfly::TempObject.new('gollum')
+  #   end
+  #   it "should raise an error if the data doesn't exist on destroy" do
+  #     uid = @data_store.store(@temp_object)
+  #     @data_store.destroy(uid)
+  #     lambda{
+  #       @data_store.destroy(uid)
+  #     }.should raise_error(Dragonfly::DataStorage::DataNotFound)
+  #   end
+  # end
+
   describe "domain" do
     it "should default to the US" do
       @data_store.region = nil
@@ -183,21 +198,21 @@ describe Dragonfly::DataStorage::S3DataStore do
     end
     
     it "should allow configuring globally" do
-      @data_store.storage.should_receive(:put_object).with('test-bucket', anything, anything,
+      @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('test-bucket', anything, anything,
+      @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('test-bucket', anything, anything,
+      @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!'})

data/spec/dragonfly/image_magick/processor_spec.rb

@@ -103,7 +103,7 @@ describe Dragonfly::ImageMagick::Processor do
     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.should_not == image2
+      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
@@ -147,12 +147,25 @@ describe Dragonfly::ImageMagick::Processor do
       image.should have_height(355)
     end
 
+    it "should do nothing if called without width and height" do
+      image = @processor.resize_and_crop(@image)
+      image.should have_width(280)
+      image.should have_height(355)
+      image.should eq @image
+    end
+
     it "should crop to the correct dimensions" do
       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.should_not equal_image(image2)
+    end
+
     it "should allow cropping in one dimension" do
       image = @processor.resize_and_crop(@image, :width => '100')
       image.should have_width(100)
@@ -162,7 +175,7 @@ describe Dragonfly::ImageMagick::Processor do
     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.should_not == image2
+      image1.should_not equal_image(image2)
     end
 
   end

data/spec/dragonfly/job_definitions_spec.rb

@@ -32,4 +32,26 @@ describe Dragonfly::JobDefinitions do
 
   end
   
+  
+  describe "#definition_names" do
+    
+    before(:each) do
+      @job_definitions = Dragonfly::JobDefinitions.new
+      @object = Object.new
+      @object.extend @job_definitions
+    end
+    
+    it "should provide an empty list when no jobs have been defined" do
+      @job_definitions.definition_names.should == []
+    end
+    
+    it "should contain the job name when one is defined" do
+      @job_definitions.add :foo do |size|
+        process :thumb, size
+      end
+      @job_definitions.definition_names.should eq [:foo]
+    end
+    
+  end
+  
 end

data/spec/dragonfly/job_endpoint_spec.rb

@@ -86,6 +86,12 @@ describe Dragonfly::JobEndpoint do
     response.status.should == 404
   end
 
+  it "should return a 404 if the datastore raises bad uid" do
+    @job.should_receive(:apply).and_raise(Dragonfly::DataStorage::BadUID)
+    response = make_request(@job)
+    response.status.should == 404
+  end
+
   describe "ETag" do
     it "should return an ETag" do
       response = make_request(@job)

data/spec/dragonfly/server_spec.rb

@@ -22,7 +22,7 @@ describe Dragonfly::Server do
       @app.destroy(@uid)
     end
 
-    describe "successful urls" do
+    describe "successful requests" do
       before(:each) do
         @server.url_format = '/media/:job/:name.:format'
       end
@@ -59,74 +59,90 @@ describe Dragonfly::Server do
         response.status.should == 200
         response.body.should == 'eggs'
       end
-    end
+      
+      it "should return a cacheable response" do
+        url = "/media/#{@job.serialize}"
+        cache = Rack::Cache.new(@server, :entitystore => 'heap:/')
+        response = request(cache, url)
+        response.status.should == 200
+        response.headers['X-Rack-Cache'].should == "miss, store"
+        response = request(cache, url)
+        response.status.should == 200
+        response.headers['X-Rack-Cache'].should == "fresh"
+      end
 
-    it "should return successfully even if the job is in the query string" do
-      @server.url_format = '/'
-      url = "/?job=#{@job.serialize}"
-      response = request(@server, url)
-      response.status.should == 200
-      response.body.should == 'HELLO THERE'
+      it "should return successfully even if the job is in the query string" do
+        @server.url_format = '/'
+        url = "/?job=#{@job.serialize}"
+        response = request(@server, url)
+        response.status.should == 200
+        response.body.should == 'HELLO THERE'
+      end
     end
 
-    it "should return a 400 if no sha given but protection on" do
-      @server.protect_from_dos_attacks = true
-      url = "/media/#{@job.serialize}"
-      response = request(@server, url)
-      response.status.should == 400
-    end
+    describe "unsuccessful requests" do
+      it "should return a 400 if no sha given but protection on" do
+        @server.protect_from_dos_attacks = true
+        url = "/media/#{@job.serialize}"
+        response = request(@server, url)
+        response.status.should == 400
+      end
   
-    it "should return a 400 if wrong sha given and protection on" do
-      @server.protect_from_dos_attacks = true
-      url = "/media/#{@job.serialize}?sha=asdfs"
-      response = request(@server, url)
-      response.status.should == 400
-    end
-
-    ['/media', '/media/'].each do |url|
-      it "should return a 404 when no job given, e.g. #{url.inspect}" do
+      it "should return a 400 if wrong sha given and protection on" do
+        @server.protect_from_dos_attacks = true
+        url = "/media/#{@job.serialize}?sha=asdfs"
         response = request(@server, url)
+        response.status.should == 400
+      end
+
+      ['/media', '/media/'].each do |url|
+        it "should return a 404 when no job given, e.g. #{url.inspect}" do
+          response = request(@server, url)
+          response.status.should == 404
+          response.body.should == 'Not found'
+          response.content_type.should == 'text/plain'
+          response.headers['X-Cascade'].should == 'pass'
+        end
+      end
+  
+      it "should return a 404 when the url matches but doesn't correspond to a job" do
+        response = request(@server, '/media/sadhfasdfdsfsdf')
         response.status.should == 404
         response.body.should == 'Not found'
         response.content_type.should == 'text/plain'
-        response.headers['X-Cascade'].should == 'pass'
+        response.headers['X-Cascade'].should be_nil
       end
-    end
-  
-    it "should return a 404 when the url matches but doesn't correspond to a job" do
-      response = request(@server, '/media/sadhfasdfdsfsdf')
-      response.status.should == 404
-      response.body.should == 'Not found'
-      response.content_type.should == 'text/plain'
-      response.headers['X-Cascade'].should be_nil
-    end
   
-    it "should return a 404 when the url isn't known at all" do
-      response = request(@server, '/jfasd/dsfa')
-      response.status.should == 404
-      response.body.should == 'Not found'
-      response.content_type.should == 'text/plain'
-      response.headers['X-Cascade'].should == 'pass'
-    end
+      it "should return a 404 when the url isn't known at all" do
+        response = request(@server, '/jfasd/dsfa')
+        response.status.should == 404
+        response.body.should == 'Not found'
+        response.content_type.should == 'text/plain'
+        response.headers['X-Cascade'].should == 'pass'
+      end
   
-    it "should return a 404 when the url is a well-encoded but bad array" do
-      url = "/media/#{Dragonfly::Serializer.marshal_encode([[:egg, {:some => 'args'}]])}"
-      response = request(@server, url)
-      response.status.should == 404
-      response.body.should == 'Not found'
-      response.content_type.should == 'text/plain'
-      response.headers['X-Cascade'].should be_nil
-    end
-
-    it "should return a cacheable response" do
-      url = "/media/#{@job.serialize}"
-      cache = Rack::Cache.new(@server, :entitystore => 'heap:/')
-      response = request(cache, url)
-      response.status.should == 200
-      response.headers['X-Rack-Cache'].should == "miss, store"
-      response = request(cache, url)
-      response.status.should == 200
-      response.headers['X-Rack-Cache'].should == "fresh"
+      it "should return a 404 when the url is a well-encoded but bad array" do
+        url = "/media/#{Dragonfly::Serializer.marshal_encode([[:egg, {:some => 'args'}]])}"
+        response = request(@server, url)
+        response.status.should == 404
+        response.body.should == 'Not found'
+        response.content_type.should == 'text/plain'
+        response.headers['X-Cascade'].should be_nil
+      end
+      
+      it "should return a 403 Forbidden when someone uses fetch_file" do
+        response = request(@server, "/media/#{@app.fetch_file('/some/file.txt').serialize}")
+        response.status.should == 403
+        response.body.should == 'Forbidden'
+        response.content_type.should == 'text/plain'
+      end
+      
+      it "should return a 403 Forbidden when someone uses fetch_url" do
+        response = request(@server, "/media/#{@app.fetch_url('some.url').serialize}")
+        response.status.should == 403
+        response.body.should == 'Forbidden'
+        response.content_type.should == 'text/plain'
+      end
     end
 
   end

data/spec/support/image_matchers.rb

@@ -45,3 +45,13 @@ RSpec::Matchers.define :have_size do |size|
     image_properties(given)[:size].should == size
   end
 end
+
+RSpec::Matchers.define :equal_image do |other|
+  match do |given|
+    image_data = given.open.read
+    other_image_data = other.open.read
+    given.close
+    other.close
+    image_data == other_image_data
+  end
+end

data/spec/test_imagemagick.ru

@@ -0,0 +1,49 @@
+require "rubygems"
+require "bundler/setup"
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'dragonfly'
+
+ROOT = (File.expand_path('../..', __FILE__))
+APP = Dragonfly[:images].configure_with(:imagemagick).configure do |c|
+  c.url_format = '/images/:job'
+  c.allow_fetch_file = true
+end
+
+def row(geometry)
+  image = APP.fetch_file(ROOT + '/samples/beach.png').thumb('100x100#')
+  %(<tr>
+    <th>#{geometry}</th>
+    <th><img src="#{image.url}" /></th>
+    <th><img src="#{image.thumb(geometry).url}" /></th>
+  </tr>)
+end
+
+use Dragonfly::Middleware, :images
+run proc{[
+  200,
+  {'Content-Type' => 'text/html'},
+  [%(
+    <table>
+      <tr>
+        <th>Geometry</th>
+        <th>Original(100x100)</th>
+        <th>Thumb</th>
+      </tr>
+    #{[
+      row('80x60'),
+      row('80x60!'),
+      row('80x'),
+      row('x60'),
+      row('80x60>'),
+      row('80x60<'),
+      row('50x50%'),
+      row('80x60^'),
+      row('2000@'),
+      row('80x60#'),
+      row('80x60#ne'),
+      row('80x60se'),
+      row('80x60+5+35')
+    ].join}
+    </table>
+  )]
+]}

data/yard/templates/default/fulldoc/html/css/common.css

@@ -71,7 +71,7 @@ ul.main_files li {
 
 ul.main_files li a {
   margin: 0;
-  padding:4px 12px;
+  padding:3px 12px;
   display:block;
   cursor:pointer;
 }

data/yard/templates/default/layout/html/layout.erb

@@ -61,7 +61,7 @@
             ['GeneralUsage', 'General usage'],
             ['Rails2', 'Rails 2.3'],
             ['Rails3', 'Rails 3'],
-            ['Models', 'Models (ActiveRecord, ActiveModel, etc.)'],
+            ['Models', 'Models'],
             ['ImageMagick', 'ImageMagick'],
             ['Rack', 'Rack'],
             ['Sinatra', 'Sinatra'],

metadata

@@ -2,7 +2,7 @@
 name: dragonfly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Mark Evans
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +01:00
+date: 2011-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -388,6 +388,7 @@ files:
 - spec/support/argument_matchers.rb
 - spec/support/image_matchers.rb
 - spec/support/simple_matchers.rb
+- spec/test_imagemagick.ru
 - yard/handlers/configurable_attr_handler.rb
 - yard/setup.rb
 - yard/templates/default/fulldoc/html/css/common.css
@@ -408,7 +409,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3169869758436759526
+      hash: 3227660044973148793
       segments: 
       - 0
       version: "0"