minfraud 1.6.0 → 2.0.0

data/lib/minfraud/components/shipping.rb

@@ -4,7 +4,7 @@ module Minfraud
   module Components
     # Shipping corresponds to the shipping object of a minFraud request.
     #
-    # @see https://dev.maxmind.com/minfraud/#Shipping_(/shipping)
+    # @see https://dev.maxmind.com/minfraud/api-documentation/requests?lang=en#schema--request--shipping
     class Shipping < Addressable
       include ::Minfraud::Enum
 
@@ -14,7 +14,7 @@ module Minfraud
       # @!attribute delivery_speed
       #
       # @return [Symbol, nil]
-      enum_accessor :delivery_speed, [:same_day, :overnight, :expedited, :standard]
+      enum_accessor :delivery_speed, %i[same_day overnight expedited standard]
 
       # @param params [Hash] Hash of parameters. Each key/value should
       #   correspond to one of the available attributes.

data/lib/minfraud/components/shopping_cart.rb

@@ -5,7 +5,7 @@ module Minfraud
     # ShoppingCart corresponds to the shopping_cart object of a minFraud
     # request.
     #
-    # @see https://dev.maxmind.com/minfraud/#Shopping_Cart_(/shoppingcart)
+    # @see https://dev.maxmind.com/minfraud/api-documentation/requests?lang=en#schema--request--shopping-cart
     class ShoppingCart < Base
       # An array of Minfraud::Components::ShoppingCartItem instances.
       #

data/lib/minfraud/components/shopping_cart_item.rb

@@ -5,20 +5,20 @@ module Minfraud
     # ShoppingCartItem corresponds to objects in the shopping_cart object
     # of a minFraud request.
     #
-    # @see https://dev.maxmind.com/minfraud/#Shopping_Cart_Item
+    # @see https://dev.maxmind.com/minfraud/api-documentation/requests?lang=en#schema--request--shopping-cart--item
     class ShoppingCartItem < Base
       include Minfraud::Validates
 
       # The category of the item. This can also be a hashed value; see link.
       #
-      # @see https://dev.maxmind.com/minfraud/#cart-hashing
+      # @see https://dev.maxmind.com/minfraud/api-documentation/requests?lang=en#schema--request--shopping-cart--item__category
       #
       # @return [String, nil]
       attr_accessor :category
 
       # The internal ID of the item. This can also be a hashed value; see link.
       #
-      # @see https://dev.maxmind.com/minfraud/#cart-hashing
+      # @see https://dev.maxmind.com/minfraud/api-documentation/requests?lang=en#schema--request--shopping-cart--item__item_id
       #
       # @return [String, nil]
       attr_accessor :item_id

data/lib/minfraud/http_service/response.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'minfraud/model/error'
 require 'minfraud/model/factors'
 require 'minfraud/model/insights'
@@ -9,32 +10,35 @@ module Minfraud
   module HTTPService
     # Response class for HTTP requests.
     class Response
-      # HTTP response status.
+      # Response HTTP status code.
       #
-      # @return [Integer, nil]
+      # @return [Fixnum, nil]
       attr_reader :status
 
-      # HTTP response model.
+      # Response model.
       #
       # @return [Minfraud::Model::Score, Minfraud::Model::Insights,
       #   Minfraud::Model::Factors, nil]
       attr_reader :body
 
-      # HTTP response headers.
+      # @param endpoint [Symbol, nil] endpoint name, like :score.
       #
-      # @return [Hash, nil]
-      attr_reader :headers
+      # @param locales [Array<String>, nil] locales, like ["en"].
+      #
+      # @param response [HTTP::Response] the response object.
+      #
+      # @param body [String] the response body.
+      #
+      # @raise [JSON::ParserError] if there was invalid JSON in the response.
+      def initialize(endpoint, locales, response, body)
+        @status = response.code
 
