scale_down 0.2.9 → 0.5.0

data/.bundle/config

@@ -1,2 +1 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- {}

data/Gemfile

@@ -1,3 +1,7 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'thin'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale_down (0.2.3.2)
+    scale_down (0.2.9)
       rmagick (>= 2.1)
       ruby-hmac (>= 0.4.0)
       sinatra (>= 1.0)
@@ -10,6 +10,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     contest (0.1.3)
+    daemons (1.1.4)
+    eventmachine (0.12.10)
     mocha (0.9.8)
       rake
     rack (1.2.2)
@@ -18,10 +20,14 @@ GEM
     rake (0.8.7)
     rmagick (2.13.1)
     ruby-hmac (0.4.0)
-    sinatra (1.2.6)
+    sinatra (1.2.7)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
-    tilt (1.3)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
@@ -31,3 +37,4 @@ DEPENDENCIES
   mocha (= 0.9.8)
   rack-test (= 0.5.6)
   scale_down!
+  thin

data/README.rdoc

@@ -1,52 +1,89 @@
 = ScaleDown
 
-A Sinatra web server for scaling and serving images on demand, nothing more.
+An on demand image scaling server.
 
 Images are scaled based upon their URL. An HMAC signature is used to prevent unauthorized scaling of images.
 
 Supports cropping images and converts CMYK to RGB.
 
-The URL schema
+== The URL schema
 
-  http://:host/:geometry/:path_to_file/:filename?:hmac_signature
+Your file on `example.com` has a public path of `/images/john/picture.png`. You want it scaled to fit in a 400x400 pixel box.  *ScaleDown* is running on the subdomain `images`.
 
-  :host is the address running ScaleDown
+The URL to your image would be:
 
-  :geometry is width x height and an optional `-crop`
+  http://images.example.com/images/john/scaled/400x400/picture.png?HMAC_SIGNATURE
+
+The scaled file will be saved in a public path identical to the request. So once an image is scaled your webserver, Apache, Nginx, etc, can statically server the file.
+
+The schema is
+
+  http://:host/:path_to_file/scaled/:geometry/:filename?:hmac_signature
+
+  :host is the address running ScaleDown
 
   :path_to_file is the public path of the original file
 
+  `scaled` keyword
+
+  :geometry is width x height and an optional `-crop`
+
   :filename is the name of the image to scale
 
   :hmac_signature a security measure to validate the request
 
-Example
+== Geometry & Cropping
 
-  http://images.example.com/400x300/images/logo.png?A3SDACEDF
+To crop an image include the `-crop` option.  The image will be scaled and cropped to fit the geometry.
 
-  would 301 redirect to the scaled image
+  http://images.example.com/images/scaled/400x300-crop/logo.png?A3SDACEDF
 
-  http://images.example.com/images/scaled/400x300/logo.png
+Using `auto` as a dimension will fit the image to other dimension.
 
-To crop an image include the 'crop' option.  The image will be scaled and cropped to fit the geometry.
+For example, to ensure an image is 300 pixels wide set the height to auto
 
-  http://images.example.com/400x300-crop/images/logo.png?A3SDACEDF
+  http://images.example.com/images/scaled/300xauto/logo.png/?A3SDACEDF
 
-Using 'auto' as a dimension will fit the image to other dimension.
+There is a very simple `/info` function for getting image dimensions. It just returns a string with the WIDTHxHEIGHT.
 
-For example, to ensure an image is 300 pixels wide set the height to auto
+  http://images.example.com/images/logo.png/info
+
+== HMAC
+
+You don't want someone taking down your server with malicious URLs, so an HMAC signature is used.  This ensures that your URL was generated by a trusted source.
+
+HMAC requires a shared key between the application generating the URL and the ScaleDown server.
 
-  http://images.example.com/300xauto/images/logo.png/?A3SDACEDF
+=== Sample Ruby URL Generator
 
-There is a very simple `/info` function for getting the image dimesions. It just returns a string with the WIDTHxHEIGHT.
+  require 'ruby-hmac'
 
