thumbs 0.0.9 → 1.0.0.beta.1

data/Gemfile

@@ -1,9 +1,11 @@
 # A sample Gemfile
 source "http://rubygems.org"
 
-gem "rack"
-gem "rack-contrib"
-gem "mini_magick"
+gem "goliath"
+gem 'eventmachine', '>= 1.0.0.beta.1'
+gem 'em-synchrony', '>= 0.3.0.beta.1'
+gem 'em-http-request', '>= 1.0.0.beta.1'
+gem "em-files"
 gem "lumberjack"
 
 group :development do

data/README.textile

@@ -1,53 +1,21 @@
 h1. Thumbs
 
-Image server proxy that can resize images on the fly. Built in ruby as a Rack application.
+Image proxy server that can resize and cache images on the fly. Built in ruby with Goliath API.
 
 h2. Requirements
 
- * rack
- * rack-contrib
- * mini_magick
+ * ruby 1.9.2
+ * goliath
 
 h2. Usage
 
-1. as a standalone rack app
+$ gem install thumbs
+$ thumbs -c path/to/config.rb -p 9000
 
-config.ru
-
-bc.. require "rubygems"
-require 'thumbs'
-
-run Thumbs.new(
-    :url_map         => "/:size/:original_url", # url pattern, :original_url is required
-    :thumbs_folder   => "public/system/thumbs", # default: false - do not write on disk
-    :cache           => true,                   # cache resized images - has no effect unless thumbs_folder exist
-    :cache_original  => true,                   # cache original images - has no effect unless thumbs_folder exist
-    :runtime         => true,                   # add X-Runtime header
-    :cache_control => {
-      :ttl           => 86400,                  # add Expires and Cache-Control header for 24h
-      :last_modified => true                    # add Last-Modfied header
-    },
-    :etag            => true,                   # add ETag
-    :logfile         => false                   # will write log file if filepath is provided
-    :server_name     => "Thumbs/0.0.8",         # Server header
-    :image_not_found => "image_not_found.jpg"   # path to image_not_found
-  )
-
-2. as a moundable rails app
-
-YourApplication::Application.routes.draw do
-
-  mount Thumbs.new(:url_map => "/:size/:original_url") => "images/resized"
-
-  ....
-end
-
-3. you can even use it on heroku for free
-
-  create your own rack app, or use this one: http://thumbs-gem.heroku.com/i/100x100/www.google.com/images/logos/ps_logo2.png
-  
 h2. TODO
 
+ * documentation
+ * more middleware
  * Tests!
  * Access control
  * SSL support

data/Rakefile

@@ -15,10 +15,11 @@ Jeweler::Tasks.new do |gem|
   gem.name = "thumbs"
   gem.homepage = "http://github.com/martinciu/thumbs"
   gem.license = "MIT"
-  gem.summary = "Image server proxy that can resize images on the fly. Built in ruby as a Rack application."
+  gem.summary = "Image proxy server that can resize and cache images on the fly. Built in ruby with Goliath API."
   gem.description = ""
   gem.email = "marcin.ciunelis@gmail.com"
   gem.authors = ["Marcin Ciunelis"]
+  gem.executables = ["thumbs"]
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+1.0.0.beta.1

data/bin/thumbs

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+begin
+  config_index = (ARGV.index('-c') || ARGV.index('--config')) + 1
+  ARGV[config_index] = File.absolute_path(ARGV[config_index])
+rescue
+  puts "Please specify a valid mneme configuration file (ex: -c config.rb)"
+  exit if !(ARGV.index('-h') || ARGV.index('--config'))
+end
+
+system("/usr/bin/env ruby " + File.dirname(__FILE__) + '/../lib/thumbs.rb' + ' ' + ARGV.join(" "))

data/examples/config.god

