IPinfo 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d123a1cdf07b3693cc28ea77d42da4d9984cbdc8676ab235c5a837d8cfb2d272
-  data.tar.gz: e322a8feefc0bb770b0318ecb66967c0ab50e0171bf5ca5d1921deb4ab79bdd3
+  metadata.gz: 908f27e7bc10bccd5d91c5697e53ef43c3399f497a797596cba28403e5fb7769
+  data.tar.gz: 93805a37bd2528f8f335bdfacb7c8367a8c95f4cf6728f5f9a7fbb216daeb831
 SHA512:
-  metadata.gz: 18d5583c9b890e82dd229ee7138a7f956ed4ce8e32267cf0b0b2eb61417f85792963a83711e7756f572868cfbeefdf828460c9c547c27578d9d5d47bef909ecf
-  data.tar.gz: d404fa4474c572d6c0e1076ecd4c460224db7393ebb9e4c1344f73ecbe4b96d92fdcd0d4f7ce2d8b5f51372c85ad2859ca5cd3328cba1b0d2070808dd17f0cfa
+  metadata.gz: f5178a2fee807837d3385b3e3fb00098aac28b54480d6492e11fc5e30de7ec92cd16d0c3bfb4685be15c3dfa18b2b6db44f8bc01568a63ba3fd24375421d6c11
+  data.tar.gz: 811a19e8a55e9a06b84e075c36d4ce52e8d127f0d5bacf944b142b0318c934d39229261e22e96a271ecf2c816175262c48e35cc593d93429880ed485e6f0c3cd

data/lib/ipinfo/adapter.rb

@@ -91,3 +91,81 @@ class IPinfo::AdapterLite
         headers
     end
 end
+
+class IPinfo::AdapterCore
+    HOST = 'https://api.ipinfo.io/lookup'
+
+    attr_reader :conn
+
+    def initialize(token = nil, adapter = :net_http)
+        @token = token
+        @conn = connection(adapter)
+    end
+
+    def get(uri)
+        @conn.get(HOST + uri) do |req|
+            default_headers.each_pair do |key, value|
+                req.headers[key] = value
+            end
+            req.params['token'] = CGI.escape(token) if token
+        end
+    end
+
+    private
+
+    attr_reader :token
+
+    def connection(adapter)
+        Faraday.new() do |conn|
+            conn.adapter(adapter)
+        end
+    end
+
+    def default_headers
+        headers = {
+            'User-Agent' => "IPinfoClient/Ruby/#{IPinfo::VERSION}",
+            'Accept' => 'application/json'
+        }
+        headers['Authorization'] = "Bearer #{CGI.escape(token)}" if token
+        headers
+    end
+end
+
+class IPinfo::AdapterPlus
+    HOST = 'https://api.ipinfo.io/lookup'
+
+    attr_reader :conn
+
+    def initialize(token = nil, adapter = :net_http)
+        @token = token
+        @conn = connection(adapter)
+    end
+
+    def get(uri)
+        @conn.get(HOST + uri) do |req|
+            default_headers.each_pair do |key, value|
+                req.headers[key] = value
+            end
+            req.params['token'] = CGI.escape(token) if token
+        end
+    end
+
+    private
+
+    attr_reader :token
+
+    def connection(adapter)
+        Faraday.new() do |conn|
+            conn.adapter(adapter)
+        end
+    end
+
+    def default_headers
+        headers = {
+            'User-Agent' => "IPinfoClient/Ruby/#{IPinfo::VERSION}",
+            'Accept' => 'application/json'
+        }
+        headers['Authorization'] = "Bearer #{CGI.escape(token)}" if token
+        headers
+    end
+end

data/lib/ipinfo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IPinfo
-    VERSION = '2.3.1'
+    VERSION = '2.4.0'
 end

