imageproxy 0.1.0 → 0.1.1

data/README.mdown

@@ -50,6 +50,12 @@ imageproxy doesn't do any sort of caching. That kind of thing is better left up
 Also, imageproxy itself isn't nearly as fast as it could be. It's written in an interpreted language, and it shells out to curl and ImageMagick to do its work. Presumably, it would be way faster written in C as an Apache module, but this implementation was quite a bit easier :)
 
 
+INSTALLING
+----------
+
+  gem install imageproxy
+
+
 API
 ---
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/config.ru

@@ -4,4 +4,4 @@ require 'rack/sendfile'
 require File.join(File.expand_path(File.dirname(__FILE__)), "imageproxy")
 require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "server")
 
-run Rack::Sendfile.new(Server.new)
+run Rack::Sendfile.new(Imageproxy::Server.new)

data/imageproxy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{imageproxy}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hanson"]

data/lib/command.rb

@@ -1,22 +1,23 @@
-class Command
-  protected
+module Imageproxy
+  class Command
+    protected
 
-  def execute_command(command_line)
-    stdin, stdout, stderr = Open3.popen3(command_line)
-    [output_to_string(stdout), output_to_string(stderr)].join("")
-  end
+    def execute_command(command_line)
+      stdin, stdout, stderr = Open3.popen3(command_line)
+      [output_to_string(stdout), output_to_string(stderr)].join("")
+    end
 
-  def curl(url, options={})
-    user_agent = options[:user_agent] || "imageproxy"
-    %|curl -s -A "#{user_agent}" "#{url}"|
-  end
+    def curl(url, options={})
+      user_agent = options[:user_agent] || "imageproxy"
+      %|curl -s -A "#{user_agent}" "#{url}"|
+    end
 
-  def to_path(obj)
-    obj.respond_to?(:path) ? obj.path : obj.to_s
-  end
+    def to_path(obj)
+      obj.respond_to?(:path) ? obj.path : obj.to_s
+    end
 
-  def output_to_string(output)
-    output.readlines.join("").chomp
+    def output_to_string(output)
+      output.readlines.join("").chomp
+    end
   end
-
 end

data/lib/compare.rb

@@ -1,12 +1,14 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "command")
 
-class Compare < Command
-  def initialize(a, b)
-    @path_a = to_path(a)
-    @path_b = to_path(b)
-  end
+module Imageproxy
+  class Compare < Imageproxy::Command
+    def initialize(a, b)
+      @path_a = to_path(a)
+      @path_b = to_path(b)
+    end
 
-  def execute
-    execute_command %'compare -metric AE -fuzz 10% "#{@path_a}" "#{@path_b}" "#{Tempfile.new("compare").path}"'
+    def execute
+      execute_command %'compare -metric AE -fuzz 10% "#{@path_a}" "#{@path_b}" "#{Tempfile.new("compare").path}"'
+    end
   end
 end

data/lib/convert.rb

@@ -1,72 +1,74 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "command")
 
-class Convert < Command
-  attr_reader :options
-  
-  def initialize(options)
-    @options = options
-    if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format || options.quality))
-      raise "Missing action or illegal parameter value"
-    end
-  end
+module Imageproxy
+  class Convert < Imageproxy::Command
+    attr_reader :options
 
-  def execute(user_agent=nil)
-    execute_command %'#{curl options.source, :user_agent => user_agent} | convert - #{convert_options} #{new_format}#{file.path}'
-    file
-  end
+    def initialize(options)
+      @options = options
+      if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format || options.quality))
+        raise "Missing action or illegal parameter value"
+      end
+    end
 
-  def convert_options
-    convert_options = []
-    convert_options << "-resize #{resize_thumbnail_options(options.resize)}" if options.resize
-    convert_options << "-thumbnail #{resize_thumbnail_options(options.thumbnail)}" if options.thumbnail
-    convert_options << "-flop" if options.flip == "horizontal"
-    convert_options << "-flip" if options.flip == "vertical"
-    convert_options << rotate_options if options.rotate
-    convert_options << "-colors 256" if options.format == "png8"
-    convert_options << "-quality #{options.quality}" if options.quality
-    convert_options << interlace_options if options.progressive
-    convert_options.join " "
-  end
+    def execute(user_agent=nil)
+      execute_command %'#{curl options.source, :user_agent => user_agent} | convert - #{convert_options} #{new_format}#{file.path}'
+      file
+    end
 
