simple-httpd 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e552a1dc3cc22d3fa1e614a440e86820ec7f95157711f77cfb5b2492966a4414
-  data.tar.gz: d014f9712b6493403d09a35b650467070dd46079a6bf401f22aa2da9edcb79a3
+  metadata.gz: 00457b4ed11c8a501e43a4c4826ef6d78722b072ffff0bab1b0c609c797e14f7
+  data.tar.gz: ed35d788fba032b31b971f29e07b23cf490ffc1d96a3aff9369bc812bda22dde
 SHA512:
-  metadata.gz: 6c258058969660cf9c45a6a1fb5193b1f5fdba24cda123bd77257531251da295082c5c71af48af16aa01fae9f28539c66409b8900d005ba525ad4ab52aa70ad8
-  data.tar.gz: 5bf9584a2c7be956483792568aa19e8996ec116ae8c49998da39e104c5943414ed3b6fb8ef6d3664958c851037292ef769f6b4248b7cca894a21d43c03d1aa11
+  metadata.gz: 0d57c201cad87a16655eb6e05a4b527176603ab063d08878b44711741babd3fb62140224b5e7cfd0c6ff3e2937c5d177c6ffcb4d88143903f99d36bd5d937f02
+  data.tar.gz: a55d03f273b5a634262a55916c15690bf845641f69af2217a82d4a778b84af089cdb3722df89c25d4d1d847a2654f4c858c141900115e895c8fa3d8ef55dbc4b

data/.envrc

@@ -0,0 +1,7 @@
+# A direnv config file: https://github.com/direnv/direnv
+
+if [ "$(type -t direnv_load)" = 'function' ]; then
+  # Whatever you want only direnv to execute
+  PATH_add bin
+fi
+

data/.rubocop.yml

@@ -16,6 +16,9 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 20
 
+Metrics/AbcSize:
+  Max: 20
+
 Style/SpecialGlobalVars:
   Enabled: false
 

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/examples/ex1/root.rb

@@ -1,3 +1,11 @@
+# This would be an example of sleeping for 1 sec with thin/eventmachine.
+#
+# aget "/" do
+#   EM.add_timer(1) {
+#     body { "hello sync" }
+#   }
+# end
+
 get "/" do
   "root"
 end

data/examples/ex3/example_service.rb

@@ -7,8 +7,6 @@ mount_service ExplicitService do |service|
   post "/echo/:a" => :explicit_echo
 
   put "/echo_context" do
-    ::Simple::Service.with_context(context) do
-      ::Simple::Service.invoke(service, :echo_context)
-    end
+    service.invoke :echo_context
   end
 end

data/lib/simple/httpd.rb

@@ -3,17 +3,6 @@
 module Simple
 end
 
-class Simple::Httpd
-end
-
-require "simple/service"
-require "simple/httpd/helpers"
-require "simple/httpd/base_controller"
-require "simple/httpd/version"
-require "simple/httpd/mount"
-require "simple/httpd/server"
-require "simple/httpd/service_adapter"
-
 class Simple::Httpd
   SELF = self
 
@@ -39,7 +28,18 @@ class Simple::Httpd
   def self.logger=(logger)
     @logger = logger
   end
+end
 
+require "simple/service"
+require "simple/httpd/helpers"
+require "simple/httpd/reloader"
+require "simple/httpd/base_controller"
+require "simple/httpd/version"
+require "simple/httpd/mount"
+require "simple/httpd/server"
+require "simple/httpd/service_integration"
+
+class Simple::Httpd
   # Converts the passed in args into a Simple::Httpd application.
   #
   # The passed in arguments are used to create a Simple::Httpd object.

data/lib/simple/httpd/base_controller.rb

@@ -2,18 +2,17 @@
 # config/routes.rb, **after** this file is loaded. See the end of this file.
 
 require "sinatra/base"
+::Sinatra::Request.include(::Simple::Httpd::Helpers::RequestHeader)
 
 class Simple::Httpd::BaseController < Sinatra::Base
   set :logging, true
 
-  # --- Sinatra::Reloader -----------------------------------------------------
+  extend Simple::Httpd::Reloader
 
