kokki 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772cdf4092ed406b8f744745b7b539ffa4375795498a4a688a71475a0df755be
-  data.tar.gz: 805150748bd3696df1463a85a01064e56d07aaf32723fed065667e8fb9b39da8
+  metadata.gz: 2c4a9dbfae1ec276cef2d3d34847f2b388c33e5e77adcf786eaa3632d800a6f1
+  data.tar.gz: ce43acc978c9a883764875763b3644851ed8f4f4dd7bf7eb89b66510cd5a90f5
 SHA512:
-  metadata.gz: dad024a32e0b8da163ef23d513f85bacb258753a9e51c268e7c1cf35954dee0ef31c7956ee8c3291c83827db9b4d2a9f57a0eebbde77a1efadf64e1560dc72e2
-  data.tar.gz: f5a67b073fa69e1eaf2fb8a997187da4d62df03421eca50716387120f48015c945e38defe7399dba371d5de8282083b3fa3dccd4b588b3bb2275d3403e6e4d30
+  metadata.gz: 4d013a6c530c203c51fb30687fcdd68bf05f7539304de62cde1ee69d8711305397db32b8ec078ab977def68e0a7b28d02ae73eb2e6848f865efc5b3803d4b84e
+  data.tar.gz: 3605cc3efee40bc90acfe969646c7f65478423e1ad1cc880da4c1076b1481313610998f1a74a63f7c7340e65d971cf939811de53a1c64b13d4633610b81625a0

data/kokki.gemspec

@@ -30,6 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "vcr", "~> 5.0"
   spec.add_development_dependency "webmock", "~> 3.6"
-
-  spec.add_dependency "geocoder", "~> 1.5"
 end

data/lib/kokki.rb

@@ -3,6 +3,8 @@
 require "kokki/version"
 require "kokki/errors"
 
+require "kokki/ipinfo"
+
 require "kokki/dictionary"
 require "kokki/ip_address"
 require "kokki/converter"

data/lib/kokki/ip_address.rb

@@ -1,30 +1,46 @@
 # frozen_string_literal: true
 
 require "ipaddr"
-require "geocoder"
 
 module Kokki
   class IPAddress
     attr_reader :address
 
-    def initialize(address)
-      raise InvalidInputError, "invalid input: #{address}" unless ip_address?(address)
+    PRIVATE_IPS = %w(10.0.0.0/8 172.16.0.0/12 192.168.0.0/16).map { |ip| IPAddr.new(ip) }.freeze
 
+    def initialize(address)
       @address = address
+
+      raise InvalidInputError, "Invalid input: #{address}" if !valid_format? || internal?
     end
 
     def country_code
       @country_code ||=
         [].tap do |out|
-          out << Geocoder.search(address)&.first&.country_code&.upcase
-        rescue Geocoder::Error => _e
-          out << nil
+          begin
+            res = IPInfo.geo(address)
+            out << res.dig("country")
+          rescue Error => _e
+            out << nil
+          end
         end.first
     end
 
+    def internal?
+      loopback? || private?
+    end
+
+    def loopback?
+      address == "0.0.0.0" || address.start_with?("127") || address == "::1"
+    end
+
+    def private?
+      PRIVATE_IPS.any? { |ip| ip.include?(address) }
+    end
+
     private
 
-    def ip_address?(address)
+    def valid_format?
       IPAddr.new(address)
       true
     rescue IPAddr::InvalidAddressError => _e

data/lib/kokki/ipinfo.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "json"
+require "net/https"
+require "uri"
+
+module Kokki
+  class IPInfo
+    HOST = "ipinfo.io"
+    BASE_URL = "https://#{HOST}"
+
+    def geo(address)
+      get("/#{address}/geo") { |json| json }
+    end
+
+    def self.geo(address)
+      new.geo address
+    end
+
+    private
+
+    def url_for(path)
+      URI(BASE_URL + path)
+    end
+
+    def https_options
+      if proxy = ENV["HTTPS_PROXY"] || ENV["https_proxy"]
+        uri = URI(proxy)
+        {
+          proxy_address: uri.hostname,
+          proxy_port: uri.port,
+          proxy_from_env: false,
+          use_ssl: true
+        }
+      else
+        { use_ssl: true }
+      end
+    end
+
+    def request(req)
+      Net::HTTP.start(HOST, 443, https_options) do |http|
+        response = http.request(req)
+
+        case response.code
+        when "200"
+          yield JSON.parse(response.body)
+        else
+          raise(Error, "Unsupported response code returned: #{response.code}")
+        end
+      end
+    end
+
+    def get(path, &block)
+      uri = url_for(path)
+      get = Net::HTTP::Get.new(uri)
+
+      request(get, &block)
+    end
+  end
+end

data/lib/kokki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kokki
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kokki
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: geocoder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 description: Convert a country name / code & IP address to an emoji flag
 email:
 - manabu.niseki@gmail.com
@@ -134,6 +120,7 @@ files:
 - lib/kokki/dictionary.rb
 - lib/kokki/errors.rb
 - lib/kokki/ip_address.rb
+- lib/kokki/ipinfo.rb
 - lib/kokki/version.rb
 homepage: https://github.com/ninoseki/kokki
 licenses:
@@ -154,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convert a country name / code & IP address to an emoji flag