IPinfo 1.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd107edec906894bab2445a4d7bc9b551fc79778c7b941a2dfa486d32c969e47
-  data.tar.gz: 1a67c2f0a6c7bbb57209982e1c1e92868aa218deec445826cef2f5ecb91eac5d
+  metadata.gz: 8f1468d25c477278fcae675ca1b4216bb5b205806dd1d23a18c43e9f5d6c0292
+  data.tar.gz: f246e5393f940fff6780227341695b9d25126d2be12f575c587742d14f3196f6
 SHA512:
-  metadata.gz: fe484b50604b7ce3dd70aa8cddc0165b0416b358933ef932d2bd93d83587ab6b4892e4e721be2ca53687cba8bc6c849cd9aab67c1aff11e69fd022d62a26faf1
-  data.tar.gz: b934e0bb1291651ebffe1628ae344294f4a7be1e6ba6c9354eaf9770f8c218e6209df843e2d4d891cd6bce35aee1c090c880fda2e850e0727ee87e954b2d6fd9
+  metadata.gz: d58a691406d3f068864a4da3fb340cf0624a4c7963cf0a4347c84a53b31dce106e6d432f7794f430522690ec84c26b2840f71bb113f58d16462aa484150e99ac
+  data.tar.gz: 439230365af148fa67ace9677bc1b7405032bff1ed581d03627aea2d9f469a9270b8aa91b56d1bcb7e0a517cf7e9a841328e87a6578d394dffaeb48af81331bc

data/.github/workflows/cd_rubygems.yaml

@@ -14,6 +14,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install apt dependencies
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev # needed by faraday-patron gem
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
 

data/.github/workflows/unittest.yaml

@@ -12,13 +12,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.0', '2.7', '2.6']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7', '2.6']
       
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install apt dependencies
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev # needed by faraday-patron gem
 
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.2.2

data/README.md

@@ -40,6 +40,7 @@ handler = IPinfo::create(access_token)
 ip_address = '216.239.36.21'
 
 details = handler.details(ip_address)
+details_v6 = handler.details_v6() # to get details from ipinfo's IPv6 host
 city = details.city # Emeryville
 loc = details.loc # 37.8342,-122.2900
 ```
@@ -58,7 +59,7 @@ require 'ipinfo' unless defined?(IPinfo)
 
 #### Usage
 
-The `IPinfo.details()` method accepts an IP address as an optional, positional
+The `IPinfo.details()` and `IPinfo.details_v6()` methods accept an IP address as an optional, positional
 argument. If no IP address is specified, the API will return data for the IP
 address from which it receives the request.
 
@@ -69,6 +70,7 @@ access_token = '123456789abc'
 handler = IPinfo::create(access_token)
 
 details = handler.details()
+details_v6 = handler.details_v6() # to get details from ipinfo's IPv6 host
 city = details.city # "Emeryville"
 loc = details.loc # 37.8342,-122.2900
 ```
@@ -86,7 +88,7 @@ handler = IPinfo::create(access_token)
 
 #### Details Data
 