-  # Note that Sinatra::Reloader is less thorough than, say, shotgun or the
-  # Rails development mode, but on the other hand it is much faster, and
-  # probably useful 90% of the time.
-  configure :development do
-    # require "sinatra/reloader"
-    # register Sinatra::Reloader
+  def dispatch!
+    self.class.reload! if ::Simple::Httpd.env == "development"
+
+    super
   end
 end
 

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

@@ -1,21 +1,22 @@
 class Simple::Httpd::BaseController
-  CORS_HEADERS = {
-    "access-control-allow-credentials" => "true",
-    "access-control-allow-headers" => "Origin,X-Requested-With,Content-Type,Accept,Session-Id",
-    "access-control-allow-methods" => "*",
-    "access-control-allow-origin" => "*",
-    # "access-control-expose-headers" => "X-Total-Entries,X-Total-Pages,X-Page,X-Per-Page",
-    # "access-control-max-age" => "-1",
-    "access-control-max-age" => "600",
-    "access-control-request-headers" => "Content-Type",
-    "access-control-request-method" => "GET,POST,PATCH,PUT,DELETE,OPTIONS"
-  }
+  # see https://fetch.spec.whatwg.org/#http-responses
+  # see https://stackoverflow.com/questions/24264574/cors-headers-present-only-on-preflight-or-every-request
 
   options "*" do
+    # The Access-Control max age setting is cached for up to 1 day. This value
+    # is capped at different values depending on the browser.
+    headers "Access-Control-Max-Age" => "86400"
+    headers "Access-Control-Allow-Methods" => "*"
+    headers "Access-Control-Allow-Headers" => "Origin,X-Requested-With,Content-Type,Accept,Session-Id"
+    headers "Access-Control-Expose-Headers" => "X-Total-Entries,X-Total-Pages,X-Page,X-Per-Page"
+
     200
   end
 
   after do
-    headers CORS_HEADERS
+    # This set of CORS headers must be set on each request.
+    headers "Access-Control-Allow-Credentials" => "true",
+            "Access-Control-Allow-Origin" => origin,
+            "Vary" => "Accept-Encoding, Origin"
   end
 end

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

@@ -1,5 +1,20 @@
+# rubocop:disable Metrics/ClassLength, Lint/Void
+# rubocop:disable Metrics/AbcSize
+
 require_relative "./json"
 
+# reimplement Sinatra's NotFound handler.
+#
+# The original renders HTML; this is not really useful for us.
+Sinatra::Base
+class Sinatra::Base
+  error ::Sinatra::NotFound do
+    content_type "text/plain"
+
+    "Don't know how to handle: #{request.request_method} '#{request.path_info}'"
+  end
+end
+
 class Simple::Httpd::BaseController
   H = ::Simple::Httpd::Helpers
 
@@ -33,10 +48,25 @@ class Simple::Httpd::BaseController
     options["description"] ||= options["title"]
     options["@type"] = error_type(exc)
     options["@now"] = Time.now.to_f
+    options["@request"] = "#{request.request_method} #{request.path}"
+
+    if Simple::Httpd.env == "development" || Simple::Httpd.env == "test"
+      options["@headers"] = request_headers_for_debugging
+      options["@backtrace"] = exc.backtrace[0, 10]
+    end
 
     json options
   end
 
+  def request_headers_for_debugging
+    request.headers.each_with_object({}) do |(key, value), hsh|
+      next if /^(Host|Version|Connection|User-Agent|Accept-Encoding)$/ =~ key
+      next if key == "Accept" && value == "*/*"
+
+      hsh[key] = value
+    end
+  end
+
   if defined?(Expectation)
 
     error(Expectation::Matcher::Mismatch) do |exc|
@@ -57,8 +87,6 @@ class Simple::Httpd::BaseController
   # end
 
   error(ArgumentError) do |exc|
-    STDERR.puts "Caught ArgumentError: #{exc}, from\n\t#{exc.backtrace[0, 5].join("\n\t")}"
-
     render_error exc, status: 422,
                       title: "Invalid input #{exc.inspect}",
                       description: error_description(exc)
@@ -75,16 +103,16 @@ class Simple::Httpd::BaseController
   class NotAuthorizedError < RuntimeError
   end
 
