Skip to content

Commit 7c8c0df

Browse files
committed
rubocop -A
1 parent b4c3cfb commit 7c8c0df

File tree

12 files changed

+83
-62
lines changed

12 files changed

+83
-62
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
source 'https://rubygems.org'
24

35
gemspec

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'bundler/gem_tasks'
24
require 'rake/testtask'
35

bin/console

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env ruby
2+
# frozen_string_literal: true
23

34
require 'bundler/setup'
45
require 'ipinfo'

ipinfo.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
lib = File.expand_path('lib', __dir__)
24
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
35

lib/ipinfo.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ def initialize(access_token = nil, settings = {})
3838

3939
def details(ip_address = nil)
4040
details = request_details(ip_address)
41-
if details.has_key? :country
41+
if details.key? :country
4242
details[:country_name] =
4343
@countries.fetch(details.fetch(:country),
4444
nil)
4545
end
4646

47-
if details.has_key? :ip
47+
if details.key? :ip
4848
details[:ip_address] =
4949
IPAddr.new(details.fetch(:ip))
5050
end
5151

52-
if details.has_key? :loc
52+
if details.key? :loc
5353
loc = details.fetch(:loc).split(',')
5454
details[:latitude] = loc[0]
5555
details[:longitude] = loc[1]

lib/ipinfo/cache/cache_interface.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module IPinfo
24
class CacheInterface
35
class InterfaceNotImplemented < StandardError; end

lib/ipinfo/cache/default_cache.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'ipinfo/cache/cache_interface'
24
require 'lru_redux'
35

lib/ipinfo/errors.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module IPinfo
24
class RateLimitError < StandardError; end
35
end

lib/ipinfo/version.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module IPinfo
2-
VERSION = '1.0.0'.freeze
4+
VERSION = '1.0.0'
35
end

test/lib/adapter_test.rb

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,37 @@
33
require 'test_helper'
44
require_relative '../../lib/ipinfo/adapter'
55

6-
class IPinfo::AdapterTest < Minitest::Test
7-
def test_default
8-
adapter = IPinfo::Adapter.new
9-
assert(adapter.conn.builder.handlers[0] === Faraday::Adapter::NetHttp)
10-
end
6+
module IPinfo
7+
class AdapterTest < Minitest::Test
8+
def test_default
9+
adapter = IPinfo::Adapter.new
10+
assert(adapter.conn.builder.handlers[0] === Faraday::Adapter::NetHttp)
11+
end
1112

12-
SUPPORTED_ADAPTERS = {
13-
net_http: Faraday::Adapter::NetHttp,
14-
net_http_persistent: Faraday::Adapter::NetHttpPersistent,
15-
typhoeus: Faraday::Adapter::Typhoeus,
16-
patron: Faraday::Adapter::Patron,
17-
em_synchrony: Faraday::Adapter::EMSynchrony,
18-
em_http: Faraday::Adapter::EMHttp,
19-
excon: Faraday::Adapter::Excon,
20-
httpclient: Faraday::Adapter::HTTPClient
21-
}.freeze
13+
SUPPORTED_ADAPTERS = {
14+
net_http: Faraday::Adapter::NetHttp,
15+
net_http_persistent: Faraday::Adapter::NetHttpPersistent,
16+
typhoeus: Faraday::Adapter::Typhoeus,
17+
patron: Faraday::Adapter::Patron,
18+
em_synchrony: Faraday::Adapter::EMSynchrony,
19+
em_http: Faraday::Adapter::EMHttp,
20+
excon: Faraday::Adapter::Excon,
21+
httpclient: Faraday::Adapter::HTTPClient
22+
}.freeze
2223

23-
def test_unsupported_adapter
24-
error = assert_raises(Faraday::Error) do
25-
IPinfo::Adapter.new(nil, :missing_adapter)
24+
def test_unsupported_adapter
25+
error = assert_raises(Faraday::Error) do
26+
IPinfo::Adapter.new(nil, :missing_adapter)
27+
end
28+
assert_equal error.message,
29+
':missing_adapter is not registered on Faraday::Adapter'
2630
end
27-
assert_equal error.message,
28-
':missing_adapter is not registered on Faraday::Adapter'
29-
end
3031

31-
def test_all_possible_adapters
32-
SUPPORTED_ADAPTERS.keys.each do |key|
33-
adapter = IPinfo::Adapter.new(nil, key)
34-
assert(adapter.conn.builder.handlers[0] === SUPPORTED_ADAPTERS[key])
32+
def test_all_possible_adapters
33+
SUPPORTED_ADAPTERS.each_key do |key|
34+
adapter = IPinfo::Adapter.new(nil, key)
35+
assert(adapter.conn.builder.handlers[0] === SUPPORTED_ADAPTERS[key])
36+
end
3537
end
3638
end
3739
end

0 commit comments

Comments
 (0)