scale_down 0.0.5 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    scale_down (0.0.4)
+    scale_down (0.1.0)
+      mini_magick (>= 2.3)
       rmagick (>= 2.1)
       ruby-hmac (>= 0.4.0)
       sinatra (>= 1.0)
@@ -10,6 +11,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     contest (0.1.2)
+    mini_magick (2.3)
+      subexec (~> 0.0.4)
     mocha (0.9.8)
       rake
     rack (1.2.1)
@@ -20,12 +23,14 @@ GEM
     ruby-hmac (0.4.0)
     sinatra (1.0)
       rack (>= 1.0)
+    subexec (0.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   contest (>= 0.1.2)
+  mini_magick (>= 2.3)
   mocha (= 0.9.8)
   rack-test (= 0.5.6)
   rmagick (>= 2.1)

data/README.rdoc

@@ -25,6 +25,10 @@ For example, to ensure an image is 300 pixels wide
 
   http://images.example.com/images/logo.png/300xauto/A3SDACEDF
 
+There is a very simple `/info` function for getting the image dimesions. It just returns a string with the WIDTHxHEIGHT.
+
+  http://images.exmaple.com/images/logo.png/info
+
 == Installation and Configuration
 
   gem install scale_down
@@ -78,10 +82,6 @@ Of course this could be done in PHP, Python, or whatever language your applicati
 
 == TODO
 
-This thing is brand spankin new and is in flux - expect changes.
-
-Define a max image size (do not scale images over this size).
-
 Support DELETE requests to remove scaled images.
 
 Custom Read/Write methods to allow for more than just local storage.

data/lib/scale_down/controller.rb

@@ -8,9 +8,17 @@ class ScaleDown::Controller < Sinatra::Application
     "<b>ScaleDown version #{ScaleDown::VERSION}<b/>"
   end
 
+  get '/*/info' do
+    info = ScaleDown::Scaler.info(params[:splat].join("/"))
+    if info
+      [200, info]
+    else
+      [404, "Image not found"]
+    end
+  end
+
   # get '/*/:filename/:geometry/:hmac'
-  # is what I want, but
-  # this fails when the URL includes things like %23 (an encoded hash tag)
+  # 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("/")
 
@@ -20,7 +28,6 @@ class ScaleDown::Controller < Sinatra::Application
       :filename => parts.pop,
       :splat    => parts
     }
-
     path, status = scaler(params)
 
     # TODO Eh? Shouldn't it be if 301
@@ -36,7 +43,7 @@ class ScaleDown::Controller < Sinatra::Application
   def scaler(params)
     ScaleDown::Scaler.process \
       :path     => params[:splat].join("/"),
-      :filename => URI.decode(params[:filename]),
+      :filename => params[:filename],
       :geometry => params[:geometry],
       :hmac     => params[:hmac]
   end

data/lib/scale_down/image.rb

@@ -37,7 +37,10 @@ class ScaleDown::Image
     @options  = properties[:options]
     @wrote    = false
 
-    save if @file
+    if @file
+      save
+      @file.destroy! #release the memory
+    end
   end
 
   def load_file(file_path)

data/lib/scale_down/scaler.rb

@@ -14,6 +14,16 @@ class ScaleDown::Scaler
         ["Error message", 403]
       end
     end
+
+    def info(relative_path)
+      path = [ScaleDown.root_path, relative_path].join("/")
+      if File.exists?(path)
+        image = MiniMagick::Image.open(path)
+        [image[:width],image[:height]].join('x')
+      else
+        nil
+      end
+    end
   end
 
   def initialize(params)

data/lib/scale_down/version.rb

@@ -1,3 +1,3 @@
 module ScaleDown
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/scale_down.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'rubygems'
 require 'sinatra'
 require 'RMagick'
+require 'mini_magick'
 require 'hmac-sha1'
 
 module ScaleDown

data/scale_down.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rmagick", ">= 2.1"
   s.add_dependency "sinatra", ">= 1.0"
   s.add_dependency "ruby-hmac", ">= 0.4.0"
+  s.add_dependency "mini_magick", ">= 2.3"
 
   s.add_development_dependency "contest", ">= 0.1.2"
   s.add_development_dependency "mocha", "0.9.8"

data/test/scale_down/controller_test.rb

@@ -8,7 +8,6 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
   end
 
   context "parsing a request" do
-
     should "have an image path" do
       ScaleDown::Scaler.expects(:process).with(
         :path     => "user/path",
@@ -22,7 +21,6 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
   end
 
   context "a valid request" do
-
     should "redirect to the image path" do
       ScaleDown::Scaler.expects(:process).returns ["/image-path", 301]
       get "/path/filename/geo/hmac"
@@ -33,6 +31,7 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
   end
 
   context "an invalid request" do
+
     should "respond with a 403 and error message" do
       ScaleDown::Scaler.expects(:process).returns ["Error description", 403]
 
@@ -43,4 +42,29 @@ class ScaleDown::Controller::Test < Test::Unit::TestCase
     end
   end
 
+  context "get dimensions" do
+    context "for image which exists" do
+      setup do
+        ScaleDown::Scaler.expects(:info).with("image/path/image.jpg").returns "400x300"
+      end
+
+      should "return the width and height as json" do
+        get "/image/path/image.jpg/info"
+
+        assert_equal 200, last_response.status
+        assert_equal "400x300", last_response.body
+      end
+    end
+
+    context "for a non-existant image" do
+      setup do
+        ScaleDown::Scaler.expects(:info).with("image/path/image.jpg").returns nil
+      end
+
+      should "respond with a 404" do
+        get "/image/path/image.jpg/info"
+        assert_equal 404, last_response.status
+      end
+    end
+  end
 end

data/test/scale_down/scaler_test.rb

@@ -122,4 +122,19 @@ class ScaleDown::Scaler::Test < Test::Unit::TestCase
       end
     end
   end
+
+  context "#info" do
+    setup do
+      ScaleDown.root_path = File.join(File.expand_path(File.dirname(__FILE__)), "..")
+    end
+
+    should "return the width x height for an image" do
+      assert_equal "200x400", ScaleDown::Scaler.info("files/graphic.png")
+    end
+
+    should "return nil for a non-existant image" do
+      assert_equal nil, ScaleDown::Scaler.info("files/notthere.jpg")
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scale_down
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - John Weir
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -04:00
+date: 2010-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,9 +65,24 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: contest
+  name: mini_magick
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: contest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +94,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,11 +110,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,7 +126,7 @@ dependencies:
         - 6
         version: 0.5.6
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: ""
 email: 
 - john@famedriver.com