Skip to content

Commit ecf60e3

Browse files
authored
Merge pull request #293 from D-system/standardrb
Update syntax for StandardRb (part 1)
2 parents c311a74 + 45bf5e6 commit ecf60e3

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

Diff for: .standard_todo.yml

-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22
# Remove from this list as you refactor files.
33
---
44
ignore:
5-
- features/step_definitions/validation_errors_steps.rb:
6-
- Lint/Void
75
- features/support/load_tests.rb:
8-
- Style/For
96
- Security/Open
10-
- Lint/UselessAssignment
11-
- lib/csvlint/cli.rb:
12-
- Style/NonNilCheck
137
- lib/csvlint/csvw/column.rb:
148
- Style/TernaryParentheses
159
- lib/csvlint/csvw/date_format.rb:

Diff for: features/support/load_tests.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def cache_file(filename)
1616
unless File.exist?(file)
1717
if filename.include? "/"
1818
levels = filename.split("/")[0..-2]
19-
for i in 0..levels.length
19+
(0..levels.length).each do |i|
2020
dir = File.join(BASE_PATH, levels[0..i].join("/"))
2121
Dir.mkdir(dir) unless Dir.exist?(dir)
2222
end
@@ -26,7 +26,7 @@ def cache_file(filename)
2626
f.puts URI.open(uri, "rb").read
2727
end
2828
end
29-
[uri, file]
29+
uri
3030
end
3131

3232
unless File.exist? SCRIPT_FILE_PATH
@@ -66,7 +66,7 @@ def cache_file(filename)
6666
file.puts ""
6767

6868
manifest["entries"].each do |entry|
69-
action_uri, action_file = cache_file(entry["action"])
69+
action_uri = cache_file(entry["action"])
7070
metadata = nil
7171
provided_files = []
7272
missing_files = []
@@ -98,7 +98,7 @@ def cache_file(filename)
9898
missing_files << URI.join(action_uri, "csv-metadata.json").to_s
9999
end
100100
entry["implicit"]&.each do |implicit|
101-
implicit_uri, implicit_file = cache_file(implicit)
101+
implicit_uri = cache_file(implicit)
102102
provided_files << implicit_uri.to_s
103103
unless implicit_uri == metadata
104104
file.puts "\t\tAnd I have a file called \"csvw/#{implicit}\" at the url \"#{implicit_uri}\""

Diff for: lib/csvlint/cli.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def print_error(index, error, dump, color)
105105
end
106106
output_string = "#{index + 1}. "
107107
if error.column && @schema && @schema.instance_of?(Csvlint::Schema)
108-
if @schema.fields[error.column - 1] != nil
108+
unless @schema.fields[error.column - 1].nil?
109109
output_string += "#{@schema.fields[error.column - 1].name}: "
110110
end
111111
end
@@ -176,7 +176,7 @@ def hashify(error)
176176
col: error.column
177177
}
178178

179-
if error.column && @schema && @schema.instance_of?(Csvlint::Schema) && @schema.fields[error.column - 1] != nil
179+
if error.column && @schema && @schema.instance_of?(Csvlint::Schema) && !@schema.fields[error.column - 1].nil?
180180
field = @schema.fields[error.column - 1]
181181
h[:header] = field.name
182182
h[:constraints] = field.constraints.map { |k, v| [k.underscore, v] }.to_h

0 commit comments

Comments
 (0)