-  def resize_thumbnail_options(size)
-    case options.shape
-      when "cut"
-        "#{size}^ -gravity center -extent #{size}"
-      when "preserve"
-        size
-      when "pad"
-        background = options.background ? %|"#{options.background}"| : %|none -matte|
-        "#{size} -background #{background} -gravity center -extent #{size}"
-      else
-        size
+    def convert_options
+      convert_options = []
+      convert_options << "-resize #{resize_thumbnail_options(options.resize)}" if options.resize
+      convert_options << "-thumbnail #{resize_thumbnail_options(options.thumbnail)}" if options.thumbnail
+      convert_options << "-flop" if options.flip == "horizontal"
+      convert_options << "-flip" if options.flip == "vertical"
+      convert_options << rotate_options if options.rotate
+      convert_options << "-colors 256" if options.format == "png8"
+      convert_options << "-quality #{options.quality}" if options.quality
+      convert_options << interlace_options if options.progressive
+      convert_options.join " "
     end
-  end
 
-  def rotate_options
-    if options.rotate.to_f % 90 == 0
-      "-rotate #{options.rotate}"
-    else
-      background = options.background ? %|"#{options.background}"| : %|none|
-      "-background #{background} -matte -rotate #{options.rotate}"
+    def resize_thumbnail_options(size)
+      case options.shape
+        when "cut"
+          "#{size}^ -gravity center -extent #{size}"
+        when "preserve"
+          size
+        when "pad"
+          background = options.background ? %|"#{options.background}"| : %|none -matte|
+          "#{size} -background #{background} -gravity center -extent #{size}"
+        else
+          size
+      end
     end
-  end
 
-  def interlace_options
-    case options.progressive
-      when "true"
-        "-interlace JPEG"
-      when "false"
-        "-interlace none"
+    def rotate_options
+      if options.rotate.to_f % 90 == 0
+        "-rotate #{options.rotate}"
       else
-        ""
+        background = options.background ? %|"#{options.background}"| : %|none|
+        "-background #{background} -matte -rotate #{options.rotate}"
+      end
     end
-  end
 
-  def new_format
-    options.format ? "#{options.format}:" : ""
-  end
+    def interlace_options
+      case options.progressive
+        when "true"
+          "-interlace JPEG"
+        when "false"
+          "-interlace none"
+        else
+          ""
+      end
+    end
 
-  def file
-    @tempfile ||= Tempfile.new("imageproxy").tap(&:close)
+    def new_format
+      options.format ? "#{options.format}:" : ""
+    end
+
+    def file
+      @tempfile ||= Tempfile.new("imageproxy").tap(&:close)
+    end
   end
 end

data/lib/identify.rb

@@ -1,11 +1,13 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "command")
 
-class Identify < Command
-  def initialize(options)
-    @options = options
-  end
+module Imageproxy
+  class Identify < Imageproxy::Command
+    def initialize(options)
+      @options = options
+    end
 
-  def execute(user_agent=nil)
-    execute_command %'#{curl @options.source, :user_agent => user_agent} | identify -verbose -'
+    def execute(user_agent=nil)
+      execute_command %'#{curl @options.source, :user_agent => user_agent} | identify -verbose -'
+    end
   end
 end

data/lib/options.rb

@@ -2,72 +2,74 @@ require 'uri'
 require 'cgi'
 require 'mime/types'
 
-class Options
-  def initialize(path, query_params)
-    params_from_path = path.split('/').reject { |s| s.nil? || s.empty? }
-    command = params_from_path.shift
+module Imageproxy
+  class Options
+    def initialize(path, query_params)
+      params_from_path = path.split('/').reject { |s| s.nil? || s.empty? }
+      command = params_from_path.shift
 
-    @hash = Hash[*params_from_path]
-    @hash['command'] = command
-    @hash.merge! query_params
-    merge_obfuscated
-    @hash["source"] = @hash.delete("src") if @hash.has_key?("src")
-    
-    unescape_source
-    unescape_signature
-    check_parameters
-  end
+      @hash = Hash[*params_from_path]
+      @hash['command'] = command
+      @hash.merge! query_params
+      merge_obfuscated
+      @hash["source"] = @hash.delete("src") if @hash.has_key?("src")
 
