maxmind-geoip2 0.2.0 → 0.7.0

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

@@ -6,65 +6,69 @@ require 'maxmind/geoip2/record/maxmind'
 require 'maxmind/geoip2/record/represented_country'
 require 'maxmind/geoip2/record/traits'
 
-module MaxMind::GeoIP2::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
+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
+        # 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
+        # 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
+        # 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
+        # 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
+        # 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'])
+        # @!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/domain.rb

@@ -2,31 +2,35 @@
 
 require 'maxmind/geoip2/model/abstract'
 
-module MaxMind::GeoIP2::Model
-  # Model class for the GeoIP2 Domain database.
-  class Domain < Abstract
-    # The second level domain associated with the IP address. This will be
-    # something like "example.com" or "example.co.uk", not "foo.example.com".
-    #
-    # @return [String, nil]
-    def domain
-      get('domain')
-    end
+module MaxMind
+  module GeoIP2
+    module Model
+      # Model class for the GeoIP2 Domain database.
+      class Domain < Abstract
+        # The second level domain associated with the IP address. This will be
+        # something like "example.com" or "example.co.uk", not "foo.example.com".
+        #
+        # @return [String, nil]
+        def domain
+          get('domain')
+        end
 
-    # The IP address that the data in the model is for.
-    #
-    # @return [String]
-    def ip_address
-      get('ip_address')
-    end
+        # The IP address that the data in the model is for.
+        #
+        # @return [String]
+        def ip_address
+          get('ip_address')
+        end
 
-    # The network in CIDR notation associated with the record. In particular,
-    # this is the largest network where all of the fields besides ip_address
-    # have the same value.
-    #
-    # @return [String]
-    def network
-      get('network')
+        # The network in CIDR notation associated with the record. In particular,
+        # this is the largest network where all of the fields besides ip_address
+        # have the same value.
+        #
+        # @return [String]
+        def network
+          get('network')
+        end
+      end
     end
   end
 end

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

@@ -2,14 +2,18 @@
 
 require 'maxmind/geoip2/model/city'
 
-module MaxMind::GeoIP2::Model
-  # Model class for the data returned by GeoIP2 Enterprise database 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::City} for inherited methods.
-  class Enterprise < City
+module MaxMind
+  module GeoIP2
+    module Model
+      # Model class for the data returned by GeoIP2 Enterprise database 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::City} for inherited methods.
+      class Enterprise < City
+      end
+    end
   end
 end

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

@@ -2,13 +2,17 @@
 
 require 'maxmind/geoip2/model/city'
 
-module MaxMind::GeoIP2::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
+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

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

@@ -2,52 +2,56 @@
 
 require 'maxmind/geoip2/model/abstract'
 
-module MaxMind::GeoIP2::Model
-  # Model class for the GeoIP2 ISP database.
-  class ISP < Abstract
-    # The autonomous system number associated with the IP address.
-    #
-    # @return [Integer, nil]
-    def autonomous_system_number
-      get('autonomous_system_number')
-    end
+module MaxMind
+  module GeoIP2
+    module Model
+      # Model class for the GeoIP2 ISP database.
+      class ISP < Abstract
+        # The autonomous system number associated with the IP address.
+        #
+        # @return [Integer, nil]
+        def autonomous_system_number
+          get('autonomous_system_number')
+        end
 
-    # The organization associated with the registered autonomous system number
-    # for the IP address.
-    #
-    # @return [String, nil]
-    def autonomous_system_organization
-      get('autonomous_system_organization')
-    end
+        # The organization associated with the registered autonomous system number
+        # for the IP address.
+        #
+        # @return [String, nil]
+        def autonomous_system_organization
+          get('autonomous_system_organization')
+        end
 
-    # The IP address that the data in the model is for.
-    #
-    # @return [String]
-    def ip_address
-      get('ip_address')
-    end
+        # The IP address that the data in the model is for.
+        #
+        # @return [String]
+        def ip_address
+          get('ip_address')
+        end
 
-    # The name of the ISP associated with the IP address.
-    #
-    # @return [String, nil]
-    def isp
-      get('isp')
-    end
+        # The name of the ISP associated with the IP address.
+        #
+        # @return [String, nil]
+        def isp
+          get('isp')
+        end
 
-    # The network in CIDR notation associated with the record. In particular,
-    # this is the largest network where all of the fields besides ip_address
-    # have the same value.
-    #
-    # @return [String]
-    def network
-      get('network')
-    end
+        # The network in CIDR notation associated with the record. In particular,
+        # this is the largest network where all of the fields besides ip_address
+        # have the same value.
+        #
+        # @return [String]
+        def network
+          get('network')
+        end
 
