dragonfly 0.9.5 → 0.9.8

data/Gemfile

@@ -13,8 +13,7 @@ group :development, :test, :cucumber do
   gem 'mongo'
   gem 'couchrest', '~> 1.0'
   gem 'rack-cache'
-  gem 'rails', '3.0.9', :require => nil
-  gem 'rake', '0.8.7'
+  gem 'rails', '~>3.1.0', :require => nil
   gem 'rspec', '~> 2.5'
   gem 'webmock'
   gem 'yard'

data/History.md

@@ -1,3 +1,32 @@
+0.9.8 (2011-09-08)
+==================
+Fixes
+-----
+- Regenerated gemspec again with ruby 1.8.7 - didn't seem to be fixed
+
+0.9.7 (2011-09-08)
+==================
+Fixes
+-----
+- Regenerated gemspec to overcome annoying yaml issue (http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yacc.html)
+
+0.9.6 (2011-09-06)
+==================
+Features
+--------
+- Allow setting `content_type` when storing in Mongo GridFS
+
+Changes
+-------
+- Tests use Rails 3.1
+
+Fixes
+-----
+- Moved from fog's deprecated `get_object_url` to `get_object_https_url`
+- Allow initializing a TempObject with Rack::Test::UploadedFile
+- Tests working in Windows (except feature that uses FileCommandAnalyser)
+- Better shell quoting
+
 0.9.5 (2011-07-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.4'
+    gem 'dragonfly', '~>0.9.8'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.8

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.9.5"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Evans"]
-  s.date = %q{2011-08-02}
+  s.authors = [%q{Mark Evans}]
+  s.date = %q{2011-09-08}
   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}
@@ -123,6 +123,7 @@ Gem::Specification.new do |s|
     "lib/dragonfly/routed_endpoint.rb",
     "lib/dragonfly/serializer.rb",
     "lib/dragonfly/server.rb",
+    "lib/dragonfly/shell.rb",
     "lib/dragonfly/simple_cache.rb",
     "lib/dragonfly/temp_object.rb",
     "lib/dragonfly/url_mapper.rb",
@@ -154,7 +155,6 @@ Gem::Specification.new do |s|
     "spec/dragonfly/image_magick/encoder_spec.rb",
     "spec/dragonfly/image_magick/generator_spec.rb",
     "spec/dragonfly/image_magick/processor_spec.rb",
-    "spec/dragonfly/image_magick/utils_spec.rb",
     "spec/dragonfly/job_builder_spec.rb",
     "spec/dragonfly/job_definitions_spec.rb",
     "spec/dragonfly/job_endpoint_spec.rb",
@@ -164,6 +164,7 @@ Gem::Specification.new do |s|
     "spec/dragonfly/routed_endpoint_spec.rb",
     "spec/dragonfly/serializer_spec.rb",
     "spec/dragonfly/server_spec.rb",
+    "spec/dragonfly/shell_spec.rb",
     "spec/dragonfly/simple_cache_spec.rb",
     "spec/dragonfly/temp_object_spec.rb",
     "spec/dragonfly/url_mapper_spec.rb",
@@ -171,12 +172,14 @@ Gem::Specification.new do |s|
     "spec/functional/image_magick_app_spec.rb",
     "spec/functional/model_urls_spec.rb",
     "spec/functional/remote_on_the_fly_spec.rb",
+    "spec/functional/shell_commands_spec.rb",
     "spec/functional/to_response_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/argument_matchers.rb",
     "spec/support/image_matchers.rb",
     "spec/support/simple_matchers.rb",
     "spec/test_imagemagick.ru",
+    "tmp/.gitignore",
     "yard/handlers/configurable_attr_handler.rb",
     "yard/setup.rb",
     "yard/templates/default/fulldoc/html/css/common.css",