-  def check_parameters
-    check_param('resize',/^[0-9]{1,5}(x[0-9]{1,5})?$/)
-    check_param('thumbnail',/^[0-9]{1,5}(x[0-9]{1,5})?$/)
-    check_param('rotate',/^(-)?[0-9]{1,3}(\.[0-9]+)?$/)
-    check_param('format',/^[0-9a-zA-Z]{2,6}$/)
-    check_param('progressive',/^true|false$/i)
-    check_param('background',/^#[0-9a-f]{3}([0-9a-f]{3})?|rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-1](.[0-9]+)?\)$/)
-    check_param('shape',/^preserve|pad|cut$/i)
-    @hash['quality'] = [[@hash['quality'].to_i, 100].min, 0].max.to_s if @hash.has_key?('quality')
-  end
+      unescape_source
+      unescape_signature
+      check_parameters
+    end
+
+    def check_parameters
+      check_param('resize', /^[0-9]{1,5}(x[0-9]{1,5})?$/)
+      check_param('thumbnail', /^[0-9]{1,5}(x[0-9]{1,5})?$/)
+      check_param('rotate', /^(-)?[0-9]{1,3}(\.[0-9]+)?$/)
+      check_param('format', /^[0-9a-zA-Z]{2,6}$/)
+      check_param('progressive', /^true|false$/i)
+      check_param('background', /^#[0-9a-f]{3}([0-9a-f]{3})?|rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-1](.[0-9]+)?\)$/)
+      check_param('shape', /^preserve|pad|cut$/i)
+      @hash['quality'] = [[@hash['quality'].to_i, 100].min, 0].max.to_s if @hash.has_key?('quality')
+    end
 
-  def check_param(param, rega)
-    if @hash.has_key? param
-      if (! rega.match(@hash[param]))
-        @hash.delete(param)
+    def check_param(param, rega)
+      if @hash.has_key? param
+        if (!rega.match(@hash[param]))
+          @hash.delete(param)
+        end
       end
     end
-  end
 
-  def method_missing(symbol)
-    @hash[symbol.to_s] || @hash[symbol]
-  end
+    def method_missing(symbol)
+      @hash[symbol.to_s] || @hash[symbol]
+    end
 
-  def content_type
-    MIME::Types.of(@hash['source']).first.content_type
-  end
+    def content_type
+      MIME::Types.of(@hash['source']).first.content_type
+    end
 
-  private
-  
-  def unescape_source
-    @hash['source'] &&= CGI.unescape(CGI.unescape(@hash['source']))
-  end
+    private
 
-  def unescape_signature
-    @hash['signature'] &&= URI.unescape(@hash['signature'])
-  end
+    def unescape_source
+      @hash['source'] &&= CGI.unescape(CGI.unescape(@hash['source']))
+    end
 
-  def merge_obfuscated
-    if @hash["_"]
-      decoded = Base64.decode64(CGI.unescape(@hash["_"]))
-      decoded_hash = CGI.parse(decoded)
-      @hash.delete "_"
-      decoded_hash.map { |k, v| @hash[k] = (v.class == Array) ? v.first : v }
+    def unescape_signature
+      @hash['signature'] &&= URI.unescape(@hash['signature'])
     end
 
-    if @hash["-"]
-      decoded = Base64.decode64(CGI.unescape(@hash["-"]))
-      decoded_hash = Hash[*decoded.split('/').reject { |s| s.nil? || s.empty? }]
-      @hash.delete "-"
-      decoded_hash.map { |k, v| @hash[k] = (v.class == Array) ? v.first : v }
+    def merge_obfuscated
+      if @hash["_"]
+        decoded = Base64.decode64(CGI.unescape(@hash["_"]))
+        decoded_hash = CGI.parse(decoded)
+        @hash.delete "_"
+        decoded_hash.map { |k, v| @hash[k] = (v.class == Array) ? v.first : v }
+      end
+
+      if @hash["-"]
+        decoded = Base64.decode64(CGI.unescape(@hash["-"]))
+        decoded_hash = Hash[*decoded.split('/').reject { |s| s.nil? || s.empty? }]
+        @hash.delete "-"
+        decoded_hash.map { |k, v| @hash[k] = (v.class == Array) ? v.first : v }
+      end
     end
   end
 end

data/lib/selftest.rb

@@ -1,6 +1,7 @@
-class Selftest
-  def self.html(request, signature_required, signature_secret)
-    html = <<-HTML
+module Imageproxy
+  class Selftest
+    def self.html(request, signature_required, signature_secret)
+      html = <<-HTML
       <html>
         <head>
           <title>imageproxy selftest</title>
@@ -12,61 +13,62 @@ class Selftest
           </style>
         </head>
         <body>
-    HTML
+      HTML
 
-    url_prefix = "#{request.scheme}://#{request.host_with_port}"
-    raw_source = "http://eahanson.s3.amazonaws.com/imageproxy/sample.png"
-    source = CGI.escape(URI.escape(URI.escape(raw_source)))
+      url_prefix = "#{request.scheme}://#{request.host_with_port}"
+      raw_source = "http://eahanson.s3.amazonaws.com/imageproxy/sample.png"
+      source = CGI.escape(URI.escape(URI.escape(raw_source)))
 
-    html += <<-HTML
+      html += <<-HTML
       <h3>Original Image</h3>
       <a href="#{raw_source}">#{raw_source}</a>
       <img src="#{raw_source}">
-    HTML
+      HTML
 
-    examples = [
-      ["Resize (regular query-string URL format)", "/convert?resize=100x100&source=#{source}"],
-      ["Resize (CloudFront-compatible URL format)", "/convert/resize/100x100/source/#{source}"],
+      examples = [
+        ["Resize (regular query-string URL format)", "/convert?resize=100x100&source=#{source}"],
+        ["Resize (CloudFront-compatible URL format)", "/convert/resize/100x100/source/#{source}"],
 
-      ["Resize with padding", "/convert?resize=100x100&shape=pad&source=#{source}"],
-      ["Resize with padding & background color", "/convert?resize=100x100&shape=pad&background=%23ff00ff&source=#{source}"],
+        ["Resize with padding", "/convert?resize=100x100&shape=pad&source=#{source}"],
+        ["Resize with padding & background color", "/convert?resize=100x100&shape=pad&background=%23ff00ff&source=#{source}"],
 
-      ["Resize with cutting", "/convert?resize=100x100&shape=cut&source=#{source}"],
+        ["Resize with cutting", "/convert?resize=100x100&shape=cut&source=#{source}"],
 
-      ["Flipping horizontally", "/convert?flip=horizontal&source=#{source}"],
-      ["Flipping vertically", "/convert?flip=vertical&source=#{source}"],
+        ["Flipping horizontally", "/convert?flip=horizontal&source=#{source}"],
+        ["Flipping vertically", "/convert?flip=vertical&source=#{source}"],
 
-      ["Rotating to a 90-degree increment", "/convert?rotate=90&source=#{source}"],
-      ["Rotating to a non-90-degree increment", "/convert?rotate=120&source=#{source}"],
-      ["Rotating to a non-90-degree increment with a background color", "/convert?rotate=120&background=%23ff00ff&source=#{source}"],
+        ["Rotating to a 90-degree increment", "/convert?rotate=90&source=#{source}"],
+        ["Rotating to a non-90-degree increment", "/convert?rotate=120&source=#{source}"],
+        ["Rotating to a non-90-degree increment with a background color", "/convert?rotate=120&background=%23ff00ff&source=#{source}"],
 
-      ["Combo", "/convert?resize=100x100&shape=cut&rotate=45&background=%23ff00ff&source=#{source}"]
-    ]
+        ["Combo", "/convert?resize=100x100&shape=cut&rotate=45&background=%23ff00ff&source=#{source}"]
+      ]
 
-    examples.each do |example|
-      path = example[1]
-      if (signature_required)
-        signature = CGI.escape(Signature.create(path, signature_secret))
-        if path.include?("&")
-          path += "&signature=#{signature}"
-        else
-          path += "/signature/#{signature}"
+      examples.each do |example|
+        path = example[1]
+        if (signature_required)
+          signature = CGI.escape(Signature.create(path, signature_secret))
+          if path.include?("&")
+            path += "&signature=#{signature}"
+          else
+            path += "/signature/#{signature}"
+          end
         end
-      end
-      example_url = url_prefix + path
-      html += <<-HTML
+        example_url = url_prefix + path
+        html += <<-HTML
         <h3>#{example[0]}</h3>
         <a href="#{example_url}">#{example_url}</a>
         <img src="#{example_url}">
-      HTML
-    end
+        HTML
+      end
 
-    html += <<-HTML
+      html += <<-HTML
           <div class="footer"><a href="https://github.com/eahanson/imageproxy">imageproxy</a> selftest</div>
         </body>
       </html>
-    HTML
+      HTML
 
-    html
+      html
+    end
   end
 end

data/lib/server.rb

@@ -5,101 +5,103 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "selftest")
 require File.join(File.expand_path(File.dirname(__FILE__)), "signature")
 require 'uri'
 
-class Server
-  def initialize
-    @file_server = Rack::File.new(File.join(File.expand_path(File.dirname(__FILE__)), "..", "public"))
-  end
+module Imageproxy
+  class Server
+    def initialize
+      @file_server = Rack::File.new(File.join(File.expand_path(File.dirname(__FILE__)), "..", "public"))
+    end
 
-  def call(env)
-    request = Rack::Request.new(env)
-    options = Options.new(request.path_info, request.params)
-    user_agent = request.env["HTTP_USER_AGENT"]
-    cachetime = config(:cache_time) ? config(:cache_time) : 86400
-
-    case options.command
-      when "convert", "process", nil
-        check_signature request, options
-        check_domain options
-        check_size options
-
-        file = Convert.new(options).execute(user_agent)
-        class << file
-          alias to_path path
-        end
-
-        file.open
-        [200, {"Content-Type" => options.content_type, "Cache-Control" => "max-age=#{cachetime}, must-revalidate"}, file]
-      when "identify"
-        check_signature request, options
-        check_domain options
-
-        [200, {"Content-Type" => "text/plain"}, [Identify.new(options).execute(user_agent)]]
-      when "selftest"
-        [200, {"Content-Type" => "text/html"}, [Selftest.html(request, config?(:signature_required), config(:signature_secret))]]
-      else
-        @file_server.call(env)
+    def call(env)
+      request = Rack::Request.new(env)
+      options = Options.new(request.path_info, request.params)
+      user_agent = request.env["HTTP_USER_AGENT"]
+      cachetime = config(:cache_time) ? config(:cache_time) : 86400
+
+      case options.command
+        when "convert", "process", nil
+          check_signature request, options
+          check_domain options
+          check_size options
+
+          file = Convert.new(options).execute(user_agent)
+          class << file
+            alias to_path path
+          end
+
+          file.open
+          [200, {"Content-Type" => options.content_type, "Cache-Control" => "max-age=#{cachetime}, must-revalidate"}, file]
+        when "identify"
+          check_signature request, options
+          check_domain options
+
+          [200, {"Content-Type" => "text/plain"}, [Identify.new(options).execute(user_agent)]]
+        when "selftest"
+          [200, {"Content-Type" => "text/html"}, [Selftest.html(request, config?(:signature_required), config(:signature_secret))]]
+        else
+          @file_server.call(env)
+      end
+    rescue
+      STDERR.puts $!
+      [500, {"Content-Type" => "text/plain"}, ["Error (#{$!})"]]
     end
-  rescue
-    STDERR.puts $!
-    [500, {"Content-Type" => "text/plain"}, ["Error (#{$!})"]]
-  end
 
-  private
+    private
 
-  def config(symbol)
-    ENV["IMAGEPROXY_#{symbol.to_s.upcase}"]
-  end
+    def config(symbol)
+      ENV["IMAGEPROXY_#{symbol.to_s.upcase}"]
+    end
 
-  def config?(symbol)
-    config(symbol) && config(symbol).casecmp("TRUE") == 0
-  end
+    def config?(symbol)
+      config(symbol) && config(symbol).casecmp("TRUE") == 0
+    end
 
-  def check_signature(request, options)
-    if config?(:signature_required)
-      raise "Missing siganture" if options.signature.nil?
+    def check_signature(request, options)
+      if config?(:signature_required)
+        raise "Missing siganture" if options.signature.nil?
 
-      valid_signature = Signature.correct?(options.signature, request.fullpath, config(:signature_secret))
-      raise "Invalid signature #{options.signature} for #{request.url}" unless valid_signature
+        valid_signature = Signature.correct?(options.signature, request.fullpath, config(:signature_secret))
+        raise "Invalid signature #{options.signature} for #{request.url}" unless valid_signature
+      end
     end
-  end
 
-  def check_domain(options)
-    raise "Invalid domain" unless domain_allowed? options.source
-  end
+    def check_domain(options)
+      raise "Invalid domain" unless domain_allowed? options.source
+    end
 
-  def check_size(options)
-    raise "Image size too large" if exceeds_max_size(options.resize, options.thumbnail)
-  end  
+    def check_size(options)
+      raise "Image size too large" if exceeds_max_size(options.resize, options.thumbnail)
+    end
 
-  def domain_allowed?(url)
-    return true unless allowed_domains
-    allowed_domains.include?(url_to_domain url)
-  end
+    def domain_allowed?(url)
+      return true unless allowed_domains
+      allowed_domains.include?(url_to_domain url)
+    end
 
-  def url_to_domain(url)
-    URI::parse(url).host.split(".")[-2, 2].join(".")
-  rescue
-    ""
-  end
+    def url_to_domain(url)
+      URI::parse(url).host.split(".")[-2, 2].join(".")
+    rescue
+      ""
+    end
 
-  def allowed_domains
-    config(:allowed_domains) && config(:allowed_domains).split(",").map(&:strip)
-  end
+    def allowed_domains
+      config(:allowed_domains) && config(:allowed_domains).split(",").map(&:strip)
+    end
 
-  def exceeds_max_size(*sizes)
-    max_size && sizes.any? { |size| size && requested_size(size) > max_size }
-  end
+    def exceeds_max_size(*sizes)
+      max_size && sizes.any? { |size| size && requested_size(size) > max_size }
+    end
 
-  def max_size
-    config(:max_size) && config(:max_size).to_i
-  end
+    def max_size
+      config(:max_size) && config(:max_size).to_i
+    end
 
-  def requested_size(req_size)
-    sizes = req_size.scan(/\d*/)
-    if sizes[2] && (sizes[2].to_i > sizes[0].to_i)
-      sizes[2].to_i
-    else
-      sizes[0].to_i
+    def requested_size(req_size)
+      sizes = req_size.scan(/\d*/)
+      if sizes[2] && (sizes[2].to_i > sizes[0].to_i)
+        sizes[2].to_i
+      else
+        sizes[0].to_i
+      end
     end
   end
-end
+end

data/lib/signature.rb

@@ -1,24 +1,26 @@
 require 'base64'
 require 'openssl'
 
-class Signature
-  def self.create(path, secret)
-    Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, remove_signature_from(path))).strip.tr('+/', '-_')
-  end
+module Imageproxy
+  class Signature
+    def self.create(path, secret)
+      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, remove_signature_from(path))).strip.tr('+/', '-_')
+    end
 