-      # @param params [Hash] Hash of parameters. +:status+, +:endpoint+,
-      #   +:body+, +:locales+, and +:headers+ are used.
-      def initialize(params = {})
-        @status  = params[:status]
-        @body    = make_body(
-          params[:endpoint],
-          params[:body],
-          params[:locales]
+        @body = make_body(
+          endpoint,
+          locales,
+          response,
+          body,
         )
-        @headers = params[:headers]
       end
 
       # Return the minFraud-specific response code.
@@ -48,15 +52,18 @@ module Minfraud
 
       private
 
-      def make_body(endpoint, body, locales)
-        if @status != 200
-          # Won't be a Hash when the body is not JSON.
-          return nil unless body.is_a?(Hash)
+      def make_body(endpoint, locales, response, body)
+        if !response.mime_type || !response.mime_type.match(/json/i)
+          return nil
+        end
+
+        h = JSON.parse(body)
 
-          return Minfraud::Model::Error.new(body)
+        if @status != 200
+          return Minfraud::Model::Error.new(h)
         end
 
-        ENDPOINT_TO_CLASS[endpoint].new(body, locales)
+        ENDPOINT_TO_CLASS[endpoint].new(h, locales)
       end
 
       ENDPOINT_TO_CLASS = {

data/lib/minfraud/model/device.rb

@@ -8,7 +8,7 @@ module Minfraud
     #
     # In order to receive device output from minFraud Insights or minFraud
     # Factors, you must be using the Device Tracking Add-on
-    # (https://dev.maxmind.com/minfraud/device/).
+    # (https://dev.maxmind.com/minfraud/track-devices?lang=en).
     class Device < Abstract
       # This number represents our confidence that the device_id refers to a
       # unique device as opposed to a cluster of similar devices. A confidence

data/lib/minfraud/model/disposition.rb

@@ -11,14 +11,14 @@ module Minfraud
     class Disposition < Abstract
       # The action to take on the transaction as defined by your custom rules.
       # The current set of values are "accept", "manual_review", "reject", and
-      # "test".  If you do not have custom rules set up, this will be nil.
+      # "test". If you do not have custom rules set up, this will be nil.
       #
       # @return [String, nil]
       attr_reader :action
 
       # The reason for the action. The current possible values are
-      # "custom_rule", "block_list", and "default". If you do not have custom
-      # rules set up, this will be nil.
+      # "custom_rule" and "default". If you do not have custom rules set up,
+      # this will be nil.
       #
       # @return [String, nil]
       attr_reader :reason

data/lib/minfraud/model/ip_address.rb

@@ -41,61 +41,18 @@ module Minfraud
         end
 
         @risk_reasons = []
-        if record && record.key?('risk_reasons')
+        if record&.key?('risk_reasons')
           record['risk_reasons'].each do |r|
             @risk_reasons << Minfraud::Model::IPRiskReason.new(r)
           end
         end
 
-        # Decorate objects with deprecated attributes and names for backwards
-        # compatibility. Do this here rather than with the overhead of
-        # subclasses/modules for them in the hope that one day we can delete
-        # them.
-
-        # These are named differently in maxmind-geoip2.
-        @country.define_singleton_method(:is_in_european_union) { in_european_union? }
-        @registered_country.define_singleton_method(:is_in_european_union) { in_european_union? }
-        @represented_country.define_singleton_method(:is_in_european_union) { in_european_union? }
-        @traits.define_singleton_method(:is_anonymous) { anonymous? }
-        @traits.define_singleton_method(:is_anonymous_vpn) { anonymous_vpn? }
-        @traits.define_singleton_method(:is_hosting_provider) { hosting_provider? }
-        @traits.define_singleton_method(:is_public_proxy) { public_proxy? }
-        @traits.define_singleton_method(:is_tor_exit_node) { tor_exit_node? }
-
-        # Mashify turned each language code into an attribute, but
-        # maxmind-geoip2 exposes the names as a hash.
-        LANGUAGE_CODES.each do |c|
-          if @city.names
-            @city.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-          end
-          if @continent.names
-            @continent.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-          end
-          if @country.names
-            @country.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-          end
-          if @registered_country.names
-            @registered_country.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-          end
-          if @represented_country.names
-            @represented_country.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-          end
-          @subdivisions.each do |s|
-            if s.names
-              s.names.define_singleton_method(c) { fetch(c.to_s, nil) }
-            end
-          end
-        end
-
-        # This attribute is deprecated.
-        @country.define_singleton_method(:is_high_risk) { get('is_high_risk') }
-
-        # These attributes are deprecated and aren't in maxmind-geoip2.
+        # These attributes are deprecated and aren't in maxmind-geoip2. The
+        # webservice still sends them as of writing, so we'd like to keep them
+        # for now as they could still be providing value.
         @traits.define_singleton_method(:is_anonymous_proxy) { get('is_anonymous_proxy') }
         @traits.define_singleton_method(:is_satellite_provider) { get('is_satellite_provider') }
       end
-
-      LANGUAGE_CODES = [:de, :en, :es, :fr, :ja, :'pt-BR', :ru, :'zh-CN'].freeze
     end
   end
 end

data/lib/minfraud/model/score.rb

@@ -65,7 +65,7 @@ module Minfraud
         @queries_remaining = get('queries_remaining')
         @risk_score        = get('risk_score')
         @warnings          = []
-        if record && record.key?('warnings')
+        if record&.key?('warnings')
           record['warnings'].each do |w|
             @warnings << Minfraud::Model::Warning.new(w)
           end

data/lib/minfraud/model/subscores.rb

@@ -84,26 +84,6 @@ module Minfraud
       # @return [Float, nil]
       attr_reader :email_local_part
 
-      # The risk associated with the issuer ID number on the email domain. If
-      # present, this is a value in the range 0.01 to 99.
-      #
-      # Deprecated effective August 29, 2019. This subscore will default to 1
-      # and will be removed in a future release. The user tenure on email is
-      # reflected in the /subscores/email_address output.
-      #
-      # @return [Float, nil]
-      attr_reader :email_tenure
-
-      # The risk associated with the issuer ID number on the IP address. If
-      # present, this is a value in the range 0.01 to 99.
-      #
-      # Deprecated effective August 29, 2019. This subscore will default to 1
-      # and will be removed in a future release. The IP tenure is reflected in
-      # the overall risk score.
-      #
-      # @return [Float, nil]
-      attr_reader :ip_tenure
-
       # The risk associated with the particular issuer ID number (IIN) given
       # the billing location and the history of usage of the IIN on your
       # account and shop ID. If present, this is a value in the range 0.01 to
@@ -162,8 +142,6 @@ module Minfraud
         @email_address                            = get('email_address')
         @email_domain                             = get('email_domain')
         @email_local_part                         = get('email_local_part')
-        @email_tenure                             = get('email_tenure')
-        @ip_tenure                                = get('ip_tenure')
         @issuer_id_number                         = get('issuer_id_number')
         @order_amount                             = get('order_amount')
         @phone_number                             = get('phone_number')

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.0.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,9 +22,9 @@ 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 '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.1'
 
   spec.add_development_dependency 'bundler', '>= 1.16'
@@ -32,4 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

metadata

@@ -1,75 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: minfraud
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - kushnir.yb
+- William Storey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-12-06 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
@@ -176,20 +165,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 +185,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,7 +214,8 @@ files:
 homepage: https://github.com/maxmind/minfraud-api-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -257,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby API for the minFraud Score, Insights, Factors, and Report Transactions