-  http://images.exmaple.com/images/logo.png/info
+  def signed_image_url(absolute_path, filename, geometry)
+    shared_secret = "secret"
+    hmac = HMAC::SHA1.new(shared_secret).update([absolute_path, 'scaled', geometry, filename].join("/")).to_s[0...8]
+    "http://images.example.com#{[absolute_path, 'scaled', geometry, CGI.escape(filename)].join("/")}?#{hmac}"
+  end
+
+=== Sample Node.js URL Generator
+
+  // Uses the Node.js crypot library
+  var crypto = require('crypto')
+
+  function hmac(string){
+    var shared_secret = "secret"
+    return crypto.createHmac('sha1',shared_secret).update(string).digest('hex').substr(0,8)
+  }
+
+  function signed_image_url(absolute_path, filename, geometry){
+    signature = hmac( [ absolute_path, '/scaled', "/" + geometry, "/", filename].join("") )
+    return [global.$FD.assetHost,  absolute_path, '/scaled', "/", geometry, "/",escape(filename)].join("") + "?"+ signature
+  }
 
 == Installation and Configuration
 
   gem install scale_down
 
-Create a rackup file (config.ru). See http://rubydoc.info/gems/scale_down/0.2.1/ScaleDown more options
+Create a Rackup file (config.ru). See https://github.com/jweir/ScaleDown/tree/master/config_sample.ru more options
 
   require 'rubygems'
   require 'scale_down'
@@ -61,36 +98,12 @@ Create a rackup file (config.ru). See http://rubydoc.info/gems/scale_down/0.2.1/
 
   run ScaleDown::Controller
 
-Configure Nginx, Apache, etc to run the server. I use Passenger http://www.modrails.com/
-
-=== Generating the URL
-
-Your application will need to generate the image's URL and HMAC signature.
-
-  # Example ruby function to generate signed URL
-  require 'HMAC::SHA1'
-  require 'cgi'
-
-  # ie signed_image_url('images', 'picture.png', '400x300-cropped')
-  def signed_image_url(path, filename, geometry)
-    hmac = HMAC::SHA1.new("secret").update("/#{geometry}/#{path}/#{filename}").to_s[0..8]
-    "http://images.myserver.com/#{geometry}/#{path}/#{CGI.escape(filename)}?#{hmac}"
-  end
-
-Of course this could be done in PHP, Node, Python, or other languages.
+Configure Nginx, Apache, etc to run the server.
 
 == Known Issues
 
 Pluses in filenames will not route properly.  Filenames need to have these removed or replaced.
 
-== TODO
-
-Custom Read/Write methods to allow for more than just local storage.
-
-Examples using Node.js
-
-There is an issue on some systems with pluses in filenames.
-
 == Dependencies
 
 * Sinatra

data/lib/scale_down/controller.rb

@@ -17,25 +17,30 @@ class ScaleDown::Controller < Sinatra::Application
     end
   end
 
-  # get '/*/:filename/:geometry?:hmac'
+  # get '/*/:geometry/:filename?:hmac'
   # is what I want, but this fails when the URL includes things like %23 (an encoded hash tag)
   get '/*' do
     parts = params[:splat].join("/").split("/")
 
     params = {
       :hmac     => request.env["QUERY_STRING"],
-      :geometry => parts.shift,
       :filename => parts.pop,
+      :geometry => parts.pop,
       :splat    => parts
     }
 
     path, status = dispatch(params)
 
     ScaleDown.logger.info "Controller#get #{path} #{status}"
-    unless status == 403
-      redirect URI.encode(path), status
+    case status
+    when 302 then
+      # File is found or scaled, use Sinatra's built in send file method
+      static!
+    when 403 then
+      [status, "Error: the the HMAC is invalid for this request"]
+    when 404 then
+      [status, "Error: the orignal image could not be found"]
     else
-      # TODO error messages which explain what went wrong
       [status, "Error: this image could not be processed"]
     end
   end

data/lib/scale_down/dispatcher.rb

