maxmind-geoip2 1.0.0 → 1.2.0

data/test/data/test-data/README.md

@@ -1,26 +1,42 @@
-The write-test-dbs script will create a small set of test databases with a
-variety of data and record sizes (24, 28, & 32 bit).
+## How to generate test data
+Use the [write-test-data](https://github.com/maxmind/MaxMind-DB/blob/main/cmd/write-test-data)
+go tool to create a small set of test databases with a variety of data and
+record sizes.
 
 These test databases are useful for testing code that reads MaxMind DB files.
 
-There is also a `maps-with-pointers.raw` file. This contains the raw output of
-the MaxMind::DB::Writer::Serializer module, when given a series of maps which
-share some keys and values. It is used to test that decoder code can handle
-pointers to map keys and values, as well as to the whole map.
-
 There are several ways to figure out what IP addresses are actually in the
 test databases. You can take a look at the
-[source-data directory](https://github.com/maxmind/MaxMind-DB/tree/master/source-data)
+[source-data directory](https://github.com/maxmind/MaxMind-DB/tree/main/source-data)
 in this repository. This directory contains JSON files which are used to
 generate many (but not all) of the database files.
 
 You can also use the
-[mmdb-dump-database script](https://github.com/maxmind/MaxMind-DB-Reader-perl/blob/master/eg/mmdb-dump-database)
+[mmdb-dump-database script](https://github.com/maxmind/MaxMind-DB-Reader-perl/blob/main/eg/mmdb-dump-database)
 in the
 [MaxMind-DB-Reader-perl repository](https://github.com/maxmind/MaxMind-DB-Reader-perl).
 
-Some databases are intentionally broken and cannot be dumped. You can look at
-the
-[script which generates these databases](https://github.com/maxmind/MaxMind-DB/blob/master/test-data/write-test-data.pl)
-to see what IP addresses they include, which will be necessary for those
-databases which cannot be dumped because they contain intentional errors.
+## Static test data
+Some of the test files are remnants of the
+[old perl test data writer](https://github.com/maxmind/MaxMind-DB/blob/f0a85c671c5b6e9c5e514bd66162724ee1dedea3/test-data/write-test-data.pl)
+and cannot be generated with the go tool. These databases are intentionally broken,
+and exploited functionality simply not available in the go mmdbwriter:
+
+- MaxMind-DB-test-broken-pointers-24.mmdb
+- MaxMind-DB-test-broken-search-tree-24.mmdb
+- MaxMind-DB-test-pointer-decoder.mmdb
+- GeoIP2-City-Test-Broken-Double-Format.mmdb
+- GeoIP2-City-Test-Invalid-Node-Count.mmdb
+- maps-with-pointers.raw
+
+## Usage
+```
+Usage of ./write-test-data:
+  -source string
+        Source data directory
+  -target string
+        Destination directory for the generated mmdb files
+```
+
+Example:
+`./write-test-data --source ../../source-data --target ../../test-data`

data/test/test_client.rb

@@ -22,6 +22,7 @@ class ClientTest < Minitest::Test
     },
     'traits' => {
       'ip_address' => '1.2.3.4',
+      'is_anycast' => true,
       'network' => '1.2.3.0/24',
     },
   }.freeze
@@ -42,6 +43,7 @@ class ClientTest < Minitest::Test
     },
     'traits' => {
       'ip_address' => '1.2.3.40',
+      'is_anycast' => true,
       'is_residential_proxy' => true,
       'network' => '1.2.3.0/24',
       'static_ip_score' => 1.3,
@@ -73,6 +75,7 @@ class ClientTest < Minitest::Test
 
     assert_equal(false, record.registered_country.in_european_union?)
 
+    assert_equal(true, record.traits.anycast?)
     assert_equal('1.2.3.0/24', record.traits.network)
   end
 
@@ -83,6 +86,7 @@ class ClientTest < Minitest::Test
 
     assert_equal(42, record.continent.geoname_id)
 
+    assert_equal(true, record.traits.anycast?)
     assert_equal(true, record.traits.residential_proxy?)
     assert_equal('1.2.3.0/24', record.traits.network)
     assert_equal(1.3, record.traits.static_ip_score)
@@ -126,7 +130,7 @@ class ClientTest < Minitest::Test
     )
   end
 
-  def test_invalid_ip_error
+  def test_invalid_ip_error_from_web_service
     error = assert_raises(
       MaxMind::GeoIP2::AddressInvalidError,
     ) { request(:country, '1.2.3.6') }
@@ -137,6 +141,17 @@ class ClientTest < Minitest::Test
     )
   end
 
+  def test_invalid_ip_error_from_client
+    error = assert_raises(
+      MaxMind::GeoIP2::AddressInvalidError,
+    ) { request(:country, '1.2.3') }
+
+    assert_equal(
+      'The value "1.2.3" is not a valid IP address',
+      error.message,
+    )
+  end
+
   def test_no_error_body_ip_error
     assert_raises(
       JSON::ParserError,
@@ -290,7 +305,7 @@ class ClientTest < Minitest::Test
       license_key: 'abcdef123456',
     )
 
-    client.send(method, '1.2.3.4')
+    client.send(method, ip_address)
   end
 
   def get_response(ip_address)
@@ -300,6 +315,7 @@ class ClientTest < Minitest::Test
         headers: { 'Content-Type': CONTENT_TYPES[:country] },
         status: 200,
       },
+      '1.2.3' => {},
       '1.2.3.4' => {
         body: JSON.generate(COUNTRY),
         headers: { 'Content-Type': CONTENT_TYPES[:country] },

data/test/test_reader.rb

@@ -97,6 +97,12 @@ class ReaderTest < Minitest::Test
       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?)
+
     reader.close
   end
 
@@ -119,7 +125,7 @@ class ReaderTest < Minitest::Test
     ip = '1.0.1.1'
     record = reader.connection_type(ip)
 
-    assert_equal('Cable/DSL', record.connection_type)
+    assert_equal('Cellular', record.connection_type)
     assert_equal(ip, record.ip_address)
     assert_equal('1.0.1.0/24', record.network)
 
@@ -150,7 +156,7 @@ class ReaderTest < Minitest::Test
     assert_equal('Europe', record.continent.name)
 
     assert_equal(2_635_167, record.country.geoname_id)
-    assert_equal(true, record.country.in_european_union?)
+    assert_equal(false, record.country.in_european_union?)
     assert_equal('GB', record.country.iso_code)
     assert_equal(
       {
@@ -209,6 +215,12 @@ class ReaderTest < Minitest::Test
     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_raises(NoMethodError) { record.foo }
     reader.close
   end
@@ -266,6 +278,20 @@ class ReaderTest < Minitest::Test
     assert_equal(ip_address, record.traits.ip_address)
     assert_equal('74.209.16.0/20', record.traits.network)
 
+    # This IP has MCC/MNC data.
+
+    ip_address = '149.101.100.0'
+    record = reader.enterprise(ip_address)
+
+    assert_equal('310', record.traits.mobile_country_code)
+    assert_equal('004', record.traits.mobile_network_code)
+
+    # This IP has is_anycast.
+
+    ip_address = '214.1.1.0'
+    record = reader.enterprise(ip_address)
+    assert_equal(true, record.traits.anycast?)
+
     reader.close
   end
 
@@ -283,6 +309,14 @@ class ReaderTest < Minitest::Test
     assert_equal(ip, record.ip_address)
     assert_equal('1.128.0.0/11', record.network)
 
+    # This IP has MCC/MNC data.
+
+    ip_address = '149.101.100.0'
+    record = reader.isp(ip_address)
+
+    assert_equal('310', record.mobile_country_code)
+    assert_equal('004', record.mobile_network_code)
+
     reader.close
   end
 
@@ -416,7 +450,7 @@ class ReaderTest < Minitest::Test
         "test/data/test-data/GeoIP2-#{t['file']}-Test.mmdb",
       )
       record = reader.send(t['method'], '81.2.69.160')
-      assert_equal(true, record.country.in_european_union?)
+      assert_equal(false, record.country.in_european_union?)
       assert_equal(false, record.registered_country.in_european_union?)
       reader.close
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxmind-geoip2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - William Storey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -167,10 +167,10 @@ files:
 - lib/maxmind/geoip2/record/represented_country.rb
 - lib/maxmind/geoip2/record/subdivision.rb
 - lib/maxmind/geoip2/record/traits.rb
+- lib/maxmind/geoip2/version.rb
 - maxmind-geoip2.gemspec
 - test/data/LICENSE
 - test/data/MaxMind-DB-spec.md
-- test/data/MaxMind-DB-test-metadata-pointers.mmdb
 - test/data/README.md
 - test/data/bad-data/README.md
 - test/data/bad-data/libmaxminddb/libmaxminddb-offset-integer-overflow.mmdb
@@ -182,7 +182,16 @@ files:
 - test/data/bad-data/maxminddb-golang/metadata-is-an-uint128.mmdb
 - test/data/bad-data/maxminddb-golang/unexpected-bytes.mmdb
 - test/data/bad-data/maxminddb-python/bad-unicode-in-map-key.mmdb
+- test/data/cmd/write-test-data/main.go
+- test/data/go.mod
+- test/data/go.sum
 - test/data/perltidyrc
+- test/data/pkg/writer/decoder.go
+- test/data/pkg/writer/geoip2.go
+- test/data/pkg/writer/ip.go
+- test/data/pkg/writer/maxmind.go
+- test/data/pkg/writer/nestedstructures.go
+- test/data/pkg/writer/writer.go
 - test/data/source-data/GeoIP2-Anonymous-IP-Test.json
 - test/data/source-data/GeoIP2-City-Test.json
 - test/data/source-data/GeoIP2-Connection-Type-Test.json
@@ -191,11 +200,13 @@ files:
 - test/data/source-data/GeoIP2-Domain-Test.json
 - test/data/source-data/GeoIP2-Enterprise-Test.json
 - test/data/source-data/GeoIP2-ISP-Test.json
+- test/data/source-data/GeoIP2-Precision-Enterprise-Sandbox-Test.json
 - test/data/source-data/GeoIP2-Precision-Enterprise-Test.json
 - test/data/source-data/GeoIP2-Static-IP-Score-Test.json
 - test/data/source-data/GeoIP2-User-Count-Test.json
 - test/data/source-data/GeoLite2-ASN-Test.json
-- test/data/source-data/README
+- test/data/source-data/GeoLite2-City-Test.json
+- test/data/source-data/GeoLite2-Country-Test.json
 - test/data/test-data/GeoIP2-Anonymous-IP-Test.mmdb
 - test/data/test-data/GeoIP2-City-Test-Broken-Double-Format.mmdb
 - test/data/test-data/GeoIP2-City-Test-Invalid-Node-Count.mmdb
@@ -210,6 +221,8 @@ files:
 - test/data/test-data/GeoIP2-Static-IP-Score-Test.mmdb
 - test/data/test-data/GeoIP2-User-Count-Test.mmdb
 - test/data/test-data/GeoLite2-ASN-Test.mmdb
+- test/data/test-data/GeoLite2-City-Test.mmdb
+- test/data/test-data/GeoLite2-Country-Test.mmdb
 - test/data/test-data/MaxMind-DB-no-ipv4-search-tree.mmdb
 - test/data/test-data/MaxMind-DB-string-value-entries.mmdb
 - test/data/test-data/MaxMind-DB-test-broken-pointers-24.mmdb
@@ -229,7 +242,6 @@ files:
 - test/data/test-data/MaxMind-DB-test-pointer-decoder.mmdb
 - test/data/test-data/README.md
 - test/data/test-data/maps-with-pointers.raw
-- test/data/test-data/write-test-data.pl
 - test/data/tidyall.ini
 - test/test_client.rb
 - test/test_model_country.rb
@@ -244,6 +256,7 @@ metadata:
   changelog_uri: https://github.com/maxmind/GeoIP2-ruby/blob/main/CHANGELOG.md
   documentation_uri: https://www.rubydoc.info/gems/maxmind-geoip2
   homepage_uri: https://github.com/maxmind/GeoIP2-ruby
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/maxmind/GeoIP2-ruby
 post_install_message: 
 rdoc_options: []
@@ -260,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.18
 signing_key: 
 specification_version: 4
 summary: A gem for interacting with the GeoIP2 webservices and databases.

data/test/data/source-data/README

@@ -1,15 +0,0 @@
-All of these but the City and Enterprise files are JSON dumps of the databases
-created by the GeoIP2 build integration tests
-(TestFor::MM::Integration::GeoIP2::Build).
-
-Additional data was added to match our legacy test databases.
-
-The City file is of unknown origin.
-
-The Enterprise file was a single example IP address, modified slightly to
-include all fields. It now has more than that.
-
-The Precision file was the normal Enterprise file with an additional marker
-(128.101.101.101) to differentiate the two. It now contains additional
-additions and changes as it is the database used in many MaxMind
-integration tests.