rack-grid-serve 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6deb8f0b7a078322007d82d31e83f659c86049f3
-  data.tar.gz: 6cdb2ae95ce99e60864862fb1b48d338e393c8e8
+  metadata.gz: 00c045ab328e8d6c02e99b63a60aaa0b969c50b9
+  data.tar.gz: 4191a3f5970bc899555e4b0b94ad603f83229983
 SHA512:
-  metadata.gz: c324950ed06aa204cacbeba0fc6cc804a7f00392c4bf78768d5018ca0afd3dc023dc68001f4fdf3a4c282b83ca001ec9a6e3f3b8e611cbc3262c5ad7b71ca655
-  data.tar.gz: b6a802f04746d1e9a18fc1f1f89e6f104801c9b52d4f83e541c96f627e53b16b62cd8d3d413b81e9f852530d39b082c668c8368b88acdb9dfc4884cff964589a
+  metadata.gz: f38407d72fe33bd7f0c756562a43952f4bb7687741d394aa33c23616138c90a74ab2832841ff06554e9d2c7ab26dcce69579e980f1d0121e8ca826b42a465beb
+  data.tar.gz: 114504fbfb3cd42f95bcc063ec2b74672fa84dd0e77a885055b28927fe786871117b24eb7b0523da2d5aaf90a871e1914dc2e3d706989ec3344ec2ae3f47843b

data/lib/rack/grid_serve.rb

@@ -3,46 +3,72 @@ require 'rack/request'
 require 'rack/utils'
 begin
   require 'rack/conditional_get'
-rescue LoadError => ex
+rescue LoadError
   require 'rack/conditionalget'
 end
 
 class Rack::GridServe
 
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'.freeze
+
+  DEFAULT_PREFIX = 'gridfs'.freeze
+  DEFAULT_CACHE_CONTROL = 'no-cache'.freeze
+  EDGE_SLASHES_RE = /\A\/|\/\z/.freeze
+  EMPTY_STRING = ''.freeze
 
   def initialize app, opts={}
     @app = app
     @db = opts[:db]
-    @prefix = (opts[:prefix] || 'gridfs').gsub(/^\/|\/$/, '')
-    @cache_control = opts[:cache_control] || 'no-cache'
+    @prefix = (opts[:prefix] || DEFAULT_PREFIX).gsub(EDGE_SLASHES_RE, EMPTY_STRING)
+    @prefix = "/#{@prefix}/".freeze
+    @cache_control = opts[:cache_control] || DEFAULT_CACHE_CONTROL
   end
 
-  def call env
-    dup._call env
-  end
+  PATH_INFO = 'PATH_INFO'.freeze
+  CONTENT_TYPE = 'Content-Type'.freeze
+  CONTENT_LENGTH = 'Content-Length'.freeze
+  LAST_MODIFIED = 'Last-Modified'.freeze
+  CACHE_CONTROL = 'Cache-Control'.freeze
+  ETAG = 'ETag'.freeze
+  TEXT_PLAIN = 'text/plain'.freeze
+  NOT_FOUND = 'Not Found'.freeze
+  NOT_FOUND_RESPONSE = [
+    404, 
+    {
+      CONTENT_TYPE => TEXT_PLAIN
+    }.freeze, 
+    [NOT_FOUND].freeze
+  ].freeze
+  UPLOAD_DATE_KEY = 'uploadDate'.freeze
+  CONTENT_TYPE_KEY = 'contentType'.freeze
+  ID_KEY = '_id'.freeze
+  MD5_KEY = 'md5'.freeze
 
-  def _call env
-    req = Rack::Request.new env
-    if under_prefix? req
-      file = find_file req
+  def call env
+    path_info = env[PATH_INFO].to_s
+    if under_prefix? path_info
+      file = find_file path_info
       if file.nil?
-        [404, {'Content-Type'=>'text/plain'}, ['Not Found']]
+        NOT_FOUND_RESPONSE
       else