@@ -0,0 +1,54 @@
+env = "production"
+app_root = File.expand_path("../..", __FILE__)
+
+%w{9001 9002}.each do |port|
+  God.watch do |w|
+    w.name = "thumbs-#{env}-#{port}"
+    w.group = "thumbs-#{env}"
+    w.interval = 30.seconds
+    w.dir = app_root
+    w.start = "thumbs -p #{port} -e #{env}"
+    w.uid = 'rails'
+    w.gid = 'rails'
+    
+    w.stop_signal = 'QUIT'
+    w.stop_timeout = 20.seconds
+
+    # restart if memory gets too high
+    w.transition(:up, :restart) do |on|
+      on.condition(:memory_usage) do |c|
+        c.above = 150.megabytes
+        c.times = 2
+      end
+    end
+
+    # determine the state on startup
+    w.transition(:init, { true => :up, false => :start }) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+      end
+    end
+
+    # determine when process has finished starting
+    w.transition([:start, :restart], :up) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+        c.interval = 5.seconds
+      end
+
+      # failsafe
+      on.condition(:tries) do |c|
+        c.times = 5
+        c.transition = :start
+        c.interval = 5.seconds
+      end
+    end
+
+    # start if process is not running
+    w.transition(:up, :start) do |on|
+      on.condition(:process_running) do |c|
+        c.running = false
+      end
+    end
+  end
+end

data/examples/config.rb

@@ -0,0 +1,4 @@
+config['url_map']        = "/images/resized/:size/:original_url"
+config['thumbs_folder']  =  "cache"
+config['cache']          = true
+config['cache_original'] = true

data/lib/thumbs/evented_magick.rb

@@ -0,0 +1,184 @@
+require "open-uri"
+require "stringio"
+require "fileutils"
+require "open3"
+
+require File.join(File.dirname(__FILE__), '/image_temp_file')
+
+module EventedMagick
+  class MiniMagickError < RuntimeError; end
+
+  class Image
+    attr :path
+    attr :tempfile
+    attr :output
+
+    # Class Methods
+    # -------------
+    class << self
+      def from_blob(blob, ext = nil)
+        begin
+          tempfile = ImageTempFile.new(ext)
+          tempfile.binmode
+          tempfile.write(blob)
+        ensure
+          tempfile.close if tempfile
+        end
+
+        return self.new(tempfile.path, tempfile)
+      end
+
+      # Use this if you don't want to overwrite the image file
+      def open(image_path)
+        File.open(image_path, "rb") do |f|
+          self.from_blob(f.read, File.extname(image_path))
+        end
+      end
+      alias_method :from_file, :open
+    end
+
+    # Instance Methods
+    # ----------------
+    def initialize(input_path, tempfile=nil)
+      @path = input_path
+      @tempfile = tempfile # ensures that the tempfile will stick around until this image is garbage collected.
+      @method = defined?(::EM) && EM.reactor_running? ? :evented_execute : :blocking_execute
+
+      # Ensure that the file is an image
+      output = run_command("identify", "-format", format_option("%m %w %h"), @path)
+      (format, width, height) = output.split
+      @values = { 'format' => format, 'width' => width.to_i, 'height' => height.to_i, 'dimensions' => [width.to_i, height.to_i] }
+    end
+
+    # For reference see http://www.imagemagick.org/script/command-line-options.php#format
+    def [](value)
+      key = value.to_s
+      return @values[key] if %w(format width height dimensions).include? key
+      if key == "size"
+        File.size(@path)
+      else
+        run_command('identify', '-format', "\"#{key}\"", @path).split("\n")[0]
+      end
+    end
+
+    # Sends raw commands to imagemagick's mogrify command. The image path is automatically appended to the command
+    def <<(*args)
+      run_command("mogrify", *args << @path)
+    end
+
+    # This is a 'special' command because it needs to change @path to reflect the new extension
+    # Formatting an animation into a non-animated type will result in ImageMagick creating multiple
+    # pages (starting with 0).  You can choose which page you want to manipulate.  We default to the
+    # first page.
+    def format(format, page=0)
+      run_command("mogrify", "-format", format, @path)
+
+      old_path = @path.dup
+      @path.sub!(/(\.\w+)?$/, ".#{format}")
+      File.delete(old_path) unless old_path == @path
+
+      unless File.exists?(@path)
+        begin
+          FileUtils.copy_file(@path.sub(".#{format}", "-#{page}.#{format}"), @path)
+        rescue e
+          raise MiniMagickError, "Unable to format to #{format}; #{e}" unless File.exist?(@path)
+        end
+      end
+    ensure
+      Dir[@path.sub(/(\.\w+)?$/, "-[0-9]*.#{format}")].each do |fname|
+        File.unlink(fname)
+      end
+    end
+
+    # Writes the temporary image that we are using for processing to the output path
+    def write(output_path)
+      FileUtils.copy_file @path, output_path
+      run_command "identify", output_path # Verify that we have a good image
+    end
+
+    # Give you raw data back
+    def to_blob
+      f = File.new @path
+      f.binmode
+      f.read
+    ensure
+      f.close if f
+    end
+
+    # If an unknown method is called then it is sent through the morgrify program
+    # Look here to find all the commands (http://www.imagemagick.org/script/mogrify.php)
+    def method_missing(symbol, *args)
+      args.push(@path) # push the path onto the end
+      run_command("mogrify", "-#{symbol}", *args)
+      self
+    end
+
+    # You can use multiple commands together using this method
+    def combine_options(&block)
+      c = CommandBuilder.new
+      block.call c
+      run_command("mogrify", *c.args << @path)
+    end
+
+    # Check to see if we are running on win32 -- we need to escape things differently
+    def windows?
+      !(RUBY_PLATFORM =~ /win32/).nil?
+    end
+
+    # Outputs a carriage-return delimited format string for Unix and Windows
+    def format_option(format)
+      windows? ? "#{format}\\n" : "#{format}\\\\n"
+    end
+
+    def run_command(command, *args)
+      full_args = args.collect do |arg|        
+        # args can contain characters like '>' so we must escape them, but don't quote switches
+        if arg !~ /^[\+\-]/
+          "\"#{arg}\""
+        else
+          arg.to_s
+        end
+      end.join(' ')
+
+      full_cmd = "#{command} #{full_args}"
+      (output, status) = send(@method, full_cmd)
+
+      if status.exitstatus == 0
+        output
+      else
+        raise MiniMagickError, "ImageMagick command (#{full_cmd.inspect}) failed: #{{:status_code => status, :output => output}.inspect}"
+      end
+    end
+
+    def evented_execute(cmd)
+      fiber = Fiber.current
+      EM::system(cmd) do |output, status|
+        fiber.resume([output, status])
+      end
+      
+      Fiber.yield
+    end
+    
+    def blocking_execute(cmd)
+      output = `#{cmd}`
+      [output, $?]
+    end
+  end
+
+  class CommandBuilder
+    attr :args
+
+    def initialize
+      @args = []
+    end
+
+    def method_missing(symbol, *args)
+      @args << "-#{symbol}"
+      @args += args
+    end
+
+    def +(value)
+      @args << "+#{value}"
+    end
+  end
+end

