dragonfly 0.8.1 → 0.8.2

data/Gemfile

@@ -3,7 +3,6 @@ source :rubygems
 # These gems are needed for development and testing
 group :development, :test, :cucumber do
   gem 'aws-s3'
-  gem 'bson_ext'
   gem 'capybara'
   gem 'cucumber', '0.8.5'
   gem 'cucumber-rails'
@@ -16,8 +15,15 @@ group :development, :test, :cucumber do
   gem 'rack-cache'
   gem 'rails', '3.0.3', :require => nil
   gem 'rake'
-  gem 'rmagick', '2.12.2', :require => nil
   gem 'rspec', '~> 1.3'
-  gem 'sqlite3-ruby', '1.3.0' # 1.3.1 segfaults on Ruby 1.9.2
   gem 'yard'
+  if RUBY_PLATFORM == "java"
+    gem "jdbc-sqlite3"
+    gem "activerecord-jdbcsqlite3-adapter"
+    gem "jruby-openssl"
+  else
+    gem 'bson_ext'
+    gem 'rmagick', '2.12.2', :require => nil
+    gem 'sqlite3-ruby', '1.3.0' # 1.3.1 segfaults on Ruby 1.9.2
+  end
 end

data/Gemfile.rails.2.3.5

@@ -10,5 +10,11 @@ group :development, :test, :cucumber do
   gem 'rack-cache', :require => nil
   gem 'rails', '2.3.5', :require => nil
   gem 'rspec', '~> 1.3'
-  gem 'sqlite3-ruby', '1.3.0'
+  if RUBY_PLATFORM == "java"
+    gem "jdbc-sqlite3"
+    gem "activerecord-jdbcsqlite3-adapter"
+    gem "jruby-openssl"
+  else
+    gem 'sqlite3-ruby', '1.3.0' # 1.3.1 segfaults on Ruby 1.9.2
+  end
 end

data/History.md

@@ -1,3 +1,12 @@
+0.8.2 (2010-01-11)
+==================
+Fixes
+-----
+- Renamed ActiveModel methods like 'attachments' to avoid name clashes
+- Respond properly to HEAD, POST, PUT and DELETE requests
+- Got it working with jRuby and Rubinius
+- Made DOS protection SHA (and ETag) consistent
+
 0.8.1 (2010-11-22)
 ==================
 Fixes

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/config.ru

@@ -1,9 +1,10 @@
-require 'rubygems'
+require "rubygems"
+require "bundler/setup"
+$:.unshift(File.expand_path('../lib', __FILE__))
+require 'dragonfly'
 require 'rack/cache'
-require File.dirname(__FILE__) + '/lib/dragonfly'
 
-APP = Dragonfly[:images].configure_with(:imagemagick) do |c|
-end
+APP = Dragonfly[:images].configure_with(:imagemagick)
 
 use Rack::Cache,
   :verbose     => true,

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-11-22}
+  s.date = %q{2011-01-11}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -81,6 +81,8 @@ Gem::Specification.new do |s|
     "lib/dragonfly/config/r_magick.rb",
     "lib/dragonfly/config/rails.rb",
     "lib/dragonfly/configurable.rb",
+    "lib/dragonfly/core_ext/array.rb",
+    "lib/dragonfly/core_ext/hash.rb",
     "lib/dragonfly/core_ext/object.rb",
     "lib/dragonfly/core_ext/string.rb",
     "lib/dragonfly/core_ext/symbol.rb",
@@ -132,13 +134,14 @@ Gem::Specification.new do |s|
     "spec/dragonfly/app_spec.rb",
     "spec/dragonfly/config/r_magick_spec.rb",
     "spec/dragonfly/configurable_spec.rb",
+    "spec/dragonfly/core_ext/array_spec.rb",
+    "spec/dragonfly/core_ext/hash_spec.rb",
     "spec/dragonfly/core_ext/string_spec.rb",
     "spec/dragonfly/core_ext/symbol_spec.rb",
     "spec/dragonfly/data_storage/data_store_spec.rb",
     "spec/dragonfly/data_storage/file_data_store_spec.rb",
     "spec/dragonfly/data_storage/mongo_data_store_spec.rb",
     "spec/dragonfly/data_storage/s3_data_store_spec.rb",
