Merge pull request #78 from maxmind/horgh/rubocop-plugins

Enable more rubocop plugins

Author: horgh

.rubocop.yml

@@ -1,5 +1,7 @@
 plugins:
+    - rubocop-minitest
     - rubocop-performance
+    - rubocop-rake
 
 AllCops:
     TargetRubyVersion: '3.0'
@@ -42,3 +44,13 @@ Style/HashTransformKeys:
 
 Gemspec/DevelopmentDependencies:
     Enabled: false
+
+# Sometimes it makes sense to have lots of assertions.
+Minitest/MultipleAssertions:
+    Enabled: false
+# This seems less clear to me.
+Minitest/RefutePredicate:
+    Enabled: false
+# This seems less clear to me.
+Minitest/AssertPredicate:
+    Enabled: false

Rakefile

@@ -11,5 +11,4 @@ end
 RuboCop::RakeTask.new
 
 desc 'Run tests and RuboCop'
-task default: :test
-task default: :rubocop
+task default: %i[test rubocop]

maxmind-geoip2.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-minitest'
   s.add_development_dependency 'rubocop-performance'
+  s.add_development_dependency 'rubocop-rake'
   s.add_development_dependency 'webmock'
 end

test/test_client.rb

@@ -66,16 +66,16 @@ def test_country
     assert_equal('North America', record.continent.name)
 
     assert_equal(1, record.country.geoname_id)
-    assert_equal(false, record.country.in_european_union?)
+    refute(record.country.in_european_union?)
     assert_equal('US', record.country.iso_code)
     assert_equal({ 'en' => 'United States of America' }, record.country.names)
     assert_equal('United States of America', record.country.name)
 
     assert_equal(11, record.maxmind.queries_remaining)
 
-    assert_equal(false, record.registered_country.in_european_union?)
+    refute(record.registered_country.in_european_union?)
 
-    assert_equal(true, record.traits.anycast?)
+    assert(record.traits.anycast?)
     assert_equal('1.2.3.0/24', record.traits.network)
   end
 
@@ -86,10 +86,10 @@ def test_insights
 
     assert_equal(42, record.continent.geoname_id)
 
-    assert_equal(true, record.traits.anycast?)
-    assert_equal(true, record.traits.residential_proxy?)
+    assert(record.traits.anycast?)
+    assert(record.traits.residential_proxy?)
     assert_equal('1.2.3.0/24', record.traits.network)
-    assert_equal(1.3, record.traits.static_ip_score)
+    assert_in_delta(1.3, record.traits.static_ip_score)
     assert_equal(2, record.traits.user_count)
   end
 

test/test_model_country.rb

@@ -29,20 +29,18 @@ class CountryModelTest < Minitest::Test
 
   def test_objects
     model = MaxMind::GeoIP2::Model::Country.new(RAW, ['en'])