data/lib/thumbs/image.rb

@@ -1,41 +1,36 @@
-require 'digest/sha1'
-module Thumbs
+class Image
 
-  class Image
+  attr_accessor :server, :path, :size, :url
 
-    attr_accessor :server, :path, :size, :url
+  def initialize(params)
+    @size          = params[:size] if params[:size] =~ /^\d+x\d+$/
+    @url           = params[:original_url]
+    @thumbs_folder = params[:thumbs_folder]
+  end
 
-    def initialize(params)
-      @size          = params[:size] if params[:size] =~ /^\d+x\d+$/
-      @url           = params[:original_url]
-      @thumbs_folder = params[:thumbs_folder]
-    end
+  def local_path(size)
+    File.join(@thumbs_folder, spread(sha(size+@url))) if @thumbs_folder
+  end
 
-    def local_path(size)
-      File.join(@thumbs_folder, spread(sha(size+@url))) if @thumbs_folder
-    end
-    
-    def original_path
-      local_path("original")
-    end
-    
-    def resized_path
-      local_path(@size)
-    end
-    
-    def remote_url
-      "http://#{@url}"
-    end
-    
-    protected
-      def sha(path)
-        Digest::SHA1.hexdigest(path)
-      end
-      
-      def spread(sha, n = 2)
-        sha[2, 0] = "/"
-        sha
-      end
+  def original_path
+    local_path("original")
   end
 
+  def resized_path
+    local_path(@size)
+  end
+
+  def remote_url
+    "http://#{@url}"
+  end
+
+  protected
+    def sha(path)
+      Digest::SHA1.hexdigest(path)
+    end
+
+    def spread(sha, n = 2)
+      sha[2, 0] = "/"
+      sha
+    end
 end

