scale_down 0.7.0 → 0.7.1

data/lib/scale_down/controller.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class ScaleDown::Controller < Sinatra::Application
 
   set :raise_errors, true
@@ -24,28 +26,24 @@ class ScaleDown::Controller < Sinatra::Application
 
     params = {
       :hmac     => request.env["QUERY_STRING"],
-      :filename => parts.pop,
+      :filename => CGI.unescape(parts.pop),
       :target   => parts.pop, # the label or geometry
       :splat    => parts
     }
 
-    path, status = dispatch(params)
+    body, status = dispatch(params)
 
-    ScaleDown.logger.info "Controller#get #{path} #{status}"
-    $0 = "scale_down Controller#get #{path} #{status}"
+    ScaleDown.logger.info "Controller#get #{body} #{status}"
+    $0 = "scale_down Controller#get #{body} #{status}"
     case status
     when 301 then
       # original is not a png/jpg redirect to jpg
-      redirect URI.encode(path), status
+      redirect URI.encode(body), 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
-      [status, "Error: this image could not be processed"]
+      [status, body]
     end
   end
 

data/lib/scale_down/dispatcher.rb

@@ -10,7 +10,7 @@ class ScaleDown::Dispatcher
       ScaleDown.logger.info "Dipatcher#process #{dispatcher.root_path}"
       $0= "scale_down Dipatcher#process #{dispatcher.root_path}"
 
-      return ["Missing file", 404] unless dispatcher.root_file_exists?
+      return ["Missing file #{dispatcher.root_path}", 404] unless dispatcher.root_file_exists?
       return [dispatcher.redirect_path, dispatcher.redirect_code] if dispatcher.scaled_file_exists?
 
       return ["Invalid HMAC signature", 403] unless dispatcher.valid_hmac?

data/lib/scale_down/version.rb

@@ -1,3 +1,3 @@
 module ScaleDown
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/scale_down_test.rb

@@ -11,6 +11,11 @@ class ScaleDown::Test < Test::Unit::TestCase
     get "#{path}?#{ScaleDown.hmac(path)}"
   end
 
+  def copy(f, to, num)
+    FileUtils.mkdir_p("/tmp/scale_down/test_images/example_#{num}")
+    FileUtils.cp fixture_path("files/#{f}"), "/tmp/scale_down/test_images/example_#{num}/#{to}"
+  end
+
   context "ScaleDown" do
     setup do
       ScaleDown.hmac_key    = "secret"
@@ -42,11 +47,8 @@ class ScaleDown::Test < Test::Unit::TestCase
 
     context "integration test" do
       setup do
-
-        FileUtils.mkdir_p("/tmp/scale_down/test_images/example_1")
-        FileUtils.cp fixture_path("files/graphic.png"), "/tmp/scale_down/test_images/example_1/graphic.png"
-        FileUtils.mkdir_p("/tmp/scale_down/test_images/example_2")
-        FileUtils.cp fixture_path("files/invalid_jpeg.jpg"), "/tmp/scale_down/test_images/example_2/invalid_jpeg.jpg"
+        copy 'graphic.png', 'graphic.png', 1
+        copy 'invalid_jpeg.jpg', 'invalid_jpeg.jpg', 2
       end
 
       teardown do
@@ -54,7 +56,7 @@ class ScaleDown::Test < Test::Unit::TestCase
       end
 
       should "get image info" do
-        FileUtils.cp fixture_path("files/cmyk.tif"), "/tmp/scale_down/test_images/example_1/long-name.tiff"
+        copy 'cmyk.tif', 'long-name.tiff', 1
         get "/test_images/example_1/#{CGI.escape 'long-name.tiff'}/info"
         assert_equal "300x500", last_response.body
       end
@@ -65,6 +67,14 @@ class ScaleDown::Test < Test::Unit::TestCase
         assert File.exists?("/tmp/scale_down/test_images/example_1/scaled/400x300-cropped/graphic.png")
       end
 
+      should "consider + in filenames as spaces" do
+        copy 'graphic.png', 'name space.png', 3
+
+        hmac = ScaleDown.hmac '/test_images/example_3/scaled/400x300/name space.png'
+        get "/test_images/example_3/scaled/400x300/name+space.png?#{hmac}"
+        assert_equal 200, last_response.status
+        assert File.exists?("/tmp/scale_down/test_images/example_3/scaled/400x300/name space.png")
+      end
       should "get a nonexistant image and return a 404" do
         valid_get "/test_images/example_none/scaled/400x300/image.jpg"
         assert_equal 404, last_response.status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scale_down
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2152325300 !ruby/object:Gem::Requirement
+  requirement: &2153009160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152325300
+  version_requirements: *2153009160
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152324800 !ruby/object:Gem::Requirement
+  requirement: &2153008660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152324800
+  version_requirements: *2153008660
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2152324340 !ruby/object:Gem::Requirement
+  requirement: &2153008200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152324340
+  version_requirements: *2153008200
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2152323880 !ruby/object:Gem::Requirement
+  requirement: &2153007740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2152323880
+  version_requirements: *2153007740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152323420 !ruby/object:Gem::Requirement
+  requirement: &2153037480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2152323420
+  version_requirements: *2153037480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152353140 !ruby/object:Gem::Requirement
+  requirement: &2153037020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2152353140
+  version_requirements: *2153037020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152352680 !ruby/object:Gem::Requirement
+  requirement: &2153036560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,7 +87,7 @@ dependencies:
         version: 0.5.6
   type: :development
   prerelease: false
-  version_requirements: *2152352680
+  version_requirements: *2153036560
 description: ''
 email:
 - john@famedriver.com