simple-httpd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce94e11efef98e3e29ead50e0259c53897af676dc24a647412470c0081eca2a8
-  data.tar.gz: 4a855b09b2d93cfd20a3e3034d45a997008faade88a9fd479443a1e2fbb420aa
+  metadata.gz: 265655ee2ae92a528dc710e3daec1bc0e3249af73450d41817a2295934bf3315
+  data.tar.gz: 4eb732b11012cbd503076ecf0b64c05765020539fce6d86c0902074a1dfb0150
 SHA512:
-  metadata.gz: 46a3f829100f9bcc91e2101271dfc12e187d331c9c5b65a8993609b7bb7025f76605354880b4a0a998190573552b5f1a209bb148c648dd1375028fd60f19201c
-  data.tar.gz: 810c4561326ff0ab3a2cf45ab64fd5e2c6a106dcfc81a5012b14a2d305f6ce0253c4aa5e4e070f178fb29a3ac88d1c1c0b7821f6d7ab38dda095e5079721c969
+  metadata.gz: 0c4c22dde10ce2ad09fabcee176b37004b39176dddb68b3c511a82d6280ac3b4a338c2aa43aabf4827bc4b91e56cb35c0d58d488753a38523cf795a82fde2918
+  data.tar.gz: 65fa2846cee1a99db0cdd736848baff796b6412036c74d6870cbd09c475a05c4464baffbf38c75c872c498defa32d4fa9e7712d5285609993b9093c2d47bf800

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/simple-httpd.rb

@@ -1,3 +1 @@
-# rubocop:disable Naming/FileName
-
 require "simple/httpd"

data/lib/simple-service.rb

@@ -1,3 +1 @@
-# rubocop:disable Naming/FileName
-
 require "simple/service"

data/lib/simple/httpd.rb

@@ -31,6 +31,8 @@ class Simple::Httpd
 end
 
 require "simple/service"
+
+require "simple/httpd/debugging"
 require "simple/httpd/helpers"
 require "simple/httpd/reloader"
 require "simple/httpd/base_controller"

data/lib/simple/httpd/base_controller/error_handling.rb

@@ -151,7 +151,7 @@ class Simple::Httpd::BaseController
 
   # -- print unspecified errors.
 
-  if ::Simple::Httpd.env == "development"
+  if ::Simple::Httpd.env != "development"
     error do |exc|
       content_type :text
       status 500

data/lib/simple/httpd/debugging.rb

@@ -0,0 +1,17 @@
+begin
+  require "pry"
+rescue LoadError
+  class Binding
+    def pry
+      STDERR.puts "*** 'binding.pry' not supported: add the 'pry-byebug' gem to your Gemfile."
+    end
+  end
+end
+
+begin
+  require "byebug"
+rescue LoadError
+  def byebug
+    STDERR.puts "*** 'byebug' not supported: add the 'byebug' gem to your Gemfile."
+  end
+end

data/lib/simple/httpd/mount.rb

@@ -38,7 +38,8 @@ module Simple::Httpd::Mount
     attr_reader :path, :mount_point
 
     def self.build(mount_point, path:)
-      path = path.gsub(/\/$/, "") # remove trailing "/"
+      mount_point = mount_point.gsub(/\/.$/, "/") # shorting trailing "/." to "/"
+      path        = path.gsub(/\/$/, "")          # remove trailing "/"
 
       raise ArgumentError, "You probably don't want to mount your root directory, check mount" if path == ""
       return unless Dir.exist?(path)
@@ -57,10 +58,12 @@ module Simple::Httpd::Mount
     end
 
     def build_rack_apps
+      return @build_rack_apps if @build_rack_apps
+
       dynamic_mount = Rack::DynamicMount.build(mount_point, path)
       static_mount = Rack::StaticMount.build(mount_point, path)
 
-      [dynamic_mount, static_mount].compact
+      @build_rack_apps = [dynamic_mount, static_mount].compact
     end
   end
 end

data/lib/simple/httpd/rack/dynamic_mount.rb

@@ -8,9 +8,15 @@ class Simple::Httpd::Rack::DynamicMount
 
   extend Forwardable
 
+  # Tries to build a DynamicMount mount point at a gievn path. This is only
+  # successful if the path location has a "routes.rb" file.
   def self.build(mount_point, path)
     expect! path => String
-    new(mount_point, path)
+
+    routes = File.join(path, "routes.rb")
+    return unless File.exist?(routes)
+
+    new(mount_point, path, routes)
   end
 
   def call(env)
@@ -22,14 +28,14 @@ class Simple::Httpd::Rack::DynamicMount
   attr_reader :path
   attr_reader :mount_point
 
-  def initialize(mount_point, path)
+  def initialize(mount_point, path, routes)
     @mount_point = mount_point
     @path = path.gsub(/\/\z/, "") # remove trailing "/"
 
     ::Simple::Httpd::Reloader.attach self, paths: service_files, reloading_instance: nil
 
     @rack_app = H.subclass ::Simple::Httpd::BaseController,
-                           paths: helper_files + ["#{path}/routes.rb"],
+                           paths: helper_files + [routes],
                            description: "<controller:#{H.shorten_path(path)}>"
 
     @rack_app.route_descriptions.each do |route|

data/lib/simple/httpd/rack/static_mount.rb

@@ -3,7 +3,7 @@ class Simple::Httpd::Rack::StaticMount
   H = ::Simple::Httpd::Helpers
   Rack = ::Simple::Httpd::Rack
 
-  EXTENSIONS = %w(.txt .md .js .css .png .jpeg .jpg)
+  EXTENSIONS = %w(.txt .md .js .css .png .jpeg .jpg .html)
   GLOB_PATTERN = "**/*.{#{EXTENSIONS.map { |s| s[1..-1] }.join(",")}}"
 
   def self.build(mount_point, path)
@@ -15,6 +15,12 @@ class Simple::Httpd::Rack::StaticMount
       "#{mount_point}: serving #{static_files.count} static file(s)"
     end
 
+    if ::Simple::Httpd.logger.debug?
+      static_files.sort.each do |file|
+        ::Simple::Httpd.logger.debug "#{mount_point}/#{file}"
+      end
+    end
+
     new(mount_point, path, static_files)
   end
 
@@ -38,9 +44,8 @@ class Simple::Httpd::Rack::StaticMount
   public
 
   def call(env)
-    request_path = env["PATH_INFO"]
-    if serve_file?(request_path)
-      file_path = request_path[1..-1]
+    file_path = lookup_static_file(env["PATH_INFO"])
+    if file_path
       env["PATH_INFO"] = file_path
       @file_server.call(env)
     else
@@ -50,7 +55,19 @@ class Simple::Httpd::Rack::StaticMount
 
   private
 
-  def serve_file?(request_path)
-    @static_files.include?(request_path[1..-1])
+  def lookup_static_file(path_info)
+    relative_path = path_info[1..-1]
+    return relative_path if @static_files.include?(relative_path)
+
+    # determine potential index paths
+    index_paths = %w(index.html README.md)
+
+    if relative_path != ""
+      index_paths = index_paths.map do |index_file|
+        File.join(relative_path, index_file)
+      end
+    end
+
+    (index_paths & @static_files.to_a).first
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-httpd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -130,6 +130,7 @@ files:
 - lib/simple/httpd/base_controller/result.rb
 - lib/simple/httpd/base_controller/x_processing.rb
 - lib/simple/httpd/cli.rb
+- lib/simple/httpd/debugging.rb
 - lib/simple/httpd/helpers.rb
 - lib/simple/httpd/mount.rb
 - lib/simple/httpd/rack.rb