lib/serviceworker/middleware.rb in serviceworker-rails-0.5.5 vs lib/serviceworker/middleware.rb in serviceworker-rails-0.6.0

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
+
+require "serviceworker/handlers"
+
 module ServiceWorker
   class Middleware
-    REQUEST_METHOD = "REQUEST_METHOD".freeze
-    GET = "GET".freeze
-    HEAD = "HEAD".freeze
+    REQUEST_METHOD = "REQUEST_METHOD"
+    GET = "GET"
+    HEAD = "HEAD"
 
     # Initialize the Rack middleware for responding to serviceworker asset
     # requests
     #
     # @app [#call] middleware stack
@@ -15,18 +18,18 @@
     # @param opts [#call] :handler resolves response from matched asset name
     # @param opts [#info] :logger logs requests
     def initialize(app, opts = {})
       @app = app
       @opts = opts
-      @headers = opts.fetch(:headers, {}).merge(default_headers)
+      @headers = default_headers.merge(opts.fetch(:headers, {}))
       @router = opts.fetch(:routes, ServiceWorker::Router.new)
-      @handler = @opts.fetch(:handler, default_handler)
+      @handler = Handlers.build(@opts.fetch(:handler, nil))
     end
 
     def call(env)
       case env[REQUEST_METHOD]
-        when GET, HEAD
+      when GET, HEAD
         route_match = @router.match_route(env)
         return respond_to_match(route_match, env) if route_match
       end
 
       @app.call(env)
@@ -41,24 +44,23 @@
     end
 
     def respond_to_match(route_match, env)
       env = env.merge("serviceworker.asset_name" => route_match.asset_name)
 
-      status, headers, body = @handler.call(env)
+      status, headers, body = handler_for_route_match(route_match).call(env)
 
       [status, headers.merge(@headers).merge(route_match.headers), body]
     end
 
+    def handler_for_route_match(route_match)
+      Handlers.handler_for_route_match(route_match) || @handler
+    end
+
     def info(msg)
       logger.info "[#{self.class}] - #{msg}"
     end
 
     def logger
       @logger ||= @opts.fetch(:logger, Logger.new(STDOUT))
-    end
-
-    def default_handler
-      require "serviceworker/handler"
-      ServiceWorker::Handler.new
     end
   end
 end