-    # The name of the organization associated with the IP address.
-    #
-    # @return [String, nil]
-    def organization
-      get('organization')
+        # The name of the organization associated with the IP address.
+        #
+        # @return [String, nil]
+        def organization
+          get('organization')
+        end
+      end
     end
   end
 end

data/lib/maxmind/geoip2/reader.rb

@@ -11,267 +11,294 @@ require 'maxmind/geoip2/model/domain'
 require 'maxmind/geoip2/model/enterprise'
 require 'maxmind/geoip2/model/isp'
 
-module MaxMind::GeoIP2
-  # Reader is a reader for the GeoIP2/GeoLite2 database format. IP addresses
-  # can be looked up using the database specific methods.
-  #
-  # == Example
-  #
-  #   require 'maxmind/geoip2'
-  #
-  #   reader = MaxMind::GeoIP2::Reader.new('GeoIP2-Country.mmdb')
-  #
-  #   record = reader.country('1.2.3.4')
-  #   puts record.country.iso_code
-  #
-  #   reader.close
-  class Reader
-    # Create a Reader for looking up IP addresses in a GeoIP2/GeoLite2 database
-    # file.
+module MaxMind
+  module GeoIP2
+    # Reader is a reader for the GeoIP2/GeoLite2 database format. IP addresses
+    # can be looked up using the database specific methods.
     #
-    # If you're performing multiple lookups, it's most efficient to create one
-    # Reader and reuse it.
+    # == Example
     #
-    # Once created, the Reader is safe to use for lookups from multiple
-    # threads. It is safe to use after forking only if you use
-    # MaxMind::DB::MODE_MEMORY or if your version of Ruby supports IO#pread.
+    #   require 'maxmind/geoip2'
     #
-    # @param database [String] a path to a GeoIP2/GeoLite2 database file.
+    #   reader = MaxMind::GeoIP2::Reader.new(database: 'GeoIP2-Country.mmdb')
     #
-    # @param locales [Array<String>] a list of locale codes to use in the name
-    #   property from most preferred to least preferred.
+    #   record = reader.country('1.2.3.4')
+    #   puts record.country.iso_code
     #
-    # @param options [Hash<Symbol, Symbol>] options controlling the behavior of
-    #   the Reader.
-    #
-    # @option options [Symbol] :mode Defines how to open the database. It may
-    #   be one of MaxMind::DB::MODE_AUTO, MaxMind::DB::MODE_FILE, or
-    #   MaxMind::DB::MODE_MEMORY. If you don't provide one, the Reader uses
-    #   MaxMind::DB::MODE_AUTO. Refer to the definition of those constants in
-    #   MaxMind::DB for an explanation of their meaning.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database is corrupt or
-    #   invalid.
-    #
-    # @raise [ArgumentError] if the mode is invalid.
-    def initialize(database, locales = ['en'], options = {})
-      @reader = MaxMind::DB.new(database, options)
-      @type = @reader.metadata.database_type
-      locales = ['en'] if locales.empty?
-      @locales = locales
-    end
+    #   reader.close
+    class Reader
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
 
-    # Look up the IP address in the database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::AnonymousIP]
-    #
-    # @raise [ArgumentError] if used against a non-Anonymous IP database or if
-    #   you attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def anonymous_ip(ip_address)
-      flat_model_for(
-        Model::AnonymousIP,
-        'anonymous_ip',
-        'GeoIP2-Anonymous-IP',
-        ip_address,
-      )
-    end
+      # Create a Reader for looking up IP addresses in a GeoIP2/GeoLite2 database
+      # file.
+      #
+      # If you're performing multiple lookups, it's most efficient to create one
+      # Reader and reuse it.
+      #
+      # Once created, the Reader is safe to use for lookups from multiple
+      # threads. It is safe to use after forking only if you use
+      # MaxMind::DB::MODE_MEMORY or if your version of Ruby supports IO#pread.
+      #
+      # @overload initialize(database:, locales: ['en'], mode: MaxMind::DB::MODE_AUTO)
+      #   @param database [String] a path to a GeoIP2/GeoLite2 database file.
+      #   @param locales [Array<String>] a list of locale codes to use in the name
+      #     property from most preferred to least preferred.
+      #   @param mode [Symbol] Defines how to open the database. It may be one of
+      #     MaxMind::DB::MODE_AUTO, MaxMind::DB::MODE_FILE, or
+      #     MaxMind::DB::MODE_MEMORY. If you don't provide one, the Reader uses
+      #     MaxMind::DB::MODE_AUTO. Refer to the definition of those constants in
+      #     MaxMind::DB for an explanation of their meaning.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database is corrupt
+      #   or invalid.
+      #
+      # @raise [ArgumentError] if the mode is invalid.
+      def initialize(*args)
+        # This if statement is to let us support calling as though we are using
+        # Ruby 2.0 keyword arguments. We can't use keyword argument syntax as
+        # we want to be backwards compatible with the old way we accepted
+        # parameters, which looked like:
+        # def initialize(database, locales = ['en'], options = {})
+        if args.length == 1 && args[0].instance_of?(Hash)
+          database = args[0][:database]
+          locales = args[0][:locales]
+          mode = args[0][:mode]
+        else
+          database = args[0]
+          locales = args[1]
+          mode = args[2].instance_of?(Hash) ? args[2][:mode] : nil
+        end
 