@@ -10,12 +10,12 @@ class ScaleDown::Dispatcher
       ScaleDown.logger.info "Dipatcher#process #{dispatcher.root_path}"
 
       return ["Missing file", 404] unless dispatcher.root_file_exists?
-      return [dispatcher.redirect_path, 301] if dispatcher.scaled_file_exists?
+      return [dispatcher.redirect_path, 302] if dispatcher.scaled_file_exists?
 
       return ["Invalid HMAC signature", 403] unless dispatcher.valid_hmac?
       return ["File failed to scale. The file may be corrupt.", 500] unless dispatcher.scale
 
-      [dispatcher.redirect_path, 301]
+      [dispatcher.redirect_path, 302]
     end
 
     # TODO return a JSON response with a full set of image details
@@ -55,7 +55,7 @@ class ScaleDown::Dispatcher
   end
 
   def redirect_path
-    ["/"+@params[:path], "scaled", scaled_filename].join("/")
+    ["/"+@params[:path], @params[:geometry], scaled_filename].join("/")
   end
 
   def root_file_exists?
@@ -67,7 +67,8 @@ class ScaleDown::Dispatcher
   end
 
   def root_path
-    File.join(ScaleDown.public_path, @params[:path], @params[:filename])
+    root = @params[:path].gsub(/\/scaled$/,"")
+    File.join(ScaleDown.public_path, root, @params[:filename])
   end
 
   def scaled_file_path
@@ -75,7 +76,7 @@ class ScaleDown::Dispatcher
   end
 
   def scaled_filename
-    "#{filename}-#{@params[:geometry]}.#{scaled_extension}"
+    "#{filename}.#{scaled_extension}"
   end
 
   def filename

data/lib/scale_down/image.rb

@@ -53,7 +53,7 @@ class ScaleDown::Image
       file = Magick::Image.read(file_path).first
       unless file.nil?
         yield file
-        file.destroy!
+        # file.destroy!
       end
     rescue Magick::ImageMagickError => e
     end

data/lib/scale_down/version.rb

@@ -1,3 +1,3 @@
 module ScaleDown
-  VERSION = "0.2.9"
+  VERSION = "0.5.0"
 end

data/lib/scale_down.rb

@@ -19,7 +19,7 @@ module ScaleDown
 
 
   def self.valid_hmac?(params)
-    str = ["/", params[:geometry], "/",params[:path], "/", params[:filename]].join
+    str = ["/", params[:path], "/", params[:geometry], "/", params[:filename]].join
     hmac(str) == params[:hmac]
   end
 

data/test/scale_down/controller_test.rb

@@ -10,23 +10,22 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
   context "parsing a request" do
     should "have an image path" do
       ScaleDown::Dispatcher.expects(:process).with(
-        :path     => "user/path",
+        :path     => "user/path/scaled",
         :filename => "filename.png",
         :geometry => "400x300-crop-grayscale",
         :hmac     => "HMAC").
       returns ["path","status"]
 
-      get '/400x300-crop-grayscale/user/path/filename.png?HMAC'
+      get '/user/path/scaled/400x300-crop-grayscale/filename.png?HMAC'
     end
   end
 
   context "a valid request" do
     should "redirect to the image path" do
-      ScaleDown::Dispatcher.expects(:process).returns ["/image-path", 301]
-      get "/geo/path/filename?hmac"
+      ScaleDown::Dispatcher.expects(:process).returns ["/image-path", 302]
+      get "/path/geo/filename?hmac"
 
-      assert_equal 301, last_response.status
-      assert_equal "http://example.org/image-path", last_response["Location"]
+      assert_equal 200, last_response.status
     end
   end
 
@@ -35,7 +34,7 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
     should "respond with a 403 and error message" do
       ScaleDown::Dispatcher.expects(:process).returns ["Error description", 403]
 
-      get "/geo/path/filename?hmac"
+      get "/path/geo/filename?hmac"
 
       assert_equal 403, last_response.status
       assert_match "Error", last_response.body

data/test/scale_down/dispatcher_test.rb

@@ -9,10 +9,10 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
       ScaleDown.hmac_length = 8
       ScaleDown.public_path = "/tmp"
 
