Merge pull request #60 from maxmind/horgh/ruby-version

Test on Ruby 3.1

Author: ugexe

.github/workflows/rubocop.yml

@@ -7,6 +7,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: 3.1
       - run: bundle install
       - run: bundle exec rake -t rubocop

.github/workflows/test.yml

@@ -12,7 +12,8 @@ jobs:
             2.5,
             2.6,
             2.7,
-            3.0,
+            '3.0',
+            3.1,
             jruby,
           ]
         exclude:

README.md

@@ -57,7 +57,7 @@ This library uses [Semantic Versioning](https://semver.org/).
 
 ## Copyright and License
 
-This software is Copyright (c) 2018 - 2020 by MaxMind, Inc.
+This software is Copyright (c) 2018 - 2021 by MaxMind, Inc.
 
 This is free software, licensed under the [Apache License, Version
 2.0](LICENSE-APACHE) or the [MIT License](LICENSE-MIT), at your option.

lib/maxmind/db.rb

@@ -200,7 +200,7 @@ def find_address_in_tree(ip_address, ip_version)
         break if depth >= bit_count || node >= node_count
 
         c = packed[depth >> 3].ord
-        bit = 1 & (c >> 7 - (depth % 8))
+        bit = 1 & (c >> (7 - (depth % 8)))
         node = read_node(node, bit)
         depth += 1
       end

maxmind-db.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     'documentation_uri' => 'https://www.rubydoc.info/gems/maxmind-db',
     'homepage_uri' => 'https://github.com/maxmind/MaxMind-DB-Reader-ruby',
     'source_code_uri' => 'https://github.com/maxmind/MaxMind-DB-Reader-ruby',
+    'rubygems_mfa_required' => 'true',
   }
   s.required_ruby_version = '>= 2.5.0'
 

test/data

@@ -150,9 +150,9 @@ def test_pointer
     "\x34\x35\x36\x37\x38\x39\x30\x31\x32\x33\x34".b +
     "\x35\x36\x37\x38\x39\x30\x31\x32\x33\x34\x35".b +
     "\x36\x37\x38\x39\x30".b => '123456789012345678901234567890',
-    "\x5e\x00\xd7".b + "\x78".b * 500 => 'x' * 500,
-    "\x5e\x06\xb3".b + "\x78".b * 2000 => 'x' * 2000,
-    "\x5f\x00\x10\x53".b + "\x78".b * 70_000 => 'x' * 70_000,
+    "\x5e\x00\xd7".b + ("\x78".b * 500) => 'x' * 500,
+    "\x5e\x06\xb3".b + ("\x78".b * 2000) => 'x' * 2000,
+    "\x5f\x00\x10\x53".b + ("\x78".b * 70_000) => 'x' * 70_000,
   }
   # rubocop:enable Style/ClassVars
 
@@ -194,9 +194,9 @@ def generate_large_uint(bits)
       "\x02".b + ctrl_byte + "\x01\xf4".b => 500,
       "\x02".b + ctrl_byte + "\x2a\x78".b => 10_872,
     }
-    (bits / 8 + 1).times do |power|
-      expected = 2**(8 * power) - 1
-      input = [power].pack('C') + ctrl_byte + "\xff".b * power
+    ((bits / 8) + 1).times do |power|
+      expected = (2**(8 * power)) - 1
+      input = [power].pack('C') + ctrl_byte + ("\xff".b * power)
       uints[input] = expected
     end
     uints