From 42d3055edff191cc3ad7742cdb7939d5c30a36d3 Mon Sep 17 00:00:00 2001 From: Thomas Brennetot Date: Sat, 23 Nov 2024 20:48:35 +0900 Subject: [PATCH] Update syntax for Style/SlicingWithRange --- .standard_todo.yml | 3 --- lib/csvlint/csvw/number_format.rb | 4 ++-- lib/csvlint/csvw/property_checker.rb | 2 +- lib/csvlint/schema.rb | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.standard_todo.yml b/.standard_todo.yml index 559a4fc..6354d46 100644 --- a/.standard_todo.yml +++ b/.standard_todo.yml @@ -9,13 +9,11 @@ ignore: - lib/csvlint/csvw/date_format.rb: - Lint/MixedRegexpCaptureTypes - lib/csvlint/csvw/number_format.rb: - - Style/SlicingWithRange - Style/IdenticalConditionalBranches - lib/csvlint/csvw/property_checker.rb: - Performance/InefficientHashSearch - Lint/UselessAssignment - Naming/VariableName - - Style/SlicingWithRange - Security/Open - Lint/BooleanSymbol - lib/csvlint/csvw/table_group.rb: @@ -25,7 +23,6 @@ ignore: - lib/csvlint/schema.rb: - Security/Open - Lint/UselessAssignment - - Style/SlicingWithRange - lib/csvlint/validate.rb: - Lint/UselessAssignment - Performance/Count diff --git a/lib/csvlint/csvw/number_format.rb b/lib/csvlint/csvw/number_format.rb index ed2564f..8732aa3 100644 --- a/lib/csvlint/csvw/number_format.rb +++ b/lib/csvlint/csvw/number_format.rb @@ -41,7 +41,7 @@ def initialize(pattern = nil, grouping_separator = nil, decimal_separator = ".", if ["+", "-"].include?(integer_part[0]) numeric_part_regexp = "\\#{integer_part[0]}" - integer_part = integer_part[1..-1] + integer_part = integer_part[1..] else numeric_part_regexp = "[-+]?" end @@ -52,7 +52,7 @@ def initialize(pattern = nil, grouping_separator = nil, decimal_separator = ".", min_exponent_digits = exponent_part.delete("#").length max_exponent_digits = exponent_part.length - integer_parts = integer_part.split(@grouping_separator)[1..-1] + integer_parts = integer_part.split(@grouping_separator)[1..] @primary_grouping_size = begin integer_parts[-1].length rescue diff --git a/lib/csvlint/csvw/property_checker.rb b/lib/csvlint/csvw/property_checker.rb index c4d15bb..145647d 100644 --- a/lib/csvlint/csvw/property_checker.rb +++ b/lib/csvlint/csvw/property_checker.rb @@ -451,7 +451,7 @@ def column_reference_property(type) if value.instance_of? String schema_url = URI.join(base_url, value).to_s schema_base_url = schema_url - schema_ref = schema_url.start_with?("file:") ? File.new(schema_url[5..-1]) : schema_url + schema_ref = schema_url.start_with?("file:") ? File.new(schema_url[5..]) : schema_url schema = JSON.parse(URI.open(schema_ref).read) schema["@id"] = schema["@id"] ? URI.join(schema_url, schema["@id"]).to_s : schema_url if schema["@context"] diff --git a/lib/csvlint/schema.rb b/lib/csvlint/schema.rb index e6d841a..27a7a2a 100644 --- a/lib/csvlint/schema.rb +++ b/lib/csvlint/schema.rb @@ -76,12 +76,12 @@ def validate_header(header, source_url = nil, validate = true) def validate_row(values, row = nil, all_errors = [], source_url = nil, validate = true) reset if values.length < fields.length - fields[values.size..-1].each_with_index do |field, i| + fields[values.size..].each_with_index do |field, i| build_warnings(:missing_column, :schema, row, values.size + i + 1) end end if values.length > fields.length - values[fields.size..-1].each_with_index do |data_column, i| + values[fields.size..].each_with_index do |data_column, i| build_warnings(:extra_column, :schema, row, fields.size + i + 1) end end