data/lib/thumbs/image_temp_file.rb

@@ -0,0 +1,9 @@
+require "tempfile"
+
+module EventedMagick
+  class ImageTempFile < Tempfile
+    def make_tmpname(ext, n)
+      "mini_magick-#{Time.now.to_i}-#{$$}-#{rand(0x10000000)}"
+    end
+  end
+end

data/lib/thumbs/middleware/content_type.rb

@@ -1,16 +1,21 @@
-require 'rack/mime'
+class ContentType
+  def initialize(app, default_content_type = "image/jpeg")
+    @app = app
+    @default_content_type = default_content_type
+  end
 
-module Thumbs
-  class ContentType
-    def initialize(app, default_content_type = "image/jpeg")
-      @app = app
-      @default_content_type = default_content_type
-    end
-    
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers['Content-Type'] = Rack::Mime.mime_type(File.extname(env["thumbs.remote_url"]), @default_content_type) if headers['Content-Type'].nil?
-      [status, headers, body]
+  def call(env)
+    async_cb = env['async.callback']
+    env['async.callback'] = Proc.new do |status, headers, body|
+      async_cb.call(post_process(status, headers, body, env))
     end
+
+    status, headers, body = @app.call(env)
+    post_process(status, headers, body, env)
+  end
+
+  def post_process(status, headers, body, env)
+    headers['Content-Type'] = Rack::Mime.mime_type(File.extname(env["PATH_INFO"]), @default_content_type) if headers['Content-Type'].nil?
+    [status, headers, body]
   end
-end
+end

data/lib/thumbs.rb

@@ -1,74 +1,133 @@
 require "rubygems"
-require "rack"
-require "rack/contrib"
-
-module Thumbs
-  autoload :Server,       'thumbs/server'
-  autoload :Image,        'thumbs/image'
-  autoload :NotFound,     'thumbs/middleware/not_found'
-  autoload :ServerName,   'thumbs/middleware/server_name'
-  autoload :CacheControl, 'thumbs/middleware/cache_control'
-  autoload :Download,     'thumbs/middleware/download'
-  autoload :Resize,       'thumbs/middleware/resize'
-  autoload :Config,       'thumbs/middleware/config'
-  autoload :CacheWrite,   'thumbs/middleware/cache_write'
-  autoload :CacheRead,    'thumbs/middleware/cache_read'
-  autoload :Logger,       'thumbs/middleware/logger'
-  autoload :ContentType,  'thumbs/middleware/content_type'
+require "bundler/setup"
+
+require 'goliath'
+require 'em-http'
+require 'em-synchrony/em-http'
+require 'digest/sha1'
+require "em-files"
+require 'rack/mime'
+require 'lumberjack'
+
+require File.join(File.dirname(__FILE__), '/thumbs/evented_magick')
+require File.join(File.dirname(__FILE__), '/thumbs/image')
+require File.join(File.dirname(__FILE__), '/thumbs/middleware/content_type')
+
+class Thumbs < Goliath::API
   
-  def self.new(args)
-    options = {
-      :thumbs_folder   => false,
-      :etag            => true,
-      :cache           => true,
-      :cache_original  => true,
-      :cache_control   => {
-        :ttl           => 86400,
-        :last_modified => true
-      },
-      :server_name     => "Thumbs/0.0.6",
-      :url_map         => "/:size/:original_url",
-      :image_not_found => File.join(File.dirname(__FILE__), "thumbs", "images", "image_not_found.jpg"),
-      :runtime         => false,
-      :logfile         => false
-    }.merge!(args)
-    
-    Rack::Builder.new do
-      
-      use Rack::Runtime if options[:runtime]
-      
-      use Rack::Config do |env|
-        env['thumbs.thumbs_folder'] = options[:thumbs_folder]
+  use ::Rack::Runtime
+
+  use Goliath::Rack::Heartbeat          # respond to /status with 200, OK (monitoring, etc)
+  use ContentType
+
+  def initialize
+    @logger = Lumberjack::Logger.new("logs/thumbs.log", :time_format => "%Y-%m-%d %H:%M:%S", :roll => :daily, :flush_seconds => 5)
+  end
+
+  def response(env)
+    start_time = Time.now.to_f
+    log_message = []
+    url_pattern, keys = compile(env.url_map)
+    status, headers, boady = [-1, {}, ""]
+
+    if match = url_pattern.match(env['PATH_INFO'])
+      values = match.captures.to_a
+      params = keys.zip(values).inject({}) do |hash,(k,v)|
+        hash[k.to_sym] = v
+        hash
       end
