dragonfly 0.9.5 → 0.9.8

data/lib/dragonfly/rails/images.rb

@@ -1,5 +1,13 @@
-require 'dragonfly'
 require 'uri'
+require 'dragonfly'
+begin
+  require 'rack/cache'
+rescue LoadError => e
+  puts "Couldn't find rack-cache - make sure you have it in your Gemfile:"
+  puts "  gem 'rack-cache', :require => 'rack/cache'"
+  puts " or configure dragonfly manually instead of using 'dragonfly/rails/images'"
+  raise e
+end
 
 ### The dragonfly app ###
 app = Dragonfly[:images]
@@ -13,15 +21,12 @@ if defined?(ActiveRecord::Base)
 end
 
 ### Insert the middleware ###
-Rails.application.middleware.insert 0, 'Dragonfly::Middleware', :images
+rack_cache_already_inserted = Rails.application.config.action_controller.perform_caching && Rails.application.config.action_dispatch.rack_cache
 
-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 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")
-end
+Rails.application.middleware.insert 0, Rack::Cache, {
+  :verbose     => true,
+  :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")
+} unless rack_cache_already_inserted
+
+Rails.application.middleware.insert_after Rack::Cache, Dragonfly::Middleware, :images

data/lib/dragonfly/railtie.rb

@@ -4,7 +4,7 @@ require 'rails'
 module Dragonfly
   class Railtie < ::Rails::Railtie
     initializer "dragonfly.railtie.initializer" do |app|
-      app.middleware.insert 0, Dragonfly::CookieMonster
+      app.middleware.insert 1, Dragonfly::CookieMonster
     end
   end
 end

data/lib/dragonfly/shell.rb

@@ -0,0 +1,44 @@
+require 'shellwords'
+
+module Dragonfly
+  module Shell
+    
+    include Configurable
+    configurable_attr :log_commands, false
+
+    # Exceptions
+    class CommandFailed < RuntimeError; end
+
+    def run(command, args="")
+      full_command = "#{command} #{escape_args(args)}"
+      log.debug("Running command: #{full_command}") if log_commands
+      begin
+        result = `#{full_command}`
+      rescue Errno::ENOENT
+        raise_shell_command_failed(full_command)
+      end
+      if $?.exitstatus == 1
+        throw :unable_to_handle
+      elsif !$?.success?
+        raise_shell_command_failed(full_command)
+      end
+      result
+    end
+  
+    def raise_shell_command_failed(command)
+      raise CommandFailed, "Command failed (#{command}) with exit status #{$?.exitstatus}"
+    end
+    
+    def escape_args(args)
+      args.shellsplit.map do |arg|
+        quote arg.gsub(/\\?'/, %q('\\\\''))
+      end.join(' ')
+    end
+    
+    def quote(string)
+      q = Dragonfly.running_on_windows? ? '"' : "'"
+      q + string + q
+    end
+
+  end
+end

data/lib/dragonfly/temp_object.rb

@@ -56,17 +56,24 @@ module Dragonfly
         @tempfile = obj
       elsif obj.is_a? File
         @pathname = Pathname.new(obj.path)
-        @original_filename = @pathname.basename.to_s
       elsif obj.is_a? Pathname
         @pathname = obj
-        @original_filename = @pathname.basename.to_s
       elsif obj.respond_to?(:tempfile)
         @tempfile = obj.tempfile
+      elsif obj.respond_to?(:path) # e.g. Rack::Test::UploadedFile
+        @pathname = Pathname.new(obj.path)
       else
-        raise ArgumentError, "#{self.class.name} must be initialized with a String, a Pathname, a File, a Tempfile, another TempObject, or something that responds to .tempfile"
+        raise ArgumentError, "#{self.class.name} must be initialized with a String, a Pathname, a File, a Tempfile, another TempObject, something that responds to .tempfile, or something that responds to .path"
       end
+      
       @tempfile.close if @tempfile
-      @original_filename = obj.original_filename if obj.respond_to?(:original_filename)
+
+      # Original filename
+      @original_filename = if obj.respond_to?(:original_filename)
+        obj.original_filename
+      elsif @pathname
+        @pathname.basename.to_s
+      end
     end
     
     attr_reader :original_filename