-  def self.remove_signature_from(path)
-    #TODO: do this in fewer passes
-    path.
-      sub(%r{&signature(=[^&]*)?(?=&|$)}, "").
-      sub(%r{\?signature(=[^&]*)?&}, "?").
-      sub(%r{\?signature(=[^&]*)?$}, "").
-      sub(%r{/signature/[^\?/]+/}, "/").
-      sub(%r{/signature/[^\?/]+\?}, "?").
-      sub(%r{/signature/[^\?/]+}, "")
-  end
+    def self.remove_signature_from(path)
+      #TODO: do this in fewer passes
+      path.
+        sub(%r{&signature(=[^&]*)?(?=&|$)}, "").
+        sub(%r{\?signature(=[^&]*)?&}, "?").
+        sub(%r{\?signature(=[^&]*)?$}, "").
+        sub(%r{/signature/[^\?/]+/}, "/").
+        sub(%r{/signature/[^\?/]+\?}, "?").
+        sub(%r{/signature/[^\?/]+}, "")
+    end
 
-  def self.correct?(signature, path, secret)
-    created = create(path, secret)
-    signature != nil && path != nil && secret != nil && (created == signature || created == signature.tr('+/', '-_'))
+    def self.correct?(signature, path, secret)
+      created = create(path, secret)
+      signature != nil && path != nil && secret != nil && (created == signature || created == signature.tr('+/', '-_'))
+    end
   end
 end

