dragonfly 0.8.6 → 0.9.0

data/lib/dragonfly/r_magick_utils.rb

@@ -1,48 +0,0 @@
-require 'tempfile'
-
-module Dragonfly
-  module RMagickUtils
-
-    include Loggable
-
-    private
-
-    # Requires the extended object to respond to 'use_filesystem'
-    def rmagick_image(temp_object, &block)
-      imagelist = use_filesystem ? Magick::Image.read(temp_object.path) : Magick::Image.from_blob(temp_object.data)
-      image = imagelist.first
-      result = block.call(image)
-      case result
-      when Magick::Image, Magick::ImageList
-        content = use_filesystem ? write_to_tempfile(result) : result.to_blob
-        result.destroy!
-      else
-        content = result
-      end
-      image.destroy!
-      content
-    rescue Magick::ImageMagickError => e
-      log.warn("Unable to handle content in #{self.class} - got:\n#{e}")
-      throw :unable_to_handle
-    end
-
-    def ping_rmagick_image(temp_object, &block)
-      imagelist = use_filesystem ? Magick::Image.ping(temp_object.path) : Magick::Image.from_blob(temp_object.data)
-      image = imagelist.first
-      result = block.call(image)
-      image.destroy!
-      result
-    rescue Magick::ImageMagickError => e
-      log.warn("Unable to handle content in #{self.class} - got:\n#{e}")
-      throw :unable_to_handle
-    end
-
-    def write_to_tempfile(rmagick_image)
-      tempfile = Tempfile.new('dragonfly')
-      tempfile.close
-      rmagick_image.write(tempfile.path)
-      tempfile
-    end
-
-  end
-end

data/lib/dragonfly/simple_endpoint.rb