-        last_modified = Time.at file['uploadDate'].to_i
+        last_modified = Time.at file[UPLOAD_DATE_KEY].to_i
         headers = {
-          'Content-Type' => file['contentType'],
-          'ETag' => file['md5'],
-          'Last-Modified' => last_modified.httpdate,
-          'Cache-Control' => @cache_control
+          CONTENT_TYPE => file[CONTENT_TYPE_KEY],
+          ETAG => file[MD5_KEY],
+          LAST_MODIFIED => last_modified.httpdate,
+          CACHE_CONTROL => @cache_control
         }
-        Rack::ConditionalGet.new(lambda {|cg_env|
+        if can_use_cached?(env, file[MD5_KEY])
+          headers.delete(CONTENT_TYPE)
+          headers.delete(CONTENT_LENGTH)
+          [304, headers, []]
+        else
           content = String.new
-          @db.fs.open_download_stream(file['_id']) do |stream|
+          @db.fs.open_download_stream(file[ID_KEY]) do |stream|
             content = stream.read
           end
           [200, headers, [content]]
-        }).call(env)
+        end
       end
     else
       @app.call env
@@ -51,12 +77,12 @@ class Rack::GridServe
 
   private
 
-  def under_prefix? req
-    req.path_info =~ %r|^/#@prefix/(.*)|
+  def under_prefix? path_info
+    path_info.start_with?(@prefix) and path_info.size > @prefix.size 
   end
 
-  def id_or_filename req
-    str = req.path_info.sub %r|^/#@prefix/|, ''
+  def id_or_filename path_info
+    str = path_info.sub @prefix, EMPTY_STRING
     if BSON::ObjectId.legal? str
       BSON::ObjectId.from_string str
     else
@@ -64,13 +90,15 @@ class Rack::GridServe
     end
   end
 
-  def find_file req
-    str = id_or_filename req
+  OR = '$or'.freeze
+
+  def find_file path_info
+    str = id_or_filename path_info
     if str.is_a? BSON::ObjectId
       @db.fs.find({_id: str}).first
     else
       @db.fs.find({
-        '$or' => [
+        OR => [
           {filename: str},
           {filename: "/#{str}"}
         ]
@@ -78,5 +106,15 @@ class Rack::GridServe
     end
   end
 
+  READ_METHODS = ['GET'.freeze, 'HEAD'.freeze].freeze
+  REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+  HTTP_IF_NONE_MATCH = 'HTTP_IF_NONE_MATCH'.freeze
+
+  def can_use_cached? env, md5
+    READ_METHODS.include?(env[REQUEST_METHOD]) and 
+      env[HTTP_IF_NONE_MATCH] and 
+      env[HTTP_IF_NONE_MATCH] == md5
+  end
+
 end
 

data/test.rb

@@ -4,6 +4,8 @@ require 'rack/grid_serve'
 require 'rack/test'
 require 'minitest/autorun'
 
+Mongo::Logger.logger.level = Logger::ERROR
+
 MONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'rack-grid-serve-test')
 DB = MONGO.database
 DB.drop
@@ -43,7 +45,7 @@ class TestRackGridServe < MiniTest::Test
   include Helpers
 
   def app
-    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB))
+    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB).freeze).freeze
   end
 
   def test_finds_file_by_id
@@ -108,11 +110,13 @@ class TestRackGridServePrefix < MiniTest::Test
   include Helpers
 
   def app
-    Rack::Lint.new(Rack::GridServe.new(inner_app, db: DB, prefix: '/attachment/prefix/'))
+    Rack::Lint.new(
+      Rack::GridServe.new(inner_app, db: DB, prefix: '/attachment/prefix/').freeze
+    ).freeze
   end
 
   def test_finds_file_with_custom_prefix
-    prefix = "/attachment/prefix/"
+    # prefix = "/attachment/prefix/"
     get '/attachment/prefix/tmnt.css'
     assert_file_found
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-grid-serve
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2019-10-25 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.6.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rack middleware for serving files stored in MongoDB GridFS