-      hmac = HMAC::SHA1.new("secret").update("file/path/filename.png/400x300-crop").to_s
+      hmac = HMAC::SHA1.new("secret").update("file/path/400x300-crop/filename.png").to_s
 
       @params = {
-        :path     => "file/path",
+        :path     => "file/path/scaled",
         :filename => "filename.png",
         :geometry => "400x300-crop",
         :hmac     => hmac[0...8]
@@ -34,8 +34,8 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
         assert @dispatcher.root_file_exists?
       end
 
-      should "deterimine the scaled image's existance" do
-        File.expects(:exists?).with("/tmp/file/path/scaled/filename-400x300-crop.png").returns true
+      should "determine the scaled image's existance" do
+        File.expects(:exists?).with("/tmp/file/path/scaled/400x300-crop/filename.png").returns true
         assert @dispatcher.scaled_file_exists?
       end
 
@@ -44,7 +44,7 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
       end
 
       should "have a redirect path" do
-        assert_equal "/file/path/scaled/filename-400x300-crop.png", @dispatcher.redirect_path
+        assert_equal "/file/path/scaled/400x300-crop/filename.png", @dispatcher.redirect_path
       end
 
       should "process the image" do
@@ -74,7 +74,7 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
       context "for an existing, unscaled image" do
         setup do
           File.expects(:exists?).with("/tmp/file/path/filename.png").returns true
-          File.expects(:exists?).with("/tmp/file/path/scaled/filename-400x300-crop.png").returns false
+          File.expects(:exists?).with("/tmp/file/path/scaled/400x300-crop/filename.png").returns false
         end
 
         context "with a valid HMAC" do
@@ -87,8 +87,8 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
             ScaleDown::Dispatcher.process(@params)
           end
 
-          should "return a 301 redirect to the processed image's URL" do
-            assert_equal ["/file/path/scaled/filename-400x300-crop.png", 301], ScaleDown::Dispatcher.process(@params)
+          should "return a 302 redirect to the processed image's URL" do
+            assert_equal ["/file/path/scaled/400x300-crop/filename.png", 302], ScaleDown::Dispatcher.process(@params)
           end
         end
 
@@ -103,11 +103,11 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
       context "for an existing, scaled, image" do
         setup do
           File.expects(:exists?).with("/tmp/file/path/filename.png").returns true
-          File.expects(:exists?).with("/tmp/file/path/scaled/filename-400x300-crop.png").returns true
+          File.expects(:exists?).with("/tmp/file/path/scaled/400x300-crop/filename.png").returns true
         end
 
-        should "return a 301 redirect to the processed image's URL" do
-          assert_equal ["/file/path/scaled/filename-400x300-crop.png", 301], ScaleDown::Dispatcher.process(@params)
+        should "return a 302 redirect to the processed image's URL" do
+          assert_equal ["/file/path/scaled/400x300-crop/filename.png", 302], ScaleDown::Dispatcher.process(@params)
         end
       end
 

data/test/scale_down/image_test.rb

@@ -17,16 +17,16 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     setup do
       @subject = create \
         fixture_path("files/graphic.png"),
-        fixture_path("scaled_test/graphic_scaled.png"),
+        fixture_path("scaled_test/scaled/graphic.png"),
         { :width => 100, :height => 180}
     end
 
     should "save the file (and generate the path)" do
-      assert File.exists?(fixture_path('scaled_test/graphic_scaled.png'))
+      assert File.exists?(fixture_path('scaled_test/scaled/graphic.png'))
     end
 
     should "scale the image" do
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.png")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.png")).first
       assert_equal 90, image.columns
       assert_equal 180, image.rows
     end
@@ -46,10 +46,10 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     should "auto scale any one dimensions" do
       assert create \
         fixture_path("files/graphic.png"),
-        fixture_path("scaled_test/graphic_scaled.png"),
+        fixture_path("scaled_test/scaled/graphic.png"),
         { :width => "auto", :height => 150 }
 
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.png")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.png")).first
       assert_equal 150, image.rows
       assert_equal 75, image.columns
     end
