serviceworker-rails 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e58a2ae3f4679e8cd32a024d0114d5a924a174a
-  data.tar.gz: 474f2390c03df7be5efb55d7f173b40dd863c259
+SHA256:
+  metadata.gz: 1b9cc730def9c457542951247f29f359590450f0101cf302939e2fc09f767d14
+  data.tar.gz: f0c0e3d207450ce4abfb81260146ffa939dcc8a67430510b4a1c34b99090471d
 SHA512:
-  metadata.gz: b212fcdba3d949901fb95462fda9472e9c27d241542c7303949d87eff1183e0c492c77596d01ddb70e41bb86f30e4eecd717a2403bb4edfea6da52724eb78d95
-  data.tar.gz: 331f5ea58dbd378e481397ff48219a80e113aff428c904a93044f6b68cf613fa7f00c9530776397a87b8fde6bfffbba78431c9ea5ba701b8cb32face5a1b2b0d
+  metadata.gz: 6ba64ff82b3c7c29a39391156883e725a4a17900ab9b67d0586d5def600f277caceef3fb71b590197bc36b4ba37005132157e0dc24f907e0c4660148a428017c
+  data.tar.gz: cb7b65a49574244b19baf1ce5d1c44b4cd5ba59a06194b7bbcda78d1fcf602acf628346d3fa36b38ef6460d77bf7d8d8ff8aed517e7d3055c01cf8ac497445b5

data/.gitignore

@@ -6,5 +6,8 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+**/tmp/
+**/log/
+**/node_modules/
 /gemfiles/*.lock
+.byebug_history

data/.rubocop.yml

@@ -1,9 +1,11 @@
 AllCops:
   Exclude:
     - "test/tmp/**/*"
+    - "test/log/**/*"
     - "tmp/**/*"
     - "coverage/**/*"
     - "gemfiles/**/*"
+    - "**/node_modules/**/*"
 
 Metrics/LineLength:
   Max: 120
@@ -29,7 +31,7 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
 Style/StringLiterals:
@@ -38,7 +40,7 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
 Style/OneLineConditional:
@@ -53,41 +55,51 @@ Style/Not:
 Documentation:
   Enabled: false # TODO: Enable again once we have more docs
 
-Style/CaseIndentation:
-  IndentWhenRelativeTo: case
+Layout/CaseIndentation:
+  EnforcedStyle: case
   SupportedStyles:
     - case
     - end
-  IndentOneStep: true
+  IndentOneStep: false
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': "[]"
     '%W': "[]"
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: false
 
 Style/SignalException:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: false
 
-Style/TrivialAccessors:
-  ExactNameMatch: true
-
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   Enabled: false
 
 Lint/HandleExceptions:
   Enabled: false
 
+Naming/FileName:
+  Enabled: false
+
 Style/SpecialGlobalVars:
   Enabled: false
 
 Style/TrivialAccessors:
+  ExactNameMatch: true
   Enabled: false
 
 Style/ClassAndModuleChildren:
   Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false

data/.travis.yml

@@ -1,10 +1,28 @@
 language: ruby
-cache: bundler
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - node_modules
 rvm:
-  - 2.2.6
-  - 2.3.3
-before_install: gem install bundler -v 1.13.6
+  - 2.4
+  - 2.5
+  - 2.6
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+install:
+  - bundle install --path vendor/bundle
+  - cd test/sample && yarn install && cd -
 gemfile:
-  - gemfiles/rails_3.gemfile
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_3.2.gemfile
+matrix:
+  exclude:
+  - rvm: 2.6
+    gemfile: gemfiles/rails_3.2.gemfile
+script:
+  - bundle exec rake

data/Appraisals

@@ -1,12 +1,26 @@
-appraise "rails-3" do
+# frozen_string_literal: true
+
+appraise "rails-3.2" do
   gem "rails", "~> 3.2"
   gem "test-unit", "~> 3.0"
 end
 
-appraise "rails-4" do
+appraise "rails-4.2" do
   gem "rails", "~> 4.2"
+  gem "webpacker"
 end
 
-appraise "rails-5" do
+appraise "rails-5.0" do
   gem "rails", "~> 5.0"