data/spec/command_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Command do
+describe Imageproxy::Command do
   describe "#curl" do
     context "when a user agent is supplied" do
       it "should send that user agent" do
-        Command.new.send(:curl, "http://example.com/dog.jpg", :user_agent => "some user agent").should ==
+        Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg", :user_agent => "some user agent").should ==
           %|curl -s -A "some user agent" "http://example.com/dog.jpg"|
       end
     end
 
     context "when no user agent is supplied" do
       it "should send a default user agent" do
-        Command.new.send(:curl, "http://example.com/dog.jpg").should ==
+        Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg").should ==
           %|curl -s -A "imageproxy" "http://example.com/dog.jpg"|
       end
     end

data/spec/convert_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Convert do
+describe Imageproxy::Convert do
   before do
     @mock_file = mock("file")
     @mock_file.stub!(:path).and_return("/mock/file/path")
   end
 
   def command(options)
-    command = Convert.new(Options.new("", {:source => "http%3A%2F%2Fexample.com%2Fdog.jpg"}.merge(options)))
+    command = Imageproxy::Convert.new(Imageproxy::Options.new("", {:source => "http%3A%2F%2Fexample.com%2Fdog.jpg"}.merge(options)))
     command.stub!(:file).and_return(@mock_file)
     command.stub!(:system)
     command
