IPinfo 0.1.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33886b42b301db7746775ab6b1ab25b599ded87a2efcaefa4a7fbebaedee0b4d
-  data.tar.gz: df842936838fc9f3f99e0f76087c4447ea77d3835ea5b68d0b2094f648b08d24
+  metadata.gz: c4c7edbf9ea00bfe0f34278ce345a0be0af732787dac8894043640d1c72f3dda
+  data.tar.gz: a012b52f9d182417c48f96997e80464b37633b46b0e54e2251b36c8d36710174
 SHA512:
-  metadata.gz: dbdae04fb5482bffd97c600ef9b39f4067cfe1a79bb9c15d17643df45f4057df2c13a549b5303c09a953da45f5e34aa8c6570c0364052b70e56bda5f070a1e6e
-  data.tar.gz: 6c6705f80829c4e3b808a2c1809df8f8eddd7d8adb0a0f34b50c2d22185bd27bbc772ca6cc05139f28a1e226675a1994f90453ef403a440f53aacc2f1565cdc5
+  metadata.gz: 706d928db455afb05db71bbf170b33616fa141c3f5765ac1045563e24b90e124fd8fbb9743bcdd7ac9b0ba1a7d0ccf30a4615cb2edf0fefe55e5c903f9be8eac
+  data.tar.gz: f49d989cf52c9b1524ce2d4a177cc906ab5c680745fb23f540fa6395c31f6a4bac304f904849f0b8298a89600e93321a2f6e0165988506f8ad0ede81c7873ad1

data/.editorconfig

@@ -10,4 +10,4 @@ indent_style = space
 indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
-max_line_length = 120
+max_line_length = 80

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+IPinfo-*.gem

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+    TargetRubyVersion: 2.5
+    NewCops: enable
+
+Layout/IndentationWidth:
+    Width: 4
+
+Layout/LineLength:
+    Enabled: true
+    Max: 80
+
+Lint/MissingSuper:
+    Enabled: false
+
+Metrics/MethodLength:
+    Enabled: false
+
+Metrics/AbcSize:
+    Enabled: false
+
+Metrics/ClassLength:
+    Enabled: false
+
+Lint/DuplicateMethods:
+    Enabled: false
+
+Style/Documentation:
+    Enabled: false
+
+Style/ClassAndModuleChildren:
+    Enabled: false
+
+Style/MethodCallWithArgsParentheses:
+    EnforcedStyle: require_parentheses
+    IgnoreMacros: false
+    IgnoredPatterns: []
+    AllowParenthesesInMultilineCall: true
+    AllowParenthesesInChaining: true
+    AllowParenthesesInCamelCaseMethod: true
+
+Style/MethodCallWithoutArgsParentheses:
+    Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/.travis.yml

@@ -3,11 +3,9 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 before_install:
 - gem install bundler

data/Gemfile

@@ -1,34 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ipinfo.gemspec
 gemspec
 
-
 group :development do
-  # Rack 2.0+ requires Ruby >= 2.2.2 which is problematic for the test suite on
-  # older Ruby versions. Check Ruby the version here and put a maximum
-  # constraint on Rack if necessary.
-
-  if RUBY_VERSION >= "2.2.2"
-    gem "rack", ">= 1.5"
-  else
-    gem "rack", ">= 1.5", "< 2.0"
-  end
-
-  gem "bundler"
-  gem "rake"
-  gem "minitest"
-  gem 'minitest-vcr'
-  gem 'minitest-reporters'
-  gem 'webmock'
-
-  platforms :mri do
-    # to avoid problems, bring Byebug in on just versions of Ruby under which
-    # it's known to work well
-    if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("2.0.0")
-      gem "byebug"
-      gem "pry"
-      gem "pry-byebug"
-    end
-  end
+    gem 'bundler'
+    gem 'minitest'
+    gem 'minitest-reporters'
+    gem 'rake'
+    gem 'rubocop'
 end

data/README.md

