Skip to content

Commit da67ae7

Browse files
committed
Use ruby 3.1 for rubocop
1 parent e838bf4 commit da67ae7

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/ruby.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Set up Ruby and install dependencies
1111
uses: ruby/setup-ruby@v1
1212
with:
13-
ruby-version: 2.7
13+
ruby-version: 3.1
1414
bundler-cache: true
1515
- name: Run linter
1616
run: bundle exec rubocop
@@ -19,11 +19,8 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
ruby: [2.7, '3.0', 3.1]
23-
faraday_version: [''] # Defaults to whatever's the most recent version.
24-
include:
25-
- ruby: 2.7
26-
faraday_version: '~> 1.0'
22+
ruby: [3.1, 3.2, 3.3]
23+
faraday_version: ['', '~> 1.0'] # Defaults to whatever's the most recent version.
2724
steps:
2825
- uses: actions/checkout@v2
2926

.rubocop.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require:
55
inherit_from: .rubocop_todo.yml
66

77
AllCops:
8-
TargetRubyVersion: 2.7
8+
TargetRubyVersion: 3.1
99
DisplayCopNames: true
1010
NewCops: enable
1111
Exclude:
@@ -16,6 +16,9 @@ AllCops:
1616
RSpec/DescribeClass:
1717
Enabled: false
1818

19+
RSpec/MultipleMemoizedHelpers:
20+
Enabled: false
21+
1922
RSpec/BeforeAfterAll:
2023
Exclude:
2124
- 'spec/lib/tasks/geo_combine_spec.rb'

lib/geo_combine/ckan_metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def envelope_from_bbox
6565
def envelope_from_spatial(delimiter)
6666
bbox = GeoCombine::BoundingBox.from_string_delimiter(
6767
extras('spatial'),
68-
delimiter: delimiter
68+
delimiter:
6969
)
7070
begin
7171
bbox.to_envelope if bbox.valid?

lib/geo_combine/geoblacklight.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Geoblacklight
1313
attr_reader :metadata
1414

1515
GEOBLACKLIGHT_VERSION = '1.0'
16-
SCHEMA_JSON_URL = "https://raw.githubusercontent.com/OpenGeoMetadata/opengeometadata.github.io/main/docs/schema/geoblacklight-schema-#{GEOBLACKLIGHT_VERSION}.json"
16+
SCHEMA_JSON_URL = "https://raw.githubusercontent.com/OpenGeoMetadata/opengeometadata.github.io/main/docs/schema/geoblacklight-schema-#{GEOBLACKLIGHT_VERSION}.json".freeze
1717
DEPRECATED_KEYS_V1 = %w[
1818
uuid
1919
georss_polygon_s

spec/lib/geo_combine/migrators/v1_aardvark_migrator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
it 'converts the collection names to ids' do
3939
input_hash = JSON.parse(full_geoblacklight)
4040
collection_id_map = { 'Uganda GIS Maps and Data, 2000-2010' => 'stanford-rb371kw9607' }
41-
output = described_class.new(v1_hash: input_hash, collection_id_map: collection_id_map).run
41+
output = described_class.new(v1_hash: input_hash, collection_id_map:).run
4242
expect(output['dct_isPartOf_sm']).to eq(['stanford-rb371kw9607'])
4343
end
4444
end

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
WebMock.allow_net_connect!
2323

2424
# include the spec support files
25-
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
25+
Dir['./spec/support/**/*.rb'].each { |f| require f }
2626

2727
RSpec.configure do |config|
2828
config.include Helpers

0 commit comments

Comments
 (0)