-    "spec/dragonfly/deprecation_spec.rb",
     "spec/dragonfly/encoding/image_magick_encoder_spec.rb",
     "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
     "spec/dragonfly/function_manager_spec.rb",
@@ -189,13 +192,14 @@ Gem::Specification.new do |s|
     "spec/dragonfly/app_spec.rb",
     "spec/dragonfly/config/r_magick_spec.rb",
     "spec/dragonfly/configurable_spec.rb",
+    "spec/dragonfly/core_ext/array_spec.rb",
+    "spec/dragonfly/core_ext/hash_spec.rb",
     "spec/dragonfly/core_ext/string_spec.rb",
     "spec/dragonfly/core_ext/symbol_spec.rb",
     "spec/dragonfly/data_storage/data_store_spec.rb",
     "spec/dragonfly/data_storage/file_data_store_spec.rb",
     "spec/dragonfly/data_storage/mongo_data_store_spec.rb",
     "spec/dragonfly/data_storage/s3_data_store_spec.rb",
-    "spec/dragonfly/deprecation_spec.rb",
     "spec/dragonfly/encoding/image_magick_encoder_spec.rb",
     "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
     "spec/dragonfly/function_manager_spec.rb",
@@ -229,7 +233,6 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<aws-s3>, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, ["= 0.8.5"])
       s.add_development_dependency(%q<cucumber-rails>, [">= 0"])
@@ -242,14 +245,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["= 3.0.3"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, [">= 0"])
+      s.add_development_dependency(%q<rmagick>, ["= 2.12.2"])
+      s.add_development_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
     else
       s.add_dependency(%q<aws-s3>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<cucumber>, ["= 0.8.5"])
       s.add_dependency(%q<cucumber-rails>, [">= 0"])
