rack-grid-serve 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bbd379048cb82f31b37e0bcb709b134c03f79b
-  data.tar.gz: 9276473a170cca1d1a43722293f80312f6554874
+  metadata.gz: 6deb8f0b7a078322007d82d31e83f659c86049f3
+  data.tar.gz: 6cdb2ae95ce99e60864862fb1b48d338e393c8e8
 SHA512:
-  metadata.gz: 0613287fda9a502c945447ae47be72e675dd83e1fe98170e06c27d288cefaf8b6e938e2ac9f2e008aaed58d0e0e333a2b5b7ee1a0a1588f590a709c50882b6ee
-  data.tar.gz: a97f26ba15c0541a21cc109b92196efaf15f40f4b0a821bf43d2f03fef88aec4762297be869fc6c5184ea27bf8623e2d077408ae2d386faf5da18202b426c990
+  metadata.gz: c324950ed06aa204cacbeba0fc6cc804a7f00392c4bf78768d5018ca0afd3dc023dc68001f4fdf3a4c282b83ca001ec9a6e3f3b8e611cbc3262c5ad7b71ca655
+  data.tar.gz: b6a802f04746d1e9a18fc1f1f89e6f104801c9b52d4f83e541c96f627e53b16b62cd8d3d413b81e9f852530d39b082c668c8368b88acdb9dfc4884cff964589a

data/lib/rack/grid_serve.rb

@@ -1,5 +1,6 @@
 require 'mongo'
 require 'rack/request'
+require 'rack/utils'
 begin
   require 'rack/conditional_get'
 rescue LoadError => ex
@@ -8,12 +9,12 @@ end
 
 class Rack::GridServe
 
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
   def initialize app, opts={}
     @app = app
     @db = opts[:db]
-    @prefix = opts[:prefix] || 'gridfs'
+    @prefix = (opts[:prefix] || 'gridfs').gsub(/^\/|\/$/, '')
     @cache_control = opts[:cache_control] || 'no-cache'
   end
 
@@ -51,26 +52,30 @@ class Rack::GridServe
   private
 
   def under_prefix? req
-    req.path_info =~ %r|/#@prefix/(.*)|
+    req.path_info =~ %r|^/#@prefix/(.*)|
   end
 
   def id_or_filename req
-    str = req.path_info.sub %r|/#@prefix/|, ''
+    str = req.path_info.sub %r|^/#@prefix/|, ''
     if BSON::ObjectId.legal? str
       BSON::ObjectId.from_string str
     else
-      str
+      Rack::Utils.unescape str
     end
   end
 
   def find_file req
     str = id_or_filename req
-    @db.fs.find({
-      '$or' => [
-        {_id: str},
-        {filename: str}
-      ]
-    }).first
+    if str.is_a? BSON::ObjectId
+      @db.fs.find({_id: str}).first
+    else
+      @db.fs.find({
+        '$or' => [
+          {filename: str},
+          {filename: "/#{str}"}
+        ]
+      }).first
+    end
   end
 
 end

data/test.rb

@@ -4,19 +4,21 @@ require 'rack/grid_serve'
 require 'rack/test'
 require 'minitest/autorun'
 
-class TestRackGridServe < MiniTest::Test
-
-  MONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'rack-grid-serve-test')
-  DB = MONGO.database
-  DB.drop
-  FILE = Mongo::Grid::File.new('.cowabunga {}', :filename => 'tmnt.css', content_type: 'text/css')
-  FILE_ID = DB.fs.insert_one(FILE)
-
-  include Rack::Test::Methods
+MONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'rack-grid-serve-test')
+DB = MONGO.database
+DB.drop
+DB.fs.open_upload_stream('tmnt.css', content_type: 'text/css') do |stream|
+  stream.write '.cowabunga {}'
+end
+DB.fs.open_upload_stream('amazing tmnt.css', content_type: 'text/css') do |stream|
+  stream.write '.cowabunga {}'
+end
+DB.fs.open_upload_stream('/slash-tmnt.css', content_type: 'text/css') do |stream|
+  stream.write '.cowabunga {}'
+end
+FILE = DB.fs.find({filename: 'tmnt.css'}).first
 
-  def app
-    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB))
-  end
+module Helpers
 
   def inner_app
     lambda {|env| 
@@ -26,15 +28,26 @@ class TestRackGridServe < MiniTest::Test
 
   def assert_file_found
     assert_equal 200, last_response.status
+    assert_equal FILE['contentType'], last_response.headers['Content-Type']
     assert_equal 13, last_response.body.size
-    assert_equal FILE.info.content_type, last_response.headers['Content-Type']
-    assert_equal FILE.info.md5, last_response.headers['ETag']
-    assert_equal Time.at(FILE.info.upload_date.to_i).httpdate, last_response.headers['Last-Modified']
+    assert_equal FILE['md5'], last_response.headers['ETag']
+    assert_equal Time.at(FILE['uploadDate'].to_i).httpdate, last_response.headers['Last-Modified']
     assert_equal 'no-cache', last_response.headers['Cache-Control']
   end
 
+end
+
+class TestRackGridServe < MiniTest::Test
+
+  include Rack::Test::Methods
+  include Helpers
+
+  def app
+    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB))
+  end
+
   def test_finds_file_by_id
-    get "/gridfs/#{FILE_ID}"
+    get "/gridfs/#{FILE['_id']}"
     assert_file_found
   end
 
@@ -43,8 +56,18 @@ class TestRackGridServe < MiniTest::Test
     assert_file_found
   end
 
+  def test_finds_file_by_name_with_url_encoding
+    get '/gridfs/amazing%20tmnt.css'
+    assert_file_found
+  end
+
+  def test_finds_file_by_name_with_slash
+    get '/gridfs/slash-tmnt.css'
+    assert_file_found
+  end
+
   def test_uses_conditional_get
-    get '/gridfs/tmnt.css', {}, {'HTTP_IF_NONE_MATCH'=>FILE.info.md5}
+    get '/gridfs/tmnt.css', {}, {'HTTP_IF_NONE_MATCH'=>FILE['md5']}
     assert_equal 304, last_response.status
   end
 
@@ -71,5 +94,28 @@ class TestRackGridServe < MiniTest::Test
     assert_equal "Inner", last_response.body
   end
 
+  def test_pass_if_prefix_not_at_the_begining
+    get '/before/gridfs/1234'
+    assert_equal 200, last_response.status
+    assert_equal "Inner", last_response.body
+  end
+
+end
+
+class TestRackGridServePrefix < MiniTest::Test
+
+  include Rack::Test::Methods
+  include Helpers
+
+  def app
+    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB, prefix: '/attachment/prefix/'))
+  end
+
+  def test_finds_file_with_custom_prefix
+    prefix = "/attachment/prefix/"
+    get '/attachment/prefix/tmnt.css'
+    assert_file_found
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-grid-serve
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware for serving files stored in MongoDB GridFS