@@ -185,9 +188,9 @@ Gem::Specification.new do |s|
     "yard/templates/default/module/setup.rb"
   ]
   s.homepage = %q{http://github.com/markevans/dragonfly}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Ideal gem for handling attachments in Rails, Sinatra and Rack applications.}
   s.test_files = [
     "spec/dragonfly/active_model_extensions/model_spec.rb",
@@ -212,7 +215,6 @@ Gem::Specification.new do |s|
     "spec/dragonfly/image_magick/encoder_spec.rb",
     "spec/dragonfly/image_magick/generator_spec.rb",
     "spec/dragonfly/image_magick/processor_spec.rb",
-    "spec/dragonfly/image_magick/utils_spec.rb",
     "spec/dragonfly/job_builder_spec.rb",
     "spec/dragonfly/job_definitions_spec.rb",
     "spec/dragonfly/job_endpoint_spec.rb",
@@ -222,6 +224,7 @@ Gem::Specification.new do |s|
     "spec/dragonfly/routed_endpoint_spec.rb",
     "spec/dragonfly/serializer_spec.rb",
     "spec/dragonfly/server_spec.rb",
+    "spec/dragonfly/shell_spec.rb",
     "spec/dragonfly/simple_cache_spec.rb",
     "spec/dragonfly/temp_object_spec.rb",
     "spec/dragonfly/url_mapper_spec.rb",
@@ -229,6 +232,7 @@ Gem::Specification.new do |s|
     "spec/functional/image_magick_app_spec.rb",
     "spec/functional/model_urls_spec.rb",
     "spec/functional/remote_on_the_fly_spec.rb",
+    "spec/functional/shell_commands_spec.rb",
     "spec/functional/to_response_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/argument_matchers.rb",
@@ -250,8 +254,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongo>, [">= 0"])
       s.add_development_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["= 3.0.9"])
-      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_development_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -269,8 +272,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
-      s.add_dependency(%q<rails>, ["= 3.0.9"])
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -289,8 +291,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<couchrest>, ["~> 1.0"])
     s.add_dependency(%q<rack-cache>, [">= 0"])
-    s.add_dependency(%q<rails>, ["= 3.0.9"])
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/extra_docs/DataStorage.md

@@ -132,6 +132,8 @@ You can also pass any options to `MongoDataStore.new` as an options hash.
 
 You can't serve directly from the mongo datastore.
 
+You can optionally pass in a `:content_type` option to `store` to tell it the content's MIME type.
+
 Couch datastore
 ---------------
 To configure with the {Dragonfly::DataStorage::CouchDataStore CouchDataStore}:
@@ -150,8 +152,9 @@ To configure:
 
 You can also pass these options to `CouchDataStore.new` as an options hash.
 
-You can serve directly from the couch datastore. You can optionally pass in a `:mime_type` option to `store`
-to tell it what to use for its 'Content-Type' header.
+You can serve directly from the couch datastore.
+
+You can optionally pass in a `:content_type` option to `store` to tell it what to use for its 'Content-Type' header.
 
 Custom datastore
 ----------------

data/extra_docs/Rails3.md

@@ -23,17 +23,19 @@ config/initializers/dragonfly.rb:
 
 application.rb:
 
-    config.middleware.insert 0, 'Dragonfly::Middleware', :images
-    config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
+    config.middleware.insert 0, 'Rack::Cache', {
       :verbose     => true,
       :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"),
       :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
-    }
+    } # unless Rails.env.production?  ## uncomment this 'unless' in Rails 3.1,
+                                      ## because it already inserts Rack::Cache in production
+    
+    config.middleware.insert_after 'Rack::Cache', 'Dragonfly::Middleware', :images
 
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.4'
+    gem 'dragonfly', '~>0.9.8'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/features/steps/rails_steps.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 RAILS_APP_NAME = 'tmp_app'
 FIXTURES_PATH = ROOT_PATH + "/fixtures"
 
@@ -12,17 +14,27 @@ end
 ##############################################################################
 
 Given "a Rails application set up for using dragonfly" do
-  raise "Problem setting up Rails app" unless `
-    cd #{fixture_path} &&
-    rm -rf #{RAILS_APP_NAME} &&
-    bundle exec rails new #{RAILS_APP_NAME} -m template.rb`
+  ok = nil
+  FileUtils.cd fixture_path do
+    FileUtils.rm_rf RAILS_APP_NAME
+    ok = `bundle exec rails new #{RAILS_APP_NAME} -m template.rb`
+  end
+  raise "Problem setting up Rails app" unless ok
 end
 
 Then /^the (.+) cucumber features in my Rails app should pass$/ do |filename|
   puts "\n*** RUNNING FEATURES IN THE RAILS APP... ***\n"
   path = File.join(fixture_path, RAILS_APP_NAME)
