geocoder 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7df4e43b7071d0114807e2152d5bcb9420f3a815
-  data.tar.gz: f6d9ee1f4a6afd37cfa319b5c8e7e35aa0c0d154
+  metadata.gz: d790b89d4257ea08df5cc44f42b141e528ab807b
+  data.tar.gz: d9b4a0cbe6b3f4c709040e9b784cb8e605e5b9ce
 SHA512:
-  metadata.gz: cfbb7fcec673e377ea503ba87a4eae35b68dc01aa1dfe363942898451a4e06b783cae5ae80a364014f5322c54e878f62d3369b55471a544ba28dd6812c990160
-  data.tar.gz: 0b7e2a80e9ce3f9a430bdc08ee12bfe76d5ff7f8f6b06e9469a799ffb8d376ad922d283babe866826b56b2d4e3252fe4adc4ed50853340334261b002e9496507
+  metadata.gz: ecfc4e757b64650f23cb1cbba2aa7294395c5cb1deff2e30f52639951c7392104c4cca299655062558540147ffab088a4d66de5da37cde17e2c0de7cfc60ab61
+  data.tar.gz: 6e60f809ce62c62bbe05522ceb1adeb5f8e6fbbff9e6eea61d934d1362afdc8123525ca30674c000f92b440182a3e6b038b0389a37128dd5a9d5e5bfb715c33b

data/CHANGELOG.md

@@ -3,6 +3,11 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.3.4 (2016 Apr 14)
+-------------------
+* Update :freegeoip host (old one is down).
+* Add ip-api.com IP address lookup (thanks github.com/piotrgorecki).
+
 1.3.3 (2016 Apr 4)
 ------------------
 * Fix incorrect gem version number.

data/README.md