@@ -15,7 +15,7 @@ describe Convert do
 
   context "general" do
     before do
-      @command = Convert.new(Options.new("/convert/format/png/resize/10x20/source/http%3A%2F%2Fexample.com%2Fdog.jpg", {}))
+      @command = Imageproxy::Convert.new(Imageproxy::Options.new("/convert/format/png/resize/10x20/source/http%3A%2F%2Fexample.com%2Fdog.jpg", {}))
       @command.stub!(:file).and_return(@mock_file)
       @command.stub!(:system)
     end

data/spec/options_spec.rb

@@ -2,10 +2,10 @@ require 'base64'
 require "#{File.dirname(__FILE__)}/../imageproxy"
 require "#{File.dirname(__FILE__)}/../lib/options"
 
-describe Options do
+describe Imageproxy::Options do
   describe "parsing path" do
     context "a simple URL" do
-      subject { Options.new "/process/color/blue/size/medium", {} }
+      subject { Imageproxy::Options.new "/process/color/blue/size/medium", {} }
       its(:command) { should == "process" }
       its(:color) { should == "blue" }
       its(:size) { should == "medium" }
@@ -13,59 +13,59 @@ describe Options do
 
     context "source" do
       context "when double-escaped" do
-        subject { Options.new "/process/source/http%253A%252F%252Fexample.com%252Fdog.jpg", {} }
+        subject { Imageproxy::Options.new "/process/source/http%253A%252F%252Fexample.com%252Fdog.jpg", {} }
         it("should unescape") { subject.source.should == "http://example.com/dog.jpg" }
       end
 
       context "when escaped" do
-        subject { Options.new "/process/source/http%3A%2F%2Fexample.com%2Fdog.jpg", {} }
+        subject { Imageproxy::Options.new "/process/source/http%3A%2F%2Fexample.com%2Fdog.jpg", {} }
         it("should unescape") { subject.source.should == "http://example.com/dog.jpg" }
       end
 
       context "when not escaped" do
