dragonfly 0.6.2 → 0.7.0

data/lib/dragonfly/simple_cache.rb

@@ -0,0 +1,23 @@
+module Dragonfly
+  class SimpleCache < Hash
+    
+    def initialize(max_size)
+      @max_size = max_size
+      @keys = []
+    end
+    
+    attr_reader :max_size
+    
+    def []=(key, value)
+      if !has_key?(key)
+        @keys << key
+        if size == max_size
+          key_to_purge = @keys.shift
+          delete(key_to_purge)
+        end
+      end
+      super
+    end
+    
+  end
+end

data/lib/dragonfly/simple_endpoint.rb

@@ -0,0 +1,64 @@
+module Dragonfly
+  class SimpleEndpoint
+
+    include Endpoint
+    include Loggable
+
+    # Instance methods
+
+    def initialize(app)
+      @app = app
+      use_same_log_as(app)
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+
+      case request.path_info
+      when '', '/', app.url_path_prefix
+        dragonfly_response
+      else
+        job = Job.from_path(request.path_info, app)
+        job.validate_sha!(request['s']) if app.protect_from_dos_attacks
+        response_for_job(job, env)
+      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"]]
+    end
+
+    def required_params_for(job)
+      {'s' => job.sha}
+    end
+
+    private
+
+    attr_reader :app
+
+    def dragonfly_response
+      body = <<-DRAGONFLY
+          _o|o_
+  _~~---._(   )_.---~~_
+ (       . \\ / .       )
+  `-.~--'  |=|  '--~.-'
+  _~-.~'" /|=|\\ "'~.-~_
+ (      ./ |=| \\.      )
+  `~~`"`   |=|   `"'~~"
+           |-|
+           <->
+            V
+      DRAGONFLY
+      [200, {
+        'Content-Type' => 'text/plain',
+        'Content-Size' => body.bytesize.to_s
+        },
+        [body]
+      ]
+    end
+
+  end
+end

data/lib/dragonfly/temp_object.rb

@@ -29,41 +29,36 @@ module Dragonfly
   # are ever called, then the filesystem will never be hit.
   #
   class TempObject
-  
+
     # Class configuration
     class << self
-      
+
       include Configurable
       configurable_attr :block_size, 8192
-      
+
     end
-  
+
     # Instance Methods
-    
-    def initialize(obj)
+
+    def initialize(obj, opts={})
       initialize_from_object!(obj)
+      validate_options!(opts)
+      extract_attributes_from(opts)
     end
-    
-    def modify_self!(obj)
-      unless obj == self
-        reset!
-        initialize_from_object!(obj)
-      end
-      self
-    end
-    
+
     def data
       @data ||= initialized_data || file.read
     end
 
     def tempfile
       @tempfile ||= begin
-        if initialized_tempfile
+        case initialized_with
+        when :tempfile
           @tempfile = initialized_tempfile
-        elsif initialized_data
+        when :data
           @tempfile = Tempfile.new('dragonfly')
           @tempfile.write(initialized_data)
-        elsif initialized_file
+        when :file
           @tempfile = copy_to_tempfile(initialized_file.path)
         end
         @tempfile.close
@@ -81,11 +76,11 @@ module Dragonfly
       end
       ret
     end
-    
+
     def path
       tempfile.path
     end
-    
+
     def size
       if initialized_data
         initialized_data.bytesize
@@ -93,24 +88,22 @@ module Dragonfly
         File.size(path)
       end
     end
-    
-    attr_writer :name
-    
-    def name
-      @name unless @name.blank?
+
+    attr_reader :name, :format
+    alias _format format
+
+    def meta
+      @meta ||= {}
     end
-    
+
     def basename
-      return unless name
-      name.sub(/\.[^.]+$/,'')
+      File.basename(name, '.*') if name
     end
-    
+
     def ext
-      return unless name
-      bits = name.split('.')
-      bits.last if bits.size > 1
+      File.extname(name)[/\.(.*)/, 1] if name
     end
-    
+
     def each(&block)
       to_io do |io|
         while part = io.read(block_size)
@@ -118,7 +111,7 @@ module Dragonfly
         end
       end
     end
-    
+
     def to_file(path)
       if initialized_data
         File.open(path, 'w'){|f| f.write(initialized_data) }
@@ -127,7 +120,7 @@ module Dragonfly
       end
       File.new(path)
     end
-    
+
     def to_io(&block)
       if initialized_data
         StringIO.open(initialized_data, &block)
@@ -136,16 +129,39 @@ module Dragonfly
       end
     end
 
+    def attributes
+      {
+        :name => name,
+        :meta => meta,
+        :format => format
+      }
+    end
+
+    def extract_attributes_from(hash)
+      self.name   = hash.delete(:name)   unless hash[:name].blank?
+      self.meta   = hash.delete(:meta)   unless hash[:meta].blank?
+      self.format = hash.delete(:format) unless hash[:format].blank?
+    end
+
+    def inspect
+      content_string = case initialized_with
+      when :data
+        data_string = size > 20 ? "#{initialized_data[0..20]}..." : initialized_data
+        "data=#{data_string.inspect}"
+      when :file then "file=#{initialized_file.inspect}"
+      when :tempfile then "tempfile=#{initialized_tempfile.inspect}"
+      end
+      to_s.sub(/>$/, " #{content_string}, @meta=#{@meta.inspect}, @name=#{@name.inspect} >")
+    end
+
     protected
-    
+
     attr_accessor :initialized_data, :initialized_tempfile, :initialized_file
-    
+
     private
-    
-    def reset!
-      @data = @tempfile = @initialized_data = @initialized_file = @initialized_tempfile = nil
-    end
-    
+
+    attr_writer :name, :meta, :format
+
     def initialize_from_object!(obj)
       case obj
       when TempObject
@@ -164,16 +180,32 @@ module Dragonfly
       end
       self.name = obj.original_filename if obj.respond_to?(:original_filename)
     end
-    
+
+    def initialized_with
+      if initialized_tempfile
+        :tempfile
+      elsif initialized_data
+        :data
+      elsif initialized_file
+        :file
+      end
+    end
+
     def block_size
       self.class.block_size
     end
-    
+
     def copy_to_tempfile(path)
       tempfile = Tempfile.new('dragonfly')
       FileUtils.cp File.expand_path(path), tempfile.path
       tempfile
     end
-    
+
+    def validate_options!(opts)
+      valid_keys = [:name, :meta, :format]
+      invalid_keys = opts.keys - valid_keys
+      raise ArgumentError, "Unrecognised options #{invalid_keys.inspect}" if invalid_keys.any?
+    end
+
   end
 end

data/spec/argument_matchers.rb

@@ -3,27 +3,17 @@ def string_matching(regexp)
 end
 
 class TempObjectArgumentMatcher
-  def initialize(data)
+  def initialize(data, opts)
     @data = data
+    @opts = opts
   end
   def ==(actual)
-    actual.is_a?(Dragonfly::TempObject) && actual.data == @data
+    actual.is_a?(Dragonfly::TempObject) &&
+      actual.data == @data &&
+      @opts.all?{|k,v| actual.send(k) == v }
   end
 end
 
-def a_temp_object_with_data(data)
-  TempObjectArgumentMatcher.new(data)
-end
-
-class ParametersArgumentMatcher
-  def initialize(hash)
-    @hash = hash
-  end
-  def ==(actual)
-    actual.to_hash.reject{|k,v| v.nil? || v.respond_to?(:empty?) && v.empty?} == @hash
-  end
-end
-
-def parameters_matching(hash)
-  ParametersArgumentMatcher.new(hash)
+def a_temp_object_with_data(data, opts={})
+  TempObjectArgumentMatcher.new(data, opts)
 end

data/spec/dragonfly/active_model_extensions/active_model_setup.rb

@@ -0,0 +1,97 @@
+# --------------------------------------------------------------- #
+# MODELS
+# --------------------------------------------------------------- #
+class MyModel
+  
+  # Callbacks
+  extend ActiveModel::Callbacks
+  define_model_callbacks :save, :destroy
+  
+  include ActiveModel::Validations
+  
+  class << self
+    def create!(attrs={})
+      new(attrs).save!
+    end
+    
+    def find(id)
+      new(instances[id])
+    end
+    
+    def instances
+      @instances ||= {}
+    end
+  end
+
+  def initialize(attrs={})
+    attrs.each do |key, value|
+      send("#{key}=", value)
+    end
+  end
+  
+  attr_accessor :id
+  
+  def to_hash
+    self.class::ATTRIBUTES.inject({}) do |hash, attr|
+      hash[attr] = send(attr)
+      hash
+    end
+  end
+  
+  def save
+    _run_save_callbacks {
+      self.id ||= rand(1000)
+      self.class.instances[id] = self.to_hash
+    }
+  end
+  def save!
+    save
+    self
+  end
+  
+  def destroy
+    _run_destroy_callbacks {}
+  end
+end
+
+class Item < MyModel
+  
+  ATTRIBUTES = [
+    :title,
+    :preview_image_uid,
+    :preview_image_some_analyser_method,
+    :preview_image_size,
+    :preview_image_name,
+    :preview_image_ext,
+    :preview_image_blah_blah,
+    :other_image_uid,
+    :yet_another_image_uid,
+    :otra_imagen_uid,
+    :trailer_video_uid,
+    :created_at,
+    :updated_at
+  ]
+  attr_accessor *ATTRIBUTES
+end
+
+class Car < MyModel
+  ATTRIBUTES = [
+    :image_uid,
+    :reliant_image_uid,
+    :type
+  ]
+  attr_accessor *ATTRIBUTES
+end
+
+class Photo < MyModel
+  ATTRIBUTES = [:image_uid]
+  attr_accessor *ATTRIBUTES
+end
+
+
+# --------------------------------------------------------------- #
+# HELPER METHODS
+# --------------------------------------------------------------- #
+def model_class
+  MyModel
+end

data/spec/dragonfly/active_model_extensions/active_record_setup.rb

@@ -0,0 +1,85 @@
+# Seems to blow up on Rails 3 without this - only need temporarily
+begin
+  require 'active_support/all'
+rescue LoadError => e
+  puts "Couldn't load activesupport: #{e}"
+end
+
+require 'active_record'
+
+# --------------------------------------------------------------- #
+# MIGRATION
+# --------------------------------------------------------------- #
+class MigrationForTest < ActiveRecord::Migration
+  
+  def self.up
+    create_table :items, :force => true do |t|
+      t.string  :title
+      t.string  :preview_image_uid
+      t.string  :preview_image_some_analyser_method
+      t.integer :preview_image_size
+      t.string  :preview_image_name
+      t.string  :preview_image_ext
+      t.string  :preview_image_blah_blah
+      t.string  :other_image_uid
+      t.string  :yet_another_image_uid
+      t.string  :otra_imagen_uid
+      t.string  :trailer_video_uid
+      t.timestamps
+    end
+    
+    create_table :cars do |t|
+      t.string :image_uid
+      t.string :reliant_image_uid
+      t.string :type
+    end
+
+    create_table :photos do |t|
+      t.string :image_uid
+    end
+
+  end
+
+  def self.down
+    drop_table :items
+  end
+
+end
+
+
+# --------------------------------------------------------------- #
+# MODELS
+# --------------------------------------------------------------- #
+class Item < ActiveRecord::Base
+end
+class Car < ActiveRecord::Base
+end
+class Photo < ActiveRecord::Base
+end
+
+
+# --------------------------------------------------------------- #
+# SPEC CONFIG
+# --------------------------------------------------------------- #
+DB_FILE = File.expand_path(File.dirname(__FILE__)+'/db.sqlite3')
+
+Spec::Runner.configure do |config|
+  
+  config.before(:all) do
+    FileUtils.rm_f(DB_FILE)
+    ActiveRecord::Base.establish_connection(
+       :adapter => "sqlite3",
+       :database  => DB_FILE
+     )
+     MigrationForTest.verbose = false
+     MigrationForTest.up
+  end
+  
+end
+
+# --------------------------------------------------------------- #
+# HELPER METHODS
+# --------------------------------------------------------------- #
+def model_class
+  ActiveRecord::Base
+end