+  def not_authorized!(msg)
+    raise NotAuthorizedError, msg
+  end
+
   error(NotAuthorizedError) do
     render_error e, status: 403,
                     title: "Not authorized",
                     description: "You don't have necessary powers to access this page."
   end
 
-  def not_authorized!(msg)
-    raise NotAuthorizedError, msg
-  end
-
   # -- login required.---------------------------------------------------------
 
   class LoginRequiredError < RuntimeError
@@ -123,7 +151,7 @@ class Simple::Httpd::BaseController
 
   # -- print unspecified errors.
 
-  if ENV["RACK_ENV"] == "production"
+  if ::Simple::Httpd.env == "development"
     error do |exc|
       content_type :text
       status 500

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

@@ -0,0 +1,8 @@
+class Simple::Httpd::BaseController
+  helpers do
+    def origin
+      request["Origin"] ||
+        "#{request.scheme}://#{request.host_with_port}"
+    end
+  end
+end

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

@@ -1,19 +1,19 @@
 class ::Simple::Httpd::BaseController
-  private
-
-  # encodes the result, according to its payload.
-  #
-  # This function is used by the service integration code, but
-  # is potentially useful outside.
-  def encode_result(result)
-    case result
-    when Array, Hash
-      json(result)
-    when String
-      content_type :text
-      result
-    else
-      result
+  helpers do
+    # encodes the result, according to its payload.
+    #
+    # This function is used by the service integration code, but
+    # is potentially useful outside.
+    def encode_result(result)
+      case result
+      when Array, Hash
+        json(result)
+      when String
+        content_type :text
+        result
+      else
+        result
+      end
     end
   end
 end

data/lib/simple/httpd/cli.rb

@@ -55,6 +55,7 @@ module Simple::Httpd::CLI
                                  port: port)
   end
 
+  # rubocop:disable Metrics/AbcSize
   def routes(*mounts, environment: "development", services: nil)
     prepare_environment!(environment: environment)
     app = build_app!(mounts: mounts, services: services)
@@ -65,11 +66,11 @@ module Simple::Httpd::CLI
     max_verb_len = routes.map(&:verb).map(&:length).max
     max_path_len = routes.map(&:path).map(&:length).max
 
-    routes.
-      sort_by { |route| [route.path, route.verb] }.
-      each { |route|
+    routes
+      .sort_by { |route| [route.path, route.verb] }
+      .each do |route|
         puts format("%#{max_verb_len}s %-#{max_path_len}s %s", route.verb, route.path, route.source_location_str)
-      }
+      end
   end
 
   private
@@ -113,12 +114,6 @@ module Simple::Httpd::CLI
     end
   end
 
-  def stderr_logger
-    logger = ::Logger.new STDERR
-    logger.level = ::Logger::INFO
-    logger
-  end
-
   def start_simplecov
     require "simplecov"
 

data/lib/simple/httpd/helpers.rb

@@ -1,4 +1,15 @@
 module Simple::Httpd::Helpers
+  module RequestHeader
+    def headers
+      env.each_with_object({}) do |(key, value), hsh|
+        next unless key =~ /\AHTTP_(.*)/
+
+        key = $1.split("_").collect(&:capitalize).join("-")
+        hsh[key] = value
+      end
+    end
+  end
+
   extend self
 
   private
@@ -16,6 +27,10 @@ module Simple::Httpd::Helpers
   def shorten_path(path)
     path = File.absolute_path(path)
 
+    shorten_absolute_path(path)
+  end
+
+  def shorten_absolute_path(path)
     if path.start_with?(pwd)
       path = path[pwd.length..-1]
       path = File.join("./", path) if path =~ /\//
@@ -52,8 +67,11 @@ module Simple::Httpd::Helpers
     raise "Missing description" unless description
 
     subclass = Class.new(klass)
+    subclass.define_singleton_method(:description) { description }
     subclass.define_method(:inspect) { description } if description
-    instance_eval_paths subclass, paths: paths if paths
+
+    ::Simple::Httpd::Reloader.attach(subclass, paths: Array(paths))
+
     subclass
   end
 

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