@@ -567,28 +567,27 @@ The [Google Places Details API](https://developers.google.com/places/documentati
 
 #### Mapzen (`:mapzen`)
 
-* **About**: Mapzen is the primary author of pelias and offers Pelias-as-a-service in free and paid versions https://mapzen.com/pelias.
 * **API key**: required
 * **Quota**: 6/sec, up to 30k per day, paid plan info at https://mapzen.com/documentation/search/api-keys-rate-limits/#rate-limits
-* **Region**: World
+* **Region**: world
 * **SSL support**: yes
 * **Languages**: en
 * **Documentation**: https://mapzen.com/documentation/search/search/
 * **Terms of Service**: http://mapzen.com/terms
-* **Limitations**: See terms
+* **Limitations**: ?
+* **Notes**: Mapzen is the primary author of Pelias and offers Pelias-as-a-service in free and paid versions https://mapzen.com/pelias.
 
 #### Pelias (`:pelias`)
 
-* **About**: Pelias is a modular open-source geocoder using ElasticSearch for fast geocoding https://github.com/pelias/pelias.
 * **API key**: required
-* **Quota**: None, self-hosted service.
-* **Region**: World
+* **Quota**: none (self-hosted service)
+* **Region**: world
 * **SSL support**: yes
 * **Languages**: en
 * **Documentation**: https://mapzen.com/documentation/search/search/
 * **Terms of Service**: http://mapzen.com/terms
 * **Limitations**: See terms
-* **Notes**: Configure your self-hosted pelias with the `endpoint` option: `Geocoder.configure(:lookup => :pelias, :api_key => 'your_api_key', :pelias => {:endpoint => 'self.hosted/pelias'})`.  Defaults to `localhost`.
+* **Notes**: Configure your self-hosted pelias with the `endpoint` option: `Geocoder.configure(:lookup => :pelias, :api_key => 'your_api_key', :pelias => {:endpoint => 'self.hosted/pelias'})`. Defaults to `localhost`.
 
 #### Data Science Toolkit (`:dstk`)
 
@@ -771,6 +770,16 @@ This uses the PostcodeAnywhere UK Geocode service, this will geocode any string
 * **Documentation**: http://ipinfo.io/developers
 * **Terms of Service**: http://ipinfo.io/developers
 
+#### IP-API.com (`:ipapi_com`)
+
+* **API key**: optional - see http://ip-api.com/docs/#usage_limits
+* **Quota**: 150/minute - unlimited with api key
+* **Region**: world
+* **SSL support**: no (not without access key - see https://signup.ip-api.com/)
+* **Languages**: English
+* **Documentation**: http://ip-api.com/docs/
+* **Terms of Service**: https://signup.ip-api.com/terms
+
 ### IP Address Local Database Services
 
 #### MaxMind Local (`:maxmind_local`) - EXPERIMENTAL

data/lib/geocoder/lookup.rb

@@ -64,7 +64,8 @@ module Geocoder
         :telize,
         :pointpin,
         :maxmind_geoip2,
-        :ipinfo_io
+        :ipinfo_io,
+        :ipapi_com
       ]
     end
 

data/lib/geocoder/lookups/freegeoip.rb

@@ -45,7 +45,7 @@ module Geocoder::Lookup
     end
 
     def host
-      configuration[:host] || "freegeoip.net"
+      configuration[:host] || "freegeoip.io"
     end
   end
 end

data/lib/geocoder/lookups/ipapi_com.rb

@@ -0,0 +1,64 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/ipapi_com'
+
+module Geocoder::Lookup
+  class IpapiCom < Base
+
+    def name
+      "ip-api.com"
+    end
+
+    def query_url(query)
+      url_ = "#{protocol}://ip-api.com/json/#{query.sanitized_text}"
+
+      if (params = url_query_string(query)) && !params.empty?
+        url_ + "?" + params
+      else
+        url_
+      end
+    end
+
+    def supported_protocols
+      if configuration.api_key
+        [:http, :https]
+      else
+        [:http]
+      end
+    end
+
+
+    private
+
+    def results(query)
+      return [reserved_result(query.text)] if query.loopback_ip_address?
+
+      (doc = fetch_data(query)) ? [doc] : []
+    end
+
+    def reserved_result(query)
+      {
+        "message"      => "reserved range",
+        "query"        => query,
+        "status"       => fail,
+        "ip"           => query,
+        "city"         => "",
+        "region_code"  => "",
+        "region_name"  => "",
+        "metrocode"    => "",
+        "zipcode"      => "",
+        "latitude"     => "0",
+        "longitude"    => "0",
+        "country_name" => "Reserved",
+        "country_code" => "RD"
+      }
+    end
+
+    def query_url_params(query)
+      params = {}
+      params.merge!(fields: configuration[:fields]) if configuration.has_key?(:fields)
+      params.merge!(key: configuration.api_key) if configuration.api_key
+      params.merge(super)
+    end
+
+  end
+end

data/lib/geocoder/results/freegeoip.rb

@@ -33,7 +33,7 @@ module Geocoder::Result
     end
 
     def self.response_attributes
-      %w[metrocode ip]
+      %w[metro_code ip]
     end
 
     response_attributes.each do |a|

data/lib/geocoder/results/ipapi_com.rb

@@ -0,0 +1,53 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class IpapiCom < Base
+
+    def latitude
+      lat
+    end
+
+    def longitude
+      lon
+    end
+
+    def coordinates
+      [lat, lon]
+    end
+
+    def address
+      "#{city}, #{state_code} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
+    end
+
+    def state
+      region_name
+    end
+
+    def state_code
+      region
+    end
+
+    def postal_code
+      zip
+    end
+
+    def country_code
+      @data['countryCode']
+    end
+
+    def region_name
+      @data['regionName']
+    end
+
+    def self.response_attributes
+      %w[country region city zip timezone isp org as reverse query status message mobile proxy lat lon]
+    end
+
+    response_attributes.each do |attribute|
+      define_method attribute do
+        @data[attribute]
+      end
+    end
+
+  end
+end

data/lib/geocoder/results/ipinfo_io.rb

@@ -16,7 +16,7 @@ module Geocoder::Result
     end
 
     def coordinates
-        [@data['loc'].split(',')[0].to_f, @data['loc'].split(',')[1].to_f]
+        [latitude, longitude]
     end
 
     def city
@@ -44,7 +44,7 @@ module Geocoder::Result
     end
 
     def self.response_attributes
-      %w['ip', 'city', 'region', 'country', 'latitude', 'longitude', 'postal_code']
+      %w['ip', 'region', 'postal']
     end
 
     response_attributes.each do |a|

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -62,6 +62,7 @@ files:
 - lib/geocoder/lookups/google_places_details.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
+- lib/geocoder/lookups/ipapi_com.rb
 - lib/geocoder/lookups/ipinfo_io.rb
 - lib/geocoder/lookups/latlon.rb
 - lib/geocoder/lookups/mapbox.rb
@@ -105,6 +106,7 @@ files:
 - lib/geocoder/results/google_places_details.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
+- lib/geocoder/results/ipapi_com.rb
 - lib/geocoder/results/ipinfo_io.rb
 - lib/geocoder/results/latlon.rb
 - lib/geocoder/results/mapbox.rb