+  gem "webpacker"
+end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1"
+  gem "webpacker"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2"
+  gem "webpacker", "~> 3.4"
 end

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.6.0 - 2019-04-11
+
+* enhancements
+  * experimental support for Webpacker (@rossta, @pedantic-git)
+  * allow cache override (@omnibs)
+  * support recent rubies (@grzuy)
+
 ### 0.5.5 - 2017-05-01
 
 * bug fixes

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in serviceworker-rails.gemspec

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/rossta/serviceworker-rails.svg?branch=master)](https://travis-ci.org/rossta/serviceworker-rails)
 [![Code Climate](https://codeclimate.com/github/rossta/serviceworker-rails/badges/gpa.svg)](https://codeclimate.com/github/rossta/serviceworker-rails)
 
-Turn your Rails app into a Progressive Web App. Use [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) with the Rails asset pipeline.
+Turn your Rails app into a Progressive Web App. Use [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) with the Rails [asset pipeline](https://github.com/rails/sprockets-rails) or [Webpacker](https://github.com/rails/webpacker)
 
 ## Why?
 
@@ -18,7 +18,7 @@ with requests and responses within `/assets/`<em>**</em>. This is not what we wa
 
 * [MDN states](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API#Download_install_and_activate) browsers check for updated service worker scripts in the background every 24 hours (possibly less). Rails developers wouldn't be able to take advantage of this feature since the fingerprint strategy means assets at a given url are immutable. Beside fingerprintings, the `Cache-Control` headers used for static files served from Rails also work against browser's treatment of service workers.
 
-We want Sprockets to compile service worker JavaScript from ES6/7, CoffeeScript, ERB, etc. but must remove the caching and scoping mechanisms offered by Rails asset pipeline defaults. This is where `serviceworker-rails` comes in.
+We want Sprockets or Webpacker to compile service worker JavaScript from ES6/7, CoffeeScript, ERB, etc. but must remove the caching and scoping mechanisms offered by Rails defaults. This is where `serviceworker-rails` comes in.
 
 *Check out the [blog post](https://rossta.net/blog/service-worker-on-rails.html)
 for more background.*
@@ -271,6 +271,9 @@ Rails.application.configure do
     match "/header-serviceworker.js" => "another/serviceworker.js",
       headers: { "X-Resource-Header" => "A resource" }
 
+    # maps to serviceworker "pack" compiled by Webpacker
+    match "/webpack-serviceworker.js" => "serviceworker.js", pack: true
+
     # anonymous glob exposes `paths` variable for interpolation
     match "/*/serviceworker.js" => "%{paths}/serviceworker.js"
   end

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rubocop/rake_task"
 
-APP_RAKEFILE = File.expand_path("../test/sample/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("test/sample/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
 RuboCop::RakeTask.new
@@ -15,4 +17,21 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task default: [:test, :rubocop]
+task default: %i[test rubocop]
+
+task :compile do
+  if defined?(Webpacker)
+    Dir.chdir("test/sample") do
+      sh "NODE_ENV=test yarn install"
+      sh "RAILS_ENV=test ./bin/rake webpacker:compile"
+    end
+  end
+end
+
+Rake::Task[:test].enhance [:compile] do
+  if defined?(Webpacker)
+    Dir.chdir("test/sample") do
+      sh "RAILS_ENV=test ./bin/rake webpacker:clobber"
+    end
+  end
+end

data/bin/_guard-core

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -9,7 +10,7 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
 require "rubygems"
 require "bundler/setup"

data/bin/appraisal

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -9,7 +10,7 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
 require "rubygems"
 require "bundler/setup"

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "serviceworker/rails"

data/bin/guard

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -9,7 +10,7 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
 require "rubygems"
 require "bundler/setup"

data/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -8,7 +10,7 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
 require "rubygems"
 require "bundler/setup"

data/bin/rubocop

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -8,7 +10,7 @@
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+                                           Pathname.new(__FILE__).realpath)
 
 require "rubygems"
 require "bundler/setup"

data/gemfiles/{rails_4.gemfile → rails_4.2.gemfile}

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.2"
+gem "webpacker"
 
 group :development, :test do
   gem "guard", :require => false

data/gemfiles/{rails_5.gemfile → rails_5.0.gemfile}

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0"
+gem "webpacker"
 
 group :development, :test do
   gem "guard", :require => false

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1"
+gem "webpacker"
+
+group :development, :test do
+  gem "guard", :require => false
+  gem "guard-minitest", :require => false
+  gem "pry"
+  gem "pry-byebug", :platforms => [:mri]
+end
+
+gemspec :path => "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+gem "webpacker", "~> 3.4"
+
+group :development, :test do
+  gem "guard", :require => false
+  gem "guard-minitest", :require => false
+  gem "pry"
+  gem "pry-byebug", :platforms => [:mri]
+end
+
+gemspec :path => "../"

data/lib/assets/images/convert.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+# rubocop:disable Lint/Void
 %w[48 60 72 76 96 120 152 180 192 512].each do |dim|
   %(convert heart-1200x1200.png -resize #{dim}x heart-#{dim}x#{dim}.png)
 end
+# rubocop:enable Lint/Void

data/lib/generators/serviceworker/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 require "fileutils"
 
@@ -33,7 +35,7 @@ module Serviceworker
       def update_application_layout
         layout = detect_layout
         snippet = %(<link rel="manifest" href="/manifest.json" />)
-        snippet << %(\n<meta name="apple-mobile-web-app-capable" content="yes">)
+        snippet += %(\n<meta name="apple-mobile-web-app-capable" content="yes">)
         unless layout
           conditional_warn "Could not locate application layout. To insert manifest tags manually, use:\n\n#{snippet}\n"
           return
@@ -55,6 +57,7 @@ module Serviceworker
         %w[.js .js.erb .coffee .coffee.erb .js.coffee .js.coffee.erb].each do |ext|
           next unless File.exist?(javascripts_dir("application#{ext}"))
           return [ext, "#="] if ext.include?(".coffee")
+
           return [ext, "//="]
         end
       end

data/lib/generators/serviceworker/templates/serviceworker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.serviceworker.routes.draw do
     # map to assets implicitly

data/lib/service_worker.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "serviceworker"

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/lib/serviceworker/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 require "rails/railtie"
 require "serviceworker"
@@ -8,7 +9,7 @@ module ServiceWorker
     config.serviceworker = ActiveSupport::OrderedOptions.new
     config.serviceworker.headers = {}
     config.serviceworker.routes = ServiceWorker::Router.new
-    config.serviceworker.handler = ServiceWorker::Rails::Handler.new
+    config.serviceworker.handler = :sprockets
     config.serviceworker.icon_sizes = %w[36 48 60 72 76 96 120 152 180 192 512]
 
     initializer "serviceworker-rails.configure_rails_initialization", after: :load_config_initializers do

data/lib/serviceworker/handlers.rb

@@ -0,0 +1,74 @@
+# 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 webpacker_handler if Route.webpacker?(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 webpacker 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 webpacker_handler
+      require "serviceworker/handlers/webpacker_handler"
+      ServiceWorker::Handlers::WebpackerHandler.new
+    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 webpacker?
+      defined?(::Webpacker)
+    end
+
+    def sprockets?
+      defined?(::Rails) && ::Rails.configuration.assets
+    end
+  end
+end

data/lib/serviceworker/handlers/rack_handler.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ServiceWorker
+  module Handlers
+    class RackHandler
+      def initialize(root = Dir.getwd)
+        @root = root
+      end
+
+      def call(env)
+        path_info = env.fetch("serviceworker.asset_name")
+
+        file_server.call(env.merge("PATH_INFO" => path_info))
+      end
+
+      def file_path(path_info)
+        @root.join(path_info)
+      end
+
+      def file_server
+        @file_server ||= ::Rack::File.new(@root)
+      end
+    end
+  end
+end

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

@@ -1,9 +1,10 @@
 # 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,7 +15,7 @@ module ServiceWorker
         end
       end
 
-    private
+      private
 
       def sprockets_server
         ::Rails.application.assets

data/lib/serviceworker/handlers/webpacker_handler.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "rack/file"
+require "webpacker"
+
+module ServiceWorker
+  module Handlers
+    class WebpackerHandler
+      def call(env)
+        path_info = env.fetch("serviceworker.asset_name")
+
+        path = Webpacker.manifest.lookup(path_info)
+
+        if Webpacker.dev_server.running?
+          proxy = Webpacker::DevServerProxy.new
+          proxy.call(env.merge("PATH_INFO" => path))
+        else
+          file_server.call(env.merge("PATH_INFO" => path))
+        end
+      end
+
+      private
+
+      def file_server
+        @file_server ||= ::Rack::File.new(::Rails.public_path)
+      end
+    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
@@ -43,11 +46,15 @@ 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
@@ -55,10 +62,5 @@ module ServiceWorker
     def logger
       @logger ||= @opts.fetch(:logger, Logger.new(STDOUT))
     end
-
-    def default_handler
-      require "serviceworker/handler"
-      ServiceWorker::Handler.new
-    end
   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/rails/version.rb

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

data/lib/serviceworker/route.rb

@@ -1,14 +1,23 @@
 # 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.webpacker?(options)
+      options.key?(:pack) && Handlers.webpacker?
+    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,7 +25,11 @@ module ServiceWorker
       end
 
       @path_pattern = path_pattern
-      @asset_pattern = asset_pattern || options[:asset] || path_pattern
+      @asset_pattern = if self.class.webpacker?(options)
+                         asset_pattern || options.fetch(:pack, path_pattern)
+                       else
+                         asset_pattern || options.fetch(:asset, path_pattern)
+                       end
       @options = options
     end
 
@@ -25,7 +38,7 @@ module ServiceWorker
 
       asset = resolver.call(path) or return nil
 
-      RouteMatch.new(path, asset, headers)
+      RouteMatch.new(path, asset, headers, options)
     end
 
     def headers
@@ -39,14 +52,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{\/\*([^\/]*)}.freeze
+      NAMED_SEGMENTS_PATTERN = %r{\/([^\/]*):([^:$\/]+)}.freeze
+      LEADING_SLASH_PATTERN = %r{^\/}.freeze
       INTERPOLATION_PATTERN = Regexp.union(
         /%%/,
-        /%\{(\w+)\}/, # matches placeholders like "%{foo}"
+        /%\{(\w+)\}/ # matches placeholders like "%{foo}"
       )
 
       attr_reader :path_pattern, :asset_pattern

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

data/serviceworker-rails.gemspec

@@ -1,5 +1,6 @@
-# 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"
 
@@ -21,13 +22,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties", [">= 3.1"]
 
-  spec.add_development_dependency "sprockets-rails"
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "appraisal", "~> 2.1.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 "rubocop"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sprockets-rails"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serviceworker-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -25,63 +25,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,9 +161,11 @@ files:
 - bin/rake
 - bin/rubocop
 - bin/setup
-- gemfiles/rails_3.gemfile
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/assets/images/convert.rb
 - lib/assets/images/serviceworker-rails/heart-1200x1200.png
 - lib/assets/images/serviceworker-rails/heart-120x120.png
@@ -201,10 +189,12 @@ files:
 - lib/serviceworker-rails.rb
 - lib/serviceworker.rb
 - lib/serviceworker/engine.rb
-- lib/serviceworker/handler.rb
+- lib/serviceworker/handlers.rb
+- lib/serviceworker/handlers/rack_handler.rb
+- lib/serviceworker/handlers/sprockets_handler.rb
+- lib/serviceworker/handlers/webpacker_handler.rb
 - lib/serviceworker/middleware.rb
 - lib/serviceworker/rails.rb
-- lib/serviceworker/rails/handler.rb
 - lib/serviceworker/rails/version.rb
 - lib/serviceworker/route.rb
 - lib/serviceworker/router.rb
@@ -228,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ServiceWorker for Rails 3+

data/lib/serviceworker/handler.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module ServiceWorker
-  class Handler
-    def initialize(root = Dir.getwd)
-      @root = root
-    end
-
-    def call(env)
-      path_info = env.fetch("serviceworker.asset_name")
-
-      file_server.call(env.merge("PATH_INFO" => path_info))
-    end
-
-    def file_path(path_info)
-      @root.join(path_info)
-    end
-
-    def file_server
-      @file_server ||= ::Rack::File.new(@root)
-    end
-  end
-end