@@ -9,13 +9,17 @@ class Simple::Httpd::Rack::DynamicMount
 
   extend Forwardable
 
-  delegate :call => :@rack_app # rubocop:disable Style/HashSyntax
-
   def self.build(mount_point, path)
     expect! path => String
     new(mount_point, path)
   end
 
+  def call(env)
+    reload! if ::Simple::Httpd.env == "development"
+
+    @rack_app.call(env)
+  end
+
   attr_reader :path
   attr_reader :mount_point
 
@@ -24,7 +28,8 @@ class Simple::Httpd::Rack::DynamicMount
     @path = path.gsub(/\/\z/, "") # remove trailing "/"
 
     setup_paths!
-    load_service_files!
+    ::Simple::Httpd::Reloader.attach self, paths: service_files, reloading_instance: nil
+
     @root_controller = build_root_controller # also loads helpers
     @url_map = build_url_map
 
@@ -47,25 +52,26 @@ class Simple::Httpd::Rack::DynamicMount
     logger.info "#{path}: found #{@source_paths.count} sources, #{@helper_paths.count} helpers"
   end
 
-  def load_service_files!
-    return if path == "." # i.e. mounting current directory
+  def service_files
+    @service_files ||= _service_files
+  end
+
+  def _service_files
+    return [] if path == "." # i.e. mounting current directory
 
     service_path = "#{path}.services"
-    service_files = Dir.glob("#{service_path}/**/*.rb")
-    return if service_files.empty?
+    return [] unless Dir.exist?(service_path)
 
+    service_files = Dir.glob("#{service_path}/**/*.rb").sort
     logger.info "#{service_path}: loading #{service_files.count} service file(s)"
-    service_files.sort.each do |path|
-      logger.debug "Loading service file #{path.inspect}"
-      load path
-    end
+    service_files
   end
 
   # wraps all helpers into a Simple::Httpd::BaseController subclass
   def build_root_controller
     H.subclass ::Simple::Httpd::BaseController,
                paths: @helper_paths.sort,
-               description: "root controller at #{path} w/#{@helper_paths.count} helpers"
+               description: "<root controller: #{H.shorten_path path}>"
   end
 
   def build_url_map
@@ -73,7 +79,9 @@ class Simple::Httpd::Rack::DynamicMount
       relative_path = absolute_path[(path.length)..-1]
 
       relative_mount_point = relative_path == "/root.rb" ? "/" : relative_path.gsub(/\.rb$/, "")
-      controller_class = H.subclass @root_controller, description: "controller at #{absolute_path}", paths: absolute_path
+      controller_class = H.subclass @root_controller,
+                                    paths: absolute_path,
+                                    description: "<controller:#{H.shorten_absolute_path(absolute_path)}>"
 
       controller_class.route_descriptions.each do |route|
         route = route.prefix(@mount_point, relative_mount_point)

data/lib/simple/httpd/reloader.rb

@@ -0,0 +1,61 @@
+module Simple::Httpd::Reloader
+  def self.attach(target, paths:, reloading_instance: target)
+    target.extend self
+    target.load!(paths: paths, reloading_instance: reloading_instance)
+    target
+  end
+
+  H = ::Simple::Httpd::Helpers
+
+  attr_accessor :reloading_paths
+
+  def load!(paths:, reloading_instance:)
+    paths = Array(paths)
+    paths = nil if paths.empty?
+
+    @__reload_paths__ = paths
+    @__reloading_instance__ = reloading_instance
+
+    reload_all_changed_files
+  end
+
+  def reload!
+    # if this is a class, and its superclass is also reloadable,
+    # reload the superclass first.
+    if respond_to?(:superclass) && superclass&.respond_to?(:reload!)
+      superclass.reload!
+    end
+
+    reload_all_changed_files
+  end
+
+  private
+
+  def reload_all_changed_files
+    return unless @__reload_paths__
+
+    @__reload_paths__.each do |path|
+      reload_file_if_necessary(path)
+    end
+  end
+
+  def reload_file_if_necessary(path)
+    @__source_mtimes_by_path__ ||= {}
+
+    mtime = File.mtime(path)
+    return if @__source_mtimes_by_path__[path] == mtime
+
+    Simple::Httpd.logger.debug do
+      verb = @__source_mtimes_by_path__.key?(path) ? "reloading" : "loading"
+      "#{verb} #{H.shorten_path path}"
+    end
+
+    if @__reloading_instance__
+      @__reloading_instance__.instance_eval File.read(path), path, 1
+    else
+      load path
+    end
+
+    @__source_mtimes_by_path__[path] = mtime
+  end
+end