-    assert_equal(MaxMind::GeoIP2::Model::Country, model.class)
-    assert_equal(MaxMind::GeoIP2::Record::Continent, model.continent.class)
-    assert_equal(MaxMind::GeoIP2::Record::Country, model.country.class)
-    assert_equal(
-      MaxMind::GeoIP2::Record::Country,
-      model.registered_country.class,
+
+    assert_instance_of(MaxMind::GeoIP2::Model::Country, model)
+    assert_instance_of(MaxMind::GeoIP2::Record::Continent, model.continent)
+    assert_instance_of(MaxMind::GeoIP2::Record::Country, model.country)
+    assert_instance_of(
+      MaxMind::GeoIP2::Record::Country, model.registered_country,
     )
-    assert_equal(
-      MaxMind::GeoIP2::Record::RepresentedCountry,
-      model.represented_country.class,
+    assert_instance_of(
+      MaxMind::GeoIP2::Record::RepresentedCountry, model.represented_country,
     )
-    assert_equal(
-      MaxMind::GeoIP2::Record::Traits,
-      model.traits.class,
+    assert_instance_of(
+      MaxMind::GeoIP2::Record::Traits, model.traits,
     )
   end
 
@@ -55,14 +53,14 @@ def test_values
     assert_equal('North America', model.continent.name)
 
     assert_equal(1, model.country.geoname_id)
-    assert_equal(false, model.country.in_european_union?)
+    refute(model.country.in_european_union?)
     assert_equal('US', model.country.iso_code)
     assert_equal({ 'en' => 'United States of America' }, model.country.names)
     assert_equal('United States of America', model.country.name)
     assert_nil(model.country.confidence)
 
     assert_equal(2, model.registered_country.geoname_id)
-    assert_equal(true, model.registered_country.in_european_union?)
+    assert(model.registered_country.in_european_union?)
     assert_equal('DE', model.registered_country.iso_code)
     assert_equal({ 'en' => 'Germany' }, model.registered_country.names)
     assert_equal('Germany', model.registered_country.name)
@@ -91,6 +89,7 @@ def test_no_traits
       },
       ['en'],
     )
+
     assert_equal(42, model.continent.geoname_id)
   end
 end

test/test_model_names.rb

@@ -29,18 +29,21 @@ class ModelNameTest < Minitest::Test
 
   def test_fallback
     model = MaxMind::GeoIP2::Model::Country.new(RAW, %w[ru zh-CN en])
+
     assert_equal('北美洲', model.continent.name)
     assert_equal('объединяет государства', model.country.name)
   end
 
   def test_two_fallbacks
     model = MaxMind::GeoIP2::Model::Country.new(RAW, %w[ru jp])
+
     assert_nil(model.continent.name)
     assert_equal('объединяет государства', model.country.name)
   end
 
   def test_no_fallbacks
     model = MaxMind::GeoIP2::Model::Country.new(RAW, %w[jp])
+
     assert_nil(model.continent.name)
     assert_nil(model.country.name)
   end

test/test_reader.rb

@@ -13,12 +13,12 @@ def test_anonymous_ip
     ip = '1.2.0.1'
     record = reader.anonymous_ip(ip)
 
-    assert_equal(true, record.anonymous?)
-    assert_equal(true, record.anonymous_vpn?)
-    assert_equal(false, record.hosting_provider?)
-    assert_equal(false, record.public_proxy?)
-    assert_equal(false, record.residential_proxy?)
-    assert_equal(false, record.tor_exit_node?)
+    assert(record.anonymous?)
+    assert(record.anonymous_vpn?)
+    refute(record.hosting_provider?)
+    refute(record.public_proxy?)
+    refute(record.residential_proxy?)
+    refute(record.tor_exit_node?)
     assert_equal(ip, record.ip_address)
     assert_equal('1.2.0.0/16', record.network)
 
@@ -32,7 +32,7 @@ def test_anonymous_ip_residential_proxy
     ip = '81.2.69.1'
     record = reader.anonymous_ip(ip)
 
-    assert_equal(true, record.residential_proxy?)
+    assert(record.residential_proxy?)
 
     reader.close
   end
@@ -45,14 +45,14 @@ def test_anonymous_plus
     record = reader.anonymous_plus(ip)
 
     assert_equal(30, record.anonymizer_confidence)
-    assert_equal(true, record.anonymous?)
-    assert_equal(true, record.anonymous_vpn?)
-    assert_equal(false, record.hosting_provider?)
+    assert(record.anonymous?)
+    assert(record.anonymous_vpn?)
+    refute(record.hosting_provider?)
     assert_equal(Date.new(2025, 4, 14), record.network_last_seen)
     assert_equal('foo', record.provider_name)
-    assert_equal(false, record.public_proxy?)
-    assert_equal(false, record.residential_proxy?)
-    assert_equal(false, record.tor_exit_node?)
+    refute(record.public_proxy?)
+    refute(record.residential_proxy?)
+    refute(record.tor_exit_node?)
 
     assert_equal(ip, record.ip_address)
     assert_equal('1.2.0.1/32', record.network)
@@ -89,8 +89,8 @@ def test_city
     assert_nil(record.city.confidence)
 
     assert_equal(100, record.location.accuracy_radius)
-    assert_equal(51.75, record.location.latitude)
-    assert_equal(-1.25, record.location.longitude)
+    assert_in_delta(51.75, record.location.latitude)
+    assert_in_delta(-1.25, record.location.longitude)
     assert_equal('Europe/London', record.location.time_zone)
 
     assert_equal(2, record.subdivisions.size)
@@ -117,14 +117,16 @@ def test_city
         'zh-CN' => '华盛顿州',
       },
       record.subdivisions[0].names,
-      assert_equal('WA', record.most_specific_subdivision.iso_code)
     )
 
+    assert_equal('WA', record.most_specific_subdivision.iso_code)
+
     # This IP has is_anycast.
 
     ip_address = '214.1.1.0'
     record = reader.city(ip_address)
-    assert_equal(true, record.traits.anycast?)
+
+    assert(record.traits.anycast?)
 
     reader.close
   end
@@ -135,7 +137,7 @@ def test_city_no_subdivisions
     )
     record = reader.city('2001:218::')
 
-    assert_equal([], record.subdivisions)
+    assert_empty(record.subdivisions)
     assert_nil(record.most_specific_subdivision)
 
     reader.close
@@ -179,7 +181,7 @@ def test_country
     assert_equal('Europe', record.continent.name)
 
     assert_equal(2_635_167, record.country.geoname_id)