@@ -77,7 +77,7 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     setup do
       @subject = create \
         fixture_path("files/invalid_jpeg.jpg"),
-        fixture_path("scaled_test/graphic_scaled.jpg"),
+        fixture_path("scaled_test/scaled/graphic.jpg"),
         { :width => 100, :height => 105 }
     end
 
@@ -86,7 +86,7 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     end
 
     should "not create a scaled image" do
-      assert !File.exists?(fixture_path("scaled_test/graphic_scaled.jpg"))
+      assert !File.exists?(fixture_path("scaled_test/scaled/graphic.jpg"))
     end
   end
 
@@ -99,7 +99,7 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
       assert_raises ScaleDown::FileSizeTooLarge do
         @subject = create \
           fixture_path("files/graphic.png"),
-          fixture_path("scaled_test/graphic_scaled.png"),
+          fixture_path("scaled_test/scaled/graphic.png"),
           { :width => 100, :height => 105 }
       end
     end
@@ -109,12 +109,12 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     setup do
       @subject = create \
         fixture_path("files/graphic.png"),
-        fixture_path("scaled_test/graphic_scaled.png"),
+        fixture_path("scaled_test/scaled/graphic.png"),
         { :width => 25, :height => 25, :crop => true }
     end
 
     should "crop the image to the dimensions" do
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.png")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.png")).first
       assert_equal 25, image.columns
       assert_equal 25, image.rows
     end
@@ -124,12 +124,12 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     setup do
       @subject = create \
         fixture_path("files/orient.jpg"),
-        fixture_path("scaled_test/graphic_scaled.jpg"),
+        fixture_path("scaled_test/scaled/graphic.jpg"),
         { :width => "auto", :height => 800}
     end
 
     should "be automatic" do
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.jpg")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.jpg")).first
       assert_equal 600, image.columns
       assert_equal 800, image.rows
     end
@@ -137,10 +137,10 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     should "ignore files without orientation EXIF" do
       @subject = create \
         fixture_path("files/no_orient.tif"),
-        fixture_path("scaled_test/graphic_scaled.jpg"),
+        fixture_path("scaled_test/scaled/graphic.jpg"),
         { :width => "auto", :height => 424}
 
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.jpg")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.jpg")).first
       assert_equal 330, image.columns
       assert_equal 424, image.rows
     end
@@ -150,20 +150,20 @@ class ScaleDown::Image::Test < Test::Unit::TestCase
     should "be converted to RGB" do
       create \
         fixture_path("files/cmyk.tif"),
-        fixture_path("scaled_test/graphic_scaled.jpg"),
+        fixture_path("scaled_test/scaled/graphic.jpg"),
         { :width => "auto", :height => 200}
 
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled.jpg")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic.jpg")).first
       assert_equal Magick::RGBColorspace, image.colorspace
     end
 
     should "convert JPGs to RGB JPEGS" do
       create \
         fixture_path("files/cmyk_gray.jpg"),
-        fixture_path("scaled_test/graphic_scaled_2.jpg"),
+        fixture_path("scaled_test/scaled/graphic_2.jpg"),
         { :width => "auto", :height => 200}
 
-      image = Magick::Image.read(fixture_path("scaled_test/graphic_scaled_2.jpg")).first
+      image = Magick::Image.read(fixture_path("scaled_test/scaled/graphic_2.jpg")).first
       assert_equal Magick::RGBColorspace, image.colorspace
     end
   end

data/test/scale_down_test.rb

@@ -21,7 +21,7 @@ class ScaleDown::Test < Test::Unit::TestCase
 
     context "HMAC" do
       setup do