-    # Look up the IP address in an ASN database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::ASN]
-    #
-    # @raise [ArgumentError] if used against a non-ASN database or if you
-    #   attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def asn(ip_address)
-      flat_model_for(Model::ASN, 'asn', 'GeoLite2-ASN', ip_address)
-    end
+        if !database.instance_of?(String)
+          raise ArgumentError, 'Invalid database parameter'
+        end
 
-    # Look up the IP address in a City database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::City]
-    #
-    # @raise [ArgumentError] if used against a non-City database or if you
-    #   attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def city(ip_address)
-      model_for(Model::City, 'city', 'City', ip_address)
-    end
+        locales = ['en'] if locales.nil? || locales.empty?
 
-    # Look up the IP address in a Connection Type database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::ConnectionType]
-    #
-    # @raise [ArgumentError] if used against a non-Connection Type database or if
-    #   you attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def connection_type(ip_address)
-      flat_model_for(
-        Model::ConnectionType,
-        'connection_type',
-        'GeoIP2-Connection-Type',
-        ip_address,
-      )
-    end
+        options = {}
+        options[:mode] = mode if !mode.nil?
+        @reader = MaxMind::DB.new(database, options)
 
-    # Look up the IP address in a Country database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::Country]
-    #
-    # @raise [ArgumentError] if used against a non-Country database or if you
-    #   attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def country(ip_address)
-      model_for(Model::Country, 'country', 'Country', ip_address)
-    end
+        @type = @reader.metadata.database_type
 
-    # Look up the IP address in a Domain database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::Domain]
-    #
-    # @raise [ArgumentError] if used against a non-Domain database or if you
-    #   attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def domain(ip_address)
-      flat_model_for(Model::Domain, 'domain', 'GeoIP2-Domain', ip_address)
-    end
+        @locales = locales
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
-    # Look up the IP address in an Enterprise database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::Enterprise]
-    #
-    # @raise [ArgumentError] if used against a non-Enterprise database or if
-    #   you attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def enterprise(ip_address)
-      model_for(Model::Enterprise, 'enterprise', 'Enterprise', ip_address)
-    end
+      # Look up the IP address in the database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::AnonymousIP]
+      #
+      # @raise [ArgumentError] if used against a non-Anonymous IP database or if
+      #   you attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def anonymous_ip(ip_address)
+        flat_model_for(
+          Model::AnonymousIP,
+          'anonymous_ip',
+          'GeoIP2-Anonymous-IP',
+          ip_address,
+        )
+      end
 
-    # Look up the IP address in an ISP database.
-    #
-    # @param ip_address [String] a string in the standard notation. It may be
-    #   IPv4 or IPv6.
-    #
-    # @return [MaxMind::GeoIP2::Model::ISP]
-    #
-    # @raise [ArgumentError] if used against a non-ISP database or if you
-    #   attempt to look up an IPv6 address in an IPv4 only database.
-    #
-    # @raise [AddressNotFoundError] if the IP address is not found in the
-    #   database.
-    #
-    # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
-    #   corrupt.
-    def isp(ip_address)
-      flat_model_for(Model::ISP, 'isp', 'GeoIP2-ISP', ip_address)
-    end
+      # Look up the IP address in an ASN database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::ASN]
+      #
+      # @raise [ArgumentError] if used against a non-ASN database or if you
+      #   attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def asn(ip_address)
+        flat_model_for(Model::ASN, 'asn', 'GeoLite2-ASN', ip_address)
+      end
 
-    # Return the metadata associated with the database.
-    #
-    # @return [MaxMind::DB::Metadata]
-    def metadata
-      @reader.metadata
-    end
+      # Look up the IP address in a City database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::City]
+      #
+      # @raise [ArgumentError] if used against a non-City database or if you
+      #   attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def city(ip_address)
+        model_for(Model::City, 'city', 'City', ip_address)
+      end
 
