serviceworker-rails 0.5.5 → 0.7.0

data/lib/serviceworker/{rails/handler.rb → handlers/sprockets_handler.rb}

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require "rack/file"
 
 module ServiceWorker
-  module Rails
-    class Handler
+  module Handlers
+    class SprocketsHandler
       def call(env)
         path_info = env.fetch("serviceworker.asset_name")
 
@@ -14,14 +13,24 @@ module ServiceWorker
         end
       end
 
-    private
+      private
 
       def sprockets_server
         ::Rails.application.assets
       end
 
       def file_server
-        @file_server ||= ::Rack::File.new(::Rails.public_path)
+        @file_server ||= rack_files_class.new(::Rails.public_path)
+      end
+
+      def rack_files_class
+        @rack_files_class ||= begin
+          require "rack/files"
+          ::Rack::Files
+        rescue LoadError
+          require "rack/file"
+          ::Rack::File
+        end
       end
 
       def config

data/lib/serviceworker/handlers.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "serviceworker/handlers/rack_handler"
+
+module ServiceWorker
+  module Handlers
+    extend self
+
+    def build(handler)
+      resolve_handler(handler) || default_handler
+    end
+
+    def handler_for_route_match(route_match)
+      options = route_match.options
+      return sprockets_handler if Route.sprockets?(options)
+
+      nil
+    end
+
+    def ===(other)
+      other.respond_to?(:call)
+    end
+
+    def handler_for_name(name)
+      available_handlers = %w[sprockets rack]
+      if available_handlers.include?(name.to_s)
+        send(:"#{name}_handler")
+      else
+        raise ServiceWorker::Error,
+          "Unknown handler #{name.inspect}. Please use one of #{available_handlers.inspect}"
+      end
+    end
+
+    def resolve_handler(handler)
+      case handler
+      when Handlers
+        handler
+      when Symbol, String
+        handler_for_name(handler)
+      end
+    end
+
+    def sprockets_handler
+      require "serviceworker/handlers/sprockets_handler"
+      ServiceWorker::Handlers::SprocketsHandler.new
+    end
+
+    def rack_handler
+      ServiceWorker::Handlers::RackHandler.new
+    end
+
+    def default_handler
+      if sprockets?
+        sprockets_handler
+      else
+        rack_handler
+      end
+    end
+
+    def sprockets?
+      defined?(::Rails) && ::Rails.configuration.assets
+    end
+  end
+end

data/lib/serviceworker/middleware.rb

@@ -1,9 +1,12 @@
 # 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
@@ -17,14 +20,14 @@ module ServiceWorker
     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
@@ -32,7 +35,7 @@ module ServiceWorker
       @app.call(env)
     end
 
