dragonfly 0.9.8 → 0.9.9

data/lib/dragonfly/data_storage/mongo_data_store.rb

@@ -34,7 +34,7 @@ module Dragonfly
         content_type = opts[:content_type] || opts[:mime_type] || 'application/octet-stream'
         temp_object.file do |f|
           mongo_id = grid.put(f, :content_type => content_type,
-                                 :metadata => marshal_encode(opts[:meta] || {}))
+                                 :metadata => marshal_encode(temp_object.meta))
           mongo_id.to_s
         end
       end

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -11,15 +11,20 @@ module Dragonfly
       configurable_attr :bucket_name
       configurable_attr :access_key_id
       configurable_attr :secret_access_key
-      configurable_attr :use_filesystem, true
       configurable_attr :region
+      configurable_attr :use_filesystem, true
       configurable_attr :storage_headers, {'x-amz-acl' => 'public-read'}
+      configurable_attr :url_scheme, 'http'
 
       REGIONS = {
-        'us-east-1'      => 's3.amazonaws.com',  #default
-        'eu-west-1'      => 's3-eu-west-1.amazonaws.com',
+        'us-east-1' => 's3.amazonaws.com',  #default
+        'us-west-1' => 's3-us-west-1.amazonaws.com',
+        'us-west-2' => 's3-us-west-2.amazonaws.com',
+        'ap-northeast-1' => 's3-ap-northeast-1.amazonaws.com',
         'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com',
-        'us-west-1'      => 's3-us-west-1.amazonaws.com'
+        'eu-west-1' => 's3-eu-west-1.amazonaws.com',
+        'sa-east-1' => 's3-sa-east-1.amazonaws.com',
+        'sa-east-1' => 's3-sa-east-1.amazonaws.com'
       }
 
       def initialize(opts={})
@@ -33,17 +38,18 @@ module Dragonfly
         ensure_configured
         ensure_bucket_initialized
         
-        meta = opts[:meta] || {}
         headers = opts[:headers] || {}
-        uid = opts[:path] || generate_uid(meta[:name] || temp_object.original_filename || 'file')
+        mime_type = opts[:mime_type] || opts[:content_type]
+        headers['Content-Type'] = mime_type if mime_type
+        uid = opts[:path] || generate_uid(temp_object.name || 'file')
         
         rescuing_socket_errors do
           if use_filesystem
             temp_object.file do |f|
-              storage.put_object(bucket_name, uid, f, full_storage_headers(headers, meta))
+              storage.put_object(bucket_name, uid, f, full_storage_headers(headers, temp_object.meta))
             end
           else
-            storage.put_object(bucket_name, uid, temp_object.data, full_storage_headers(headers, meta))
+            storage.put_object(bucket_name, uid, temp_object.data, full_storage_headers(headers, temp_object.meta))
           end
         end
         
@@ -75,7 +81,8 @@ module Dragonfly
             storage.get_object_url(bucket_name, uid, opts[:expires])
           end
         else
-          "http://#{bucket_name}.s3.amazonaws.com/#{uid}"
+          scheme = opts[:scheme] || url_scheme
+          "#{scheme}://#{bucket_name}.s3.amazonaws.com/#{uid}"
         end
       end
 
@@ -93,7 +100,7 @@ module Dragonfly
       end
 
       def bucket_exists?
-        rescuing_socket_errors{ storage.get_bucket_location(bucket_name) }
+        rescuing_socket_errors{ storage.get_bucket(bucket_name) }
         true
       rescue Excon::Errors::NotFound => e
         false

data/lib/dragonfly/function_manager.rb

@@ -26,7 +26,7 @@ module Dragonfly
       obj.use_same_log_as(self) if obj.is_a?(Loggable)
       obj.use_as_fallback_config(self) if obj.is_a?(Configurable)
       methods_to_add(obj).each do |meth|
-        add meth.to_sym, obj.method(meth)
+        add meth, obj.method(meth)
       end
       objects << obj
       obj
@@ -58,13 +58,9 @@ module Dragonfly
     private
 
     def methods_to_add(obj)
-      if obj.is_a?(Configurable)
-        obj.public_methods(false) -
-          obj.config_methods.map{|meth| meth.to_method_name} -
-          [:configured_class.to_method_name] # Hacky - there must be a better way...
-      else
-        obj.public_methods(false)
-      end
+      methods = obj.public_methods(false).map{|m| m.to_sym }
+      methods -= obj.config_methods if obj.is_a?(Configurable)
+      methods
     end
 
   end