-    # Close the Reader and return resources to the system.
-    #
-    # @return [void]
-    def close
-      @reader.close
-    end
+      # Look up the IP address in a Connection Type database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::ConnectionType]
+      #
+      # @raise [ArgumentError] if used against a non-Connection Type database or if
+      #   you attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def connection_type(ip_address)
+        flat_model_for(
+          Model::ConnectionType,
+          'connection_type',
+          'GeoIP2-Connection-Type',
+          ip_address,
+        )
+      end
 
-    private
+      # Look up the IP address in a Country database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::Country]
+      #
+      # @raise [ArgumentError] if used against a non-Country database or if you
+      #   attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def country(ip_address)
+        model_for(Model::Country, 'country', 'Country', ip_address)
+      end
 
-    def model_for(model_class, method, type, ip_address)
-      record, prefix_length = get_record(method, type, ip_address)
+      # Look up the IP address in a Domain database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::Domain]
+      #
+      # @raise [ArgumentError] if used against a non-Domain database or if you
+      #   attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def domain(ip_address)
+        flat_model_for(Model::Domain, 'domain', 'GeoIP2-Domain', ip_address)
+      end
 
-      record['traits'] = {} if !record.key?('traits')
-      record['traits']['ip_address'] = ip_address
-      record['traits']['prefix_length'] = prefix_length
+      # Look up the IP address in an Enterprise database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::Enterprise]
+      #
+      # @raise [ArgumentError] if used against a non-Enterprise database or if
+      #   you attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def enterprise(ip_address)
+        model_for(Model::Enterprise, 'enterprise', 'Enterprise', ip_address)
+      end
 
-      model_class.new(record, @locales)
-    end
+      # Look up the IP address in an ISP database.
+      #
+      # @param ip_address [String] a string in the standard notation. It may be
+      #   IPv4 or IPv6.
+      #
+      # @return [MaxMind::GeoIP2::Model::ISP]
+      #
+      # @raise [ArgumentError] if used against a non-ISP database or if you
+      #   attempt to look up an IPv6 address in an IPv4 only database.
+      #
+      # @raise [AddressNotFoundError] if the IP address is not found in the
+      #   database.
+      #
+      # @raise [MaxMind::DB::InvalidDatabaseError] if the database appears
+      #   corrupt.
+      def isp(ip_address)
+        flat_model_for(Model::ISP, 'isp', 'GeoIP2-ISP', ip_address)
+      end
 
-    def get_record(method, type, ip_address)
-      if !@type.include?(type)
-        raise ArgumentError,
-              "The #{method} method cannot be used with the #{@type} database."
+      # Return the metadata associated with the database.
+      #
+      # @return [MaxMind::DB::Metadata]
+      def metadata
+        @reader.metadata
       end
 
-      record, prefix_length = @reader.get_with_prefix_length(ip_address)
+      # Close the Reader and return resources to the system.
+      #
+      # @return [void]
+      def close
+        @reader.close
+      end
 
-      if record.nil?
-        raise AddressNotFoundError,
-              "The address #{ip_address} is not in the database."
+      private
+
+      def model_for(model_class, method, type, ip_address)
+        record, prefix_length = get_record(method, type, ip_address)
+
+        record['traits'] = {} if !record.key?('traits')
+        record['traits']['ip_address'] = ip_address
+        record['traits']['prefix_length'] = prefix_length
+
+        model_class.new(record, @locales)
       end
 
-      [record, prefix_length]
-    end
+      def get_record(method, type, ip_address)
+        if !@type.include?(type)
+          raise ArgumentError,
+                "The #{method} method cannot be used with the #{@type} database."
+        end
 
-    def flat_model_for(model_class, method, type, ip_address)
-      record, prefix_length = get_record(method, type, ip_address)
+        record, prefix_length = @reader.get_with_prefix_length(ip_address)
 
-      record['ip_address'] = ip_address
-      record['prefix_length'] = prefix_length
+        if record.nil?
+          raise AddressNotFoundError,
+                "The address #{ip_address} is not in the database."
+        end
 
-      model_class.new(record)
+        [record, prefix_length]
+      end
+
+      def flat_model_for(model_class, method, type, ip_address)
+        record, prefix_length = get_record(method, type, ip_address)
+
+        record['ip_address'] = ip_address
+        record['prefix_length'] = prefix_length
+
+        model_class.new(record)
+      end
     end
   end
 end