@@ -94,7 +101,7 @@ module Dragonfly
       tempfile.binmode
       if block_given?
         ret = yield f
-        tempfile.close
+        tempfile.close unless tempfile.closed?
       else
         ret = f
       end
@@ -188,4 +195,4 @@ module Dragonfly
     end
 
   end
-end
+end

data/spec/dragonfly/analysis/file_command_analyser_spec.rb

@@ -5,6 +5,7 @@ png_path = File.dirname(__FILE__) + '/../../../samples/egg.png'
 describe Dragonfly::Analysis::FileCommandAnalyser do
   
   before(:each) do
+    pending "not applicable to windows" if Dragonfly.running_on_windows?
     @analyser = Dragonfly::Analysis::FileCommandAnalyser.new
   end
   

data/spec/dragonfly/cookie_monster_spec.rb

@@ -14,14 +14,16 @@ describe Dragonfly::CookieMonster do
     response = Rack::MockRequest.new(app).get('')
     response.status.should == 200
     response.body.should == "body here"
-    response.headers.should == {"Set-Cookie" => "blah", "Something" => "else"}
+    response.headers["Set-Cookie"].should == "blah"
+    response.headers["Something"].should == "else"
   end
 
   it "should delete the set-cookie header from the response if the response comes from dragonfly" do
     response = Rack::MockRequest.new(app('dragonfly.job' => mock)).get('')
     response.status.should == 200
     response.body.should == "body here"
-    response.headers.should == {"Something" => "else"}
+    response.headers["Set-Cookie"].should be_nil
+    response.headers["Something"].should == "else"
   end
 
 end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -10,7 +10,7 @@ describe Dragonfly::DataStorage::FileDataStore do
   
   before(:each) do
     @data_store = Dragonfly::DataStorage::FileDataStore.new
-    @data_store.root_path = '/var/tmp/dragonfly_test'
+    @data_store.root_path = 'tmp/file_data_store_test'
   end
   
   after(:each) do

data/spec/dragonfly/data_storage/mongo_data_store_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/shared_data_store_examples'
 require 'mongo'
 
 describe Dragonfly::DataStorage::MongoDataStore do
-  
+
   before(:each) do
     begin
       Mongo::Connection.new
@@ -13,19 +13,19 @@ describe Dragonfly::DataStorage::MongoDataStore do
     end
     @data_store = Dragonfly::DataStorage::MongoDataStore.new :database => 'dragonfly_test'
   end
-  
+
   it_should_behave_like 'data_store'
-  
+
   describe "authenticating" do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new('Feijão verde')
     end
-    
+
     it "should not attempt to authenticate if a username is not given" do
       @data_store.db.should_not_receive(:authenticate)
-      @data_store.store(@temp_object)    
+      @data_store.store(@temp_object)
     end
-    
+
     it "should attempt to authenticate once if a username is given" do
       @data_store.username = 'terry'
       @data_store.password = 'butcher'
@@ -40,13 +40,13 @@ describe Dragonfly::DataStorage::MongoDataStore do
       @connection = Mongo::Connection.new
       @temp_object = Dragonfly::TempObject.new('asdf')
     end
-    
+
     it "should allow sharing the connection" do
       @data_store.connection = @connection
       @connection.should_receive(:db).with('dragonfly_test').and_return(db=mock)
       @data_store.db.should == db
     end
-    
+
     it "should allow sharing the db" do
       db = @connection.db('dragonfly_test_yo')
       @data_store.db = db
@@ -54,4 +54,19 @@ describe Dragonfly::DataStorage::MongoDataStore do
     end
   end
 
+  describe "extra options" do
+
+    before(:each) do
+      @temp_object = Dragonfly::TempObject.new('testingyo')
+    end
+
+    [:content_type, :mime_type].each do |key|
+      it "should allow setting content type on store with #{key.inspect}" do
+        uid = @data_store.store(@temp_object, key => 'text/plain')
+        @data_store.grid.get(BSON::ObjectId(uid)).content_type.should == 'text/plain'
+        @data_store.grid.get(BSON::ObjectId(uid)).read.should == 'testingyo'
+      end
+    end
+  end
+
 end

data/spec/dragonfly/image_magick/generator_spec.rb