-        subject { Options.new "/process/source/foo", {} }
+        subject { Imageproxy::Options.new "/process/source/foo", {} }
         it("should not unescape") { subject.source.should == "foo" }
       end
 
       context "when parameter is named 'src'" do
-        subject { Options.new "/process/src/foo", {} }
+        subject { Imageproxy::Options.new "/process/src/foo", {} }
         it("should rename to 'source'") { subject.source.should == "foo" }
       end
     end
 
     context "signature" do
       context "when escaped with + signs" do
-        subject { Options.new "/process/source/foo/signature/foo+bar", {} }
+        subject { Imageproxy::Options.new "/process/source/foo/signature/foo+bar", {} }
         it("should keep the + sign") { subject.signature.should == "foo+bar" }
       end
     end
   end
 
   describe "adding query params" do
-    subject { Options.new "/convert/source/foo", { "resize" => "20x20" } }
+    subject { Imageproxy::Options.new "/convert/source/foo", { "resize" => "20x20" } }
     it("should add query params") { subject.resize.should == "20x20" }
     it("should keep params from path") { subject.source.should == "foo" }
   end
 
   describe "content type" do
     context "when guessing based on source filename" do
-      it("should understand .png") { Options.new("/convert", "source" => "foo.png").content_type.should == "image/png" }
-      it("should understand .jpg") { Options.new("/convert", "source" => "foo.jpg").content_type.should == "image/jpeg" }
-      it("should understand .JPEG") { Options.new("/convert", "source" => "foo.JPEG").content_type.should == "image/jpeg" }
+      it("should understand .png") { Imageproxy::Options.new("/convert", "source" => "foo.png").content_type.should == "image/png" }
+      it("should understand .jpg") { Imageproxy::Options.new("/convert", "source" => "foo.jpg").content_type.should == "image/jpeg" }
+      it("should understand .JPEG") { Imageproxy::Options.new("/convert", "source" => "foo.JPEG").content_type.should == "image/jpeg" }
     end
   end
 
   describe "obfuscation" do
     it "should allow the query string to be encoded in base64" do
       encoded = CGI.escape(Base64.encode64("resize=20x20&source=http://example.com/dog.jpg"))
-      options = Options.new "/convert", "_" => encoded
+      options = Imageproxy::Options.new "/convert", "_" => encoded
       options.resize.should == "20x20"
       options.source.should == "http://example.com/dog.jpg"
     end
 
     it "should allow the path to be encoded in base64" do
       encoded = CGI.escape(Base64.encode64("resize/20x20/source/http%3A%2F%2Fexample.com%2Fdog.jpg"))
-      options = Options.new "/convert/-/#{encoded}", {}
+      options = Imageproxy::Options.new "/convert/-/#{encoded}", {}
       options.resize.should == "20x20"
       options.source.should == "http://example.com/dog.jpg"
     end
@@ -73,15 +73,15 @@ describe Options do
 
   describe "quality" do
     it "should be set to 0 if it's less than 0" do
-      Options.new("/convert", "quality" => "-39").quality.should == "0"
+      Imageproxy::Options.new("/convert", "quality" => "-39").quality.should == "0"
     end
 
     it "should be set to 100 if it's > 100" do
-      Options.new("/convert", "quality" => "293").quality.should == "100"
+      Imageproxy::Options.new("/convert", "quality" => "293").quality.should == "100"
     end
     
     it "should not change if it's >= 0 <= 100" do
-      Options.new("/convert", "quality" => "59").quality.should == "59"
+      Imageproxy::Options.new("/convert", "quality" => "59").quality.should == "59"
     end
   end
 end

data/spec/server_spec.rb

@@ -16,14 +16,14 @@ describe "Server" do
   end
 
   def app
-    @app ||= Server.new
+    @app ||= Imageproxy::Server.new
   end
 
   context "when converting" do
     it "should send back the right result" do
       app.stub!(:config) { |sym| nil }
       get("/convert/resize/10x20/source/#{escaped_test_image_url}").should succeed
-      Compare.new(response_body_as_file, test_image_path("10x20")).execute.should == "0"
+      Imageproxy::Compare.new(response_body_as_file, test_image_path("10x20")).execute.should == "0"
     end
   end
 
@@ -53,13 +53,13 @@ describe "Server" do
 
     it "should work if the signature is correct" do
       url = "/convert/resize/10x20/source/#{escaped_test_image_url}"
-      signature = Signature.create(url, @secret)
+      signature = Imageproxy::Signature.create(url, @secret)
       get("#{url}?signature=#{CGI.escape(signature)}").should succeed
     end
 
     it "should work if the signature is part of the path" do
       url = "/convert/resize/10x20/source/#{escaped_test_image_url}"
-      signature = Signature.create(url, @secret)
+      signature = Imageproxy::Signature.create(url, @secret)
       get("#{url}/signature/#{URI.escape(signature)}").should succeed
     end
   end

data/spec/signature_spec.rb

