Skip to content

Commit 646da7a

Browse files
committed
Appease standardrb
1 parent e9d7bcf commit 646da7a

File tree

11 files changed

+66
-66
lines changed

11 files changed

+66
-66
lines changed

gemfiles/rails_6.0.gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
gem 'rails', '~> 6.0.0'
3+
gem "rails", "~> 6.0.0"
44

55
group :development, :test do
6-
gem 'guard', require: false
7-
gem 'guard-minitest', require: false
8-
gem 'pry'
9-
gem 'pry-byebug', platforms: [:mri]
6+
gem "guard", require: false
7+
gem "guard-minitest", require: false
8+
gem "pry"
9+
gem "pry-byebug", platforms: [:mri]
1010
end
1111

12-
gemspec path: '../'
12+
gemspec path: "../"

gemfiles/rails_6.1.gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
gem 'rails', '~> 6.1.0'
3+
gem "rails", "~> 6.1.0"
44

55
group :development, :test do
6-
gem 'guard', require: false
7-
gem 'guard-minitest', require: false
8-
gem 'pry'
9-
gem 'pry-byebug', platforms: [:mri]
6+
gem "guard", require: false
7+
gem "guard-minitest", require: false
8+
gem "pry"
9+
gem "pry-byebug", platforms: [:mri]
1010
end
1111

12-
gemspec path: '../'
12+
gemspec path: "../"

gemfiles/rails_7.0.gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
gem 'rails', '~> 7.0.0'
3+
gem "rails", "~> 7.0.0"
44

55
group :development, :test do
6-
gem 'guard', require: false
7-
gem 'guard-minitest', require: false
8-
gem 'pry'
9-
gem 'pry-byebug', platforms: [:mri]
6+
gem "guard", require: false
7+
gem "guard-minitest", require: false
8+
gem "pry"
9+
gem "pry-byebug", platforms: [:mri]
1010
end
1111

12-
gemspec path: '../'
12+
gemspec path: "../"

gemfiles/rails_7.1.gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
gem 'rails', '~> 7.1.0'
3+
gem "rails", "~> 7.1.0"
44

55
group :development, :test do
6-
gem 'guard', require: false
7-
gem 'guard-minitest', require: false
8-
gem 'pry'
9-
gem 'pry-byebug', platforms: [:mri]
6+
gem "guard", require: false
7+
gem "guard-minitest", require: false
8+
gem "pry"
9+
gem "pry-byebug", platforms: [:mri]
1010
end
1111

12-
gemspec path: '../'
12+
gemspec path: "../"

lib/serviceworker/handlers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def ===(other)
2525
def handler_for_name(name)
2626
available_handlers = %w[sprockets webpacker rack]
2727
if available_handlers.include?(name.to_s)
28-
send("#{name}_handler")
28+
send(:"#{name}_handler")
2929
else
3030
raise ServiceWorker::Error,
3131
"Unknown handler #{name.inspect}. Please use one of #{available_handlers.inspect}"

lib/serviceworker/handlers/webpacker_handler.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# frozen_string_literal: true
22

3-
require 'rack/file'
3+
require "rack/file"
44
begin
5-
require 'webpacker'
5+
require "webpacker"
66
rescue LoadError
77
# ignore
88
end
@@ -11,15 +11,15 @@ module ServiceWorker
1111
module Handlers
1212
class WebpackerHandler
1313
def call(env)
14-
path_info = env.fetch('serviceworker.asset_name')
14+
path_info = env.fetch("serviceworker.asset_name")
1515

1616
path = Webpacker.manifest.lookup(path_info)
1717

1818
if Webpacker.dev_server.running?
1919
proxy = Webpacker::DevServerProxy.new
20-
proxy.call(env.merge('PATH_INFO' => path))
20+
proxy.call(env.merge("PATH_INFO" => path))
2121
else
22-
file_server.call(env.merge('PATH_INFO' => path))
22+
file_server.call(env.merge("PATH_INFO" => path))
2323
end
2424
end
2525

lib/serviceworker/route.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ module ServiceWorker
44
class Route
55
attr_reader :path_pattern, :asset_pattern, :options
66

7-
RouteMatch = Struct.new(:path, :asset_name, :headers, :options) {
7+
RouteMatch = Struct.new(:path, :asset_name, :headers, :options) do
88
def to_s
99
asset_name
1010
end
11-
}
11+
end
1212

