rack-app 7.6.5 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f181500774143b5c53a11d4dd9f06a4f3782808226b2ad840fd5af9fe3dcff96
-  data.tar.gz: 4059d1bd01e8f36ec6a0d46b41bdfd524e002789125e0e51b3d4a716bd5c35aa
+  metadata.gz: bf6acb7c4c89bd038387d214bd7379ade393a3f0b48088f4b7542b6a0c6f05ca
+  data.tar.gz: e084eaa3c611498a98bbdb7cb1a8ccbcdc81cc893e1c08848a515db4b9e536f1
 SHA512:
-  metadata.gz: 7a209cb4d5cfb40f161a15bcce3f049b16558f71aef1597d8a02a721f410774ea6b3e6752ba73cb3f8711fd59163fa904fd5fbde635b5b6ff7b949abf6ad7843
-  data.tar.gz: 590c2a8ec95a1a6f1d8b9610f76d87d197cfa449efe97ca2a5c3a3a4bc13f383ad0620ca82891058e20c0b6e90ec99812d58a6c81f163bec960e61964aa26442
+  metadata.gz: '09f143bdb3a084226e0f51f9f8c471dff28b06ab99f4f52c0895abd3541673152ef3949f34711a5eb67fc53ce1544c0bfd0acf6d000b30cf803c5b28f96ce1c1'
+  data.tar.gz: 6667a98608f80d53984ec9147373e370edecec9b5b525b74c3ff0c354f0843ea685deb2b96b57cae354039f56b1d1ab8104ae20bb1cf884bfba98c36b741c537

data/VERSION

@@ -1 +1 @@
-7.6.5
+7.7.0

data/lib/rack/app/file_server.rb

@@ -1,10 +1,24 @@
 class Rack::App::FileServer
+  attr_accessor :relative_file_paths
 
-  def initialize(root_folder)
-    require 'rack/file'
+  def self.serve_file(env, file_path)
+    dir_path = File.dirname(file_path)
+    basename = File.basename(file_path)
+    file_server = new(dir_path, map_relative_file_paths: false)
+    env = env.dup
+    env[::Rack::App::Constants::ENV::REQUEST_METHOD] = 'GET'
+    env[::Rack::App::Constants::ENV::PATH_INFO] = basename
+    file_server.call(env)
+  end
+
+  def initialize(root_folder, opts = {})
     @root_folder = root_folder
-    @relative_file_paths = Dir.glob(File.join(@root_folder, '**', '*')).map { |file_path| file_path.sub(@root_folder, '') }.sort_by { |str| str.length }.reverse
+    @relative_file_paths = []
     @rack_file_server = ::Rack::File.new(@root_folder, {})
+
+    if map_relative_file_paths?(opts)
+      map_relative_paths!
+    end
   end
 
   def call(env)
@@ -12,7 +26,7 @@ class Rack::App::FileServer
 
     @relative_file_paths.each do |relative_file_path|
       if path_info =~ /#{Regexp.escape(relative_file_path)}$/
-        env[::Rack::App::Constants::ENV::PATH_INFO]= relative_file_path
+        env[::Rack::App::Constants::ENV::PATH_INFO] = relative_file_path
         break
       end
     end
@@ -20,19 +34,31 @@ class Rack::App::FileServer
     @rack_file_server.call(env)
   end
 
-  def self.serve_file(env, file_path)
-    file_server = self.new(File.dirname(file_path))
-    env = env.dup
-    env[::Rack::App::Constants::ENV::REQUEST_METHOD]= 'GET'
-    env[::Rack::App::Constants::ENV::PATH_INFO]= file_path
-    file_server.call(env)
+  protected
+
+  def map_relative_file_paths?(opts = {})
+    unless opts.key?(:map_relative_file_paths)
+      return true
+    end
+
+    opts[:map_relative_file_paths]
   end
 
-  protected
+  def opts_set_defaults(opts)
+    unless opts.key?(:map_relative_file_paths)
+      opts[:map_relative_file_paths] = true
+    end
+  end
+
+  def map_relative_paths!
+    @relative_file_paths = Dir.glob(File.join(@root_folder, '**', '*'))
+                               .map { |file_path| file_path.sub(@root_folder, '') }
+                               .sort_by { |str| str.length }
+                               .reverse
+  end
 
   def clean_path_info(env)
     path_info = ::Rack::Utils.unescape(env[::Rack::App::Constants::ENV::PATH_INFO])
     ::Rack::Utils.clean_path_info(path_info)
   end
-
 end

data/lib/rack/app/singleton_methods/mounting.rb

@@ -46,8 +46,8 @@ module Rack::App::SingletonMethods::Mounting
     nil
   end
 
-  def serve_files_from(file_path, options={})
-    file_server = Rack::App::FileServer.new(Rack::App::Utils.expand_path(file_path))
+  def serve_files_from(dir_path, options={})
+    file_server = Rack::App::FileServer.new(Rack::App::Utils.expand_path(dir_path))
     request_path = Rack::App::Utils.join(options[:to], Rack::App::Constants::PATH::MOUNT_POINT)
     add_route(::Rack::App::Constants::HTTP::METHOD::ANY, request_path, file_server)
     nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 7.6.5
+  version: 7.7.0
 platform: ruby
 authors:
 - Adam Luzsi