data/lib/dragonfly/has_filename.rb

@@ -0,0 +1,24 @@
+module Dragonfly
+  # Convenience methods for setting basename and extension
+  # Including class needs to define a 'name' accessor
+  # which is assumed to hold a filename-style string
+  module HasFilename
+    
+    def basename
+      File.basename(name, '.*') if name
+    end
+    
+    def basename=(basename)
+      self.name = [basename, ext].compact.join('.')
+    end
+
+    def ext
+      File.extname(name)[/\.(.*)/, 1] if name
+    end
+    
+    def ext=(ext)
+      self.name = [(basename || 'file'), ext].join('.')
+    end
+    
+  end
+end

data/lib/dragonfly/image_magick/analyser.rb

@@ -2,8 +2,8 @@ module Dragonfly
   module ImageMagick
     class Analyser
 
-      include Utils
       include Configurable
+      include Utils
 
       def width(temp_object)
         identify(temp_object)[:width]

data/lib/dragonfly/image_magick/generator.rb

@@ -36,8 +36,8 @@ module Dragonfly
         '900'     => 900
       }
 
-      include Utils
       include Configurable
+      include Utils
 
       def plain(width, height, colour, opts={})
         format = opts[:format] || 'png'

data/lib/dragonfly/image_magick/processor.rb

@@ -20,12 +20,17 @@ module Dragonfly
       CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
       THUMB_GEOMETRY = Regexp.union RESIZE_GEOMETRY, CROPPED_RESIZE_GEOMETRY, CROP_GEOMETRY
       
+      include Configurable
       include Utils
       
       def resize(temp_object, geometry)
         convert(temp_object, "-resize #{geometry}")
       end
       
+      def auto_orient(temp_object)
+        convert(temp_object, "-auto-orient")
+      end
+
       def crop(temp_object, opts={})
         width   = opts[:width]
         height  = opts[:height]

data/lib/dragonfly/image_magick/utils.rb

@@ -21,8 +21,7 @@ module Dragonfly
       def identify(temp_object)
         # example of details string:
         # myimage.png PNG 200x100 200x100+0+0 8-bit DirectClass 31.2kb