data/lib/simple/httpd/server.rb

@@ -18,19 +18,29 @@ class Simple::Httpd
 
       ::Simple::Httpd.logger.info "Starting httpd server on http://#{host}:#{port}/"
 
+      app = ::Rack::CommonLogger.new(app)
       app = ::Rack::Lint.new(app) if environment != "production"
 
       # re/AccessLog: the AccessLog setting points WEBrick's access logging to the
       # NullLogger object.
       #
-      # Instead we'll use a combination of Rack::CommonLogger (see Simple::Httpd.app),
-      # and sinatra's logger (see Simple::Httpd::BaseController).
-      ::Rack::Server.start app: app,
-                           Host: host,
-                           Port: port,
-                           environment: environment,
-                           Logger: build_logger,
-                           AccessLog: [[NullLogger, ""]]
+      # We do not set the environment. Rack is using this to load different
+      # default middlewares (ShowException, Lint, CommonLogger) depending on
+      # the environment setting (which should be either "development" or
+      # "deployment").
+      server_opts = {
+        app: app,
+        Host: host,
+        Port: port,
+        Logger: build_logger,
+        AccessLog: [[NullLogger, ""]]
+      }
+
+      unless ::Simple::Httpd.env == "development"
+        server_opts.update workers: 4, min_threads: 4
+      end
+
+      ::Rack::Server.start server_opts
     end
 
     private

data/lib/simple/httpd/{service_adapter.rb → service_integration.rb}

@@ -1,19 +1,29 @@
 require "simple-service"
 
-module Simple::Httpd::ServiceAdapter
-  def mount_service(service)
-    @service = service
-
-    instance_eval do
-      def dispatch!
-        ::Simple::Service.with_context(context)
-        super
-      ensure
-        ::Simple::Service.context = nil
-      end
+module Simple::Httpd::ServiceIntegration
+  class Adapter
+    extend Forwardable
 
-      yield(service)
+    def initialize(simple_service)
+      @simple_service = simple_service
     end
+
+    def action(action_name)
+      ::Simple::Service.action(@simple_service, action_name)
+    end
+
+    def invoke(name, args: {}, flags: {})
+      ::Simple::Service.invoke @simple_service, name, args: args, flags: flags
+    end
+
+    def invoke3(name, *args, **flags)
+      ::Simple::Service.invoke3 @simple_service, name, *args, **flags
+    end
+  end
+
+  def mount_service(service)
+    @service = Adapter.new(service)
+    yield(@service)
   ensure
     @service = nil
   end
@@ -52,16 +62,18 @@ module Simple::Httpd::ServiceAdapter
   def install_route(verb, path, opts, &block)
     if service_route?(verb, path, opts, &block)
       path, action_name = *path.first
-      handle_service_route(verb, path, action_name)
+      install_service_shortcut(verb, path, action_name)
+    elsif @service
+      install_service_route(verb, path, opts, &block)
     else
-      handle_non_service_route(verb, path, opts, &block)
+      install_non_service_route(verb, path, opts, &block)
     end
   end
 
-  def handle_service_route(verb, path, action_name)
+  def install_service_shortcut(verb, path, action_name)
     # Fetch action's source_location. This also verifies that the action
     # is defined in the first place.
-    action = ::Simple::Service.action(@service, action_name)
+    action = @service.action(action_name)
 
     describe_route!(verb: verb, path: path, source_location: action.source_location)
 
@@ -72,27 +84,43 @@ module Simple::Httpd::ServiceAdapter
     # define sinatra route.
     route(verb, path) do
       ::Simple::Service.with_context(context) do