-`handler.details()` will return a `Response` object that contains all fields
+`handler.details()` and `handler.details_v6` will return a `Response` object that contains all fields
 listed in the [IPinfo developerdocs](https://ipinfo.io/developers/responses#full-response)
 with a few minor additions. Properties can be accessed directly.
 
@@ -96,8 +98,8 @@ hostname = details.hostname # cpe-104-175-221-247.socal.res.rr.com
 
 ##### Country Name
 
-`details.country_name` will return the country name, as supplied by the
-`countries.json` file. See below for instructions on changing that file for use
+`details.country_name` will return the country name, as defined by `DEFAULT_COUNTRY_LIST`
+within `countriesData.rb`. See below for instructions on changing that file for use
 with non-English languages. `details.country` will still return the country code.
 
 ```ruby
@@ -107,7 +109,8 @@ country_name = details.country_name # United States
 
 ##### European Union (EU) Country
 
-`details.is_eu` will return `true` if the country is a member of the European Union (EU), as supplied by the `eu.json` file.
+`details.is_eu` will return `true` if the country is a member of the European Union (EU)
+, as defined by `DEFAULT_EU_COUNTRIES_LIST` within `countriesData.rb`.
 
 ```ruby
 is_eu = details.is_eu # false
@@ -115,11 +118,10 @@ is_eu = details.is_eu # false
 
 It is possible to change the file by setting the `eu_countries` setting when creating the `IPinfo` object.
 
-The file must be a `.json` file with the [following structure](lib/ipinfo/eu.json).
-
 ##### Country Flag
 
-`details.country_flag` will return `emoji` and `unicode` of a country's flag, as supplied by the `eu.json` file.
+`details.country_flag` will return `emoji` and `unicode` of a country's flag, as defined by
+`DEFAULT_COUNTRIES_FLAG_LIST` within `countriesData.rb`.
 
 ```ruby
 country_flag = details.country_flag # {"emoji"=>"🇺🇸", "unicode"=>"U+1F1FA U+1F1F8"}
@@ -137,7 +139,8 @@ country_flag = details.country_flag_url # {"https://cdn.ipinfo.io/static/images/
 
 ##### Country Currency
 
-`details.country_currency` will return `code` and `symbol` of a country's currency, as supplied by the `currency.json` file.
+`details.country_currency` will return `code` and `symbol` of a country's currency, as defined by
+`DEFAULT_COUNTRIES_CURRENCIES_LIST` within `countriesData.rb`.
 
 ```ruby
 country_currency = details.country_currency # {"code"=>"USD", "symbol"=>"$"}
@@ -147,11 +150,10 @@ country_currency_symbol = details.country_currency['symbol'] # $
 
 It is possible to change the file by setting the `countries_currencies` setting when creating the `IPinfo` object.
 
-The file must be a `.json` file with the [following structure](lib/ipinfo/currency.json).
-
 ##### Continent
 
-`details.continent` will return `code` and `name` of the continent, as supplied by the `continent.json` file.
+`details.continent` will return `code` and `name` of the continent, as defined by
+`DEFAULT_CONTINENT_LIST` within `countriesData.rb`.
 
 ```ruby
 continent = details.continent # {"code"=>"NA", "name"=>"North America"}
@@ -161,8 +163,6 @@ continent_name = details.continent['name'] # North America
 
 It is possible to change the file by setting the `continents` setting when creating the `IPinfo` object.
 
-The file must be a `.json` file with the [following structure](lib/ipinfo/continent.json).
-
 #### IP Address
 
 `details.ip_address` will return the `IPAddr` object from the
@@ -273,14 +273,12 @@ When looking up an IP address, the response object includes a
 American English. It is possible to return the country name in other languages
 by setting the `countries` setting when creating the `IPinfo` object.
 
-The file must be a `.json` file with the following structure:
-
 ```
 {
- "BD": "Bangladesh",
- "BE": "Belgium",
- "BF": "Burkina Faso",
- "BG": "Bulgaria"
+ "BD" => "Bangladesh",
+ "BE" => "Belgium",
+ "BF" => "Burkina Faso",
+ "BG" => "Bulgaria"
  ...
 }
 ```

data/ipinfo.gemspec

@@ -16,7 +16,15 @@ Gem::Specification.new do |spec|
     spec.description   = ' This is a ruby wrapper for http://ipinfo.io. '
     spec.homepage      = 'https://ipinfo.io'
 
-    spec.add_runtime_dependency 'faraday', '~> 1.0'
+    spec.add_runtime_dependency 'faraday', '~> 2.0'
+    # add development dependency to test against faraday adapters that are been moved out the gem
+    spec.add_development_dependency 'async-http-faraday'
+    spec.add_development_dependency 'faraday-net_http_persistent', '~> 2.0'
+    spec.add_development_dependency 'faraday-typhoeus', '~> 1.0'
+    spec.add_development_dependency 'faraday-patron', '~> 2.0'
+    spec.add_development_dependency 'faraday-httpclient', '~> 2.0'
+    spec.add_development_dependency 'faraday-excon', '~> 2.1'
+
     spec.add_runtime_dependency 'json', '~> 2.1'
     spec.add_runtime_dependency 'lru_redux', '~> 1.1'
 

data/lib/ipinfo/adapter.rb

@@ -3,9 +3,11 @@
 require 'faraday'
 require 'cgi'
 require 'ipinfo/mod'
+require_relative './version.rb'
 
 class IPinfo::Adapter
-    HOST = 'ipinfo.io'
+    HOST = 'https://ipinfo.io'
+    HOST_V6 = 'https://v6.ipinfo.io'
 
     attr_reader :conn
 
@@ -14,8 +16,9 @@ class IPinfo::Adapter
         @conn = connection(adapter)
     end
 
-    def get(uri)
-        @conn.get(uri) do |req|
+    def get(uri, host_type= :v4)
+        host = (host_type == :v6) ? HOST_V6 : HOST
+        @conn.get(host + uri) do |req|
             default_headers.each_pair do |key, value|
                 req.headers[key] = value
             end
@@ -24,7 +27,7 @@ class IPinfo::Adapter
     end
 
     def post(uri, body, timeout = 2)
-        @conn.post(uri) do |req|
+        @conn.post(HOST + uri) do |req|
             req.body = body
             req.options.timeout = timeout
         end
@@ -35,14 +38,14 @@ class IPinfo::Adapter
     attr_reader :token
 
     def connection(adapter)
-        Faraday.new(url: "https://#{HOST}") do |conn|
+        Faraday.new() do |conn|
             conn.adapter(adapter)
         end
     end
 
     def default_headers
         headers = {
-            'User-Agent' => 'IPinfoClient/Ruby/1.1.0',
+            'User-Agent' => "IPinfoClient/Ruby/#{IPinfo::VERSION}",
             'Accept' => 'application/json'
         }
         headers['Authorization'] = "Bearer #{CGI.escape(token)}" if token