minfraud 1.6.0 → 2.2.0

data/lib/minfraud/report.rb

@@ -3,10 +3,8 @@
 module Minfraud
   # Report is used to perform minFraud Report Transaction API requests.
   #
-  # @see https://dev.maxmind.com/minfraud/report-transaction/
+  # @see https://dev.maxmind.com/minfraud/report-a-transaction?lang=en
   class Report
-    include ::Minfraud::HTTPService
-
     # The Report::Transaction component.
     #
     # @return [Minfraud::Components::Report::Transaction, nil]
@@ -23,6 +21,8 @@ module Minfraud
     #
     # @return [nil]
     #
+    # @raise [JSON::ParserError] if there was invalid JSON in the response.
+    #
     # @raise [Minfraud::AuthorizationError] If there was an authentication
     #   problem.
     #
@@ -32,16 +32,24 @@ module Minfraud
     # @raise [Minfraud::ServerError] If the server reported an error of some
     #   kind.
     def report_transaction
-      raw = request.perform(
-        verb:     :post,
-        endpoint: 'transactions/report',
-        body:     @transaction.to_json,
-      )
+      response = nil
+      body     = nil
+      Minfraud.connection_pool.with do |client|
+        response = client.post(
+          '/minfraud/v2.0/transactions/report',
+          json: @transaction.to_json,
+        )
+
+        body = response.to_s
+      end
 
+      endpoint = nil
+      locales  = nil
       response = ::Minfraud::HTTPService::Response.new(
-        status:  raw.status.to_i,
-        body:    raw.body,
-        headers: raw.headers
+        endpoint,
+        locales,
+        response,
+        body,
       )
 
       ::Minfraud::ErrorHandler.examine(response)

data/lib/minfraud/validates.rb

@@ -114,7 +114,7 @@ module Minfraud
         raise InvalidInputError, "The #{field} value is not valid. It must be numeric."
       end
 
-      if value < 0 || value > 1e13 - 1
+      if value.negative? || value > 1e13 - 1
         raise InvalidInputError, "The #{field} value is not valid. It must be at least 0 and at most 1e13 - 1."
       end
     end
@@ -126,7 +126,7 @@ module Minfraud
         raise InvalidInputError, "The #{field} is not valid. It must be an integer."
       end
 
-      if value < 0 || value > 1e13 - 1
+      if value.negative? || value > 1e13 - 1
         raise InvalidInputError, "The #{field} is not valid. It must be at least 0 and at most 1e13 - 1."
       end
     end

data/lib/minfraud/version.rb

@@ -2,5 +2,5 @@
 
 module Minfraud
   # The Gem version.
-  VERSION = '1.6.0'
+  VERSION = '2.2.0'
 end

data/lib/minfraud.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'faraday'
+require 'connection_pool'
+require 'http'
 require 'minfraud'
 require 'minfraud/enum'
 require 'minfraud/validates'
@@ -22,8 +23,6 @@ require 'minfraud/components/shopping_cart_item'
 require 'minfraud/resolver'
 require 'minfraud/version'
 require 'minfraud/errors'
-require 'minfraud/http_service'
-require 'minfraud/http_service/request'
 require 'minfraud/http_service/response'
 require 'minfraud/error_handler'
 require 'minfraud/assessments'
@@ -48,21 +47,13 @@ module Minfraud
     # @return [String, nil]
     attr_accessor :host
 
-    # The MaxMind account ID that is used for authorization.
-    #
-    # @deprecated Use {::account_id} instead. This will be removed in the next
-    #   major version.
-    #
-    # @return [Integer, nil]
-    attr_accessor :user_id
-
     # The MaxMind license key that is used for authorization.
     #
     # @return [String, nil]
     attr_accessor :license_key
 
     # @!visibility private
-    attr_reader :connection
+    attr_reader :connection_pool
 
     # Yield self to accept configuration settings.
     #
@@ -70,20 +61,23 @@ module Minfraud
     def configure
       yield self
 
-      config      = Minfraud::HTTPService.configuration
-      @connection = Faraday.new(config[:server], {}, &config[:middleware])
+      pool_size        = 5
+      host             = @host.nil? ? 'minfraud.maxmind.com' : @host
+      @connection_pool = ConnectionPool.new(size: pool_size) do
+        make_http_client.persistent("https://#{host}")
+      end
     end
 
-    # The current Minfraud configuration.
-    #
-    # @deprecated This will be removed in the next major version.
-    #
-    # @return [Hash]
-    def configuration
-      {
-        user_id:     @user_id,
-        license_key: @license_key
-      }
+    private
+
+    def make_http_client
+      HTTP.basic_auth(
+        user: @account_id,
+        pass: @license_key,
+      ).headers(
+        accept:     'application/json',
+        user_agent: "minfraud-api-ruby/#{Minfraud::VERSION}",
+      )
     end
   end
 end

