utopia 0.9.52 → 0.9.53

data/lib/utopia/middleware/static.rb

@@ -130,11 +130,29 @@ module Utopia
 				return result
 			end
 
+			# Accelerate the response if sendfile is configured.
+			def sendfile(request, response)
+				if @sendfile.respond_to?(:call)
+					response = @sendfile.call(request.env, response)
+				elsif @sendfile && request.env['HTTP_X_SENDFILE_MODE'] == "X-Sendfile"
+					response[1]["X-Sendfile"] = response[2].to_path
+					response[2] = []
+				end
+				
+				return response
+			end
+
 			public
 			def initialize(app, options = {})
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
 
+				if options.key? :sendfile
+					@sendfile = options[:sendfile]
+				else
+					@sendfile = (UTOPIA_ENV == :production)
+				end
+
 				if options[:types]
 					@extensions = load_mime_types(options[:types])
 				else
@@ -148,7 +166,9 @@ module Utopia
 			end
 
 			def fetch_file(path)
+				# We need file_path to be an absolute path for X-Sendfile to work correctly.
 				file_path = File.join(@root, path.components)
+				
 				if File.exist?(file_path)
 					return FileReader.new(file_path)
 				else
@@ -201,12 +221,13 @@ module Utopia
 							"Last-Modified" => file.mtime_date,
 							"Content-Type" => @extensions[ext],
 							"Cache-Control" => @cache_control,
-							"ETag" => file.etag
+							"ETag" => file.etag,
 						}
 
 						if file.modified?(env)
 							response_headers["Content-Length"] = file.size.to_s
-							return [200, response_headers, file]
+							
+							return sendfile(request, [200, response_headers, file])
 						else
 							return [304, response_headers, []]
 						end

data/lib/utopia/version.rb

@@ -6,7 +6,7 @@ module Utopia
   module VERSION
     MAJOR = 0
     MINOR = 9
-    TINY  = 52
+    TINY  = 53
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: 
   segments: 
   - 0
   - 9
-  - 52
-  version: 0.9.52
+  - 53
+  version: 0.9.53
 platform: ruby
 authors: 
 - Samuel Williams