maxmind-geoip2 1.0.0 → 1.1.0

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

@@ -10,17 +10,17 @@ 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)
+[script which generates these databases](https://github.com/maxmind/MaxMind-DB/blob/main/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.

data/test/data/test-data/write-test-data.pl

@@ -19,7 +19,7 @@ use Test::MaxMind::DB::Common::Util qw( standard_test_metadata );
 my $Dir = dirname( abs_path($0) );
 
 sub main {
-    my @sizes = ( 24, 28, 32 );
+    my @sizes      = ( 24, 28, 32 );
     my @ipv4_range = ( '1.1.1.1', '1.1.1.32' );
 
     my @ipv4_subnets = Net::Works::Network->range_as_subnets(@ipv4_range);
@@ -243,7 +243,7 @@ sub write_test_db {
             ::4.5.6.7/128
             abcd::/64
             1000::1234:0000/112
-        );
+            );
 
         for my $subnet (@subnets) {
             $writer->insert_network(
@@ -379,7 +379,7 @@ sub write_test_db {
             ::4.5.6.7/128
             abcd::/64
             1000::1234:0000/112
-        );
+            );
 
         for my $subnet (@subnets) {
             $writer->insert_network(
@@ -411,6 +411,8 @@ sub write_geoip2_dbs {
         ['GeoIP2-Static-IP-Score'],
         ['GeoIP2-User-Count'],
         ['GeoLite2-ASN'],
+        ['GeoLite2-City'],
+        ['GeoLite2-Country'],
         );
 }
 
@@ -485,6 +487,8 @@ sub _universal_map_key_type_callback {
         location                       => 'map',
         longitude                      => 'double',
         metro_code                     => 'uint16',
+        mobile_country_code            => 'utf8_string',
+        mobile_network_code            => 'utf8_string',
         names                          => 'map',
         organization                   => 'utf8_string',
         population_density             => 'uint32',
@@ -655,7 +659,7 @@ sub write_test_serialization_data {
     $serializer->store_data( map => { long_key  => 'long_value1' } );
     $serializer->store_data( map => { long_key2 => 'long_value2' } );
 
-    open my $fh, '>', 'maps-with-pointers.raw';
+    open my $fh, '>', "$Dir/maps-with-pointers.raw";
     print {$fh} ${ $serializer->buffer() }
         or die "Cannot write to maps-with-pointers.raw: $!";
     close $fh;
@@ -681,7 +685,7 @@ sub write_db_with_metadata_pointers {
 
     _populate_all_networks( $writer, {} );
 
-    open my $fh, '>', 'MaxMind-DB-test-metadata-pointers.mmdb';
+    open my $fh, '>', "$Dir/MaxMind-DB-test-metadata-pointers.mmdb";
 
     $writer->write_tree($fh);
 

data/test/test_reader.rb

@@ -150,7 +150,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(
       {
@@ -266,6 +266,14 @@ 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)
+
     reader.close
   end
 
@@ -283,6 +291,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 +432,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.1.0
 platform: ruby
 authors:
 - William Storey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -170,7 +170,6 @@ files:
 - 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
@@ -195,6 +194,8 @@ files:
 - 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/GeoLite2-City-Test.json
+- test/data/source-data/GeoLite2-Country-Test.json
 - test/data/source-data/README
 - test/data/test-data/GeoIP2-Anonymous-IP-Test.mmdb
 - test/data/test-data/GeoIP2-City-Test-Broken-Double-Format.mmdb
@@ -210,6 +211,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
@@ -244,6 +247,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 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A gem for interacting with the GeoIP2 webservices and databases.