data/minfraud.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', File.dirname(File.realpath(__FILE__)))
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'minfraud/version'
@@ -8,7 +8,7 @@ require 'minfraud/version'
 Gem::Specification.new do |spec|
   spec.name          = 'minfraud'
   spec.version       = Minfraud::VERSION
-  spec.authors       = ['kushnir.yb']
+  spec.authors       = ['kushnir.yb', 'William Storey']
   spec.email         = ['support@maxmind.com']
 
   spec.summary       = 'Ruby API for the minFraud Score, Insights, Factors, and Report Transactions services'
@@ -22,14 +22,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faraday', '>= 0.9.1', '< 2.0'
-  spec.add_runtime_dependency 'faraday_middleware', '>= 0.9.1', '< 2.0'
-  spec.add_runtime_dependency 'net-http-persistent', '>= 2.0.0', '< 5.0'
-  spec.add_runtime_dependency 'simpleidn', '>= 0.1.1'
+  spec.add_runtime_dependency 'connection_pool', '~> 2.2'
+  spec.add_runtime_dependency 'http', '>= 4.3', '< 6.0'
+  spec.add_runtime_dependency 'maxmind-geoip2', '~> 1.1'
+  spec.add_runtime_dependency 'simpleidn', '~> 0.1', '>= 0.1.1'
 
-  spec.add_development_dependency 'bundler', '>= 1.16'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'rubocop', '~> 1.23'
+  spec.add_development_dependency 'webmock', '~> 3.14'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

metadata

@@ -1,79 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: minfraud
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.2.0
 platform: ruby
 authors:
 - kushnir.yb
-autorequire: 
+- William Storey
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: maxmind-geoip2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
@@ -81,6 +73,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
@@ -88,30 +83,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,31 +125,31 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '3.14'
+description:
 email:
 - support@maxmind.com
 executables: []
@@ -176,20 +171,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/maxmind/geoip2/model/city.rb
-- lib/maxmind/geoip2/model/country.rb
-- lib/maxmind/geoip2/model/insights.rb
-- lib/maxmind/geoip2/record/abstract.rb
-- lib/maxmind/geoip2/record/city.rb
-- lib/maxmind/geoip2/record/continent.rb
-- lib/maxmind/geoip2/record/country.rb
-- lib/maxmind/geoip2/record/location.rb
-- lib/maxmind/geoip2/record/maxmind.rb
-- lib/maxmind/geoip2/record/place.rb
-- lib/maxmind/geoip2/record/postal.rb
-- lib/maxmind/geoip2/record/represented_country.rb
-- lib/maxmind/geoip2/record/subdivision.rb
-- lib/maxmind/geoip2/record/traits.rb
 - lib/minfraud.rb
 - lib/minfraud/assessments.rb
 - lib/minfraud/components/account.rb
@@ -210,8 +191,6 @@ files:
 - lib/minfraud/enum.rb
 - lib/minfraud/error_handler.rb
 - lib/minfraud/errors.rb
-- lib/minfraud/http_service.rb
-- lib/minfraud/http_service/request.rb
 - lib/minfraud/http_service/response.rb
 - lib/minfraud/model/abstract.rb
 - lib/minfraud/model/address.rb
@@ -241,8 +220,9 @@ files:
 homepage: https://github.com/maxmind/minfraud-api-ruby
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -257,8 +237,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Ruby API for the minFraud Score, Insights, Factors, and Report Transactions
   services

data/lib/maxmind/geoip2/model/city.rb

