Separate functions for v4 & v6.

ipinfo · Jan 1, 2024 · 51a1487 · 51a1487
1 parent 8ee44c4
commit 51a1487
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,21 @@ city = details.city # Emeryville
 loc = details.loc # 37.8342,-122.2900
 ```
 
+#### To make an IPv6 request
+
+```ruby
+require 'ipinfo'
+
+access_token = '123456789abc'
+handler = IPinfo::create(access_token)
+handler.initialize_v6
+ip_address = '216.239.36.21'
+
+details = handler.details(ip_address)
+city = details.city # Emeryville
+loc = details.loc # 37.8342,-122.2900
+``````
+
 ##### Note about Rails 6+
 
 If using this package in Rails 6+, the Zeitwerk auto-loader may not properly

diff --git a/lib/ipinfo.rb b/lib/ipinfo.rb
@@ -33,18 +33,11 @@ class IPinfo::IPinfo
  attr_accessor :access_token, :countries, :httpc, :host_type
 
  def initialize(access_token = nil, settings = {})
- @access_token = access_token
- @host_type = settings.fetch('host_type', :v4)
- @httpc = prepare_http_client(settings.fetch('http_client', nil))
+ initialize_base(access_token, settings, host_type: :v4)
+ end
 
- maxsize = settings.fetch('maxsize', DEFAULT_CACHE_MAXSIZE)
- ttl = settings.fetch('ttl', DEFAULT_CACHE_TTL)
- @cache = settings.fetch('cache', 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)
+ def initialize_v6(access_token = nil, settings = {})
+ initialize_base(access_token, settings, host_type: :v6)
  end
 
  def details(ip_address = nil)
@@ -159,15 +152,27 @@ def request_details(ip_address = nil)
  end
 
  def prepare_http_client(httpc = nil)
- @httpc = if httpc
- Adapter.new(access_token, httpc, host_type)
- else
- Adapter.new(access_token, :net_http, host_type)
- end
+ @httpc = httpc ? Adapter.new(access_token, httpc, host_type) :
+ Adapter.new(access_token, :net_http, host_type)
  end
 
  private
 
+ def initialize_base(access_token = nil, settings = {}, host_type: :v4)
+ @access_token = access_token
+ @host_type = host_type
+ @httpc = prepare_http_client(settings.fetch('http_client', nil))
+
+ maxsize = settings.fetch('maxsize', DEFAULT_CACHE_MAXSIZE)
+ ttl = settings.fetch('ttl', DEFAULT_CACHE_TTL)
+ @cache = settings.fetch('cache', 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 isBogon(ip)
  if ip.nil?
  return false

diff --git a/lib/ipinfo/adapter.rb b/lib/ipinfo/adapter.rb
@@ -3,6 +3,7 @@
 require 'faraday'
 require 'cgi'
 require 'ipinfo/mod'
+require_relative './version.rb'
 
 class IPinfo::Adapter
  HOST = 'ipinfo.io'
@@ -44,7 +45,7 @@ def connection(adapter)
 
  def default_headers
  headers = {
- 'User-Agent' => 'IPinfoClient/Ruby/2.2.0',
+ 'User-Agent' => 'IPinfoClient/Ruby/#{IPinfo::VERSION}',
  'Accept' => 'application/json'
  }
  headers['Authorization'] = "Bearer #{CGI.escape(token)}" if token

diff --git a/test/ipinfo_test.rb b/test/ipinfo_test.rb
@@ -22,8 +22,9 @@ def test_set_adapter_v4
  def test_set_adapter_v6
  ipinfo = IPinfo.create(
  ENV['IPINFO_TOKEN'],
- { http_client: :excon, 'host_type' => :v6 }
+ { http_client: :excon }
  )
+ ipinfo.initialize_v6
 
  assert(ipinfo.httpc = :excon)
  end
@@ -103,15 +104,17 @@ def test_lookup_ip6
  end
  end
 
- def test_lookup_ip6_on_host_v6
- ipinfo = IPinfo.create(ENV['IPINFO_TOKEN'], { 'host_type' => :v6 })
+ # # Requires IPv6 support
+ # def test_lookup_ip6_on_host_v6
+ # ipinfo = IPinfo.create(ENV['IPINFO_TOKEN'])
+ # ipinfo.initialize_v6
 
- # multiple checks for cache
- (0...5).each do |_|
- resp = ipinfo.details(TEST_IPV6)
- assert_ip6(resp)
- end
- end
+ #  # multiple checks for cache
+ #  (0...5).each do |_|
+ #  resp = ipinfo.details(TEST_IPV6)
+ #  assert_ip6(resp)
+ #  end
+ # end
 
  def assert_ip4(resp)
  assert_equal(resp.ip, TEST_IPV4)
@@ -191,13 +194,15 @@ def test_lookup_ip4
  end
  end
 
- def test_lookup_ip4_on_host_v6
- ipinfo = IPinfo.create(ENV['IPINFO_TOKEN'], { 'host_type' => :v6 })
-
- # multiple checks for cache
- (0...5).each do |_|
- resp = ipinfo.details(TEST_IPV4)
- assert_ip4(resp)
- end
- end
+ # # Requires IPv6 support
+ # def test_lookup_ip4_on_host_v6
+ # ipinfo = IPinfo.create(ENV['IPINFO_TOKEN'])
+ # ipinfo.initialize_v6
+
+ # # multiple checks for cache
+ # (0...5).each do |_|
+ # resp = ipinfo.details(TEST_IPV4)
+ # assert_ip4(resp)
+ # end
+ # end
 end