@@ -1,24 +1,25 @@
 # [<img src="https://ipinfo.io/static/ipinfo-small.svg" alt="IPinfo" width="24"/>](https://ipinfo.io/) IPinfo Ruby Client Library
 
 This is the official Ruby client library for the [IPinfo.io](https://ipinfo.io) IP address API, allowing you to lookup your own IP address, or get any of the following details for an IP:
- - IP geolocation (city, region, country, postal code, latitude and longitude)
- - ASN details (ISP or network operator, associated domain name, and type, such as business, hosting or company)
- - Company details (the name and domain of the business that uses the IP address)
- - Carrier details (the name of the mobile carrier and MNC and MCC for that carrier if the IP is used exclusively for mobile traffic)
+ - [IP geolocation data](https://ipinfo.io/ip-geolocation-api) (city, region, country, postal code, latitude and longitude)
+ - [ASN information](https://ipinfo.io/asn-api) (ISP or network operator, associated domain name, and type, such as business, hosting or company)
+ - [Firmographic data](https://ipinfo.io/ip-company-api) (the name and domain of the business that uses the IP address)
+ - [Carrier details](https://ipinfo.io/ip-carrier-api) (the name of the mobile carrier and MNC and MCC for that carrier if the IP is used exclusively for mobile traffic)
 
+Check all the data we have for your IP address [here](https://ipinfo.io/what-is-my-ip).
 
 ### Getting Started
 
-You'll need an IPinfo API access token, which you can get by singing up for a free account at [https://ipinfo.io/signup](https://ipinfo.io/signup?ref=lib-Ruby).
+You'll need an IPinfo API access token, which you can get by singing up for a free account at [https://ipinfo.io/signup](https://ipinfo.io/signup).
 
-The free plan is limited to 1,000 requests a day, and doesn't include some of the data fields such as IP type and company data. To enable all the data fields and additional request volumes see [https://ipinfo.io/pricing](https://ipinfo.io/pricing?ref=lib-Ruby)
+The free plan is limited to 50,000 requests per month, and doesn't include some of the data fields such as IP type and company data. To enable all the data fields and additional request volumes see [https://ipinfo.io/pricing](https://ipinfo.io/pricing)
 
 #### Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ipinfo'
+gem 'IPinfo'
 ```
 
 And then execute:
@@ -27,12 +28,12 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ipinfo
+    $ gem install IPinfo
 
 #### Quick Start
 
 ```ruby
-require 'ipinfo'
+require 'IPinfo'
 
 access_token = '123456789abc'
 handler = IPinfo::create(access_token)
@@ -45,10 +46,12 @@ loc = details.loc # 37.8342,-122.2900
 
 #### Usage
 
-The `IPinfo.details()` method accepts 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.
+The `IPinfo.details()` method accepts 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.
 
 ```ruby
-require 'ipinfo'
+require 'IPinfo'
 
 access_token = '123456789abc'
 handler = IPinfo::create(access_token)
@@ -60,7 +63,9 @@ loc = details.loc # 37.8342,-122.2900
 
 #### Authentication
 
-The IPinfo library can be authenticated with your IPinfo API token, which is passed in as a positional argument. It also works without an authentication token, but in a more limited capacity.
+The IPinfo library can be authenticated with your IPinfo API token, which is
+passed in as a positional argument. It also works without an authentication
+token, but in a more limited capacity.
 
 ```ruby
 access_token = '123456789abc'
@@ -69,7 +74,9 @@ handler = IPinfo::create(access_token)
 
 #### Details Data
 
-`handler.details()` will return a `Response` object that contains all fields listed in the [IPinfo developer docs](https://ipinfo.io/developers/responses#full-response) with a few minor additions. Properties can be accessed directly.
+`handler.details()` 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.
 
 ```ruby
 hostname = details.hostname # cpe-104-175-221-247.socal.res.rr.com
@@ -77,7 +84,9 @@ 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 with non-English languages. `details.country` will still return country code.
+`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
+with non-English languages. `details.country` will still return country code.
 
 ```ruby
 country = details.country # US
@@ -86,7 +95,9 @@ country_name = details.country_name # United States
 
 #### IP Address
 
-`details.ip_address` will return the an `IPAddr` object from the [Ruby Standard Library](https://ruby-doc.org/stdlib-2.5.1/libdoc/ipaddr/rdoc/IPAddr.html). `details.ip` will still return a string.
+`details.ip_address` will return the an `IPAddr` object from the
+[Ruby Standard Library](https://ruby-doc.org/stdlib-2.5.1/libdoc/ipaddr/rdoc/IPAddr.html).
+`details.ip` will still return a string.
 
 ```ruby
 ip = details.ip # 104.175.221.247
@@ -95,7 +106,9 @@ ip_addr = details.ip_address # <IPAddr: IPv4:104.175.221.247/255.255.255.255>
 
 ##### Longitude and Latitude
 
-`details.latitude` and `details.longitude` will return latitude and longitude, respectively, as strings. `details.loc` will still return a composite string of both values.
+`details.latitude` and `details.longitude` will return latitude and longitude,
+respectively, as strings. `details.loc` will still return a composite string of
+both values.
 
 ```ruby
 loc = details.loc # 34.0293,-118.3570
@@ -134,13 +147,22 @@ details.all = {
 
 #### Caching
 
-In-memory caching of `details` data is provided by default via the [lrucache](https://www.rubydoc.info/gems/lrucache/0.1.4/LRUCache) gem. This uses an LRU (least recently used) cache with a TTL (time to live) by default. This means that values will be cached for the specified duration; if the cache's max size is reached, cache values will be invalidated as necessary, starting with the oldest cached value.
+In-memory caching of `details` data is provided by default via the
+[`lru_redux`](https://github.com/SamSaffron/lru_redux) gem. This uses an LRU
+(least recently used) cache with a TTL (time to live) by default. This means
+that values will be cached for the specified duration; if the cache's max size
+is reached, cache values will be invalidated as necessary, starting with the
+oldest cached value.
 
 ##### Modifying cache options
 
-Cache behavior can be modified by setting the `cache_options` keyword argument. `cache_options` is a dictionary in which the keys are keyword arguments specified in the `cachetools` library. The nesting of keyword arguments is to prevent name collisions between this library and its dependencies.
+Cache behavior can be modified by setting the `cache_options` keyword argument.
+`cache_options` is a dictionary in which the keys are keyword arguments
+specified in the `cachetools` library. The nesting of keyword arguments is to
+prevent name collisions between this library and its dependencies.
 
-* Default maximum cache size: 4096 (multiples of 2 are recommended to increase efficiency)
+* Default maximum cache size: 4096 (multiples of 2 are recommended to increase
+  efficiency)
 * Default TTL: 24 hours (in seconds)
 
 ```ruby
@@ -150,15 +172,22 @@ handler = IPinfo::create(token, {:ttl => 30, :maxsize => 30})
 
 ##### Using a different cache
 
-It's possible to use a custom cache by creating a child class of the [CacheInterface](https://github.com/jhtimmins/ruby/blob/master/lib/ipinfo/cache/cache_interface.rb) class and passing this into the handler object with the `cache` keyword argument. FYI this is known as [the Strategy Pattern](https://sourcemaking.com/design_patterns/strategy).
+It's possible to use a custom cache by creating a child class of the
+[CacheInterface](https://github.com/jhtimmins/ruby/blob/master/lib/ipinfo/cache/cache_interface.rb)
+class and passing this into the handler object with the `cache` keyword
+argument. FYI this is known as
+[the Strategy Pattern](https://sourcemaking.com/design_patterns/strategy).
 
 ```ruby
 handler = IPinfo.handler(token, {:cache => my_fancy_custom_class})
 ```
 
-
 ### Using a different HTTP library
-Ruby is notorious for having lots of HTTP libraries. While `Net::HTTP` is a reasonable default, you can set any other that [Faraday supports](https://github.com/lostisland/faraday/tree/29feeb92e3413d38ffc1fd3a3479bb48a0915730#faraday) if you prefer.
+
+Ruby is notorious for having lots of HTTP libraries. While `Net::HTTP` is a
+reasonable default, you can set any other that
+[Faradaysupports](https://github.com/lostisland/faraday/tree/29feeb92e3413d38ffc1fd3a3479bb48a0915730#faraday)
+if you prefer.
 
 ```ruby
 access_token = '123456789abc'
@@ -169,7 +198,10 @@ Don't forget to bundle the custom HTTP library as well.
 
 #### Internationalization
 
-When looking up an IP address, the response object includes a `details.country_name` attribute which includes the country name based on American English. It is possible to return the country name in other languages by setting the `countries` setting when creating the `IPinfo` object.
+When looking up an IP address, the response object includes a
+`details.country_name` attribute which includes the country name based on
+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:
 
@@ -189,6 +221,6 @@ There are official IPinfo client libraries available for many languages includin
 
 ### About IPinfo
 
-Founded in 2013, IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. Our API handles over 12 billion requests a month for 100,000 businesses and developers.
+Founded in 2013, IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier, privacy detection, reverse IP, and IP type data sets. Our API handles over 20 billion requests a month for 100,000 businesses and developers.
 
 [![image](https://avatars3.githubusercontent.com/u/15721521?s=128&u=7bb7dde5c4991335fb234e68a30971944abc6bf3&v=4)](https://ipinfo.io/)

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+    t.libs << 'test'
+    t.libs << 'lib'
+    t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,14 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "ipinfo"
+require 'bundler/setup'
+require 'ipinfo'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
+require 'irb'
 IRB.start

data/bin/setup

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
+
 set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/ipinfo.gemspec

@@ -1,37 +1,39 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'ipinfo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "IPinfo"
-  spec.version       = IPinfo::VERSION
-  spec.required_ruby_version = ">= 2.0.0"
-  spec.authors       = ["Stanislav K, James Timmins"]
-  spec.email         = ["jameshtimmins@gmail.com"]
+    spec.name = 'IPinfo'
+    spec.version = IPinfo::VERSION
+    spec.required_ruby_version = '>= 2.5.0'
+    spec.authors       = ['Stanislav K, James Timmins', 'Uman Shahzad']
+    spec.email         = ['jameshtimmins@gmail.com', 'uman@mslm.io']
 
-  spec.summary       = %q{ The official Python library for IPinfo. IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. You can visit our developer docs at https://ipinfo.io/developers. }
-  spec.description   = %q{ The official Python library for IPinfo. IPinfo prides itself on being the most reliable, accurate, and in-depth source of IP address data available anywhere. We process terabytes of data to produce our custom IP geolocation, company, carrier and IP type data sets. You can visit our developer docs at https://ipinfo.io/developers. }
-  spec.homepage      = "https://ipinfo.io"
-  spec.license       = "Apache-2.0"
+    spec.summary       = ' This is a ruby wrapper for http://ipinfo.io. '
+    spec.description   = ' This is a ruby wrapper for http://ipinfo.io. '
+    spec.homepage      = 'https://ipinfo.io'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    #spec.metadata['allowed_push_host'] = "http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+    # Prevent pushing this gem to RubyGems.org. To allow pushes either set the
+    # 'allowed_push_host' to allow pushing to a single host or delete this
+    # section to allow pushing to any host.
+    if spec.respond_to?(:metadata)
+    # spec.metadata['allowed_push_host'] = "http://mygemserver.com'"
+    else
+        raise 'RubyGems 2.0 or newer is required to protect against ' \
+          'public gem pushes.'
+    end
 
-  spec.add_runtime_dependency 'faraday', '~> 0'
-  spec.add_runtime_dependency 'lrucache', '~> 0.1.4'
-  spec.add_runtime_dependency 'json', '~> 2.1'
+    spec.add_runtime_dependency 'faraday', '~> 1.0'
+    spec.add_runtime_dependency 'json', '~> 2.1'
+    spec.add_runtime_dependency 'lru_redux', '~> 1.1'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+    spec.files = `git ls-files -z`.split("\x0").reject do |f|
+        f.match(%r{^(test|spec|features)/})
+    end
+    spec.bindir        = 'exe'
+    spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+    spec.require_paths = ['lib']
 end

data/lib/ipinfo.rb

@@ -10,80 +10,90 @@ require 'ipinfo/version'
 require 'json'
 
 module IPinfo
-  DEFAULT_CACHE_MAXSIZE = 4096
-  DEFAULT_CACHE_TTL = 60 * 60 * 24
-  DEFAULT_COUNTRY_FILE = File.join(File.dirname(__FILE__), 'ipinfo/countries.json')
-  RATE_LIMIT_MESSAGE = "To increase your limits, please review our paid plans at https://ipinfo.io/pricing"
-
-  class << self
-    def create(access_token=nil, settings={})
-      IPinfo.new(access_token, settings)
+    DEFAULT_CACHE_MAXSIZE = 4096
+    DEFAULT_CACHE_TTL = 60 * 60 * 24
+    DEFAULT_COUNTRY_FILE = File.join(File.dirname(__FILE__),
+                                     'ipinfo/countries.json')
+    RATE_LIMIT_MESSAGE = 'To increase your limits, please review our ' \
+                         'paid plans at https://ipinfo.io/pricing'
+
+    class << self
+        def create(access_token = nil, settings = {})
+            IPinfo.new(access_token, settings)
+        end
     end
-  end
+end
 
-  class IPinfo
-    attr_accessor :access_token
-    attr_accessor :countries
-    attr_accessor :http_client
+class IPinfo::IPinfo
+    include IPinfo
+    attr_accessor :access_token, :countries, :httpc
 
-    def initialize(access_token=nil, settings={})
-      @access_token = access_token
-      @http_client = http_client(settings.fetch("http_client", nil))
+    def initialize(access_token = nil, settings = {})
+        @access_token = access_token
+        @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 = countries(settings.fetch('countries', DEFAULT_COUNTRY_FILE))
+        maxsize = settings.fetch('maxsize', DEFAULT_CACHE_MAXSIZE)
+        ttl = settings.fetch('ttl', DEFAULT_CACHE_TTL)
+        @cache = settings.fetch('cache', DefaultCache.new(ttl, maxsize))
+        @countries = prepare_countries(settings.fetch('countries',
+                                                      DEFAULT_COUNTRY_FILE))
     end
 
-    def details(ip_address=nil)
-      details = request_details(ip_address)
-      if details.has_key? :country
-        details[:country_name] = @countries.fetch(details.fetch(:country), nil)
-      end
-
-      if details.has_key? :ip
-        details[:ip_address] = IPAddr.new(details.fetch(:ip))
-      end
-
-      if details.has_key? :loc
-        loc = details.fetch(:loc).split(",")
-        details[:latitude] = loc[0]
-        details[:longitude] = loc[1]
-      end
-
-      Response.new(details)
+    def details(ip_address = nil)
+        details = request_details(ip_address)
+        if details.key? :country
+            details[:country_name] =
+                @countries.fetch(details.fetch(:country), nil)
+        end
+
+        if details.key? :ip
+            details[:ip_address] =
+                IPAddr.new(details.fetch(:ip))
+        end
+
+        if details.key? :loc
+            loc = details.fetch(:loc).split(',')
+            details[:latitude] = loc[0]
+            details[:longitude] = loc[1]
+        end
+
+        Response.new(details)
     end
 
     protected
-    def request_details(ip_address=nil)
-      if !@cache.contains?(ip_address)
-        response = @http_client.get(escape_path(ip_address))
 
-        raise RateLimitError.new(RATE_LIMIT_MESSAGE) if response.status.eql?(429)
+    def request_details(ip_address = nil)
+        res = @cache.get(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(ip_address, details)
-      end
-      @cache.get(ip_address)
+        details
     end
 
-    def http_client(http_client=nil)
-      if http_client
-        @http_client = Adapter.new(access_token, http_client)
-      else
-        @http_client = Adapter.new(access_token)
-      end
+    def prepare_http_client(httpc = nil)
+        @httpc = if httpc
+                     Adapter.new(access_token, httpc)
+                 else
+                     Adapter.new(access_token)
+                 end
     end
 
-    def countries(filename)
-      file = File.read(filename)
-      JSON.parse(file)
+    def prepare_countries(filename)
+        file = File.read(filename)
+        JSON.parse(file)
     end
 
     private
+
     def escape_path(ip)
-      ip ? "/#{CGI::escape(ip)}" : '/'
+        ip ? "/#{CGI.escape(ip)}" : '/'
     end
-  end
 end

data/lib/ipinfo/adapter.rb

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
+
 require 'faraday'
 require 'cgi'
+require 'ipinfo/mod'
 
-module IPinfo
-  class Adapter
+class IPinfo::Adapter
     HOST = 'ipinfo.io'
 
     attr_reader :conn
 
     def initialize(token = nil, adapter = :net_http)
-      @token = token
-      @conn = connection(adapter)
+        @token = token
+        @conn = connection(adapter)
     end
 
     def get(uri)
-      @conn.get(uri) do |req|
-        default_headers.each_pair do |key, value|
-          req.headers[key] = value
+        @conn.get(uri) do |req|
+            default_headers.each_pair do |key, value|
+                req.headers[key] = value
+            end
+            req.params['token'] = CGI.escape(token) if token
         end
-        req.params['token'] = CGI::escape(token) if token
-      end
     end
 
     private
@@ -27,20 +28,17 @@ module IPinfo
     attr_reader :token
 
     def connection(adapter)
-      Faraday.new(url: "https://#{HOST}") do |faraday|
-        faraday.adapter adapter
-      end
+        Faraday.new(url: "https://#{HOST}") do |conn|
+            conn.adapter(adapter)
+        end
     end
 
     def default_headers
         headers = {
-          'User-Agent' => "IPinfoClient/Ruby/1.0",
-          'Accept' => 'application/json'
+            'User-Agent' => 'IPinfoClient/Ruby/1.0',
+            'Accept' => 'application/json'
         }
-        if token
-          headers['Authorization'] = "Bearer #{CGI::escape(token)}"
-        end
+        headers['Authorization'] = "Bearer #{CGI.escape(token)}" if token
         headers
     end
-  end
 end

data/lib/ipinfo/cache/cache_interface.rb

@@ -1,16 +1,17 @@
-module IPinfo
-  class CacheInterface
+# frozen_string_literal: true
+
+class IPinfo::CacheInterface
     class InterfaceNotImplemented < StandardError; end
-    def get(key)
-      raise InterfaceNotImplemented
+
+    def get(_key)
+        raise InterfaceNotImplemented
     end
 
-    def set(key, value)
-      raise InterfaceNotImplemented
+    def set(_key, _value)
+        raise InterfaceNotImplemented
     end
 
-    def contains?(key)
-      raise InterfaceNotImplemented
+    def contains?(_key)
+        raise InterfaceNotImplemented
     end
-  end
 end

data/lib/ipinfo/cache/default_cache.rb

@@ -1,23 +1,22 @@
-require 'ipinfo/cache/cache_interface'
-require 'lrucache'
+# frozen_string_literal: true
 
-module IPinfo
-  class DefaultCache < CacheInterface
+require 'ipinfo/cache/cache_interface'
+require 'lru_redux'
 
+class IPinfo::DefaultCache < IPinfo::CacheInterface
     def initialize(ttl, max_size)
-      @cache = LRUCache.new(:ttl => ttl, :max_size => max_size)
+        @cache = LruRedux::TTL::Cache.new(max_size, ttl)
     end
 
     def get(key)
-      @cache[key]
+        @cache[key]
     end
 
     def set(key, value)
-      @cache[key] = value
+        @cache[key] = value
     end
 
     def contains?(key)
-      !@cache[key].nil?
+        !@cache[key].nil?
     end
-  end
 end

data/lib/ipinfo/errors.rb

@@ -1,3 +1,3 @@
-module IPinfo
-  class RateLimitError < StandardError; end
-end
+# frozen_string_literal: true
+
+class IPinfo::RateLimitError < StandardError; end

data/lib/ipinfo/mod.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module IPinfo
+end

data/lib/ipinfo/response.rb

@@ -3,18 +3,17 @@
 require 'ipaddr'
 require 'json'
 
-module IPinfo
-  class Response
-
+class IPinfo::Response
     attr_reader :all
 
     def initialize(response)
-      @all = response
+        @all = response
+
+        @all.each do |name, value|
+            instance_variable_set("@#{name}", value)
 
-      @all.each do |name, value|
-        instance_variable_set("@#{name}", value)
-        self.class.send(:attr_accessor, name)
-      end
+            c = class << self; self end
+            c.send(:attr_accessor, name)
+        end
     end
-  end
 end

data/lib/ipinfo/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IPinfo
-  VERSION = "0.1.2"
+    VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: IPinfo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Stanislav K, James Timmins
+- Uman Shahzad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,54 +17,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: lrucache
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-description: " The official Python library for IPinfo. IPinfo prides itself on being
-  the most reliable, accurate, and in-depth source of IP address data available anywhere.
-  We process terabytes of data to produce our custom IP geolocation, company, carrier
-  and IP type data sets. You can visit our developer docs at https://ipinfo.io/developers. "
+        version: '1.1'
+description: " This is a ruby wrapper for http://ipinfo.io. "
 email:
 - jameshtimmins@gmail.com
+- uman@mslm.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -78,11 +79,11 @@ files:
 - lib/ipinfo/cache/default_cache.rb
 - lib/ipinfo/countries.json
 - lib/ipinfo/errors.rb
+- lib/ipinfo/mod.rb
 - lib/ipinfo/response.rb
 - lib/ipinfo/version.rb
 homepage: https://ipinfo.io
-licenses:
-- Apache-2.0
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -92,19 +93,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: The official Python library for IPinfo. IPinfo prides itself on being the
-  most reliable, accurate, and in-depth source of IP address data available anywhere.
-  We process terabytes of data to produce our custom IP geolocation, company, carrier
-  and IP type data sets. You can visit our developer docs at https://ipinfo.io/developers.
+summary: This is a ruby wrapper for http://ipinfo.io.
 test_files: []