@@ -262,15 +265,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack-cache>, [">= 0"])
       s.add_dependency(%q<rails>, ["= 3.0.3"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<rmagick>, ["= 2.12.2"])
+      s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
       s.add_dependency(%q<rack>, [">= 0"])
     end
   else
     s.add_dependency(%q<aws-s3>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<cucumber>, ["= 0.8.5"])
     s.add_dependency(%q<cucumber-rails>, [">= 0"])
@@ -283,10 +286,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack-cache>, [">= 0"])
     s.add_dependency(%q<rails>, ["= 3.0.3"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rmagick>, ["= 2.12.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<rmagick>, ["= 2.12.2"])
+    s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.0"])
     s.add_dependency(%q<rack>, [">= 0"])
   end
 end

data/extra_docs/Index.md

@@ -6,9 +6,6 @@ I actually lied about image handling - it can be used for any type of content.
 
 See the links on the right for more info.
 
-**NOTE: the API has changed since v0.6.2!
-[Docs for v0.6.2 are here](v0.6.2/index.html) for a very limited time.**
-
 Installation
 ------------
 

data/irbrc.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "bundler/setup"
-require File.dirname(__FILE__) + '/lib/dragonfly'
+$:.unshift(File.expand_path('../lib', __FILE__))
+require 'dragonfly'
 APP = Dragonfly[:images].configure_with(:imagemagick)
 
 # available_uids = `find #{APP.datastore.root_path} ! -type d`.split("\n").map do |file|

data/lib/dragonfly.rb

@@ -30,9 +30,11 @@ end
 
 autoload_files_in_dir("#{File.dirname(__FILE__)}/dragonfly", 'Dragonfly')
 
-require File.dirname(__FILE__) + '/dragonfly/core_ext/object'
-require File.dirname(__FILE__) + '/dragonfly/core_ext/string'
-require File.dirname(__FILE__) + '/dragonfly/core_ext/symbol'
+require 'dragonfly/core_ext/object'
+require 'dragonfly/core_ext/string'
+require 'dragonfly/core_ext/symbol'
+require 'dragonfly/core_ext/array'
+require 'dragonfly/core_ext/hash'
 
 module Dragonfly
   class << self

data/lib/dragonfly/active_model_extensions/class_methods.rb

@@ -11,20 +11,20 @@ module Dragonfly
           define_method macro_name do |attribute|
 
             # Prior to activerecord 3, adding before callbacks more than once does add it more than once
-            before_save :save_attachments unless respond_to?(:before_save_callback_chain) && before_save_callback_chain.find(:save_attachments)
-            before_destroy :destroy_attachments unless respond_to?(:before_destroy_callback_chain) && before_destroy_callback_chain.find(:destroy_attachments)
+            before_save :save_dragonfly_attachments unless respond_to?(:before_save_callback_chain) && before_save_callback_chain.find(:save_dragonfly_attachments)
+            before_destroy :destroy_dragonfly_attachments unless respond_to?(:before_destroy_callback_chain) && before_destroy_callback_chain.find(:destroy_dragonfly_attachments)
       
             # Register the new attribute
             dragonfly_apps_for_attributes[attribute] = app
             
             # Define the setter for the attribute
             define_method "#{attribute}=" do |value|
-              attachments[attribute].assign(value)
+              dragonfly_attachments[attribute].assign(value)
             end
       
             # Define the getter for the attribute
             define_method attribute do
-              attachments[attribute].to_value
+              dragonfly_attachments[attribute].to_value
             end
       
           end

data/lib/dragonfly/active_model_extensions/instance_methods.rb

@@ -2,8 +2,8 @@ module Dragonfly
   module ActiveModelExtensions
     module InstanceMethods
       
-      def attachments
-        @attachments ||= self.class.dragonfly_apps_for_attributes.inject({}) do |hash, (attribute, app)|
+      def dragonfly_attachments
+        @dragonfly_attachments ||= self.class.dragonfly_apps_for_attributes.inject({}) do |hash, (attribute, app)|
           hash[attribute] = Attachment.new(app, self, attribute)
           hash
         end
@@ -11,14 +11,14 @@ module Dragonfly
 
       private
       
-      def save_attachments
-        attachments.each do |attribute, attachment|
+      def save_dragonfly_attachments
+        dragonfly_attachments.each do |attribute, attachment|
           attachment.save!
         end
       end
       
-      def destroy_attachments
-        attachments.each do |attribute, attachment|
+      def destroy_dragonfly_attachments
+        dragonfly_attachments.each do |attribute, attachment|
           attachment.destroy!
         end
       end

data/lib/dragonfly/app.rb

@@ -127,31 +127,17 @@ module Dragonfly
       url_path_prefix.blank? ? '/' : url_path_prefix
     end
 
-    def url_for(job, *args)
-      if (args.length == 1 && args.first.kind_of?(Hash)) || args.empty?
-        opts = args.first ? args.first.dup : {}
-        host = opts.delete(:host) || url_host
-        suffix = opts.delete(:suffix) || url_suffix
-        suffix = suffix.call(job) if suffix.respond_to?(:call)
-        path_prefix = opts.delete(:path_prefix) || url_path_prefix
-        path = "#{host}#{path_prefix}#{job.to_path}#{suffix}"
-        query = opts
-        query.merge!(server.required_params_for(job)) if protect_from_dos_attacks
-        path << "?#{Rack::Utils.build_query(query)}" if query.any?
-        path
-      else
-        # Deprecation stuff - will be removed!!!
-        case args[0]
-        when /^(\d+)?x(\d+)?/
-          log.warn("DEPRECATED USE OF url_for and will be removed in the future - please use thumb(#{args.map{|a|a.inspect}.join(', ')}).url")
-          args[1] ? job.thumb(args[0], args[1]).url : job.thumb(args[0]).url
-        when :gif, :png, :jpg, :jpeg
-          log.warn("DEPRECATED USE OF url_for and will be removed in the future - please use encode(#{args.first.inspect}).url")
-          job.encode(args[0]).url
-        else
-          raise "DEPRECATED USE OF url_for - will be removed in future versions - please consult the docs"
-        end
-      end
+    def url_for(job, opts={})
+      opts = opts.dup
+      host = opts.delete(:host) || url_host
+      suffix = opts.delete(:suffix) || url_suffix
+      suffix = suffix.call(job) if suffix.respond_to?(:call)
+      path_prefix = opts.delete(:path_prefix) || url_path_prefix
+      path = "#{host}#{path_prefix}#{job.to_path}#{suffix}"
+      query = opts
+      query.merge!(server.required_params_for(job)) if protect_from_dos_attacks
+      path << "?#{Rack::Utils.build_query(query)}" if query.any?
+      path
     end
 
     def define_macro(mod, macro_name)

data/lib/dragonfly/configurable.rb

@@ -25,7 +25,15 @@ module Dragonfly
       end
     end
 
-    class DeferredBlock < Proc; end
+    class DeferredBlock # Inheriting from Proc causes errors in some versions of Ruby
+      def initialize(blk)
+        @blk = blk
+      end
+
+      def call
+        @blk.call
+      end
+    end
 
     module InstanceMethods
 
@@ -64,7 +72,7 @@ module Dragonfly
       private
 
       def configurable_attr attribute, default=nil, &blk
-        default_configuration[attribute] = blk ? DeferredBlock.new(&blk) : default
+        default_configuration[attribute] = blk ? DeferredBlock.new(blk) : default
 
         # Define the reader
         define_method(attribute) do

data/lib/dragonfly/core_ext/array.rb

@@ -0,0 +1,7 @@
+class Array
+
+  def to_dragonfly_unique_s
+    map{|item| item.to_dragonfly_unique_s }.join
+  end
+
+end

data/lib/dragonfly/core_ext/hash.rb

@@ -0,0 +1,7 @@
+class Hash
+
+  def to_dragonfly_unique_s
+    sort_by{|k, v| k.to_dragonfly_unique_s }.to_dragonfly_unique_s
+  end
+
+end

data/lib/dragonfly/core_ext/object.rb

@@ -4,5 +4,9 @@ class Object
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
+
+  def to_dragonfly_unique_s
+    to_s
+  end
   
 end

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -57,7 +57,7 @@ module Dragonfly
         dirname = File.dirname(path)
         basename = File.basename(path, '.*')
         extname = File.extname(path)
-        "#{dirname}/#{basename}_#{Time.now.usec.to_s(32)}#{extname}"
+        "#{dirname}/#{basename}_#{(Time.now.usec*10 + rand(100)).to_s(32)}#{extname}"
       end
 
       private

data/lib/dragonfly/job.rb

@@ -243,16 +243,20 @@ module Dragonfly
 
     # Serializing, etc.
 
+    def to_unique_s
+      to_a.to_dragonfly_unique_s
+    end
+
     def serialize
       Serializer.marshal_encode(to_a)
     end
 
     def unique_signature
-      Digest::SHA1.hexdigest(serialize)
+      Digest::SHA1.hexdigest(to_unique_s)
     end
 
     def sha
-      Digest::SHA1.hexdigest("#{serialize}#{app.secret}")[0...8]
+      Digest::SHA1.hexdigest("#{to_unique_s}#{app.secret}")[0...8]
     end
 
     def validate_sha!(sha)
@@ -268,8 +272,8 @@ module Dragonfly
 
     # URLs, etc.
 
-    def url(*args)
-      app.url_for(self, *args) unless steps.empty?
+    def url(opts={})
+      app.url_for(self, opts) unless steps.empty?
     end
 
     def b64_data

data/lib/dragonfly/response.rb

@@ -16,11 +16,13 @@ module Dragonfly
     end
 
     def to_response
-      if etag_matches?
-        # Not Modified
+      if !(request.head? || request.get?)
+        [405, method_not_allowed_headers, ["#{request.request_method} method not allowed"]]
+      elsif etag_matches?
         [304, cache_headers, []]
-      else
-        # Success
+      elsif request.head?
+        [200, success_headers.merge(cache_headers), []]
+      elsif request.get?
         [200, success_headers.merge(cache_headers), job.result]
       end
     rescue DataStorage::DataNotFound => e
@@ -65,6 +67,13 @@ module Dragonfly
       parts << %(filename="#{URI.encode(filename)}") if filename
       parts.any? ? {"Content-Disposition" => parts.join('; ')} : {}
     end
+    
+    def method_not_allowed_headers
+      {
+        'Content-Type' => 'text/plain',
+        'Allow' => 'GET, HEAD'
+      }
+    end
 
     def content_disposition
       @content_disposition ||= evaluate(app.content_disposition)