1313
def self.webpacker?(options)
1414
options.key?(:pack) && Handlers.webpacker?
@@ -54,9 +54,9 @@ def resolver
5454
class AssetResolver
5555
PATH_INFO = "PATH_INFO"
5656
DEFAULT_WILDCARD_NAME = :paths
57-
WILDCARD_PATTERN = %r{/\*([^/]*)}.freeze
58-
NAMED_SEGMENTS_PATTERN = %r{/([^/]*):([^:$/]+)}.freeze
59-
LEADING_SLASH_PATTERN = %r{^/}.freeze
57+
WILDCARD_PATTERN = %r{/\*([^/]*)}
58+
NAMED_SEGMENTS_PATTERN = %r{/([^/]*):([^:$/]+)}
59+
LEADING_SLASH_PATTERN = %r{^/}
6060
INTERPOLATION_PATTERN = Regexp.union(
6161
/%%/,
6262
/%\{(\w+)\}/ # matches placeholders like "%{foo}"
@@ -112,14 +112,14 @@ def path_captures(regexp, path)
112112
params = if @wildcard_name
113113
{@wildcard_name => path_match[1].to_s.split("/")}
114114
else
115-
Hash[path_match.names.map(&:to_sym).zip(path_match.captures)]
115+
path_match.names.map(&:to_sym).zip(path_match.captures).to_h
116116
end
117117
params.delete(:format) if params.key?(:format) && params[:format].nil?
118118
params
119119
end
120120

121121
def interpolate_captures(string, captures)
122-
string.gsub(INTERPOLATION_PATTERN) { |match|
122+
string.gsub(INTERPOLATION_PATTERN) do |match|
123123
if match == "%%"
124124
"%"
125125
else
@@ -128,7 +128,7 @@ def interpolate_captures(string, captures)
128128
value = value.call(captures) if value.respond_to?(:call)
129129
Regexp.last_match(3) ? format("%#{Regexp.last_match(3)}", value) : value
130130
end
131-
}.gsub(LEADING_SLASH_PATTERN, "")
131+
end.gsub(LEADING_SLASH_PATTERN, "")
132132
end
133133
end
134134
end

serviceworker-rails.gemspec

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
# frozen_string_literal: true
22

3-
lib = File.expand_path('lib', __dir__)
3+
lib = File.expand_path("lib", __dir__)
44
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5-
require 'serviceworker/rails/version'
5+
require "serviceworker/rails/version"
66

77
Gem::Specification.new do |spec|
8-
spec.name = 'serviceworker-rails'
8+
spec.name = "serviceworker-rails"
99
spec.version = ServiceWorker::Rails::VERSION
10-
spec.authors = ['Ross Kaffenberger']
11-
spec.email = ['rosskaff@gmail.com']
10+
spec.authors = ["Ross Kaffenberger"]
11+
spec.email = ["rosskaff@gmail.com"]
1212

13-
spec.summary = 'ServiceWorker for Rails 5+'
14-
spec.description = 'Integrates ServiceWorker into the Rails asset pipeline.'
15-
spec.homepage = 'https://github.com/rossta/serviceworker-rails'
16-
spec.license = 'MIT'
13+
spec.summary = "ServiceWorker for Rails 5+"
14+
spec.description = "Integrates ServiceWorker into the Rails asset pipeline."
15+
spec.homepage = "https://github.com/rossta/serviceworker-rails"
16+
spec.license = "MIT"
1717

1818
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
19-
spec.bindir = 'exe'
19+
spec.bindir = "exe"
2020
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
21-
spec.require_paths = ['lib']
21+
spec.require_paths = ["lib"]
2222

23-
spec.add_dependency 'railties', '>= 6.0'
23+
spec.add_dependency "railties", ">= 6.0"
2424

25-
spec.add_development_dependency 'minitest', '~> 5.0'
26-
spec.add_development_dependency 'rack-test'
27-
spec.add_development_dependency 'rails'
28-
spec.add_development_dependency 'rake'
29-
spec.add_development_dependency 'simplecov'
30-
spec.add_development_dependency 'sprockets', '~> 3.0'
31-
spec.add_development_dependency 'sprockets-rails'
32-
spec.add_development_dependency 'standard'
25+
spec.add_development_dependency "minitest", "~> 5.0"
26+
spec.add_development_dependency "rack-test"
27+
spec.add_development_dependency "rails"
28+
spec.add_development_dependency "rake"
29+
spec.add_development_dependency "simplecov"
30+
spec.add_development_dependency "sprockets", "~> 3.0"
31+
spec.add_development_dependency "sprockets-rails"
32+
spec.add_development_dependency "standard"
3333
end

test/sample/config/initializers/serviceworker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
config.serviceworker.routes.draw do
77
match "/header-serviceworker.js" => "another/serviceworker.js",
8-
:headers => {"X-Resource-Header" => "A resource"}
8+
:headers => {"X-Resource-Header" => "A resource"}
99

1010
match "/nested/serviceworker.js", asset: "another/serviceworker.js"
1111

test/serviceworker/rack_integration_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def router
1313
ServiceWorker::Router.new do
1414
match "/serviceworker.js" => "assets/serviceworker.js"
1515
match "/cacheable-serviceworker.js" => "assets/serviceworker.js",
16-
:headers => {"Cache-Control" => "public, max-age=12345"}
16+
:headers => {"Cache-Control" => "public, max-age=12345"}
1717
end
1818
end
1919

0 commit comments

Comments
 (0)