-  `cd #{path} && RAILS_ENV=cucumber rake db:migrate`
-  features_passed = system "cd #{path} && cucumber features/#{filename}.feature"
+  FileUtils.cd path do
+    env = ENV['RAILS_ENV']
+    ENV['RAILS_ENV'] = 'cucumber'
+    `rake db:migrate`
+    ENV['RAILS_ENV'] = env
+  end
+  features_passed = nil
+  FileUtils.cd path do
+    features_passed = system "cucumber features/#{filename}.feature"
+  end
   puts "\n*** FINISHED RUNNING FEATURES IN THE RAILS APP ***\n"
   raise "Features failed" unless features_passed
 end

data/features/support/setup.rb

@@ -5,8 +5,17 @@ require ROOT_PATH + '/spec/support/image_matchers.rb'
 # A hash of <name for reference> => <dragonfly uid> pairs
 TEMP_FILES = {}
 
-Dragonfly[:images].configure_with(:imagemagick)
+root_path = ROOT_PATH + '/tmp/dragonfly_cukes'
+logger = Logger.new(ROOT_PATH + '/tmp/dragonfly_cukes.log')
+
+Dragonfly[:images].configure_with(:imagemagick).configure do |c|
+  c.datastore.root_path = root_path
+  c.log = logger
+end
+
 Dragonfly[:files].configure do |c|
+  c.datastore.root_path = root_path
+  c.log = logger
   c.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
 end
 

data/fixtures/rails/files/features/step_definitions/image_steps.rb

@@ -16,7 +16,7 @@ end
 
 Then /^I should see a (.+) image of size (.+)$/ do |format, size|
   tempfile = Tempfile.new('wicked')
-  page.source.force_encoding('UTF-8').encode! if page.source.respond_to?(:force_encoding) # For some reason need this on Ruby 1.9.2
+  tempfile.binmode
   tempfile.write page.source
   tempfile.close
   output = `identify #{tempfile.path}`.split(' ')

data/lib/dragonfly.rb

@@ -52,5 +52,9 @@ module Dragonfly
     App.register_configuration(:rails){ Config::Rails }
     App.register_configuration(:heroku){ Config::Heroku }
 
+    def running_on_windows?
+      ENV['OS'] && ENV['OS'].downcase == 'windows_nt'
+    end
+
   end
 end

data/lib/dragonfly/analysis/file_command_analyser.rb

@@ -3,6 +3,7 @@ module Dragonfly
     
     class FileCommandAnalyser
       
+      include Shell
       include Configurable
       
       configurable_attr :file_command, "file"
@@ -11,7 +12,7 @@ module Dragonfly
       
       def mime_type(temp_object)
         content_type = if use_filesystem
-          `#{file_command} -b --mime '#{temp_object.path}'`
+          `#{file_command} -b --mime #{quote temp_object.path}`
         else
           IO.popen("#{file_command} -b --mime -", 'r+') do |io|
             if num_bytes_to_check

data/lib/dragonfly/data_storage/couch_data_store.rb

@@ -29,7 +29,7 @@ module Dragonfly
         temp_object.file do |f|
           doc = CouchRest::Document.new(:meta => marshal_encode(meta))
           response = db.save_doc(doc)
-          doc.put_attachment(name, f, {:content_type => content_type})
+          doc.put_attachment(name, f.dup, :content_type => content_type)
           form_uid(response['id'], name)
         end
       rescue RuntimeError => e

data/lib/dragonfly/data_storage/mongo_data_store.rb

@@ -31,8 +31,10 @@ module Dragonfly
 
       def store(temp_object, opts={})
         ensure_authenticated!
+        content_type = opts[:content_type] || opts[:mime_type] || 'application/octet-stream'
         temp_object.file do |f|
-          mongo_id = grid.put(f, :metadata => marshal_encode(opts[:meta] || {}))
+          mongo_id = grid.put(f, :content_type => content_type,
+                                 :metadata => marshal_encode(opts[:meta] || {}))
           mongo_id.to_s
         end
       end