@@ -1,72 +1,72 @@
 require 'spec_helper'
 
-describe Signature do
+describe Imageproxy::Signature do
   describe "#create" do
     it "should create a signature from a query string" do
-      Signature.create("/convert?src=http://www.example.com/dog.jpg&resize=400x400&signature=AAA&key=BBB", "SECRET").should_not be_nil
+      Imageproxy::Signature.create("/convert?src=http://www.example.com/dog.jpg&resize=400x400&signature=AAA&key=BBB", "SECRET").should_not be_nil
     end
 
     it "should ignore the signature param" do
-      Signature.create("/convert?src=SRC&resize=10x10&signature=SIG&key=KEY", "SECRET").should == Signature.create("/convert?src=SRC&resize=10x10&key=KEY", "SECRET")
+      Imageproxy::Signature.create("/convert?src=SRC&resize=10x10&signature=SIG&key=KEY", "SECRET").should == Imageproxy::Signature.create("/convert?src=SRC&resize=10x10&key=KEY", "SECRET")
     end
   end
 
   describe "#correct?" do
     it "should validate a signature" do
-      Signature.correct?(Signature.create("/convert?src=SRC&resize=10x10&key=KEY", "SECRET"), "/convert?src=SRC&resize=10x10&key=KEY", "SECRET").should be_true
+      Imageproxy::Signature.correct?(Imageproxy::Signature.create("/convert?src=SRC&resize=10x10&key=KEY", "SECRET"), "/convert?src=SRC&resize=10x10&key=KEY", "SECRET").should be_true
     end
 
     it "should return false if signature is nil" do
-      Signature.correct?(nil, "/convert?src=SRC&resize=10x10&key=KEY", "SECRET").should be_false
+      Imageproxy::Signature.correct?(nil, "/convert?src=SRC&resize=10x10&key=KEY", "SECRET").should be_false
     end
 
     it "should handle URL-safe signatures" do
-      Signature.correct?("_v70E0zfdcRR4cJehS2mhvqJ-8s=", "YLANEBHFSJGCAWKDNCKWEKJRXKPMYU", "SECRET").should be_true
+      Imageproxy::Signature.correct?("_v70E0zfdcRR4cJehS2mhvqJ-8s=", "YLANEBHFSJGCAWKDNCKWEKJRXKPMYU", "SECRET").should be_true
     end
 
     it "should handle non-URL-safe signatures" do
-      Signature.correct?("k7DMQ/G8YAsbSovX+mDFjlHHMjo=", "YPMMYCRRECCCIPSXPDDFIJFSINOIRC", "SECRET").should be_true
+      Imageproxy::Signature.correct?("k7DMQ/G8YAsbSovX+mDFjlHHMjo=", "YPMMYCRRECCCIPSXPDDFIJFSINOIRC", "SECRET").should be_true
     end
   end
 
   describe "#remove_signature_from" do
     it "should remove the signature when it's the only query param" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana?signature=SIG").should ==
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana?signature=SIG").should ==
         "/convert/a/apple/b/banana"
     end
 
     it "should remove the signature from the beginning of the query string" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana?signature=SIG&c=cherry&d=donut").should == 
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana?signature=SIG&c=cherry&d=donut").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
     
     it "should remove the signature from the middle of the query string" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana?c=cherry&signature=SIG&d=donut").should == 
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana?c=cherry&signature=SIG&d=donut").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
     
     it "should remove the signature from the end of the query string" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana?c=cherry&d=donut&signature=SIG").should == 
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana?c=cherry&d=donut&signature=SIG").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
 
     it "should remove the signature from the beginning of the path" do
-      Signature.remove_signature_from("/convert/signature/SIG/a/apple/b/banana?c=cherry&d=donut").should ==
+      Imageproxy::Signature.remove_signature_from("/convert/signature/SIG/a/apple/b/banana?c=cherry&d=donut").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
 
     it "should remove the signature from the middle of the path" do
-      Signature.remove_signature_from("/convert/a/apple/signature/SIG/b/banana?c=cherry&d=donut").should ==
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/signature/SIG/b/banana?c=cherry&d=donut").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
 
     it "should remove the signature from the end of the path" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana/signature/SIG?c=cherry&d=donut").should ==
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana/signature/SIG?c=cherry&d=donut").should ==
         "/convert/a/apple/b/banana?c=cherry&d=donut"
     end
 
     it "should remove the signature from the end of the path when there's no query string" do
-      Signature.remove_signature_from("/convert/a/apple/b/banana/signature/SIG").should ==
+      Imageproxy::Signature.remove_signature_from("/convert/a/apple/b/banana/signature/SIG").should ==
         "/convert/a/apple/b/banana"
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: imageproxy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Erik Hanson
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3683020924727670917
+      hash: -2872923147310214835
       segments: 
       - 0
       version: "0"