data/lib/ipinfo_core.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'ipinfo/adapter'
+require 'ipinfo/cache/default_cache'
+require 'ipinfo/errors'
+require 'ipinfo/response'
+require_relative 'ipinfo/ipAddressMatcher'
+require_relative 'ipinfo/countriesData'
+require 'ipaddr'
+require 'cgi'
+
+module IPinfoCore
+    include CountriesData
+    DEFAULT_CACHE_MAXSIZE = 4096
+    DEFAULT_CACHE_TTL = 60 * 60 * 24
+    RATE_LIMIT_MESSAGE = 'To increase your limits, please review our ' \
+                         'paid plans at https://ipinfo.io/pricing'
+    # Base URL to get country flag image link.
+    # "PK" -> "https://cdn.ipinfo.io/static/images/countries-flags/PK.svg"
+    COUNTRY_FLAGS_URL = 'https://cdn.ipinfo.io/static/images/countries-flags/'
+
+    class << self
+        def create(access_token = nil, settings = {})
+            IPinfo::IPinfoCore.new(access_token, settings)
+        end
+    end
+end
+
+class IPinfo::IPinfoCore
+    include IPinfoCore
+    attr_accessor :access_token, :countries, :httpc
+
+    def initialize(access_token = nil, settings = {})
+        @access_token = access_token
+        @httpc = IPinfo::AdapterCore.new(access_token, httpc || :net_http)
+
+        maxsize = settings.fetch('maxsize', DEFAULT_CACHE_MAXSIZE)
+        ttl = settings.fetch('ttl', DEFAULT_CACHE_TTL)
+        @cache = settings.fetch('cache', IPinfo::DefaultCache.new(ttl, maxsize))
+        @countries = settings.fetch('countries', DEFAULT_COUNTRY_LIST)
+        @eu_countries = settings.fetch('eu_countries', DEFAULT_EU_COUNTRIES_LIST)
+        @countries_flags = settings.fetch('countries_flags', DEFAULT_COUNTRIES_FLAG_LIST)
+        @countries_currencies = settings.fetch('countries_currencies', DEFAULT_COUNTRIES_CURRENCIES_LIST)
+        @continents = settings.fetch('continents', DEFAULT_CONTINENT_LIST)
+    end
+
+    def details(ip_address = nil)
+        details_base(ip_address)
+    end
+
+    def request_details(ip_address = nil)
+        if ip_address && isBogon(ip_address)
+            details = {}
+            details[:ip] = ip_address
+            details[:bogon] = true
+            details[:ip_address] = IPAddr.new(ip_address)
+            return details
+        end
+
+        res = @cache.get(cache_key(ip_address))
+        return res unless res.nil?
+
+        response = @httpc.get(escape_path(ip_address))
+
+        if response.status.eql?(429)
+            raise RateLimitError,
+                  RATE_LIMIT_MESSAGE
+        end
+
+        details = JSON.parse(response.body, symbolize_names: true)
+        @cache.set(cache_key(ip_address), details)
+        details
+    end
+
+    def details_base(ip_address)
+        details = request_details(ip_address)
+
+        # Core response has nested geo object
+        if details.key?(:geo) && details[:geo].is_a?(Hash) && details[:geo].key?(:country_code)
+            country_code = details[:geo][:country_code]
+            details[:geo][:country_name] = @countries.fetch(country_code, nil)
+            details[:geo][:is_eu] = @eu_countries.include?(country_code)
+            details[:geo][:country_flag] = @countries_flags.fetch(country_code, nil)
+            details[:geo][:country_currency] = @countries_currencies.fetch(country_code, nil)
+            details[:geo][:continent] = @continents.fetch(country_code, nil)
+            details[:geo][:country_flag_url] = "#{COUNTRY_FLAGS_URL}#{country_code}.svg"
+        end
+
+        # Handle top-level country_code if present (for certain edge cases)
+        if details.key?(:country_code)
+            country_code = details[:country_code]
+            details[:country_name] = @countries.fetch(country_code, nil)
+            details[:is_eu] = @eu_countries.include?(country_code)
+            details[:country_flag] = @countries_flags.fetch(country_code, nil)
+            details[:country_currency] = @countries_currencies.fetch(country_code, nil)
+            details[:continent] = @continents.fetch(country_code, nil)
+            details[:country_flag_url] = "#{COUNTRY_FLAGS_URL}#{country_code}.svg"
+        end
+
+        if details.key? :ip
+            details[:ip_address] =
+                IPAddr.new(details.fetch(:ip))
+        end
+
+        IPinfo::Response.new(details)
+    end
+
+    def isBogon(ip)
+        if ip.nil?
+          return false
+        end
+
+        matcher_object = IPinfo::IpAddressMatcher.new(ip)
+        matcher_object.matches
+    end
+
+    def escape_path(ip)
+        ip ? "/#{CGI.escape(ip)}" : '/'
+    end
+
+    def cache_key(ip)
+        "1:#{ip}"
+    end
+end

data/lib/ipinfo_lite.rb

@@ -50,10 +50,10 @@ class IPinfo::IPinfoLite
 
     def request_details(ip_address = nil)
         if ip_address && ip_address != 'me' && isBogon(ip_address)
+            details = {}
             details[:ip] = ip_address
             details[:bogon] = true
             details[:ip_address] = IPAddr.new(ip_address)
-
             return details
         end
 