-        hmac = HMAC::SHA1.new("secret").update("/400x300-crop/file/path/filename.png").to_s
+        hmac = HMAC::SHA1.new("secret").update("/file/path/400x300-crop/filename.png").to_s
 
         @params = {
           :path     => "file/path",
@@ -59,19 +59,19 @@ class ScaleDown::Test < Test::Unit::TestCase
       end
 
       should "get an image and scale it" do
-        valid_get '/400x300-cropped/test_images/example_1/graphic.png'
-        assert_equal 301, last_response.status
-        assert_match "/test_images/example_1/scaled/graphic-400x300-cropped.png", last_response["Location"]
-        assert File.exists?("/tmp/scale_down/test_images/example_1/scaled/graphic-400x300-cropped.png")
+        valid_get '/test_images/example_1/scaled/400x300-cropped/graphic.png'
+        assert_equal 200, last_response.status
+        assert File.exists?("/tmp/scale_down/test_images/example_1/scaled/400x300-cropped/graphic.png")
+        assert_match "/test_images/example_1/scaled/400x300-cropped/graphic.png", last_response["Location"]
       end
 
       should "get a nonexistant image and return a 404" do
-        valid_get "/test_exmaples/example_none/image.jpg"
+        valid_get "/test_images/example_none/scaled/400x300/image.jpg"
         assert_equal 404, last_response.status
       end
 
       should "get an invalid image and return a 500" do
-        valid_get '/400x300-cropped/test_images/example_2/invalid_jpeg.jpg'
+        valid_get '/test_images/example_2/scaled/400x300-cropped/invalid_jpeg.jpg'
 
         assert_equal 500, last_response.status
         assert !File.exists?("/tmp/scale_down/test_images/example_2/scaled/400x300-cropped/invalid_jpeg.jpg")

data/test/scaled_image_tag_test.rb

@@ -4,9 +4,9 @@ require 'cgi'
 
 class ScaleDown::Test < Test::Unit::TestCase
 
-  def signed_image_url(path, filename, options)
-    hmac = HMAC::SHA1.new("secret").update([path, filename, options].join("/")).to_s[0...8]
-    "http://images.myserver.com#{[path, CGI.escape(filename), options, hmac].join("/")}"
+  def signed_image_url(path, filename, geometry)
+    hmac = HMAC::SHA1.new("secret").update([path, 'scaled', geometry, filename].join("/")).to_s[0...8]
+    "http://images.myserver.com#{[path, 'scaled', geometry, CGI.escape(filename)].join("/")}?#{hmac}"
   end
 
   setup do
@@ -17,17 +17,17 @@ class ScaleDown::Test < Test::Unit::TestCase
   end
 
   should "create a URL with the HMAC signature" do
-    hmac = ScaleDown.hmac("/images/graphic.png/400x300-cropped")
+    hmac = ScaleDown.hmac("/images/scaled/400x300-cropped/graphic.png")
     assert_equal\
-      "http://images.myserver.com/images/graphic.png/400x300-cropped/#{hmac}",
+      "http://images.myserver.com/images/scaled/400x300-cropped/graphic.png?#{hmac}",
       signed_image_url("/images","graphic.png","400x300-cropped")
   end
 
   should "create a URL when the filename has URI break characters" do
     filename = "# !%23?.png"
-    hmac = ScaleDown.hmac("/images/#{filename}/400x300-cropped")
+    hmac = ScaleDown.hmac("/images/scaled/400x300-cropped/#{filename}")
     assert_equal\
-      "http://images.myserver.com/images/#{CGI.escape filename}/400x300-cropped/#{hmac}",
+      "http://images.myserver.com/images/scaled/400x300-cropped/#{CGI.escape filename}?#{hmac}",
       signed_image_url("/images", filename, "400x300-cropped")
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,7 @@
-require 'scale_down'
+require './lib/scale_down'
 require 'rack/test'
 require 'contest'
 require 'mocha'
-require 'ruby-debug'
 
 ENV['RACK_ENV'] = 'test'
 

metadata

@@ -2,7 +2,7 @@
 name: scale_down
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.9
+  version: 0.5.0
 platform: ruby
 authors: 
 - John Weir
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-13 00:00:00 -04:00
-default_executable: 
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -118,7 +117,6 @@ files:
 - test/scale_down_test.rb
 - test/scaled_image_tag_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/jweir/ScaleDown
 licenses: []
 
@@ -142,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scale_down
-rubygems_version: 1.5.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A Sinatra based server for quickly scaling and serving images. Nothing more.