scale_down 0.5.0 → 0.5.2

data/CHANGES

@@ -1,3 +1,10 @@
+== 2011-12-09 ==
+Version 0.5.1
+Fix for non PNG/JPG images.  Redirect to the JPG version.
+
+Version 0.5.0 
+This version no longer uses redirects.
+
 == 2011-09-13 ==
 Ruby 1.9.2 tested
 

data/README.rdoc

@@ -79,6 +79,13 @@ HMAC requires a shared key between the application generating the URL and the Sc
     return [global.$FD.assetHost,  absolute_path, '/scaled', "/", geometry, "/",escape(filename)].join("") + "?"+ signature
   }
 
+== Images: PNGs, JPGs, Tiffs and others
+
+ScaleDown will handle any image that Image Magick can process.  But there are some rules:
+
+* PNGs remain PNGs and JPGs remain JPGS
+* All other images are converted to JPG and issued a 301 redirect
+
 == Installation and Configuration
 
   gem install scale_down

data/lib/scale_down/controller.rb

@@ -33,6 +33,9 @@ class ScaleDown::Controller < Sinatra::Application
 
     ScaleDown.logger.info "Controller#get #{path} #{status}"
     case status
+    when 301 then
+      # original is not a png/jpg redirect to jpg
+      redirect URI.encode(path), status
     when 302 then
       # File is found or scaled, use Sinatra's built in send file method
       static!

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, 302] if dispatcher.scaled_file_exists?
+      return [dispatcher.redirect_path, dispatcher.redirect_code] 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, 302]
+      [dispatcher.redirect_path, dispatcher.redirect_code]
     end
 
     # TODO return a JSON response with a full set of image details
@@ -54,6 +54,10 @@ class ScaleDown::Dispatcher
     ScaleDown.valid_hmac?(@params)
   end
 
+  def redirect_code
+    @params[:filename].match(/(png|jpg)$/) ? 302 : 301
+  end
+
   def redirect_path
     ["/"+@params[:path], @params[:geometry], scaled_filename].join("/")
   end

data/lib/scale_down/version.rb

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

data/test/scale_down/controller_test.rb

@@ -21,12 +21,20 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
   end
 
   context "a valid request" do
-    should "redirect to the image path" do
+    should "send the file" do
       ScaleDown::Dispatcher.expects(:process).returns ["/image-path", 302]
       get "/path/geo/filename?hmac"
 
       assert_equal 200, last_response.status
     end
+
+    should "redirect to the image path for non png or jpg original imags" do
+      ScaleDown::Dispatcher.expects(:process).returns ["/image-path", 301]
+      get "/path/geo/filename?hmac"
+
+      assert_equal 301, last_response.status
+      assert_equal "http://example.org/image-path", last_response["Location"]
+    end
   end
 
   context "an invalid request" do

data/test/scale_down/dispatcher_test.rb

@@ -67,6 +67,24 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
         dispatcher = ScaleDown::Dispatcher.new @params.merge(:filename => "test.png")
         assert_match /\.png$/, dispatcher.scaled_file_path
       end
+
+      should "use a jpeg for all non png images" do
+        dispatcher = ScaleDown::Dispatcher.new @params.merge(:filename => "test.tif")
+        assert_match /\.jpg$/, dispatcher.scaled_file_path
+        assert_match /\.jpg$/, dispatcher.redirect_path
+      end
+
+      context "redirect_code" do
+        should "be 302 for png and jpgs" do
+          dispatcher = ScaleDown::Dispatcher.new @params
+          assert_equal 302, dispatcher.redirect_code
+        end
+
+        should "be 301 for non png or jpgs " do
+          dispatcher = ScaleDown::Dispatcher.new @params.merge(:filename => "test.tif")
+          assert_equal 301, dispatcher.redirect_code
+        end
+      end
     end
 
     context "process response" do

data/test/scale_down_test.rb

@@ -62,7 +62,6 @@ class ScaleDown::Test < Test::Unit::TestCase
         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

metadata

@@ -1,94 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scale_down
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.2
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - John Weir
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rmagick
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2165822980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2165822980
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2165822480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2165822480
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: &2165822020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: contest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2165822020
+- !ruby/object:Gem::Dependency
+  name: contest
+  requirement: &2165821560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2165821560
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2165851280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2165851280
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2165850820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.5.6
   type: :development
-  version_requirements: *id006
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *2165850820
+description: ''
+email:
 - john@famedriver.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .bundle/config
+files:
 - .gitignore
 - CHANGES
 - Gemfile
@@ -119,32 +114,29 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/jweir/ScaleDown
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: scale_down
 rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A Sinatra based server for quickly scaling and serving images. Nothing more.
-test_files: 
+test_files:
 - test/files/cmyk.tif
 - test/files/cmyk_gray.jpg
 - test/files/graphic.png

data/.bundle/config

@@ -1 +0,0 @@
---- {}