@@ -76,7 +78,7 @@ module Dragonfly
           @authenticated ||= db.authenticate(username, password)
         end
       end
-      
+
       def bson_id(uid)
         OBJECT_ID.from_string(uid)
       end

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -69,7 +69,11 @@ module Dragonfly
 
       def url_for(uid, opts={})
         if opts && opts[:expires]
-          storage.get_object_url(bucket_name, uid, opts[:expires])
+          if storage.respond_to?(:get_object_https_url) # fog's get_object_url is deprecated (aug 2011)
+            storage.get_object_https_url(bucket_name, uid, opts[:expires])
+          else
+            storage.get_object_url(bucket_name, uid, opts[:expires])
+          end
         else
           "http://#{bucket_name}.s3.amazonaws.com/#{uid}"
         end

data/lib/dragonfly/image_magick/generator.rb

@@ -42,7 +42,7 @@ module Dragonfly
       def plain(width, height, colour, opts={})
         format = opts[:format] || 'png'
         [
-          convert(nil, "-size #{width}x#{height} \"xc:#{colour}\"", format),
+          convert(nil, "-size #{width}x#{height} xc:#{colour}", format),
           {:format => format.to_sym, :name => "plain.#{format}"}
         ]
       end
@@ -96,7 +96,7 @@ module Dragonfly
           args.push("-size #{width}x#{height}")
           args.push("xc:#{background}")
           args.push("-annotate 0x0+#{padding_left}+#{padding_top} #{escaped_string}")
-          run "#{convert_command} #{args.join(' ')} #{tempfile.path}"
+          run convert_command,  "#{args.join(' ')} #{quote tempfile.path}"
         end
 
         [

data/lib/dragonfly/image_magick/processor.rb

@@ -23,7 +23,7 @@ module Dragonfly
       include Utils
       
       def resize(temp_object, geometry)
-        convert(temp_object, "-resize \"#{geometry}\"")
+        convert(temp_object, "-resize #{geometry}")
       end
       
       def crop(temp_object, opts={})
@@ -69,7 +69,7 @@ module Dragonfly
       end
       
       def rotate(temp_object, amount, opts={})
-        convert(temp_object, "-rotate \"#{amount}#{opts[:qualifier]}\"")
+        convert(temp_object, "-rotate #{amount}#{opts[:qualifier]}")
       end
 
       def strip(temp_object)

data/lib/dragonfly/image_magick/utils.rb

@@ -4,20 +4,17 @@ module Dragonfly
   module ImageMagick
     module Utils
 
-      # Exceptions
-      class ShellCommandFailed < RuntimeError; end
-
+      include Shell
       include Loggable
       include Configurable
       configurable_attr :convert_command, "convert"
       configurable_attr :identify_command, "identify"
-      configurable_attr :log_commands, false
     
       private
 
       def convert(temp_object=nil, args='', format=nil)
         tempfile = new_tempfile(format)
-        run "#{convert_command} #{'"'+temp_object.path+'"' if temp_object} #{args} #{tempfile.path}"
+        run convert_command, %(#{quote(temp_object.path) if temp_object} #{args} #{quote(tempfile.path)})
         tempfile
       end
 
@@ -35,7 +32,7 @@ module Dragonfly
       end
     
       def raw_identify(temp_object, args='')
-        run "#{identify_command} #{args} \"#{temp_object.path}\""
+        run identify_command, "#{args} #{quote(temp_object.path)}"
       end
     
       def new_tempfile(ext=nil)
@@ -45,25 +42,6 @@ module Dragonfly
         tempfile
       end
 
-      def run(command)
-        log.debug("Running command: #{command}") if log_commands
-        begin
-          result = `#{command}`
-        rescue Errno::ENOENT
-          raise_shell_command_failed(command)
-        end
-        if $?.exitstatus == 1
-          throw :unable_to_handle
-        elsif !$?.success?
-          raise_shell_command_failed(command)
-        end
-        result
-      end
-    
-      def raise_shell_command_failed(command)
-        raise ShellCommandFailed, "Command failed (#{command}) with exit status #{$?.exitstatus}"
-      end
-
     end
   end
 end