@@ -1,99 +0,0 @@
-# Copyright (c) 2020 by MaxMind, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-require 'maxmind/geoip2/model/country'
-require 'maxmind/geoip2/record/city'
-require 'maxmind/geoip2/record/location'
-require 'maxmind/geoip2/record/postal'
-require 'maxmind/geoip2/record/subdivision'
-
-module MaxMind
-  module GeoIP2
-    module Model
-      # Model class for the data returned by the GeoIP2 City web service and
-      # database. It is also used for GeoLite2 City lookups.
-      #
-      # The only difference between the City and Insights model classes is which
-      # fields in each record may be populated. See
-      # https://dev.maxmind.com/geoip/geoip2/web-services for more details.
-      #
-      # See {MaxMind::GeoIP2::Model::Country} for inherited methods.
-      class City < Country
-        # City data for the IP address.
-        #
-        # @return [MaxMind::GeoIP2::Record::City]
-        attr_reader :city
-
-        # Location data for the IP address.
-        #
-        # @return [MaxMind::GeoIP2::Record::Location]
-        attr_reader :location
-
-        # Postal data for the IP address.
-        #
-        # @return [MaxMind::GeoIP2::Record::Postal]
-        attr_reader :postal
-
-        # The country subdivisions for the IP address.
-        #
-        # The number and type of subdivisions varies by country, but a subdivision
-        # is typically a state, province, country, etc. Subdivisions are ordered
-        # from most general (largest) to most specific (smallest).
-        #
-        # If the response did not contain any subdivisions, this attribute will be
-        # an empty array.
-        #
-        # @return [Array<MaxMind::GeoIP2::Record::Subdivision>]
-        attr_reader :subdivisions
-
-        # @!visibility private
-        def initialize(record, locales)
-          super(record, locales)
-          @city         = MaxMind::GeoIP2::Record::City.new(record['city'], locales)
-          @location     = MaxMind::GeoIP2::Record::Location.new(record['location'])
-          @postal       = MaxMind::GeoIP2::Record::Postal.new(record['postal'])
-          @subdivisions = create_subdivisions(record['subdivisions'], locales)
-        end
-
-        # The most specific subdivision returned.
-        #
-        # If the response did not contain any subdivisions, this method returns
-        # nil.
-        #
-        # @return [MaxMind::GeoIP2::Record::Subdivision, nil]
-        def most_specific_subdivision
-          @subdivisions.last
-        end
-
-        private
-
-        def create_subdivisions(subdivisions, locales)
-          return [] if subdivisions.nil?
-
-          subdivisions.map do |s|
-            MaxMind::GeoIP2::Record::Subdivision.new(s, locales)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/maxmind/geoip2/model/country.rb

@@ -1,94 +0,0 @@
-# Copyright (c) 2020 by MaxMind, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-require 'maxmind/geoip2/record/continent'
-require 'maxmind/geoip2/record/country'
-require 'maxmind/geoip2/record/maxmind'
-require 'maxmind/geoip2/record/represented_country'
-require 'maxmind/geoip2/record/traits'
-
-module MaxMind
-  module GeoIP2
-    module Model
-      # Model class for the data returned by the GeoIP2 Country web service and
-      # database. It is also used for GeoLite2 Country lookups.
-      class Country
-        # Continent data for the IP address.
-        #
-        # @return [MaxMind::GeoIP2::Record::Continent]
-        attr_reader :continent
-
-        # Country data for the IP address. This object represents the country where
-        # MaxMind believes the end user is located.
-        #
-        # @return [MaxMind::GeoIP2::Record::Country]
-        attr_reader :country
-
-        # Data related to your MaxMind account.
-        #
-        # @return [MaxMind::GeoIP2::Record::MaxMind]
-        attr_reader :maxmind
-
-        # Registered country data for the IP address. This record represents the
-        # country where the ISP has registered a given IP block and may differ from
-        # the user's country.
-        #
-        # @return [MaxMind::GeoIP2::Record::Country]
-        attr_reader :registered_country
-
-        # Represented country data for the IP address. The represented country is
-        # used for things like military bases. It is only present when the
-        # represented country differs from the country.
-        #
-        # @return [MaxMind::GeoIP2::Record::RepresentedCountry]
-        attr_reader :represented_country
-
-        # Data for the traits of the IP address.
-        #
-        # @return [MaxMind::GeoIP2::Record::Traits]
-        attr_reader :traits
-
-        # @!visibility private
-        def initialize(record, locales)
-          @continent           = MaxMind::GeoIP2::Record::Continent.new(
-            record['continent'],
-            locales,
-          )
-          @country             = MaxMind::GeoIP2::Record::Country.new(
-            record['country'],
-            locales,
-          )
-          @maxmind             = MaxMind::GeoIP2::Record::MaxMind.new(record['maxmind'])
-          @registered_country  = MaxMind::GeoIP2::Record::Country.new(
-            record['registered_country'],
-            locales,
-          )
-          @represented_country = MaxMind::GeoIP2::Record::RepresentedCountry.new(
-            record['represented_country'],
-            locales,
-          )
-          @traits              = MaxMind::GeoIP2::Record::Traits.new(record['traits'])
-        end
-      end
-    end
-  end
-end

data/lib/maxmind/geoip2/model/insights.rb

@@ -1,38 +0,0 @@
-# Copyright (c) 2020 by MaxMind, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-require 'maxmind/geoip2/model/city'
-
-module MaxMind
-  module GeoIP2
-    module Model
-      # Model class for the data returned by the GeoIP2 Precision Insights web
-      # service.
-      #
-      # The only difference between the City and Insights model classes is which
-      # fields in each record may be populated. See
-      # https://dev.maxmind.com/geoip/geoip2/web-services for more details.
-      class Insights < City
-      end
-    end
-  end
-end