-        format, geometry, depth = raw_identify(temp_object).scan(/([A-Z]+) (.+) .+ (\d+)-bit/)[0]
-        width, height = geometry.split('x')
+        format, width, height, depth = raw_identify(temp_object).scan(/([A-Z0-9]+) (\d+)x(\d+) .+ (\d+)-bit/)[0]
         {
           :format => format.downcase.to_sym,
           :width => width.to_i,

data/lib/dragonfly/job.rb

@@ -10,17 +10,19 @@ module Dragonfly
     # Exceptions
     class AppDoesNotMatch < StandardError; end
     class JobAlreadyApplied < StandardError; end
+    class NoContent < StandardError; end
     class NothingToProcess < StandardError; end
     class NothingToEncode < StandardError; end
-    class NothingToAnalyse < StandardError; end
     class InvalidArray < StandardError; end
     class NoSHAGiven < StandardError; end
     class IncorrectSHA < StandardError; end
 
     extend Forwardable
     def_delegators :result,
-                   :data, :file, :tempfile, :path, :to_file, :size, :each
-    def_delegator :app, :server
+                   :data, :file, :tempfile, :path, :to_file, :size, :each,
+                   :meta, :meta=, :name, :name=, :basename, :basename=, :ext, :ext=
+    def_delegator :app,
+                  :server
 
     class Step
 
@@ -81,7 +83,7 @@ module Dragonfly
 
     class Encode < Step
       def init
-        job.meta[:format] = format
+        job.url_attrs[:format] = format
       end
       def format
         args.first
@@ -92,8 +94,7 @@ module Dragonfly
       def apply
         raise NothingToEncode, "Can't encode because temp object has not been initialized. Need to fetch first?" unless job.temp_object
         content, meta = job.app.encoder.encode(job.temp_object, format, *arguments)
-        job.update(content, meta)
-        job.meta[:format] = format
+        job.update(content, (meta || {}).merge(:format => format))
       end
     end
 
@@ -106,19 +107,22 @@ module Dragonfly
 
     class FetchFile < Step
       def init
-        job.name = File.basename(path)
+        job.url_attrs[:name] = filename
       end
       def path
-        File.expand_path(args.first)
+        @path ||= File.expand_path(args.first)
+      end
+      def filename
+        @filename ||= File.basename(path)
       end
       def apply
-        job.temp_object = TempObject.new(Pathname.new(path))
+        job.update(Pathname.new(path), :name => filename)
       end
     end
 
     class FetchUrl < Step
       def init
-        job.name = File.basename(path) if path[/[^\/]$/]
+        job.url_attrs[:name] = filename
       end
       def url
         @url ||= (args.first[%r<^\w+://>] ? args.first : "http://#{args.first}")
@@ -126,9 +130,12 @@ module Dragonfly
       def path
         @path ||= URI.parse(url).path
       end
+      def filename
+        @filename ||= File.basename(path) if path[/[^\/]$/]
+      end
       def apply
         open(url) do |f|
-          job.temp_object = TempObject.new(f.read)
+          job.update(f.read, :name => filename)
         end
       end
     end
@@ -183,7 +190,7 @@ module Dragonfly
       
       def format
         apply
-        format_from_meta || analyse(:format)
+        meta[:format] || (ext.to_sym if ext && app.trust_file_extensions) || analyse(:format)
       end
       
       def mime_type
@@ -196,13 +203,13 @@ module Dragonfly
       
     end
 
-    def initialize(app, content=nil, meta={})
+    def initialize(app, content=nil, meta={}, url_attrs={})
       @app = app
       @steps = []
       @next_step_index = 0
-      @meta = {}
       @previous_temp_objects = []
-      update(content, meta)
+      update(content, meta) if content
+      self.url_attrs = url_attrs
     end
 
     # Used by 'dup' and 'clone'
@@ -237,9 +244,6 @@ module Dragonfly
     end
 
     def analyse(method, *args)
-      unless result
-        raise NothingToAnalyse, "Can't analyse because temp object has not been initialized. Need to fetch first?"
-      end
       analyser.analyse(result, method, *args)
     end
 
@@ -255,11 +259,6 @@ module Dragonfly
       next_step_index == steps.length
     end
 
-    def result
-      apply
-      temp_object
-    end
-
     def applied_steps
       steps[0...next_step_index]
     end
@@ -309,6 +308,12 @@ module Dragonfly
       app.url_for(self, attributes_for_url.merge(opts)) unless steps.empty?
     end
 
+    def url_attrs=(hash)
+      @url_attrs = UrlAttributes[hash]
+    end
+    
+    attr_reader :url_attrs
+
     def b64_data
       "data:#{mime_type};base64,#{Base64.encode64(data)}"
     end
@@ -324,7 +329,7 @@ module Dragonfly
     end
 
     def to_fetched_job(uid)
-      new_job = self.class.new(app, temp_object, meta)
+      new_job = self.class.new(app, temp_object, meta, url_attrs)
       new_job.fetch!(uid)
       new_job.next_step_index = 1
       new_job
@@ -368,56 +373,20 @@ module Dragonfly
     # Misc
 
     def store(opts={})
-      app.store(result, opts.merge(:meta => meta))
+      temp_object = result
+      app.store(temp_object, opts_for_store.merge(opts).merge(:meta => temp_object.meta))
     end
 
     def inspect
       to_s.sub(/>$/, " app=#{app}, steps=#{steps.inspect}, temp_object=#{temp_object.inspect}, steps applied:#{applied_steps.length}/#{steps.length} >")
     end
-
-    # Name and stuff
-        
-    attr_reader :meta
-
-    def meta=(hash)
-      raise ArgumentError, "meta must be a hash, you tried setting it as #{hash.inspect}" unless hash.is_a?(Hash)
-      @meta = hash
-    end
-
-    def name
-      meta[:name]
-    end
-
-    def name=(name)
-      meta[:name] = name
-    end
     
-    def basename
-      meta[:basename] || (File.basename(name, '.*') if name)
-    end
-
-    def ext
-      meta[:ext] || (File.extname(name)[/\.(.*)/, 1] if name)
-    end
-    
-    def attributes_for_url
-      attrs = meta.reject{|k, v| !server.params_in_url.include?(k.to_s) }
-      attrs[:basename] ||= basename if server.params_in_url.include?('basename')
-      attrs[:ext] ||= ext if server.params_in_url.include?('ext')
-      attrs[:format] = (attrs[:format] || format_from_meta).to_s if server.params_in_url.include?('format')
-      attrs.delete_if{|k, v| v.blank? }
-      attrs
-    end
-    
-    def update(content, meta)
-      if meta
-        meta.merge!(meta.delete(:meta)) if meta[:meta] # legacy data etc. may have nested meta hash - deprecate gracefully here
-        self.meta.merge!(meta)
-      end
-      if content
-        self.temp_object = TempObject.new(content)
-        self.name = temp_object.original_filename if name.nil? && temp_object.original_filename
+    def update(content, new_meta)
+      if new_meta
+        new_meta.merge!(new_meta.delete(:meta)) if new_meta[:meta] # legacy data etc. may have nested meta hash - deprecate gracefully here
       end
+      old_meta = temp_object ? temp_object.meta : {}
+      self.temp_object = TempObject.new(content, old_meta.merge(new_meta || {}))
     end
     
     def close
@@ -432,15 +401,27 @@ module Dragonfly
 
     private
 
-    attr_reader :previous_temp_objects
-
-    def format_from_meta
-      meta[:format] || (ext.to_sym if ext && app.trust_file_extensions)
+    def result
+      apply
+      temp_object || raise(NoContent, "Job has not been initialized with content. Need to fetch first?")
+    end
+    
+    def attributes_for_url
+      attrs = url_attrs.slice(*server.params_in_url)
+      attrs[:format] = (attrs[:format] || (url_attrs.ext if app.trust_file_extensions)).to_s if server.params_in_url.include?('format')
+      attrs.delete_if{|k, v| v.blank? }
+      attrs
     end
+    
+    attr_reader :previous_temp_objects
 
     def last_step_of_type(type)
       steps.select{|s| s.is_a?(type) }.last
     end
+    
+    def opts_for_store
+      {:mime_type => mime_type}
+    end
 
   end
 end

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 1, Dragonfly::CookieMonster
+      app.middleware.insert_before 'ActionDispatch::Cookies', Dragonfly::CookieMonster
     end
   end
 end

data/lib/dragonfly/temp_object.rb

@@ -32,20 +32,14 @@ module Dragonfly
   #
   class TempObject
 
+    include HasFilename
+
     # Exceptions
     class Closed < RuntimeError; end
 
-    # Class configuration
-    class << self
-
-      include Configurable
-      configurable_attr :block_size, 8192
-
-    end
-
     # Instance Methods
 
-    def initialize(obj)
+    def initialize(obj, meta={})
       if obj.is_a? TempObject
         @data = obj.get_data
         @tempfile = obj.get_tempfile
@@ -74,9 +68,22 @@ module Dragonfly
       elsif @pathname
         @pathname.basename.to_s
       end
+      
+      # Meta
+      @meta = meta
+      @meta[:name] ||= @original_filename if @original_filename
     end
     
     attr_reader :original_filename
+    attr_accessor :meta
+    
+    def name
+      meta[:name]
+    end
+    
+    def name=(name)
+      meta[:name] = name
+    end
 
     def data
       raise Closed, "can't read data as TempObject has been closed" if closed?
@@ -124,12 +131,14 @@ module Dragonfly
       end
     end
 
-    def to_file(path)
+    def to_file(path, opts={})
+      mode = opts[:mode] || 0644
+      prepare_path(path) unless opts[:mkdirs] == false
       if @data
-        File.open(path, 'wb'){|f| f.write(@data) }
+        File.open(path, 'wb', mode){|f| f.write(@data) }
       else
         FileUtils.cp(self.path, path)
-        File.chmod(0644, path)
+        File.chmod(mode, path)
       end
       File.new(path, 'rb')
     end
@@ -159,6 +168,10 @@ module Dragonfly
       to_s.sub(/>$/, " #{content_string} >")
     end
 
+    def unique_id
+      @unique_id ||= "#{object_id}#{rand(1000000)}"
+    end
+
     protected
 
     # We don't use normal accessors here because #data etc. do more than just return the instance var
@@ -177,7 +190,7 @@ module Dragonfly
     private
 
     def block_size
-      self.class.block_size
+      8192
     end
 
     def copy_to_tempfile(path)
@@ -187,12 +200,17 @@ module Dragonfly
     end
 
     def new_tempfile(content=nil)
-      tempfile = Tempfile.new('dragonfly')
+      tempfile = ext ? Tempfile.new(['dragonfly', ".#{ext}"]) : Tempfile.new('dragonfly')
       tempfile.binmode
       tempfile.write(content) if content
       tempfile.close
       tempfile
     end
 
+    def prepare_path(path)
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+    end
+
   end
 end