-        result = ::Simple::Service.invoke(service, action_name, args: self.parsed_body, flags: stringified_params)
+        result = service.invoke(action_name, args: parsed_body, flags: stringified_params)
         encode_result(result)
+      rescue Exception => e
+        Simple::Httpd.logger.warn "#{e}, from\n    #{e.backtrace[0,10].join("\n    ")}"
+        raise
       end
     end
   end
 
-  def handle_non_service_route(verb, path, opts, &block)
+  def install_service_route(verb, path, opts, &block)
     describe_route!(verb: verb, path: path, source_location: block.source_location) if block
 
     route(verb, path, opts) do
-      result = instance_eval(&block)
-      unless headers["Content-Type"]
-        result = encode_result(result)
+      ::Simple::Service.with_context(context) do
+        result = instance_eval(&block)
+        unless headers["Content-Type"]
+          result = encode_result(result)
+        end
+        result
+      rescue Exception => e
+        Simple::Httpd.logger.warn "#{e}, from\n    #{e.backtrace[0,10].join("\n    ")}"
+        raise
       end
-      result
+    end
+  end
+
+  def install_non_service_route(verb, path, opts, &block)
+    describe_route!(verb: verb, path: path, source_location: block.source_location) if block
+
+    route(verb, path, opts) do
+      instance_eval(&block)
     end
   end
 
   module Helpers
     def stringified_params
-      params.each_with_object({}) do |(k,v), hsh|
+      params.each_with_object({}) do |(k, v), hsh|
         hsh[k.to_s] = v
       end
     end
@@ -105,5 +133,5 @@ module Simple::Httpd::ServiceAdapter
   end
 end
 
-::Simple::Httpd::BaseController.extend(::Simple::Httpd::ServiceAdapter)
-::Simple::Httpd::BaseController.helpers(::Simple::Httpd::ServiceAdapter::Helpers)
+::Simple::Httpd::BaseController.extend(::Simple::Httpd::ServiceIntegration)
+::Simple::Httpd::BaseController.helpers(::Simple::Httpd::ServiceIntegration::Helpers)

data/simple-httpd.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   # dependencies
   gem.add_dependency "neatjson", "~> 0.8.4"
   gem.add_dependency "sinatra", "~> 2"
+  # gem.add_dependency "async_sinatra" #, "~> 2"
   # gem.add_dependency "sinatra-reloader", "~> 1"
   gem.add_dependency "expectation", "~> 1"
   gem.add_dependency "simple-cli", "~> 0.3.5"

data/spec/spec_helper.rb

@@ -33,7 +33,9 @@ end
 Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
 
 require "simple/httpd"
-
+#Simple::Httpd.env = "test"
+if ::Simple::Httpd.env == "development"
+end
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: (ENV["CI"] != "true")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-httpd
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -87,6 +87,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".rubocop.yml"
 - ".tm_properties"
@@ -99,7 +100,6 @@ files:
 - bin/console
 - bin/rake
 - bin/rspec
-- bin/rubocop
 - bin/simple-httpd
 - examples/README.md
 - examples/ex1.services/ex1_service_module.rb
@@ -127,6 +127,7 @@ files:
 - lib/simple/httpd/base_controller/debug.rb
 - lib/simple/httpd/base_controller/error_handling.rb
 - lib/simple/httpd/base_controller/json.rb
+- lib/simple/httpd/base_controller/origin.rb
 - lib/simple/httpd/base_controller/request.rb
 - lib/simple/httpd/base_controller/result.rb
 - lib/simple/httpd/base_controller/x_processing.rb
@@ -137,9 +138,10 @@ files:
 - lib/simple/httpd/rack/dynamic_mount.rb
 - lib/simple/httpd/rack/merger.rb
 - lib/simple/httpd/rack/static_mount.rb
+- lib/simple/httpd/reloader.rb
 - lib/simple/httpd/route.rb
 - lib/simple/httpd/server.rb
-- lib/simple/httpd/service_adapter.rb
+- lib/simple/httpd/service_integration.rb
 - lib/simple/httpd/version.rb
 - log/.gitkeep
 - scripts/release
@@ -179,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Super-simple HTTPD server

data/bin/rubocop

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rubocop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rubocop", "rubocop")