From 9613cf1cbbfab042645b8dc6946ce9e61cfca658 Mon Sep 17 00:00:00 2001 From: Stanislav K Date: Wed, 1 Nov 2017 19:30:18 +0700 Subject: [PATCH] dumb-down adapter --- lib/ipinfo_io.rb | 9 ++++++++- lib/ipinfo_io/adapter.rb | 8 ++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/ipinfo_io.rb b/lib/ipinfo_io.rb index cae2414..4591bad 100644 --- a/lib/ipinfo_io.rb +++ b/lib/ipinfo_io.rb @@ -4,6 +4,7 @@ require 'ipinfo_io/errors' require 'ipinfo_io/response' require 'ipinfo_io/adapter' +require 'cgi' module IpinfoIo RATE_LIMIT_MESSAGE = "To increase your limits, please review our paid plans at https://ipinfo.io/pricing" @@ -12,11 +13,17 @@ class << self attr_accessor :access_token def lookup(ip=nil) - response = Adapter.new(access_token).get(ip) + response = Adapter.new(access_token).get(uri_builder(ip)) raise RateLimitError.new(RATE_LIMIT_MESSAGE) if response.status.eql?(429) Response.from_faraday(response) end + + private + + def uri_builder(ip) + ip ? "/#{CGI::escape(ip)}" : '/' + end end end diff --git a/lib/ipinfo_io/adapter.rb b/lib/ipinfo_io/adapter.rb index 0b94531..4383311 100644 --- a/lib/ipinfo_io/adapter.rb +++ b/lib/ipinfo_io/adapter.rb @@ -11,8 +11,8 @@ def initialize(token=nil, conn=Faraday.new(url: "https://#{HOST}")) @conn = conn end - def get(ip=nil) - @conn.get(uri_builder(ip)) do |req| + def get(uri) + @conn.get(uri) do |req| default_headers.each_pair do |key, value| req.headers[key] = value end @@ -22,10 +22,6 @@ def get(ip=nil) private - def uri_builder(ip) - ip ? "/#{CGI::escape(ip)}" : '/' - end - attr_reader :token def default_headers