-      
-      use Rack::ShowExceptions
-
-      use Thumbs::Config, options[:url_map]
-      
-      use Thumbs::Logger, options[:logfile] if options[:logfile]
-
-      use Thumbs::ServerName, options[:server_name] if options[:server_name]
-      use Thumbs::CacheControl, options[:cache_control] if options[:cache_control]
-      use Rack::ETag if options[:etag]
-
-      use Thumbs::ContentType
-      
-      if options[:cache] && options[:thumbs_folder] && File.exist?(File.expand_path(options[:thumbs_folder]))
-        use Thumbs::CacheRead, "resized"
-        use Thumbs::CacheWrite, "resized"
+      image = Image.new(params.merge(:thumbs_folder => env.thumbs_folder))
+      log_message << image.url
+      log_message << image.size
+    else
+      log_message << "invalid_url"
+      return not_found
+    end
+
+    #cache_resized_read
+    if env.cache
+      begin
+        status, body = 200, File.read(image.resized_path)
+        log_message << "resized_cache"
+        write_log log_message, start_time
+        return [status, headers, body]
+      rescue Errno::ENOENT, IOError => e
       end
-      
-      use Thumbs::Resize
+    end
+
+    #cache_original_read
+    if env.cache_original
+      begin
+        status, body = 200, File.read(image.original_path)
+        log_message << "original_cache"
+      rescue Errno::ENOENT, IOError => e
+      end
+    end
 
-      use Thumbs::CacheWrite, "original" if options[:cache_original] && options[:thumbs_folder] && File.exist?(File.expand_path(options[:thumbs_folder]))
+    if status < 200
+      #download
+      log_message << "download"
+      original_response = EM::HttpRequest.new(image.remote_url).get :connection_timeout => 5, :inactivity_timeout => 10, :redirects => 0
+      status = original_response.response_header.status
+      if status >= 200 && status < 300
+        status, body = 200, original_response.response
+        #cache_original_write
+        if cache_original
+          path = image.original_path
+          tries = 0
+          begin
+            EM::File.open(path, "wb") {|f| f.write(body) }
+          rescue Errno::ENOENT, IOError
+            Dir.mkdir(File.dirname(path), 0755)
+            retry if (tries += 1) == 1
+          end
+        end
+      else
+        status, heders, body = not_found
+      end
 
-      use Thumbs::NotFound, options[:image_not_found] if options[:image_not_found] && File.exist?(File.expand_path(options[:image_not_found]))
+    end
 
-      use Thumbs::CacheRead, "original" if options[:cache_original]
-      use Thumbs::Download
+    #resize
+    if status > 0
+      thumb = EventedMagick::Image.from_blob(body)
+      thumb.resize image.size
+      body = thumb.to_blob
+    end
 
-      run Thumbs::Server.new
+    #cache_resized_write
+    if env.cache && status >= 200 && status < 300
+      path = image.resized_path
+      tries = 0
+      begin
+        EM::File.open(path, "wb") {|f| f.write(body) }
+      rescue Errno::ENOENT, IOError
+        Dir.mkdir(File.dirname(path), 0755)
+        retry if (tries += 1) == 1
+      end
     end
+    write_log log_message, start_time
+    [status, headers, body]
   end
-  
+
+  private
+
+    def compile(url_map)
+      keys = []
+      pattern = url_map.gsub(/((:\w+))/) do |match|
+        keys << $2[1..-1]
+        "(.+?)"
+      end
+      [/^#{pattern}$/, keys]
+    end
+
+    def not_found
+      [404, {}, File.read(File.expand_path("thumbs/images/image_not_found.jpg", __FILE__))]
+    end
+
+    def write_log(message, start_time)
+      message << "#{((Time.now.to_f - start_time)*1000).round}ms"
+      @logger.info message.join("\t")
+    end
+
 end

data/thumbs.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thumbs}
-  s.version = "0.0.9"
+  s.version = "1.0.0.beta.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcin Ciunelis"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-04-12}
   s.description = %q{}
   s.email = %q{marcin.ciunelis@gmail.com}