@@ -1,76 +0,0 @@
-module Dragonfly
-  class SimpleEndpoint
-
-    # Exceptions
-    class JobNotAllowed < RuntimeError; end
-
-    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)
-        validate_job!(job)
-        job.validate_sha!(request['s']) if app.protect_from_dos_attacks
-        Response.new(job, env).to_response
-      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"]]
-    rescue JobNotAllowed => e
-      log.warn(e.message)
-      [403, {"Content-Type" => 'text/plain'}, ["Forbidden"]]
-    end
-
-    def required_params_for(job)
-      {'s' => job.sha}
-    end
-
-    private
-
-    attr_reader :app
-
-    def dragonfly_response
-      body = <<-DRAGONFLY
-          _o|o_
-  _~~---._(   )_.---~~_
- (       . \\ / .       )
-  `-.~--'  |=|  '--~.-'
-  _~-.~'" /|=|\\ "'~.-~_
- (      ./ |=| \\.      )
-  `~~`"`   |=|   `"'ME"
-           |-|
-           <->
-            V
-      DRAGONFLY
-      [200, {
-        'Content-Type' => 'text/plain',
-        'Content-Size' => body.bytesize.to_s
-        },
-        [body]
-      ]
-    end
-    
-    def validate_job!(job)
-      if job.fetch_file_step
-        raise JobNotAllowed, "Dragonfly Server doesn't allow requesting job with steps #{job.steps.inspect}"
-      end
-    end
-
-  end
-end

data/spec/dragonfly/active_model_extensions/active_model_setup.rb

@@ -1,97 +0,0 @@
-# --------------------------------------------------------------- #
-# 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

@@ -1,85 +0,0 @@
-# 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

data/spec/dragonfly/analysis/image_magick_analyser_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-require 'dragonfly/analysis/shared_analyser_spec'
-
-describe Dragonfly::Analysis::ImageMagickAnalyser do
-  
-  before(:each) do
-    image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
-    @image = Dragonfly::TempObject.new(File.new(image_path))
-    @analyser = Dragonfly::Analysis::ImageMagickAnalyser.new
-    @analyser.log = Logger.new(LOG_FILE)
-  end
-
-  it_should_behave_like "image analyser methods"
-
-end

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -1,31 +0,0 @@
-unless ENV['IGNORE_RMAGICK']
-
-  require 'spec_helper'
-  require 'dragonfly/analysis/shared_analyser_spec'
-
-  describe Dragonfly::Analysis::RMagickAnalyser do
-  
-    before(:each) do
-      image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
-      @image = Dragonfly::TempObject.new(File.new(image_path))
-      @analyser = Dragonfly::Analysis::RMagickAnalyser.new
-      @analyser.log = Logger.new(LOG_FILE)
-    end
-  
-    describe "when using the filesystem" do
-      before(:each) do
-        @analyser.use_filesystem = true
-      end
-      it_should_behave_like "image analyser methods"
-    end
-  
-    describe "when not using the filesystem" do
-      before(:each) do
-        @analyser.use_filesystem = false
-      end
-      it_should_behave_like "image analyser methods"
-    end
-  
-  end
-
-end

data/spec/dragonfly/config/r_magick_spec.rb

@@ -1,29 +0,0 @@
-unless ENV['IGNORE_RMAGICK']
-
-  require File.dirname(__FILE__) + '/../../spec_helper'
-
-  describe Dragonfly::Config::RMagick do
-
-    before(:each) do
-      @app = test_app
-    end
-
-    it "should configure all to use the filesystem by default" do
-      @app.configure_with(Dragonfly::Config::RMagick)
-      @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_true
-      @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_true
-      @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_true
-      @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_true
-    end
-
-    it "should configure all not to use the filesystem if requested" do
-      @app.configure_with(Dragonfly::Config::RMagick, :use_filesystem => false)
-      @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_false
-      @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_false
-      @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_false
-      @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_false
-    end
-
-  end
-
-end

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -1,41 +0,0 @@
-unless ENV['IGNORE_RMAGICK']
-
-  require 'spec_helper'
-
-  describe Dragonfly::Encoding::RMagickEncoder do
-  
-    before(:all) do
-      sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
-      @image = Dragonfly::TempObject.new(File.new(sample_file))
-      @encoder = Dragonfly::Encoding::RMagickEncoder.new
-    end
-  
-    describe "#encode" do
-    
-      it "should encode the image to the correct format" do
-        image = @encoder.encode(@image, :gif)
-        image.should have_format('gif')
-      end
-    
-      it "should throw :unable_to_handle if the format is not handleable" do
-        lambda{
-          @encoder.encode(@image, :goofy)
-        }.should throw_symbol(:unable_to_handle)
-      end
-    
-      it "should do nothing if the image is already in the correct format" do
-        image = @encoder.encode(@image, :png)
-        image.should == @image
-      end
-    
-      it "should work when not using the filesystem" do
-        @encoder.use_filesystem = false
-        image = @encoder.encode(@image, :gif)
-        image.should have_format('gif')
-      end
-
-    end
-  
-  end
-
-end

data/spec/dragonfly/generation/image_magick_generator_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-require 'dragonfly/generation/shared_generator_spec'
-
-describe Dragonfly::Generation::ImageMagickGenerator do
-
-  before(:each) do
-    @generator = Dragonfly::Generation::ImageMagickGenerator.new
-  end
-
-  it_should_behave_like 'image generator'
-
-end

data/spec/dragonfly/generation/r_magick_generator_spec.rb

@@ -1,28 +0,0 @@
-unless ENV['IGNORE_RMAGICK']
-
-  require 'spec_helper'
-  require 'dragonfly/generation/shared_generator_spec'
-
-  describe Dragonfly::Generation::RMagickGenerator do
-
-    before(:each) do
-      @generator = Dragonfly::Generation::RMagickGenerator.new
-    end
-
-    describe "when using the filesystem" do
-      before(:each) do
-        @generator.use_filesystem = true
-      end
-      it_should_behave_like 'image generator'
-    end
-  
-    describe "when not using the filesystem" do
-      before(:each) do
-        @generator.use_filesystem = false
-      end
-      it_should_behave_like 'image generator'
-    end
-  
-  end
-
-end