rack-app 7.6.1 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d79b70dcb9b2e40f6f72d744393137ac491c60e5d8d60580c780c2ed22b1450
-  data.tar.gz: c49619a0f6b1b369312efd415aa46e8464a649609fcc7b2520fc2ee31046d397
+  metadata.gz: bf6acb7c4c89bd038387d214bd7379ade393a3f0b48088f4b7542b6a0c6f05ca
+  data.tar.gz: e084eaa3c611498a98bbdb7cb1a8ccbcdc81cc893e1c08848a515db4b9e536f1
 SHA512:
-  metadata.gz: 673c644050ef4bcd62cda1144d5078a149e9f13770ec4a0f5855b5659c0b50f025d84fc25f405c16c24194effeb0d65b1bc1bc1f90b8615f3f611cadd085d162
-  data.tar.gz: 2891119e70ad873a642e1b6d19c921292376be152fe2e08ae175310916ae2d8ee028d5a346e85501c7663c66782d9e37ee6108efdade49feb11fca296c469a7e
+  metadata.gz: '09f143bdb3a084226e0f51f9f8c471dff28b06ab99f4f52c0895abd3541673152ef3949f34711a5eb67fc53ce1544c0bfd0acf6d000b30cf803c5b28f96ce1c1'
+  data.tar.gz: 6667a98608f80d53984ec9147373e370edecec9b5b525b74c3ff0c354f0843ea685deb2b96b57cae354039f56b1d1ab8104ae20bb1cf884bfba98c36b741c537

data/README.md

@@ -33,9 +33,8 @@ when rack provides a finalized support for http2.
 If you have an issue, I weekly check the issues tab,
 answer and reply, or implement a fix for it.
 
-Since the framework, the only dependency is the `rack` gem,
-I don't have to update the code base,
-because there are no integration problems.
+Since the framework's only dependency is the `rack` gem,
+I don't have to update the code base to often.
 
 Cheers and Happy Coding!
 

data/VERSION

@@ -1 +1 @@
-7.6.1
+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/instance_methods/serve_file.rb

@@ -1,10 +1,10 @@
 module Rack::App::InstanceMethods::ServeFile
 
   def serve_file(file_path)
-    raw_rack_resp = Rack::App::FileServer.serve_file(request.env, file_path)
-    response.status = raw_rack_resp[0]
-    response.headers.merge!(raw_rack_resp[1])
-    response.body = raw_rack_resp[2]
+    rack_resp = Rack::App::FileServer.serve_file(request.env, file_path)
+    response.status = rack_resp[0]
+    response.headers.merge!(rack_resp[1])
+    response.body = rack_resp[2]
     finish!
   end
 

data/lib/rack/app/payload/parser/builder/formats.rb

@@ -2,11 +2,11 @@ module Rack::App::Payload::Parser::Builder::Formats
   extend(self)
 
   JSON_CONTENT_TYPES = [
-    'application/json',
-    'application/x-javascript',
-    'text/javascript',
-    'text/x-javascript',
-    'text/x-json'
+      'application/json',
+      'application/x-javascript',
+      'text/javascript',
+      'text/x-javascript',
+      'text/x-json'
   ].freeze
 
   JSON_PARSER = proc do |io|
@@ -28,9 +28,9 @@ module Rack::App::Payload::Parser::Builder::Formats
   end
 
   JSON_STREAM_CONTENT_TYPES = [
-    'application/jsonstream',
-    'application/stream+json',
-    'application/x-json-stream'
+      'application/jsonstream',
+      'application/stream+json',
+      'application/x-json-stream'
   ].freeze
 
   JSON_STREAM_PARSER = proc do |io|
@@ -62,8 +62,8 @@ module Rack::App::Payload::Parser::Builder::Formats
   # end
 
   FORM_CONTENT_TYPES = [
-    'application/x-www-form-urlencoded',
-    # 'multipart/form-data'
+      'application/x-www-form-urlencoded',
+  # 'multipart/form-data'
   ].freeze
 
   FORM_SEP_CHAR = '&'.freeze
@@ -76,7 +76,7 @@ module Rack::App::Payload::Parser::Builder::Formats
                         lambda do |form|
                           ::Rack::Utils.parse_nested_query(form, FORM_SEP_CHAR)
                         end
-  end
+                      end
 
   NULL_END_CHAR = /#{"\u0000"}$/
 
@@ -102,7 +102,7 @@ module Rack::App::Payload::Parser::Builder::Formats
       last_name = form_name
       unless respond_to?(form_name)
         raise(NotImplementedError, "unknown formatter: #{last_name}")
-      end 
+      end
       __send__ form_name, builder
     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

data/lib/rack/app/streamer/scheduler/null.rb

@@ -3,8 +3,8 @@ module Rack::App::Streamer::Scheduler::Null
   extend(self)
 
   def schedule(*)
-     yield
-   end
+    yield
+  end
 
   def defer(*)
     yield

data/rack-app.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |spec|
   spec.license = 'Apache License 2.0'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '10.4.2'
   spec.add_development_dependency 'rspec'
-
   spec.add_dependency 'rack'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 7.6.1
+  version: 7.7.0
 platform: ruby
 authors:
 - Adam Luzsi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +197,7 @@ homepage: http://www.rack-app.com/
 licenses:
 - Apache License 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Minimalist rack application interface building framework.
 test_files: []