-  private
+    private
 
     def default_headers
       {
@@ -43,22 +46,21 @@ module ServiceWorker
     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
+      @logger ||= @opts.fetch(:logger, Logger.new($stdout))
     end
   end
 end

data/lib/serviceworker/rails/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module ServiceWorker
   module Rails
-    VERSION = "0.5.5".freeze
+    VERSION = "0.7.0"
   end
 end

data/lib/serviceworker/rails.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module ServiceWorker
   module Rails
   end
 end
 
 require "serviceworker/rails/version"
-require "serviceworker/rails/handler"
 require "serviceworker/engine"

data/lib/serviceworker/route.rb

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
+
 module ServiceWorker
   class Route
     attr_reader :path_pattern, :asset_pattern, :options
 
-    RouteMatch = Struct.new(:path, :asset_name, :headers) do
+    RouteMatch = Struct.new(:path, :asset_name, :headers, :options) do
       def to_s
         asset_name
       end
     end
 
+    def self.sprockets?(options)
+      options.key?(:asset)
+    end
+
     def initialize(path_pattern, asset_pattern = nil, options = {})
       if asset_pattern.is_a?(Hash)
         options = asset_pattern
@@ -16,16 +21,16 @@ module ServiceWorker
       end
 
       @path_pattern = path_pattern
-      @asset_pattern = asset_pattern || options[:asset] || path_pattern
+      @asset_pattern = asset_pattern || options.fetch(:asset, path_pattern)
       @options = options
     end
 
     def match(path)
       raise ArgumentError, "path is required" if path.to_s.strip.empty?
 
-      asset = resolver.call(path) or return nil
+      (asset = resolver.call(path)) || (return nil)
 
-      RouteMatch.new(path, asset, headers)
+      RouteMatch.new(path, asset, headers, options)
     end
 
     def headers
@@ -39,14 +44,14 @@ module ServiceWorker
     end
 
     class AssetResolver
-      PATH_INFO = "PATH_INFO".freeze
+      PATH_INFO = "PATH_INFO"
       DEFAULT_WILDCARD_NAME = :paths
-      WILDCARD_PATTERN = %r{\/\*([^\/]*)}
-      NAMED_SEGMENTS_PATTERN = %r{\/([^\/]*):([^:$\/]+)}
-      LEADING_SLASH_PATTERN = %r{^\/}
+      WILDCARD_PATTERN = %r{/\*([^/]*)}
+      NAMED_SEGMENTS_PATTERN = %r{/([^/]*):([^:$/]+)}
+      LEADING_SLASH_PATTERN = %r{^/}
       INTERPOLATION_PATTERN = Regexp.union(
         /%%/,
-        /%\{(\w+)\}/, # matches placeholders like "%{foo}"
+        /%\{(\w+)\}/ # matches placeholders like "%{foo}"
       )
 
       attr_reader :path_pattern, :asset_pattern
@@ -59,7 +64,7 @@ module ServiceWorker
       def call(path)
         raise ArgumentError, "path is required" if path.to_s.strip.empty?
 
-        captures = path_captures(regexp, path) or return nil
+        (captures = path_captures(regexp, path)) || (return nil)
 
         interpolate_captures(asset_pattern, captures)
       end
@@ -79,28 +84,28 @@ module ServiceWorker
         pattern_match = pattern.match(WILDCARD_PATTERN)
         if pattern_match
           @wildcard_name = if pattern_match[1].to_s.strip.empty?
-                             DEFAULT_WILDCARD_NAME
-                           else
-                             pattern_match[1].to_sym
-                           end
+            DEFAULT_WILDCARD_NAME
+          else
+            pattern_match[1].to_sym
+          end
           pattern.gsub(WILDCARD_PATTERN, "(?:/(.*)|)")
         else
           p = if pattern.match(NAMED_SEGMENTS_PATTERN)
-                pattern.gsub(NAMED_SEGMENTS_PATTERN, '/\1(?<\2>[^.$/]+)')
-              else
-                pattern
-              end
+            pattern.gsub(NAMED_SEGMENTS_PATTERN, '/\1(?<\2>[^.$/]+)')
+          else
+            pattern
+          end
           p + '(?:\.(?<format>.*))?'
         end
       end
 
       def path_captures(regexp, path)
-        path_match = path.match(regexp) or return nil
+        (path_match = path.match(regexp)) || (return nil)
         params = if @wildcard_name
-                   { @wildcard_name => path_match[1].to_s.split("/") }
-                 else
-                   Hash[path_match.names.map(&:to_sym).zip(path_match.captures)]
-                 end
+          {@wildcard_name => path_match[1].to_s.split("/")}
+        else
+          path_match.names.map(&:to_sym).zip(path_match.captures).to_h
+        end
         params.delete(:format) if params.key?(:format) && params[:format].nil?
         params
       end

data/lib/serviceworker/router.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module ServiceWorker
   class Router
-    PATH_INFO = "PATH_INFO".freeze
+    PATH_INFO = "PATH_INFO"
 
     def self.default
       new.draw_default
@@ -9,14 +10,15 @@ module ServiceWorker
 
     attr_reader :routes
 
-    def initialize
+    # standard:disable Style/ArgumentsForwarding
+    def initialize(&block)
       @routes = []
 
-      draw(&Proc.new) if block_given?
+      draw(&block)
     end
 
     def draw(&block)
-      return self unless block_given?
+      return self unless block
 
       if block.arity == 1
         yield(self)
@@ -26,6 +28,7 @@ module ServiceWorker
 
       self
     end
+    # standard:enable Style/ArgumentsForwarding
 
     def draw_default
       draw { get "/serviceworker.js" }
@@ -42,7 +45,7 @@ module ServiceWorker
         @routes << route
       end
     end
-    alias get match
+    alias_method :get, :match
 
     def any?
       @routes.any?
@@ -50,10 +53,7 @@ module ServiceWorker
 
     def match_route(env)
       path = env[PATH_INFO]
-      @routes.each do |route|
-        match = route.match(path) and return match
-      end
-      nil
+      @routes.lazy.map { |route| route.match(path) }.detect(&:itself)
     end
   end
 end

data/lib/serviceworker-rails.rb

@@ -1,3 +1,4 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
+
 require "serviceworker"
 require "serviceworker/rails"

data/lib/serviceworker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ServiceWorker
   Error = Class.new(StandardError)
   RouteError = Class.new(Error)

data/serviceworker-rails.gemspec

@@ -1,33 +1,42 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "serviceworker/rails/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "serviceworker-rails"
-  spec.version       = ServiceWorker::Rails::VERSION
-  spec.authors       = ["Ross Kaffenberger"]
-  spec.email         = ["rosskaff@gmail.com"]
+  spec.name = "serviceworker-rails"
+  spec.version = ServiceWorker::Rails::VERSION
+  spec.authors = ["Ross Kaffenberger"]
+  spec.email = ["rosskaff@gmail.com"]
 
-  spec.summary       = "ServiceWorker for Rails 3+"
-  spec.description   = "Integrates ServiceWorker into the Rails asset pipeline."
-  spec.homepage      = "https://github.com/rossta/serviceworker-rails"
-  spec.license       = "MIT"
+  spec.summary = "ServiceWorker for Rails 7+"
+  spec.description = "Integrates ServiceWorker into the Rails asset pipeline."
+  spec.homepage = "https://github.com/rossta/serviceworker-rails"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "railties", [">= 3.1"]
+  spec.add_dependency "railties", ">= 7.0"
+  spec.add_dependency "rack", [">= 2.1"]
+  spec.add_dependency "logger"
+  spec.add_dependency "benchmark"
+  spec.add_dependency "bigdecimal"
+  spec.add_dependency "ostruct"
+  spec.add_dependency "mutex_m"
+  spec.add_dependency "drb"
+  spec.add_dependency "cgi"
 
-  spec.add_development_dependency "sprockets-rails"
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rubocop", "0.46.0"
   spec.add_development_dependency "rails"
-  spec.add_development_dependency "appraisal", "~> 2.1.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "parallel", "~> 1.27"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sprockets", "~> 3.0"
+  spec.add_development_dependency "sprockets-rails"
+  spec.add_development_dependency "standard"
 end