maxmind-geoip2 0.2.0 → 0.7.0

data/test/data/tidyall.ini

@@ -0,0 +1,5 @@
+[PerlTidy]
+select = **/*.{pl,pm,t}
+
+[JSON]
+select = **/*.json

data/test/test_client.rb

@@ -42,6 +42,7 @@ class ClientTest < Minitest::Test
     },
     'traits' => {
       'ip_address' => '1.2.3.40',
+      'is_residential_proxy' => true,
       'network' => '1.2.3.0/24',
       'static_ip_score' => 1.3,
       'user_count' => 2,
@@ -82,6 +83,7 @@ class ClientTest < Minitest::Test
 
     assert_equal(42, record.continent.geoname_id)
 
+    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)
     assert_equal(2, record.traits.user_count)
@@ -337,12 +339,12 @@ class ClientTest < Minitest::Test
         status: 400,
       },
       '1.2.3.71' => {
-        body: JSON.generate({ 'code': 'HI' }),
+        body: JSON.generate({ code: 'HI' }),
         headers: { 'Content-Type': CONTENT_TYPES[:country] },
         status: 400,
       },
       '1.2.3.8' => {
-        body: JSON.generate({ 'weird': 42 }),
+        body: JSON.generate({ weird: 42 }),
         headers: { 'Content-Type': CONTENT_TYPES[:country] },
         status: 400,
       },

data/test/test_model_country.rb

@@ -77,4 +77,20 @@ class CountryModelTest < Minitest::Test
     model = MaxMind::GeoIP2::Model::Country.new(RAW, ['en'])
     assert_raises(NoMethodError) { model.traits.unknown }
   end
+
+  # This can happen if we're being created from a not fully populated response
+  # when used by minFraud. It shouldn't ever happen from GeoIP2 though.
+  def test_no_traits
+    model = MaxMind::GeoIP2::Model::Country.new(
+      {
+        'continent' => {
+          'code' => 'NA',
+          'geoname_id' => 42,
+          'names' => { 'en' => 'North America' },
+        },
+      },
+      ['en'],
+    )
+    assert_equal(42, model.continent.geoname_id)
+  end
 end

data/test/test_reader.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ipaddr'
+require 'maxmind/db'
 require 'maxmind/geoip2'
 require 'minitest/autorun'
 
@@ -16,6 +17,7 @@ class ReaderTest < Minitest::Test
     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_equal(ip, record.ip_address)
     assert_equal('1.2.0.0/16', record.network)
@@ -23,6 +25,18 @@ class ReaderTest < Minitest::Test
     reader.close
   end
 