@@ -27,11 +27,6 @@ describe Dragonfly::ImageMagick::Generator do
       image.should have_width(1)
     end
 
-    it "should cope with rgb format with whitespace" do
-      image, meta = @generator.plain(1, 1, ' rgb ( 244 , 255 , 1 ) ')
-      image.should have_width(1)
-    end
-
     it "should cope with rgb percent format" do
       image, meta = @generator.plain(1, 1, 'rgb(100%,50%,20%)')
       image.should have_width(1)

data/spec/dragonfly/job_spec.rb

@@ -749,7 +749,11 @@ describe Dragonfly::Job do
       it "should return the fetch_file step otherwise" do
         step = @app.fetch_file('/my/file.png').process(:cheese).fetch_file_step
         step.should be_a(Dragonfly::Job::FetchFile)
-        step.path.should == '/my/file.png'
+        if Dragonfly.running_on_windows?
+          step.path.should =~ %r(:/my/file\.png$)
+        else
+          step.path.should == '/my/file.png'
+        end
       end
     end
 

data/spec/dragonfly/shell_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Dragonfly::Shell do
+
+  include Dragonfly::Shell
+
+  it "should raise an error if the identify command isn't found" do
+    suppressing_stderr do
+      lambda{
+        run "non-existent-command"
+      }.should raise_error(Dragonfly::Shell::CommandFailed)
+    end
+  end
+  
+  describe "escaping args" do
+    {
+      %q(hello) => %q('hello'),
+      %q("hello") => %q('hello'),
+      %q('hello') => %q('hello'),
+      %q(he\'llo) => %q('he'\''llo'),
+      %q('he'\''llo') => %q('he'\''llo'),
+      %q("he'llo") => %q('he'\''llo'),
+      %q(hel$(lo)) => %q('hel$(lo)'),
+      %q(hel\$(lo)) => %q('hel$(lo)'),
+      %q('hel\$(lo)') => %q('hel\$(lo)')
+    }.each do |args, escaped_args|
+      it "should escape #{args.inspect} -> #{escaped_args.inspect}" do
+        pending "not applicable to windows" if Dragonfly.running_on_windows?
+        escape_args(args).should == escaped_args
+      end
+    end
+  end
+  
+end

data/spec/dragonfly/temp_object_spec.rb

@@ -15,14 +15,14 @@ describe Dragonfly::TempObject do
     tempfile
   end
 
-  def new_file(data='HELLO', path="/tmp/test_file")
+  def new_file(data='HELLO', path="tmp/test_file")
     File.open(path, 'w') do |f|
       f.write(data)
     end
     File.new(path)
   end
 
-  def new_pathname(data='HELLO', path="/tmp/test_file")
+  def new_pathname(data='HELLO', path="tmp/test_file")
     File.open(path, 'w') do |f|
       f.write(data)
     end
@@ -104,7 +104,11 @@ describe Dragonfly::TempObject do
 
       describe "path" do
         it "should return an absolute file path" do
-          @temp_object.path.should =~ %r{^/\w+}
+          if Dragonfly.running_on_windows?
+            @temp_object.path.should =~ %r{^[a-zA-Z]:/\w+}
+          else
+            @temp_object.path.should =~ %r{^/\w+}
+          end
         end
       end
 
@@ -116,11 +120,11 @@ describe Dragonfly::TempObject do
 
       describe "to_file" do
         before(:each) do
-          @filename = 'eggnog.txt'
-          FileUtils.rm(@filename) if File.exists?(@filename)
+          @filename = 'tmp/eggnog.txt'
+          FileUtils.rm_f(@filename) if File.exists?(@filename)
         end
         after(:each) do
-          FileUtils.rm(@filename) if File.exists?(@filename)
+          FileUtils.rm_f(@filename) if File.exists?(@filename)
         end
         it "should write to a file" do
           @temp_object.to_file(@filename)
@@ -246,13 +250,17 @@ describe Dragonfly::TempObject do
     it "should return the file's path" do
       file = new_file('HELLO')
       temp_object = Dragonfly::TempObject.new(file)
-      temp_object.path.should == file.path
+      temp_object.path.should == File.expand_path(file.path)
     end
     
     it "should return an absolute path even if the file wasn't instantiated like that" do
-      file = new_file('HELLO', 'testfile')
+      file = new_file('HELLO', 'tmp/bongo')
       temp_object = Dragonfly::TempObject.new(file)
-      temp_object.path.should =~ %r{^/\w.*testfile}
+      if Dragonfly.running_on_windows?
+        temp_object.path.should =~ %r{^[a-zA-Z]:/\w.*bongo}
+      else
+        temp_object.path.should =~ %r{^/\w.*bongo}
+      end
       file.close
       FileUtils.rm(file.path)
     end
@@ -275,13 +283,17 @@ describe Dragonfly::TempObject do
     it "should return the file's path" do
       pathname = new_pathname('HELLO')
       temp_object = Dragonfly::TempObject.new(pathname)
-      temp_object.path.should == pathname.to_s
+      temp_object.path.should == File.expand_path(pathname.to_s)
     end
     
     it "should return an absolute path even if the pathname is relative" do
-      pathname = new_pathname('HELLO', 'testfile')
+      pathname = new_pathname('HELLO', 'tmp/bingo')
       temp_object = Dragonfly::TempObject.new(pathname)
-      temp_object.path.should =~ %r{^/\w.*testfile}
+      if Dragonfly.running_on_windows?
+        temp_object.path.should =~ %r{^[a-zA-Z]:/\w.*bingo}
+      else
+        temp_object.path.should =~ %r{^/\w.*bingo}
+      end
       pathname.delete
     end
   end
@@ -310,6 +322,26 @@ describe Dragonfly::TempObject do
     end
   end
 
+  describe "initialize from a Rack::Test::UploadedFile" do
+    def initialization_object(data)
+      # The criteria we're using to determine if an object is a
+      # Rack::Test::UploadedFile is if it responds to path
+      #
+      # We can't just check if it is_a?(Rack::Test::UploadedFile) because that
+      # class may not always be present.
+      uploaded_file = mock("mock_uploadedfile")
+      uploaded_file.stub!(:path).and_return File.expand_path('tmp/test_file')
+      uploaded_file.stub!(:original_filename).and_return('foo.jpg')
+
+      # Create a real file with the contents required at the correct path
+      new_file(data, 'tmp/test_file')
+
+      uploaded_file
+    end
+
+    it_should_behave_like "common behaviour"
+  end
+
   describe "original_filename" do
     before(:each) do
       @obj = new_tempfile

data/spec/functional/image_magick_app_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "a configured imagemagick app" do
   
   before(:each) do
-    @app = Dragonfly[:images].configure_with(:imagemagick)
+    @app = test_app.configure_with(:imagemagick)
   end
   
   describe "convert command path" do

data/spec/functional/remote_on_the_fly_spec.rb

@@ -22,15 +22,15 @@ describe "remote on-the-fly urls" do
         end
       end
       c.datastore = Dragonfly::DataStorage::FileDataStore.new
-      c.datastore.root_path = '/var/tmp/dragonfly'
-      c.datastore.server_root = '/var/tmp'
+      c.datastore.root_path = 'tmp/dragonfly_test_urls'
+      c.datastore.server_root = 'tmp'
     end
     @job = @app.generate(:test)
   end
 
   after(:each) do
     THUMBS.delete_if{true}
-    FileUtils.rm_f('/var/tmp/dragonfly/yay.txt')
+    FileUtils.rm_f('tmp/dragonfly_test_urls/yay.txt')
   end
   
   it "should give the url for the server" do
@@ -38,14 +38,14 @@ describe "remote on-the-fly urls" do
   end
   
   it "should store the content when first called" do
-    File.exist?('/var/tmp/dragonfly/yay.txt').should be_false
+    File.exist?('tmp/dragonfly_test_urls/yay.txt').should be_false
     @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
-    File.read('/var/tmp/dragonfly/yay.txt').should == 'TEST'
+    File.read('tmp/dragonfly_test_urls/yay.txt').should == 'TEST'
   end
 
   it "should point to the external url the second time" do
     @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
-    @job.url.should == '/dragonfly/yay.txt'
+    @job.url.should == '/dragonfly_test_urls/yay.txt'
   end
 
 end