+  s.executables = ["thumbs"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.textile"
@@ -22,20 +23,15 @@ Gem::Specification.new do |s|
     "README.textile",
     "Rakefile",
     "VERSION",
+    "bin/thumbs",
+    "examples/config.god",
+    "examples/config.rb",
     "lib/thumbs.rb",
+    "lib/thumbs/evented_magick.rb",
     "lib/thumbs/image.rb",
+    "lib/thumbs/image_temp_file.rb",
     "lib/thumbs/images/image_not_found.jpg",
-    "lib/thumbs/middleware/cache_control.rb",
-    "lib/thumbs/middleware/cache_read.rb",
-    "lib/thumbs/middleware/cache_write.rb",
-    "lib/thumbs/middleware/config.rb",
     "lib/thumbs/middleware/content_type.rb",
-    "lib/thumbs/middleware/download.rb",
-    "lib/thumbs/middleware/logger.rb",
-    "lib/thumbs/middleware/not_found.rb",
-    "lib/thumbs/middleware/resize.rb",
-    "lib/thumbs/middleware/server_name.rb",
-    "lib/thumbs/server.rb",
     "spec/spec_helper.rb",
     "spec/thumbs_spec.rb",
     "thumbs.gemspec"
@@ -43,9 +39,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/martinciu/thumbs}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
-  s.summary = %q{Image server proxy that can resize images on the fly. Built in ruby as a Rack application.}
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{Image proxy server that can resize and cache images on the fly. Built in ruby with Goliath API.}
   s.test_files = [
+    "examples/config.rb",
     "spec/spec_helper.rb",
     "spec/thumbs_spec.rb"
   ]
