Skip to content

Commit a67e69c

Browse files
committed
Use standardrb as code formatter for this repo
1 parent db0a292 commit a67e69c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+503
-378
lines changed

.solargraph.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
include:
3+
- "**/*.rb"
4+
exclude:
5+
- spec/**/*
6+
- test/**/*
7+
- vendor/**/*
8+
- ".bundle/**/*"
9+
require: []
10+
domains: []
11+
plugins:
12+
- solargraph-standardrb
13+
reporters:
14+
- standardrb
15+
require_paths: []
16+
max_files: 5000

Changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
* Enhancements
66
* Test with Ruby 2.7 - [aried3r (Anton Rieder)](https://github.com/aried3r) (#167)
7+
* Add standardrb as code formatter
78

89
### 4.0.0
910

Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# frozen_string_literal: true
22

3-
source 'https://rubygems.org'
3+
source "https://rubygems.org"
44
gemspec
55

66
# Added here so it does not show up on the Gemspec; I only want it for CI builds
7-
gem 'codecov', group: :test, require: false
7+
gem "codecov", group: :test, require: false
8+
# Not actually required to run the tests for the gem, but a real convenience
9+
# for local development.
10+
gem "standard", group: [:test, :development], require: false

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require 'bundler/setup'
3+
require "bundler/setup"
44

55
Bundler::GemHelper.install_tasks
66

@@ -10,4 +10,4 @@ task :spec do
1010
end
1111

1212
desc "Default: Run specs"
13-
task :default => :spec
13+
task default: :spec

lib/roadie.rb

+23-23
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
module Roadie
44
end
55

6-
require 'roadie/version'
7-
require 'roadie/errors'
6+
require "roadie/version"
7+
require "roadie/errors"
88

9-
require 'roadie/utils'
10-
require 'roadie/deduplicator'
9+
require "roadie/utils"
10+
require "roadie/deduplicator"
1111

12-
require 'roadie/stylesheet'
13-
require 'roadie/selector'
14-
require 'roadie/style_property'
15-
require 'roadie/style_attribute_builder'
16-
require 'roadie/style_block'
12+
require "roadie/stylesheet"
13+
require "roadie/selector"
14+
require "roadie/style_property"
15+
require "roadie/style_attribute_builder"
16+
require "roadie/style_block"
1717

18-
require 'roadie/asset_provider'
19-
require 'roadie/provider_list'
20-
require 'roadie/filesystem_provider'
21-
require 'roadie/null_provider'
22-
require 'roadie/net_http_provider'
23-
require 'roadie/cached_provider'
24-
require 'roadie/path_rewriter_provider'
18+
require "roadie/asset_provider"
19+
require "roadie/provider_list"
20+
require "roadie/filesystem_provider"
21+
require "roadie/null_provider"
22+
require "roadie/net_http_provider"
23+
require "roadie/cached_provider"
24+
require "roadie/path_rewriter_provider"
2525

26-
require 'roadie/asset_scanner'
27-
require 'roadie/markup_improver'
28-
require 'roadie/url_generator'
29-
require 'roadie/url_rewriter'
30-
require 'roadie/null_url_rewriter'
31-
require 'roadie/inliner'
32-
require 'roadie/document'
26+
require "roadie/asset_scanner"
27+
require "roadie/markup_improver"
28+
require "roadie/url_generator"
29+
require "roadie/url_rewriter"
30+
require "roadie/null_url_rewriter"
31+
require "roadie/inliner"
32+
require "roadie/document"

lib/roadie/asset_scanner.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ def find_css
4343
# @see #find_css
4444
# @return [Enumerable<Stylesheet>] every extracted stylesheet
4545
def extract_css
46-
stylesheets = @dom.css(STYLE_ELEMENT_QUERY).map { |element|
46+
@dom.css(STYLE_ELEMENT_QUERY).map { |element|
4747
stylesheet = read_stylesheet(element)
4848
element.remove if stylesheet
4949
stylesheet
5050
}.compact
51-
stylesheets
5251
end
5352

5453
private
54+
5555
STYLE_ELEMENT_QUERY = (
5656
"style:not([data-roadie-ignore]), " +
5757
# TODO: When using Nokogiri 1.6.1 and later; we may use a double :not here
@@ -75,7 +75,7 @@ def extract_css
7575
def read_stylesheet(element)
7676
if element.name == "style"
7777
read_style_element element
78-
elsif element.name == "link" && element['media'] != "print" && element["href"]
78+
elsif element.name == "link" && element["media"] != "print" && element["href"]
7979
read_link_element element
8080
end
8181
end
@@ -86,14 +86,14 @@ def read_style_element(element)
8686

8787
def read_link_element(element)
8888
if Utils.path_is_absolute?(element["href"])
89-
external_asset_provider.find_stylesheet! element['href'] if should_find_external?
89+
external_asset_provider.find_stylesheet! element["href"] if should_find_external?
9090
else
91-
normal_asset_provider.find_stylesheet! element['href']
91+
normal_asset_provider.find_stylesheet! element["href"]
9292
end
9393
end
9494

9595
def clean_css(css)
96-
css.gsub(CLEANING_MATCHER, '')
96+
css.gsub(CLEANING_MATCHER, "")
9797
end
9898

9999
def should_find_external?

lib/roadie/cached_provider.rb

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def find_stylesheet!(name)
6969
end
7070

7171
private
72+
7273
def cache_fetch(name)
7374
cache[name] || cache[name] = yield
7475
rescue CssNotFound

lib/roadie/deduplicator.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def apply
2626
end
2727

2828
private
29+
2930
attr_reader :input, :latest_occurance
3031

3132
def has_duplicates?

lib/roadie/document.rb

+6-5
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def mode=(mode)
152152
end
153153

154154
private
155+
155156
VALID_MODES = %i[html xhtml xml].freeze
156157
private_constant :VALID_MODES
157158

@@ -169,7 +170,7 @@ def inline(dom, options = {})
169170
Inliner.new(dom_stylesheets + [stylesheet], dom).inline(
170171
keep_uninlinable_css: keep_uninlinable_css,
171172
keep_uninlinable_in: keep_uninlinable_in,
172-
merge_media_queries: merge_media_queries,
173+
merge_media_queries: merge_media_queries
173174
)
174175
end
175176

@@ -183,15 +184,15 @@ def serialize_document(dom)
183184
format = {
184185
html: save_options::AS_HTML,
185186
xhtml: save_options::AS_XHTML,
186-
xml: save_options::AS_XML,
187+
xml: save_options::AS_XML
187188
}.fetch(mode)
188189

189190
dom.dup.to_html(
190191
save_with: (
191192
save_options::NO_DECLARATION |
192193
save_options::NO_EMPTY_TAGS |
193194
format
194-
),
195+
)
195196
)
196197
end
197198

@@ -208,9 +209,9 @@ def callback(callable, dom)
208209
# Arity checking is to support the API without bumping a major version.
209210
# TODO: Remove on next major version (v4.0)
210211
if !callable.respond_to?(:parameters) || callable.parameters.size == 1
211-
callable.(dom)
212+
callable.call(dom)
212213
else
213-
callable.(dom, self)
214+
callable.call(dom, self)
214215
end
215216
end
216217
end

lib/roadie/errors.rb

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ class InvalidUrlPath < Error
1818

1919
def initialize(given_path, cause = nil)
2020
@cause = cause
21-
if cause
22-
cause_message = " Caused by: #{cause}"
21+
cause_message = if cause
22+
" Caused by: #{cause}"
2323
else
24-
cause_message = ""
24+
""
2525
end
2626
super "Cannot use path \"#{given_path}\" in URL generation.#{cause_message}"
2727
end
@@ -52,11 +52,13 @@ def initialize(css_name, extra_message = nil, provider = nil)
5252
end
5353

5454
protected
55+
5556
def error_row
5657
"#{provider || "Unknown provider"}: #{extra_message || message}"
5758
end
5859

5960
private
61+
6062
# Redundant method argument is to keep API compatability without major version bump.
6163
# TODO: Remove argument on version 4.0.
6264
def build_message(extra_message = @extra_message)
@@ -76,6 +78,7 @@ def initialize(css_name, provider_list, errors)
7678
end
7779

7880
private
81+
7982
def build_message(extra_message)
8083
message = +%(Could not find stylesheet "#{css_name}": #{extra_message}\nUsed providers:\n)
8184
each_error_row(errors) do |row|

lib/roadie/filesystem_provider.rb

+8-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,16 @@ def find_stylesheet!(name)
3636
end
3737
end
3838

39-
def to_s() inspect end
40-
def inspect() "#<#{self.class} #@path>" end
39+
def to_s
40+
inspect
41+
end
42+
43+
def inspect
44+
"#<#{self.class} #{@path}>"
45+
end
4146

4247
private
48+
4349
def build_file_path(name)
4450
raise InsecurePathError, name if name.include?("..")
4551
File.join(@path, name[/^([^?]+)/])

0 commit comments

Comments
 (0)