Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
ruby-version: 3.4
- run: bundle install
- run: bundle exec rake -t rubocop
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
version:
[
2.7,
'3.0',
3.1,
3.2,
3.3,
3.4,
jruby,
]
exclude:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require: rubocop-performance

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: '3.0'
NewCops: enable

# Metrics are too arbitrary.
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## 1.3.0

* Ruby 2.5 and 2.6 are no longer supported. If you're using one of these
versions, please use version 1.2.0 of this gem.
* Ruby 3.0+ is now required. If you're using Ruby 2.5, 2.6, or 2.7, please
use version 1.2.0 of this gem.

## 1.2.0 (2023-12-04)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ client API, please see [our support page](https://www.maxmind.com/en/support).

## Requirements

This code requires Ruby version 2.7 or higher.
This code requires Ruby version 3.0 or higher.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion lib/maxmind/geoip2/model/city.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class City < Country

# @!visibility private
def initialize(record, locales)
super(record, locales)
super
@city = MaxMind::GeoIP2::Record::City.new(record['city'], locales)
@location = MaxMind::GeoIP2::Record::Location.new(record['location'])
@postal = MaxMind::GeoIP2::Record::Postal.new(record['postal'])
Expand Down
2 changes: 1 addition & 1 deletion lib/maxmind/geoip2/record/traits.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Record
class Traits < Abstract
# @!visibility private
def initialize(record)
super(record)
super
if record && !record.key?('network') && record.key?('ip_address') &&
record.key?('prefix_length')
ip = IPAddr.new(record['ip_address']).mask(record['prefix_length'])
Expand Down
8 changes: 4 additions & 4 deletions maxmind-geoip2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ Gem::Specification.new do |s|
'rubygems_mfa_required' => 'true',
'source_code_uri' => 'https://github.com/maxmind/GeoIP2-ruby',
}
s.required_ruby_version = '>= 2.7.0'
s.required_ruby_version = '>= 3.0'

s.add_runtime_dependency 'connection_pool', ['~> 2.2']
s.add_runtime_dependency 'http', '>= 4.3', '< 6.0'
s.add_runtime_dependency 'maxmind-db', ['~> 1.2']
s.add_dependency 'connection_pool', ['~> 2.2']
s.add_dependency 'http', '>= 4.3', '< 6.0'
s.add_dependency 'maxmind-db', ['~> 1.2']

s.add_development_dependency 'minitest'
s.add_development_dependency 'rake'
Expand Down
Loading