+  def test_anonymous_ip_residential_proxy
+    reader = MaxMind::GeoIP2::Reader.new(
+      'test/data/test-data/GeoIP2-Anonymous-IP-Test.mmdb',
+    )
+    ip = '81.2.69.1'
+    record = reader.anonymous_ip(ip)
+
+    assert_equal(true, record.residential_proxy?)
+
+    reader.close
+  end
+
   def test_asn
     reader = MaxMind::GeoIP2::Reader.new(
       'test/data/test-data/GeoLite2-ASN-Test.mmdb',
@@ -456,4 +470,49 @@ class ReaderTest < Minitest::Test
     assert_equal('GeoIP2-City', reader.metadata.database_type)
     reader.close
   end
+
+  def test_constructor_with_minimum_keyword_arguments
+    reader = MaxMind::GeoIP2::Reader.new(
+      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
+
+  def test_constructor_with_all_keyword_arguments
+    reader = MaxMind::GeoIP2::Reader.new(
+      database: 'test/data/test-data/GeoIP2-Country-Test.mmdb',
+      locales: %w[ru],
+      mode: MaxMind::DB::MODE_MEMORY,
+    )
+    record = reader.country('81.2.69.160')
+    assert_equal('Великобритания', record.country.name)
+    reader.close
+  end
+
+  def test_constructor_missing_database
+    error = assert_raises(ArgumentError) do
+      MaxMind::GeoIP2::Reader.new
+    end
+    assert_equal('Invalid database parameter', error.message)
+
+    error = assert_raises(ArgumentError) do
+      MaxMind::GeoIP2::Reader.new(
+        locales: %w[ru],
+      )
+    end
+    assert_equal('Invalid database parameter', error.message)
+  end
+
+  def test_old_constructor_parameters
+    reader = MaxMind::GeoIP2::Reader.new(
+      'test/data/test-data/GeoIP2-Country-Test.mmdb',
+      %w[ru],
+      mode: MaxMind::DB::MODE_MEMORY,
+    )
+    record = reader.country('81.2.69.160')
+    assert_equal('Великобритания', record.country.name)
+    reader.close
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: maxmind-geoip2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - William Storey
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem for interacting with the GeoIP2 webservices and databases. MaxMind
   provides geolocation data as downloadable databases as well as through a webservice.
 email: support@maxmind.com
@@ -47,7 +131,6 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE-APACHE
 - LICENSE-MIT
 - README.dev.md
@@ -79,6 +162,69 @@ files:
 - lib/maxmind/geoip2/record/subdivision.rb
 - lib/maxmind/geoip2/record/traits.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
+- test/data/bad-data/maxminddb-golang/cyclic-data-structure.mmdb
+- test/data/bad-data/maxminddb-golang/invalid-bytes-length.mmdb
+- test/data/bad-data/maxminddb-golang/invalid-data-record-offset.mmdb
+- test/data/bad-data/maxminddb-golang/invalid-map-key-length.mmdb
+- test/data/bad-data/maxminddb-golang/invalid-string-length.mmdb
+- 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/perltidyrc
+- 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
+- test/data/source-data/GeoIP2-Country-Test.json
+- test/data/source-data/GeoIP2-DensityIncome-Test.json
+- 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-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/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
+- test/data/test-data/GeoIP2-City-Test.mmdb
+- test/data/test-data/GeoIP2-Connection-Type-Test.mmdb
+- test/data/test-data/GeoIP2-Country-Test.mmdb
+- test/data/test-data/GeoIP2-DensityIncome-Test.mmdb
+- test/data/test-data/GeoIP2-Domain-Test.mmdb
+- test/data/test-data/GeoIP2-Enterprise-Test.mmdb
+- test/data/test-data/GeoIP2-ISP-Test.mmdb
+- test/data/test-data/GeoIP2-Precision-Enterprise-Test.mmdb
+- 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/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
+- test/data/test-data/MaxMind-DB-test-broken-search-tree-24.mmdb
+- test/data/test-data/MaxMind-DB-test-decoder.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv4-24.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv4-28.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv4-32.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv6-24.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv6-28.mmdb
+- test/data/test-data/MaxMind-DB-test-ipv6-32.mmdb
+- test/data/test-data/MaxMind-DB-test-metadata-pointers.mmdb
+- test/data/test-data/MaxMind-DB-test-mixed-24.mmdb
+- test/data/test-data/MaxMind-DB-test-mixed-28.mmdb
+- test/data/test-data/MaxMind-DB-test-mixed-32.mmdb
+- test/data/test-data/MaxMind-DB-test-nested.mmdb
+- 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
 - test/test_model_names.rb
@@ -89,11 +235,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/maxmind/GeoIP2-ruby/issues
-  changelog_uri: https://github.com/maxmind/GeoIP2-ruby/blob/master/CHANGELOG.md
-  documentation_uri: https://github.com/maxmind/GeoIP2-ruby
+  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
   source_code_uri: https://github.com/maxmind/GeoIP2-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +254,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: A gem for interacting with the GeoIP2 webservices and databases.
 test_files: []

data/Gemfile.lock

@@ -1,70 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.12.2)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    hashdiff (1.0.0)
-    http (4.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.2.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
-    jaro_winkler (1.5.4)
-    maxmind-db (1.1.0)
-    minitest (5.14.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    public_suffix (4.0.3)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
-    webmock (3.8.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  http
-  maxmind-db
-  minitest
-  rake
-  rubocop
-  rubocop-performance
-  webmock
-
-BUNDLED WITH
-   2.1.4