serviceworker-rails 0.6.0 → 0.7.0

data/lib/serviceworker/middleware.rb

@@ -35,7 +35,7 @@ module ServiceWorker
       @app.call(env)
     end
 
-  private
+    private
 
     def default_headers
       {
@@ -60,7 +60,7 @@ module ServiceWorker
     end
 
     def logger
-      @logger ||= @opts.fetch(:logger, Logger.new(STDOUT))
+      @logger ||= @opts.fetch(:logger, Logger.new($stdout))
     end
   end
 end

data/lib/serviceworker/rails/version.rb

@@ -2,6 +2,6 @@
 
 module ServiceWorker
   module Rails
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/lib/serviceworker/route.rb

@@ -10,10 +10,6 @@ module ServiceWorker
       end
     end
 
-    def self.webpacker?(options)
-      options.key?(:pack) && Handlers.webpacker?
-    end
-
     def self.sprockets?(options)
       options.key?(:asset)
     end
@@ -25,18 +21,14 @@ module ServiceWorker
       end
 
       @path_pattern = 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
+      @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, options)
     end
@@ -54,9 +46,9 @@ module ServiceWorker
     class AssetResolver
       PATH_INFO = "PATH_INFO"
       DEFAULT_WILDCARD_NAME = :paths
-      WILDCARD_PATTERN = %r{\/\*([^\/]*)}.freeze
-      NAMED_SEGMENTS_PATTERN = %r{\/([^\/]*):([^:$\/]+)}.freeze
-      LEADING_SLASH_PATTERN = %r{^\/}.freeze
+      WILDCARD_PATTERN = %r{/\*([^/]*)}
+      NAMED_SEGMENTS_PATTERN = %r{/([^/]*):([^:$/]+)}
+      LEADING_SLASH_PATTERN = %r{^/}
       INTERPOLATION_PATTERN = Regexp.union(
         /%%/,
         /%\{(\w+)\}/ # matches placeholders like "%{foo}"
@@ -72,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
@@ -92,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

@@ -10,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)
@@ -27,6 +28,7 @@ module ServiceWorker
 
       self
     end
+    # standard:enable Style/ArgumentsForwarding
 
     def draw_default
       draw { get "/serviceworker.js" }
@@ -43,7 +45,7 @@ module ServiceWorker
         @routes << route
       end
     end
-    alias get match
+    alias_method :get, :match
 
     def any?
       @routes.any?
@@ -51,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/serviceworker-rails.gemspec

@@ -5,29 +5,38 @@ $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 "appraisal", "~> 2.1.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rubocop"
+  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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: serviceworker-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ross Kaffenberger
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,28 +15,126 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
+        version: '2.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +192,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.27'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.27'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +220,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +248,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets-rails
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,36 +268,47 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
+- ".node-version"
 - ".rubocop.yml"
-- ".travis.yml"
-- Appraisals
+- ".ruby-version"
+- ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/_guard-core
-- bin/appraisal
 - bin/console
 - bin/guard
 - bin/rake
 - bin/rubocop
 - bin/setup
-- 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
+- bin/standardrb
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.1.gemfile.lock
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.0.gemfile.lock
+- gemfiles/rails_8.1.gemfile
+- gemfiles/rails_8.1.gemfile.lock
+- gemfiles/rails_8.1_rack3.gemfile
+- gemfiles/rails_8.1_rack3.gemfile.lock
 - lib/assets/images/convert.rb
 - lib/assets/images/serviceworker-rails/heart-1200x1200.png
 - lib/assets/images/serviceworker-rails/heart-120x120.png
+- lib/assets/images/serviceworker-rails/heart-144x144.png
 - lib/assets/images/serviceworker-rails/heart-152x152.png
 - lib/assets/images/serviceworker-rails/heart-180x180.png
 - lib/assets/images/serviceworker-rails/heart-192x192.png
 - lib/assets/images/serviceworker-rails/heart-36x36.png
+- lib/assets/images/serviceworker-rails/heart-384x384.png
 - lib/assets/images/serviceworker-rails/heart-48x48.png
 - lib/assets/images/serviceworker-rails/heart-512x512.png
 - lib/assets/images/serviceworker-rails/heart-60x60.png
@@ -192,7 +328,6 @@ files:
 - 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/version.rb
@@ -203,7 +338,6 @@ homepage: https://github.com/rossta/serviceworker-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
-summary: ServiceWorker for Rails 3+
+summary: ServiceWorker for Rails 7+
 test_files: []

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-cache:
-  bundler: true
-  yarn: true
-  directories:
-    - node_modules
-rvm:
-  - 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.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,26 +0,0 @@
-# frozen_string_literal: true
-
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2"
-  gem "test-unit", "~> 3.0"
-end
-
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2"
-  gem "webpacker"
-end
-
-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/bin/appraisal

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'appraisal' 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)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("appraisal", "appraisal")

data/gemfiles/rails_3.2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2"
-gem "test-unit", "~> 3.0"
-
-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_4.2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2"
-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.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0"
-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.1.gemfile

@@ -1,15 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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 => "../"