rack-gridfs-thumb 0.1.0 → 0.2.0

data/README.md

@@ -1,7 +1,7 @@
 Rack::GridFSThumb
 =================
 
-Rack::GridFS is Rack middleware for resizing images served via [Rack::GridFS][https://github.com/skinandbones/rack-gridfs].  Resizing is done via [MiniMagick] [https://github.com/probablycorey/mini_magick] and all the usual geometry strings are accepted.  See http://www.imagemagick.org/script/command-line-processing.php#geometry for more details.
+Rack::GridFSThumb is Rack middleware for resizing images served via [Rack::GridFS](https://github.com/skinandbones/rack-gridfs).  Resizing is done via [MiniMagick](https://github.com/probablycorey/mini_magick) and all the usual [geometry arguments](http://www.imagemagick.org/script/command-line-processing.php#geometry) are accepted.
 
 For example:
     
@@ -15,10 +15,8 @@ Installation
 Usage
 -----
 
-    require 'rack/gridfs'
     require 'rack/gridfs-thumb'
     
-    prefix = 'gridfs'
+    use Rack::GridFSThumb, :prefix => 'gridfs', :hostname => 'localhost', :port => 27017, :database => 'test'
     
-    use Rack::GridFS, :prefix => prefix, :hostname => 'localhost', :port => 27017, :database => 'test'
-    use Rack::GridFSThumb, :prefix => prefix
+See the Rack::GridFS README for all available options.

data/lib/rack/gridfs-thumb.rb

@@ -1,11 +1,12 @@
 require 'mini_magick'
+require 'rack/gridfs'
 
 module Rack
   class GridFSThumb
     def initialize(app, options = {})
       @app = app
-      @options = options
-      @options[:prefix] ||= 'gridfs'
+      @options = default_options.merge(options)
+      @gridfs = @options[:gridfs] || Rack::GridFS::Endpoint.new(@options)
     end
     
     def call(env)
@@ -14,8 +15,12 @@ module Rack
       response = catch(:respond) do
         match(@request.path_info) do |path, geometry|
           status, @headers, image = request_image(path)
-          thumb = thumbnail(image, geometry)
           
+          if geometry.nil?
+            throw :respond, [status, @headers, image]
+          end
+          
+          thumb = thumbnail(image, geometry)
           response_for(thumb)
         end
       end
@@ -23,10 +28,17 @@ module Rack
       response || @app.call(env)
     end
     
+    def route
+      %r{(/#{@options[:prefix]}/[^/]+)/?([^/]+)?/?$}
+    end
+    
     private
     
-    def route
-      %r{(/#{@options[:prefix]}/[^/]+)/([^/]+)/?$}
+    def default_options
+      {
+        :prefix => 'gridfs',
+        :mapper => lambda { |path| %r!^/#{@options[:prefix]}/([^/]+)/?!.match(path)[1] }
+      }
     end
     
     def match(path_info)
@@ -47,7 +59,7 @@ module Rack
     
     def request_image(path_info)
       env = @request.env.merge('PATH_INFO' => path_info)
-      status, headers, body = @app.call(env)
+      status, headers, body = @gridfs.call(env)
       
       unless status >= 200 && status < 300
         throw :respond, [status, headers, body]

data/lib/rack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class GridFSThumb
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/rack-gridfs-thumb.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary       = "rack-gridfs-thumb-#{s.version}"
   s.description   = 'Rack middleware for resizing images served via Rack::GridFS'
   
-  s.add_dependency('rack')
+  s.add_dependency('rack-gridfs', '>= 0.4.1')
   s.add_dependency('mini_magick', '>= 3.3')
   
   s.add_development_dependency('rack-test')

data/test/test_gridfs_thumb.rb

@@ -13,8 +13,30 @@ class Rack::GridFSThumbTest < Test::Unit::TestCase
   end
   
   def app
-    @app ||= image_app
-    Rack::GridFSThumb.new(@app, :prefix => 'gridfs')
+    @app ||= gridfs_stub
+    Rack::GridFSThumb.new(@app, :prefix => 'gridfs', :gridfs => @app)
+  end
+  
+  def test_route_regex
+    route = app.route
+    
+    match = "/gridfs/#{@id}".match(route)
+    assert_equal "/gridfs/#{@id}", match[1]
+    assert_nil match[2]
+    
+    match = "/gridfs/#{@id}/".match(route)
+    assert_equal "/gridfs/#{@id}", match[1]
+    assert_nil match[2]
+    
+    match = "/gridfs/#{@id}/100x100".match(route)
+    assert_equal "/gridfs/#{@id}", match[1]
+    assert_equal '100x100', match[2]
+    
+    match = "/gridfs/#{@id}/100x100/".match(route)
+    assert_equal "/gridfs/#{@id}", match[1]
+    assert_equal '100x100', match[2]
+    
+    assert_nil "/gridfs/#{@id}/100x100/extra".match(route)
   end
   
   def test_not_called_without_geometry
@@ -26,7 +48,7 @@ class Rack::GridFSThumbTest < Test::Unit::TestCase
   end
   
   def test_not_called_when_not_found
-    @app = not_found_app
+    @app = notfound_stub
     
     get "/gridfs/#{@id}/100x100"
     
@@ -58,7 +80,7 @@ class Rack::GridFSThumbTest < Test::Unit::TestCase
   
   private
   
-  def image_app
+  def gridfs_stub
     image = File.new(@image_path, 'rb')
     headers = { 'Content-Length' => image.size.to_s }
     Proc.new do |env|
@@ -66,7 +88,7 @@ class Rack::GridFSThumbTest < Test::Unit::TestCase
     end
   end
   
-  def not_found_app
+  def notfound_stub
     Proc.new do |env|
       [404, { 'Content-Length' => 9 }, ['Not Found']]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-gridfs-thumb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2152191760 !ruby/object:Gem::Requirement
+  name: rack-gridfs
+  requirement: &2152258380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152191760
+  version_requirements: *2152258380
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &2152190700 !ruby/object:Gem::Requirement
+  requirement: &2152257420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152190700
+  version_requirements: *2152257420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152189560 !ruby/object:Gem::Requirement
+  requirement: &2152256820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152189560
+  version_requirements: *2152256820
 description: Rack middleware for resizing images served via Rack::GridFS
 email:
 - scottbnel@gmail.com
@@ -82,7 +82,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: rack-gridfs-thumb-0.1.0
+summary: rack-gridfs-thumb-0.2.0
 test_files:
 - test/image.png
 - test/test_gridfs_thumb.rb