@@ -54,26 +51,32 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<rack-contrib>, [">= 0"])
-      s.add_runtime_dependency(%q<mini_magick>, [">= 0"])
+      s.add_runtime_dependency(%q<goliath>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 1.0.0.beta.1"])
+      s.add_runtime_dependency(%q<em-synchrony>, [">= 0.3.0.beta.1"])
+      s.add_runtime_dependency(%q<em-http-request>, [">= 1.0.0.beta.1"])
+      s.add_runtime_dependency(%q<em-files>, [">= 0"])
       s.add_runtime_dependency(%q<lumberjack>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack-contrib>, [">= 0"])
-      s.add_dependency(%q<mini_magick>, [">= 0"])
+      s.add_dependency(%q<goliath>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, [">= 1.0.0.beta.1"])
+      s.add_dependency(%q<em-synchrony>, [">= 0.3.0.beta.1"])
+      s.add_dependency(%q<em-http-request>, [">= 1.0.0.beta.1"])
+      s.add_dependency(%q<em-files>, [">= 0"])
       s.add_dependency(%q<lumberjack>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack-contrib>, [">= 0"])
-    s.add_dependency(%q<mini_magick>, [">= 0"])
+    s.add_dependency(%q<goliath>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, [">= 1.0.0.beta.1"])
+    s.add_dependency(%q<em-synchrony>, [">= 0.3.0.beta.1"])
+    s.add_dependency(%q<em-http-request>, [">= 1.0.0.beta.1"])
+    s.add_dependency(%q<em-files>, [">= 0"])
     s.add_dependency(%q<lumberjack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: thumbs
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  prerelease: 6
+  version: 1.0.0.beta.1
 platform: ruby
 authors: 
 - Marcin Ciunelis
@@ -15,113 +10,111 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
-default_executable: 
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: goliath
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: eventmachine
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: rack-contrib
-  prerelease: false
+        version: 1.0.0.beta.1
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: em-synchrony
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: mini_magick
-  prerelease: false
+        version: 0.3.0.beta.1
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: em-http-request
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: lumberjack
-  prerelease: false
+        version: 1.0.0.beta.1
   type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: em-files
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id005
-  name: rspec
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: lumberjack
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
+  type: :runtime
+  prerelease: false
   version_requirements: *id006
-  name: bundler
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
   prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
-  version_requirements: *id007
-  name: jeweler
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id009
 description: ""
 email: marcin.ciunelis@gmail.com
-executables: []
-
+executables: 
+- thumbs
 extensions: []
 
 extra_rdoc_files: 
@@ -133,24 +126,18 @@ files:
 - README.textile
 - Rakefile
 - VERSION
+- bin/thumbs
+- examples/config.god
+- examples/config.rb
 - lib/thumbs.rb
+- lib/thumbs/evented_magick.rb
 - lib/thumbs/image.rb
+- lib/thumbs/image_temp_file.rb
 - lib/thumbs/images/image_not_found.jpg
-- lib/thumbs/middleware/cache_control.rb
-- lib/thumbs/middleware/cache_read.rb
-- lib/thumbs/middleware/cache_write.rb
-- lib/thumbs/middleware/config.rb
 - lib/thumbs/middleware/content_type.rb
-- lib/thumbs/middleware/download.rb
-- lib/thumbs/middleware/logger.rb
-- lib/thumbs/middleware/not_found.rb
-- lib/thumbs/middleware/resize.rb
-- lib/thumbs/middleware/server_name.rb
-- lib/thumbs/server.rb
 - spec/spec_helper.rb
 - spec/thumbs_spec.rb
 - thumbs.gemspec
-has_rdoc: true
 homepage: http://github.com/martinciu/thumbs
 licenses: 
 - MIT
@@ -164,26 +151,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 758287189825552390
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Image server proxy that can resize images on the fly. Built in ruby as a Rack application.
+summary: Image proxy server that can resize and cache images on the fly. Built in ruby with Goliath API.
 test_files: 
+- examples/config.rb
 - spec/spec_helper.rb
 - spec/thumbs_spec.rb

data/lib/thumbs/middleware/cache_control.rb

@@ -1,17 +0,0 @@
-module Thumbs
-  class CacheControl
-    def initialize(app, options)
-      @app           = app
-      @ttl           = options[:ttl] || 86400
-      @last_modified = options[:last_modified].nil? ? true : options[:last_modified]
-    end
-    
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers['Cache-Control'] ||=  "max-age=#{@ttl}, public"
-      headers['Expires']       ||= (Time.now + @ttl).httpdate
-      headers['Last-Modified'] ||= Time.now.httpdate if @last_modified
-      [status, headers, body]
-    end
-  end
-end

data/lib/thumbs/middleware/cache_read.rb

@@ -1,22 +0,0 @@
-module Thumbs
-  class CacheRead
-    
-    def initialize(app, cache_type = "resized")
-      @app = app
-      @cache_type = cache_type
-    end
-
-    def call(env)
-      if env["thumbs.#{@cache_type}_path"]
-        begin
-          status, headers, body = [200, {}, File.read(env["thumbs.#{@cache_type}_path"])]
-          env['thumbs.logger'] << "#{@cache_type}_cache" if env['thumbs.logger']
-          return [status, headers, body]
-        rescue Errno::ENOENT, IOError => e
-        end
-      end
-      return @app.call(env)
-    end
-  end
-
-end

data/lib/thumbs/middleware/cache_write.rb

@@ -1,32 +0,0 @@
-module Thumbs
-  class CacheWrite
-    
-    def initialize(app, cache_type = "resized")
-      @app = app
-      @cache_type = cache_type
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-
-      path = env["thumbs.#{@cache_type}_path"]
-
-      if path && status == 200
-        tries = 0
-        begin
-          File.open(path, "wb") {|f| f.write(body) }
-        rescue Errno::ENOENT, IOError
-          Dir.mkdir(File.dirname(path), 0755)
-          retry if (tries += 1) == 1
-        end
-      end
-
-      [status, headers, body]
-    end
-    
-  end
-
-end
-
-
-

data/lib/thumbs/middleware/config.rb

@@ -1,41 +0,0 @@
-module Thumbs
-  class Config
-
-    def initialize(app, url_map)
-      @app = app
-      @url_pattern, @keys = compile(url_map)
-    end
-
-    def call(env)
-      env['thumbs.url_pattern'] = @url_pattern
-      if match = @url_pattern.match(env['PATH_INFO'])
-        values = match.captures.to_a
-        params = @keys.zip(values).inject({}) do |hash,(k,v)|
-          hash[k.to_sym] = v
-          hash
-        end
-        
-        image = Image.new(params.merge(:thumbs_folder => env['thumbs.thumbs_folder']))
-
-        env['thumbs.remote_url']      = image.remote_url
-        env['thumbs.url']             = image.url
-        env['thumbs.resized_path']    = image.resized_path
-        env['thumbs.original_path']   = image.original_path
-        env['thumbs.size']            = image.size
-      end
-      @app.call(env)
-    end
-
-    protected
-      def compile(url_map)
-        keys = []
-        pattern = url_map.gsub(/((:\w+))/) do |match|
-          keys << $2[1..-1]
-          "(.+?)"
-        end
-        [/^#{pattern}$/, keys]
-      end
-
-  end
-
-end

data/lib/thumbs/middleware/download.rb

@@ -1,27 +0,0 @@
-require 'open-uri'
-
-module Thumbs
-  class Download
-    
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      if env['thumbs.remote_url']
-        begin
-          status, headers, body = [200, {}, open(env['thumbs.remote_url']).read]
-          env['thumbs.logger'] << "download" if env['thumbs.logger']
-          return [status, headers, body]
-        rescue StandardError, Timeout::Error => e
-          status, headers, body = [404, {'Content-Type' => 'text/plain'}, ["Not found"]]
-          env['thumbs.logger'] << "not_found" if env['thumbs.logger']
-          return [status, headers, body]
-        end
-      else
-        return @app.call(env)
-      end
-    end
-    
-  end
-end

data/lib/thumbs/middleware/logger.rb

@@ -1,25 +0,0 @@
-require 'lumberjack'
-require 'benchmark'
-
-module Thumbs
-  class Logger
-    def initialize(app, logfile_path)
-      @logger = Lumberjack::Logger.new(logfile_path, :time_format => "%Y-%m-%d %H:%M:%S", :roll => :daily, :flush_seconds => 5)
-      @app = app
-    end
-    
-    def call(env)
-      env['thumbs.logger'] = []
-      env['thumbs.logger'] << env['thumbs.url']
-      env['thumbs.logger'] << env['thumbs.size']
-      response = []
-      realtime = Benchmark.realtime do
-        response = @app.call(env)
-      end
-      status, headers, body = response
-      env['thumbs.logger'] << sprintf('%.4f', realtime)
-      @logger.info env['thumbs.logger'].join("\t")
-      return [status, headers, body]
-    end
-  end
-end

data/lib/thumbs/middleware/not_found.rb

@@ -1,24 +0,0 @@
-module Thumbs
-
-  class NotFound
-    F = ::File
-    
-    def initialize(app, image_not_found)
-      @app = app
-      file = F.expand_path(image_not_found)
-      @content = F.read(file)
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-      if status == 200
-        [status, headers, body]
-      else
-        env['thumbs.logger'] << "not_found" if env['thumbs.logger']
-        [404, {}, @content]
-      end
-    end
-    
-  end
-
-end

data/lib/thumbs/middleware/resize.rb

@@ -1,25 +0,0 @@
-require 'mini_magick'
-
-module Thumbs
-  class Resize
-    
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      status, headers, body = @app.call(env)
-
-      if env['thumbs.size']
-        begin
-          thumb = MiniMagick::Image.read(body)
-          thumb.resize env['thumbs.size']
-          body = thumb.to_blob
-        rescue
-        end
-      end
-
-      [status, headers, body]
-    end
-  end
-end

data/lib/thumbs/middleware/server_name.rb

@@ -1,14 +0,0 @@
-module Thumbs
-  class ServerName
-    def initialize(app, server_name)
-      @app = app
-      @server_name = server_name
-    end
-    
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers['Server'] = @server_name
-      [status, headers, body]
-    end
-  end
-end

data/lib/thumbs/server.rb

@@ -1,16 +0,0 @@
-module Thumbs
-
-  class Server
-    
-    def call(env)
-      if env['PATH_INFO'] =~ env['thumbs.url_pattern']
-        [200, {}, ["Found"]]
-      else
-        [404, {}, ["Not found"]]
-      end
-      
-    end
-
-  end
-
-end