-    assert_equal(false, record.country.in_european_union?)
+    refute(record.country.in_european_union?)
     assert_equal('GB', record.country.iso_code)
     assert_equal(
       {
@@ -197,7 +199,7 @@ def test_country
     assert_equal('United Kingdom', record.country.name)
 
     assert_equal(3_017_382, record.registered_country.geoname_id)
-    assert_equal(true, record.registered_country.in_european_union?)
+    assert(record.registered_country.in_european_union?)
     assert_equal('FR', record.registered_country.iso_code)
     assert_equal(
       {
@@ -235,14 +237,16 @@ def test_country
     assert_equal('military', record.represented_country.type)
 
     record = reader.country('81.2.69.163')
+
     assert_equal('81.2.69.163', record.traits.ip_address)
     assert_equal('81.2.69.160/27', record.traits.network)
 
     # This IP has is_anycast.
 
     ip_address = '214.1.1.0'
     record = reader.country(ip_address)
-    assert_equal(true, record.traits.anycast?)
+
+    assert(record.traits.anycast?)
 
     assert_raises(NoMethodError) { record.foo }
     reader.close
@@ -253,7 +257,8 @@ def test_is_method_returns_false
       'test/data/test-data/GeoIP2-Country-Test.mmdb',
     )
     record = reader.country('74.209.24.0')
-    assert_equal(false, record.country.in_european_union?)
+
+    refute(record.country.in_european_union?)
 
     reader.close
   end
@@ -289,14 +294,14 @@ def test_enterprise
     assert_equal(11, record.city.confidence)
     assert_equal(99, record.country.confidence)
     assert_equal(6_252_001, record.country.geoname_id)
-    assert_equal(false, record.country.in_european_union?)
+    refute(record.country.in_european_union?)
 
     assert_equal(27, record.location.accuracy_radius)
 
-    assert_equal(false, record.registered_country.in_european_union?)
+    refute(record.registered_country.in_european_union?)
 
     assert_equal('Cable/DSL', record.traits.connection_type)
-    assert_equal(true, record.traits.legitimate_proxy?)
+    assert(record.traits.legitimate_proxy?)
 
     assert_equal(ip_address, record.traits.ip_address)
     assert_equal('74.209.16.0/20', record.traits.network)
@@ -313,7 +318,8 @@ def test_enterprise
 
     ip_address = '214.1.1.0'
     record = reader.enterprise(ip_address)
-    assert_equal(true, record.traits.anycast?)
+
+    assert(record.traits.anycast?)
 
     reader.close
   end
@@ -352,7 +358,7 @@ def test_no_traits
     assert_equal('2.125.160.216', record.traits.ip_address)
     assert_equal('2.125.160.216/29', record.traits.network)
     assert_nil(record.traits.autonomous_system_number)
-    assert_equal(false, record.traits.anonymous?)
+    refute(record.traits.anonymous?)
 
     reader.close
   end
@@ -438,6 +444,7 @@ def test_default_locale
         "test/data/test-data/GeoIP2-#{t['file']}-Test.mmdb",
       )
       record = reader.send(t['method'], '81.2.69.160')
+
       assert_equal('United Kingdom', record.country.name)
       reader.close
     end
@@ -450,6 +457,7 @@ def test_locale_list
         %w[xx ru pt-BR es en],
       )
       record = reader.send(t['method'], '81.2.69.160')
+
       assert_equal('Великобритания', record.country.name)
       reader.close
     end
@@ -461,6 +469,7 @@ def test_has_ip_address_and_network
         "test/data/test-data/GeoIP2-#{t['file']}-Test.mmdb",
       )
       record = reader.send(t['method'], '81.2.69.163')
+
       assert_equal('81.2.69.163', record.traits.ip_address)
       assert_equal('81.2.69.160/27', record.traits.network)
       reader.close
@@ -473,8 +482,9 @@ def test_is_in_european_union
         "test/data/test-data/GeoIP2-#{t['file']}-Test.mmdb",
       )
       record = reader.send(t['method'], '81.2.69.160')
-      assert_equal(false, record.country.in_european_union?)
-      assert_equal(false, record.registered_country.in_european_union?)
+
+      refute(record.country.in_european_union?)
+      refute(record.registered_country.in_european_union?)
       reader.close
     end
   end
@@ -524,6 +534,7 @@ def test_metadata
     reader = MaxMind::GeoIP2::Reader.new(
       'test/data/test-data/GeoIP2-City-Test.mmdb',
     )
+
     assert_equal('GeoIP2-City', reader.metadata.database_type)
     reader.close
   end
@@ -533,6 +544,7 @@ def test_constructor_with_minimum_keyword_arguments
       database: 'test/data/test-data/GeoIP2-Country-Test.mmdb',
     )
     record = reader.country('81.2.69.160')
+
     assert_equal('United Kingdom', record.country.name)
     reader.close
   end
@@ -544,6 +556,7 @@ def test_constructor_with_all_keyword_arguments
       mode: MaxMind::DB::MODE_MEMORY,
     )
     record = reader.country('81.2.69.160')
+
     assert_equal('Великобритания', record.country.name)
     reader.close
   end
@@ -569,6 +582,7 @@ def test_old_constructor_parameters
       mode: MaxMind::DB::MODE_MEMORY,
     )
     record = reader.country('81.2.69.160')
+
     assert_equal('Великобритания', record.country.name)
     reader.close
   end