Merge pull request #53 from maxmind/horgh/rubocop

Fix lints

Author: rafl

.rubocop.yml

@@ -2,6 +2,7 @@ require: rubocop-performance
 
 AllCops:
     TargetRubyVersion: 2.4
+    NewCops: enable
 
 # Metrics are too arbitrary.
 Metrics/AbcSize:
@@ -26,33 +27,3 @@ Style/TrailingCommaInArrayLiteral:
     Enabled: false
 Style/TrailingCommaInHashLiteral:
     Enabled: false
-
-# These are new and rubocop warns if you don't configure them.
-Layout/EmptyLinesAroundAttributeAccessor:
-    Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-    Enabled: true
-Lint/RaiseException:
-    Enabled: true
-Lint/StructNewOverride:
-    Enabled: true
-Style/ExponentialNotation:
-    Enabled: true
-Style/SlicingWithRange:
-    Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-    Enabled: true
-Lint/MixedRegexpCaptureTypes:
-    Enabled: true
-Style/HashEachMethods:
-    Enabled: true
-Style/HashTransformKeys:
-    Enabled: true
-Style/HashTransformValues:
-    Enabled: true
-Style/RedundantRegexpCharacterClass:
-    Enabled: true
-Style/RedundantRegexpEscape:
-    Enabled: true
-Style/RedundantFetchBlock:
-    Enabled: true

bin/mmdb-benchmark.rb

@@ -29,9 +29,9 @@ def parse_args
 
 def print_usage
   # rubocop:disable Style/StderrPuts
-  STDERR.puts "Usage: #{$PROGRAM_NAME} <MMDB file> <IP file>"
-  STDERR.puts
-  STDERR.puts 'Benchmark by reading IPs from the IP file and looking up each one in the MMDB file.'
+  $stderr.puts "Usage: #{$PROGRAM_NAME} <MMDB file> <IP file>"
+  $stderr.puts
+  $stderr.puts 'Benchmark by reading IPs from the IP file and looking up each one in the MMDB file.'
   # rubocop:enable Style/StderrPuts
 end
 

lib/maxmind/db.rb

@@ -3,9 +3,9 @@
 require 'ipaddr'
 require 'maxmind/db/decoder'
 require 'maxmind/db/errors'
-require 'maxmind/db/file_reader.rb'
-require 'maxmind/db/memory_reader.rb'
-require 'maxmind/db/metadata.rb'
+require 'maxmind/db/file_reader'
+require 'maxmind/db/memory_reader'
+require 'maxmind/db/metadata'
 
 module MaxMind
   # DB provides a way to read {MaxMind DB

lib/maxmind/db/decoder.rb

@@ -12,6 +12,8 @@ class DB
     #
     # @!visibility private
     class Decoder
+      # rubocop:disable Style/OptionalBooleanParameter
+
       # Create a +Decoder+.
       #
       # +io+ is the DB. It must provide a +read+ method. It must be opened in
@@ -28,6 +30,7 @@ def initialize(io, pointer_base = 0, pointer_test = false)
         @pointer_base = pointer_base
         @pointer_test = pointer_test
       end
+      # rubocop:enable Style/OptionalBooleanParameter
 
       private
 

test/test_reader.rb

@@ -12,10 +12,11 @@ def test_reader
     ]
 
     modes.each do |mode|
-      [24, 28, 32].each do |record_size|
-        [4, 6].each do |ip_version|
-          filename = 'test/data/test-data/MaxMind-DB-test-ipv' +
-                     ip_version.to_s + '-' + record_size.to_s + '.mmdb'
+      record_sizes = [24, 28, 32]
+      record_sizes.each do |record_size|
+        ip_versions = [4, 6]
+        ip_versions.each do |ip_version|
+          filename = "test/data/test-data/MaxMind-DB-test-ipv#{ip_version}-#{record_size}.mmdb"
           reader = MaxMind::DB.new(filename, mode: mode)
           check_metadata(reader, ip_version, record_size)
           if ip_version == 4
@@ -134,7 +135,7 @@ def test_get_with_prefix_len
     }]
 
     tests.each do |test|
-      reader = MaxMind::DB.new('test/data/test-data/' + test['file_name'])
+      reader = MaxMind::DB.new("test/data/test-data/#{test['file_name']}")
       record, prefix_length = reader.get_with_prefix_length(test['ip'])
 
       assert_equal(test['expected_prefix_length'], prefix_length,
@@ -235,15 +236,15 @@ def test_ip_validation
     e = assert_raises ArgumentError do
       reader.get('not_ip')
     end
-    assert(e.message.match(/invalid address/))
+    assert(e.message.include?('invalid address'))
     reader.close
   end
 
   def test_missing_database
     e = assert_raises SystemCallError do
       MaxMind::DB.new('file-does-not-exist.mmdb')
     end
-    assert(e.message.match(/No such file or directory/))
+    assert(e.message.include?('No such file or directory'))
   end
 
   def test_nondatabase
@@ -260,14 +261,14 @@ def test_too_many_constructor_args
     e = assert_raises ArgumentError do
       MaxMind::DB.new('README.md', {}, 'blah')
     end
-    assert(e.message.match(/wrong number of arguments/))
+    assert(e.message.include?('wrong number of arguments'))
   end
 
   def test_no_constructor_args
     e = assert_raises ArgumentError do
       MaxMind::DB.new
     end
-    assert(e.message.match(/wrong number of arguments/))
+    assert(e.message.include?('wrong number of arguments'))
   end
 
   def test_too_many_get_args
@@ -277,7 +278,7 @@ def test_too_many_get_args
     e = assert_raises ArgumentError do
       reader.get('1.1.1.1', 'blah')
     end
-    assert(e.message.match(/wrong number of arguments/))
+    assert(e.message.include?('wrong number of arguments'))
     reader.close
   end
 
@@ -288,7 +289,7 @@ def test_no_get_args
     e = assert_raises ArgumentError do
       reader.get
     end
-    assert(e.message.match(/wrong number of arguments/))
+    assert(e.message.include?('wrong number of arguments'))
     reader.close
   end
 
@@ -299,7 +300,7 @@ def test_metadata_args
     e = assert_raises ArgumentError do
       reader.metadata('hi')
     end
-    assert(e.message.match(/wrong number of arguments/))
+    assert(e.message.include?('wrong number of arguments'))
     reader.close
   end
 
@@ -310,7 +311,7 @@ def test_metadata_unknown_attribute
     e = assert_raises NoMethodError do
       reader.metadata.what
     end
-    assert(e.message.match(/undefined method `what'/))
+    assert(e.message.include?('undefined method `what\''))
     reader.close
   end