data/lib/ipinfo_plus.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'ipinfo/adapter'
+require 'ipinfo/cache/default_cache'
+require 'ipinfo/errors'
+require 'ipinfo/response'
+require_relative 'ipinfo/ipAddressMatcher'
+require_relative 'ipinfo/countriesData'
+require 'ipaddr'
+require 'cgi'
+
+module IPinfoPlus
+    include CountriesData
+    DEFAULT_CACHE_MAXSIZE = 4096
+    DEFAULT_CACHE_TTL = 60 * 60 * 24
+    RATE_LIMIT_MESSAGE = 'To increase your limits, please review our ' \
+                         'paid plans at https://ipinfo.io/pricing'
+    # Base URL to get country flag image link.
+    # "PK" -> "https://cdn.ipinfo.io/static/images/countries-flags/PK.svg"
+    COUNTRY_FLAGS_URL = 'https://cdn.ipinfo.io/static/images/countries-flags/'
+
+    class << self
+        def create(access_token = nil, settings = {})
+            IPinfo::IPinfoPlus.new(access_token, settings)
+        end
+    end
+end
+
+class IPinfo::IPinfoPlus
+    include IPinfoPlus
+    attr_accessor :access_token, :countries, :httpc
+
+    def initialize(access_token = nil, settings = {})
+        @access_token = access_token
+        @httpc = IPinfo::AdapterPlus.new(access_token, httpc || :net_http)
+
+        maxsize = settings.fetch('maxsize', DEFAULT_CACHE_MAXSIZE)
+        ttl = settings.fetch('ttl', DEFAULT_CACHE_TTL)
+        @cache = settings.fetch('cache', IPinfo::DefaultCache.new(ttl, maxsize))
+        @countries = settings.fetch('countries', DEFAULT_COUNTRY_LIST)
+        @eu_countries = settings.fetch('eu_countries', DEFAULT_EU_COUNTRIES_LIST)
+        @countries_flags = settings.fetch('countries_flags', DEFAULT_COUNTRIES_FLAG_LIST)
+        @countries_currencies = settings.fetch('countries_currencies', DEFAULT_COUNTRIES_CURRENCIES_LIST)
+        @continents = settings.fetch('continents', DEFAULT_CONTINENT_LIST)
+    end
+
+    def details(ip_address = nil)
+        details_base(ip_address)
+    end
+
+    def request_details(ip_address = nil)
+        if ip_address && isBogon(ip_address)
+            details = {}
+            details[:ip] = ip_address
+            details[:bogon] = true
+            details[:ip_address] = IPAddr.new(ip_address)
+            return details
+        end
+
+        res = @cache.get(cache_key(ip_address))
+        return res unless res.nil?
+
+        response = @httpc.get(escape_path(ip_address))
+
+        if response.status.eql?(429)
+            raise RateLimitError,
+                  RATE_LIMIT_MESSAGE
+        end
+
+        details = JSON.parse(response.body, symbolize_names: true)
+        @cache.set(cache_key(ip_address), details)
+        details
+    end
+
+    def details_base(ip_address)
+        details = request_details(ip_address)
+
+        # Plus response has nested geo object (same structure as Core)
+        if details.key?(:geo) && details[:geo].is_a?(Hash) && details[:geo].key?(:country_code)
+            country_code = details[:geo][:country_code]
+            details[:geo][:country_name] = @countries.fetch(country_code, nil)
+            details[:geo][:is_eu] = @eu_countries.include?(country_code)
+            details[:geo][:country_flag] = @countries_flags.fetch(country_code, nil)
+            details[:geo][:country_currency] = @countries_currencies.fetch(country_code, nil)
+            details[:geo][:continent] = @continents.fetch(country_code, nil)
+            details[:geo][:country_flag_url] = "#{COUNTRY_FLAGS_URL}#{country_code}.svg"
+        end
+
+        # Handle top-level country_code if present (for certain edge cases)
+        if details.key?(:country_code)
+            country_code = details[:country_code]
+            details[:country_name] = @countries.fetch(country_code, nil)
+            details[:is_eu] = @eu_countries.include?(country_code)
+            details[:country_flag] = @countries_flags.fetch(country_code, nil)
+            details[:country_currency] = @countries_currencies.fetch(country_code, nil)
+            details[:continent] = @continents.fetch(country_code, nil)
+            details[:country_flag_url] = "#{COUNTRY_FLAGS_URL}#{country_code}.svg"
+        end
+
+        if details.key? :ip
+            details[:ip_address] =
+                IPAddr.new(details.fetch(:ip))
+        end
+
+        IPinfo::Response.new(details)
+    end
+
+    def isBogon(ip)
+        if ip.nil?
+          return false
+        end
+
+        matcher_object = IPinfo::IpAddressMatcher.new(ip)
+        matcher_object.matches
+    end
+
+    def escape_path(ip)
+        ip ? "/#{CGI.escape(ip)}" : '/'
+    end
+
+    def cache_key(ip)
+        "1:#{ip}"
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: IPinfo
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - IPinfo releases
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -166,7 +166,9 @@ files:
 - lib/ipinfo/mod.rb
 - lib/ipinfo/response.rb
 - lib/ipinfo/version.rb
+- lib/ipinfo_core.rb
 - lib/ipinfo_lite.rb
+- lib/ipinfo_plus.rb
 homepage: https://ipinfo.io
 licenses: []
 metadata: {}