geocoder 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18d22b519d25e7d3214aa1e52f39d1578a15aa4
-  data.tar.gz: 82e49a050c93eeb2033f27d961bb354706e9208f
+  metadata.gz: 586633875af5786e76c1f815ca613d2dbe658298
+  data.tar.gz: 1aae8533ea6744c231c912c767dcf56e12ff087a
 SHA512:
-  metadata.gz: 6bee51b01c6fe33f9c2acfd174802908f311724684643de8831414a437015219cfa4ea33266062e09564afa7cff2f54778c02a8f8fa43287692568ce86662fbc
-  data.tar.gz: df0f94753763aa06902bd1bf25182e6b468595a4ed2f0d77767b2130af08c06b60a8b1fdffc5e0bccd1bdddae83ed305d3f6e9c914e87eb69e1142fc5f8e689e
+  metadata.gz: f0a636c5d6b2f40b72c0af679a9fe246ef484b99b6be301f9102d202f0bc5d71f51000b3ae714299c5575b3812b3eae00c787b221fbe7baa23ce6d4c9b1a8f65
+  data.tar.gz: e5598a6dd62abe28f60307104a483e3c67e9e161d56a382c37009a89c83a6912ebf526bb94dfcecbcfcba154e7f8b2dd33cb352997b7b3752e694ecd56ce2a91

data/CHANGELOG.md

@@ -3,6 +3,13 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.3.2 (2016 Apr 1)
+------------------
+* Remove :yahoo lookup (service was discontinued Mar 31) (thanks github.com/galiat).
+* Add support for LatLon.io service (thanks github.com/evanmarks).
+* Add support for IpInfo.io service (thanks github.com/rehan, akostyuk).
+* Add support for Pelias/Mapzen service (thanks github.com/RealScout).
+
 1.3.1 (2016 Feb 20)
 -------------------
 * Warn about upcoming discontinuation of :yahoo lookup (thanks github.com/galiat).

data/README.md

@@ -434,19 +434,6 @@ The [Google Places Details API](https://developers.google.com/places/documentati
 * **Terms of Service**: https://developers.google.com/places/policies
 * **Limitations**: "If your application displays Places API data on a page or view that does not also display a Google Map, you must show a "Powered by Google" logo with that data."
 
-#### Yahoo BOSS (`:yahoo`)
-**Warning - [this API will be discontinued on March 31.](https://developer.yahoo.com/boss/placefinder/)**
-
-* **API key**: requires OAuth consumer key and secret (set `Geocoder.configure(:api_key => [key, secret])`)
-* **Key signup**: http://developer.yahoo.com/boss/geo/
-* **Quota**: unlimited, but subject to usage fees
-* **Region**: world
-* **SSL support**: no
-* **Languages**: en, fr, de, it, es, pt, nl, zh, ja, ko
-* **Documentation**: http://developer.yahoo.com/boss/geo/docs/index.html
-* **Terms of Service**: http://info.yahoo.com/legal/us/yahoo/boss/tou/?pir=ucJPcJ1ibUn.h.d.lVmlcbcEkoHjwJ_PvxG9SLK9VIbIQAw1XFrnDqY-
-* **Limitations**: No mass downloads, no commercial map production based on the data, no storage of data except for caching.
-
 #### Bing (`:bing`)
 
 * **API key**: required (set `Geocoder.configure(:lookup => :bing, :api_key => key)`)
@@ -578,6 +565,31 @@ The [Google Places Details API](https://developers.google.com/places/documentati
 * **Limitations**: ?
 * **Notes**: You can specify which projection you want to use by setting, for example: `Geocoder.configure(:esri => {:outSR => 102100})`.
 
+#### 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
+* **SSL support**: yes
+* **Languages**: en
+* **Documentation**: https://mapzen.com/documentation/search/search/
+* **Terms of Service**: http://mapzen.com/terms
+* **Limitations**: See terms
+
+#### 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
+* **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`.
+
 #### Data Science Toolkit (`:dstk`)
 
 Data Science Toolkit provides an API whose reponse format is like Google's but which can be set up as a privately hosted service.
@@ -663,6 +675,17 @@ This uses the PostcodeAnywhere UK Geocode service, this will geocode any string
 * **Limitations**: ?
 * **Notes**: To use PostcodeAnywhere you must include an API key: `Geocoder.configure(:lookup => :postcode_anywhere_uk, :api_key => 'your_api_key')`.
 
+#### LatLon.io (`:latlon`)
+
+* **API key**: required
+* **Quota**: Depends on the user's plan (free and paid plans available)
+* **Region**: US
+* **SSL support**: yes
+* **Languages**: en
+* **Documentation**: https://latlon.io/documentation
+* **Terms of Service**: ?
+* **Limitations**: No restrictions on use
+
 
 ### IP Address Services
 
@@ -726,6 +749,27 @@ This uses the PostcodeAnywhere UK Geocode service, this will geocode any string
 * **Limitations**: Only good for non-commercial use. For commercial usage please check http://developer.baidu.com/map/question.htm#qa0013
 * **Notes**: To use Baidu set `Geocoder.configure(:lookup => :baidu_ip, :api_key => "your_api_key")`.
 
+#### MaxMind GeoIP2 Precision Web Services (`:maxmind_geoip2`)
+
+* **API key**: required
+* **Quota**: Request Packs can be purchased
+* **Region**: world
+* **SSL support**: yes
+* **Languages**: English
+* **Documentation**: http://dev.maxmind.com/geoip/geoip2/web-services/
+* **Terms of Service**: ?
+* **Limitations**: ?
+* **Notes**: You must specify which MaxMind service you are using in your configuration, and also basic authentication. For example: `Geocoder.configure(:maxmind_geoip2 => {:service => :country, :basic_auth => {:user => '', :password => ''}})`.
+
+#### IPInfo.io (`:ipinfo_io`)
+
+* **API key**: optional - see http://ipinfo.io/pricing
+* **Quota**: 1,000/day - more with api key
+* **Region**: world
+* **SSL support**: no (not without access key - see http://ipinfo.io/pricing)
+* **Languages**: English
+* **Documentation**: http://ipinfo.io/developers
+* **Terms of Service**: http://ipinfo.io/developers
 
 ### IP Address Local Database Services
 
@@ -1033,7 +1077,7 @@ Error Handling
 
 By default Geocoder will rescue any exceptions raised by calls to a geocoding service and return an empty array. You can override this on a per-exception basis, and also have Geocoder raise its own exceptions for certain events (eg: API quota exceeded) by using the `:always_raise` option:
 
-    Geocoder.configure(:always_raise => [SocketError, TimeoutError])
+    Geocoder.configure(:always_raise => [SocketError, Timeout::Error])
 
 You can also do this to raise all exceptions:
 
@@ -1042,14 +1086,14 @@ You can also do this to raise all exceptions:
 The raise-able exceptions are:
 
     SocketError
-    TimeoutError
+    Timeout::Error
     Geocoder::OverQueryLimitError
     Geocoder::RequestDenied
     Geocoder::InvalidRequest
     Geocoder::InvalidApiKey
     Geocoder::ServiceUnavailable
 
-Note that only a few of the above exceptions are raised by any given lookup, so there's no guarantee if you configure Geocoder to raise `ServiceUnavailable` that it will actually be raised under those conditions (because most APIs don't return 503 when they should; you may get a `TimeoutError` instead). Please see the source code for your particular lookup for details.
+Note that only a few of the above exceptions are raised by any given lookup, so there's no guarantee if you configure Geocoder to raise `ServiceUnavailable` that it will actually be raised under those conditions (because most APIs don't return 503 when they should; you may get a `Timeout::Error` instead). Please see the source code for your particular lookup for details.
 
 
 Troubleshooting
@@ -1071,6 +1115,16 @@ A lot of debugging time can be saved by understanding how Geocoder works with Ac
 * using the `pluck` method (selects only a single column)
 * specifying another model through `includes` (selects columns from other tables)
 
+### Geocoding is Slow
+
+With most lookups, addresses are translated into coordinates via an API that must be accessed through the Internet. These requests are subject to the same bandwidth constraints as every other HTTP request, and will vary in speed depending on network conditions. Furthermore, many of the services supported by Geocoder are free and thus very popular. Often they cannot keep up with demand and their response times become quite bad.
+
+If your application requires quick geocoding responses you will probably need to pay for a non-free service, or--if you're doing IP address geocoding--use a lookup that doesn't require an external (network-accessed) service.
+
+For IP address lookups in Rails applications, it is generally NOT a good idea to run `request.location` during a synchronous page load without understanding the speed/behavior of your configured lookup. If the lookup becomes slow, so will your website.
+
+For the most part, the speed of geocoding requests has little to do with the Geocoder gem. Please take the time to learn about your configured lookup (links to documentation are provided above) before posting performance-related issues.
+
 ### Unexpected Responses from Geocoding Services
 
 Take a look at the server's raw response. You can do this by getting the request URL in an app console:

data/examples/reverse_geocode_job.rb

@@ -35,6 +35,6 @@ class ReverseGeocodeJob < ActiveJob::Base
   end
 
   def retryable?(exception)
-    exception.is_a?(TimeoutError) || exception.is_a?(SocketError)
+    exception.is_a?(Timeout::Error) || exception.is_a?(SocketError)
   end
 end

data/lib/generators/geocoder/config/templates/initializer.rb

@@ -12,7 +12,7 @@ Geocoder.configure(
 
   # Exceptions that should not be rescued by default
   # (if you want to implement custom error handling);
-  # supports SocketError and TimeoutError
+  # supports SocketError and Timeout::Error
   # always_raise: [],
 
   # Calculation options

data/lib/geocoder/configuration.rb

@@ -17,10 +17,6 @@ module Geocoder
     if !options.nil?
       Configuration.instance.configure(options)
     end
-
-    if config.lookup == :yahoo
-      Geocoder.log(:warn, "Yahoo BOSS Placefinder API will be discontinued March 31, 2016.")
-    end
   end
 
   ##
@@ -109,7 +105,7 @@ module Geocoder
 
       # exceptions that should not be rescued by default
       # (if you want to implement custom error handling);
-      # supports SocketError and TimeoutError
+      # supports SocketError and Timeout::Error
       @data[:always_raise] = []
 
       # calculation options

data/lib/geocoder/lookup.rb

@@ -28,7 +28,6 @@ module Geocoder
         :google,
         :google_premier,
         :google_places_details,
-        :yahoo,
         :bing,
         :geocoder_ca,
         :geocoder_us,
@@ -36,8 +35,10 @@ module Geocoder
         :nominatim,
         :mapbox,
         :mapquest,
+        :mapzen,
         :opencagedata,
         :ovi,
+        :pelias,
         :here,
         :baidu,
         :geocodio,
@@ -45,7 +46,8 @@ module Geocoder
         :okf,
         :postcode_anywhere_uk,
         :geoportail_lu,
-        :test
+        :test,
+        :latlon
       ]
     end
 
@@ -61,7 +63,8 @@ module Geocoder
         :maxmind_local,
         :telize,
         :pointpin,
-        :maxmind_geoip2
+        :maxmind_geoip2,
+        :ipinfo_io
       ]
     end
 

data/lib/geocoder/lookups/base.rb

@@ -179,7 +179,7 @@ module Geocoder
         raise_error(err) or Geocoder.log(:warn, "Geocoding API connection cannot be established.")
       rescue Errno::ECONNREFUSED => err
         raise_error(err) or Geocoder.log(:warn, "Geocoding API connection refused.")
-      rescue TimeoutError => err
+      rescue Timeout::Error => err
         raise_error(err) or Geocoder.log(:warn, "Geocoding API not responding fast enough " +
           "(use Geocoder.configure(:timeout => ...) to set limit).")
       end

data/lib/geocoder/lookups/freegeoip.rb

@@ -7,6 +7,10 @@ module Geocoder::Lookup
     def name
       "FreeGeoIP"
     end
+    
+    def supported_protocols
+      [:http]
+    end
 
     def query_url(query)
       "#{protocol}://#{host}/json/#{query.sanitized_text}"

data/lib/geocoder/lookups/ipinfo_io.rb

@@ -0,0 +1,55 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/ipinfo_io'
+
+module Geocoder::Lookup
+  class IpinfoIo < Base
+
+    def name
+      "Ipinfo.io"
+    end
+
+    def query_url(query)
+      if configuration.api_key
+        "#{protocol}://ipinfo.io/#{query.sanitized_text}/geo?" + url_query_string(query)
+      else
+        "#{protocol}://ipinfo.io/#{query.sanitized_text}/geo"
+      end
+    end
+
+    # HTTPS available only for paid plans
+    def supported_protocols
+      if configuration.api_key
+        [:http, :https]
+      else
+        [:http]
+      end
+    end
+
+    private # ---------------------------------------------------------------
+
+    def results(query)
+      # don't look up a loopback address, just return the stored result
+      return [reserved_result(query.text)] if query.loopback_ip_address?
+      if (doc = fetch_data(query)).nil? or doc['code'] == 401 or empty_result?(doc)
+        []
+      else
+        [doc]
+      end
+    end
+
+    def empty_result?(doc)
+      !doc.is_a?(Hash) or doc.keys == ["ip"]
+    end
+
+    def reserved_result(ip)
+      {"message" => "Input string is not a valid IP address", "code" => 401}
+    end
+
+    def query_url_params(query)
+      {
+        token: configuration.api_key
+      }.merge(super)
+    end
+
+  end
+end

data/lib/geocoder/lookups/latlon.rb

@@ -0,0 +1,59 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/latlon'
+
+module Geocoder::Lookup
+  class Latlon < Base
+
+    def name
+      "LatLon.io"
+    end
+
+    def required_api_key_parts
+      ["api_key"]
+    end
+
+    def query_url(query)
+      "#{protocol}://latlon.io/api/v1/#{'reverse_' if query.reverse_geocode?}geocode?#{url_query_string(query)}"
+    end
+
+    private # ---------------------------------------------------------------
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      if doc['error'].nil?
+        [doc]
+      # The API returned a 404 response, which indicates no results found
+      elsif doc['error']['type'] == 'api_error'
+        []
+      elsif
+        doc['error']['type'] == 'authentication_error'
+        raise_error(Geocoder::InvalidApiKey) ||
+          Geocoder.log(:warn, "LatLon.io service error: invalid API key.")
+      else
+        []
+      end
+    end
+
+    def supported_protocols
+      [:https]
+    end
+
+    private # ---------------------------------------------------------------
+
+    def query_url_params(query)
+      if query.reverse_geocode?
+        {
+          :token => configuration.api_key,
+          :lat => query.coordinates[0],
+          :lon => query.coordinates[1]
+        }.merge(super)
+      else
+        {
+          :token => configuration.api_key,
+          :address => query.sanitized_text
+        }.merge(super)
+      end
+    end
+
+  end
+end

data/lib/geocoder/lookups/mapzen.rb

@@ -0,0 +1,15 @@
+require 'geocoder/lookups/pelias'
+require 'geocoder/results/mapzen'
+
+# https://mapzen.com/documentation/search/search/ for more information
+module Geocoder::Lookup
+  class Mapzen < Pelias
+    def name
+      'Mapzen'
+    end
+
+    def endpoint
+      configuration[:endpoint] || 'search.mapzen.com'
+    end
+  end
+end

data/lib/geocoder/lookups/pelias.rb

@@ -0,0 +1,56 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/pelias'
+
+module Geocoder::Lookup
+  class Pelias < Base
+    def name
+      'Pelias'
+    end
+
+    def endpoint
+      configuration[:endpoint] || 'localhost'
+    end
+
+    def query_url(query)
+      query_type = query.reverse_geocode? ? 'reverse' : 'search'
+      "#{protocol}://#{endpoint}/v1/#{query_type}?" + url_query_string(query)
+    end
+
+    def required_api_key_parts
+      ['search-XXXX']
+    end
+
+    private
+
+    def query_url_params(query)
+      {
+        api_key: configuration.api_key,
+        text: query.text,
+        size: 1
+      }.merge(super(query))
+    end
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+
+      # not all responses include a meta
+      if doc['meta']
+        error = doc.fetch('results', {}).fetch('error', {})
+        message = error.fetch('type', 'Unknown Error') + ': ' + error.fetch('message', 'No message')
+        log_message = 'Pelias Geocoding API error - ' + message
+        case doc['meta']['status_code']
+          when '200'
+            # nothing to see here
+          when '403'
+            raise_error(Geocoder::RequestDenied, message) || Geocoder.log(:warn, log_message)
+          when '429'
+            raise_error(Geocoder::OverQueryLimitError, message) || Geocoder.log(:warn, log_message)
+          else
+            raise_error(Geocoder::Error, message) || Geocoder.log(:warn, log_message)
+        end
+      end
+
+      doc['features'] || []
+    end
+  end
+end

data/lib/geocoder/results/ipinfo_io.rb

@@ -0,0 +1,56 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class IpinfoIo < Base
+
+    def address(format = :full)
+      "#{city} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
+    end
+
+    def latitude
+      @data['loc'].split(',')[0].to_f
+    end
+
+    def longitude
+      @data['loc'].split(',')[1].to_f
+    end
+
+    def coordinates
+        [@data['loc'].split(',')[0].to_f, @data['loc'].split(',')[1].to_f]
+    end
+
+    def city
+      @data['city']
+    end
+
+    def state
+      @data['region']
+    end
+
+    def country
+      @data['country']
+    end
+
+    def postal_code
+      @data['postal']
+    end
+
+    def country_code
+      @data.fetch('country', '')
+    end
+
+    def state_code
+      @data.fetch('region_code', '')
+    end
+
+    def self.response_attributes
+      %w['ip', 'city', 'region', 'country', 'latitude', 'longitude', 'postal_code']
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a]
+      end
+    end
+  end
+end

data/lib/geocoder/results/latlon.rb

@@ -0,0 +1,71 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Latlon < Base
+
+    def city
+      address_components["city"]
+    end
+
+    def coordinates
+      [@data['lat'].to_f, @data['lon'].to_f]
+    end
+
+    def country
+      "United States" # LatLon.io only supports the US
+    end
+
+    def country_code
+      "US" # LatLon.io only supports the US
+    end
+
+    def formatted_address(format = :full)
+      address_components["address"]
+    end
+    alias_method :address, :formatted_address
+
+    def number
+      address_components["number"]
+    end
+
+    def prefix
+      address_components["prefix"]
+    end
+
+    def state
+      address_components["state"]
+    end
+    alias_method :state_code, :state
+
+    def street
+      [street_name, street_type].compact.join(' ')
+    end
+
+    def street_name
+      address_components["street_name"]
+    end
+
+    def street_type
+      address_components["street_type"]
+    end
+
+    def suffix
+      address_components["suffix"]
+    end
+
+    def unit
+      address_components["unit"]
+    end
+
+    def zip
+      address_components["zip"]
+    end
+    alias_method :postal_code, :zip
+
+    private
+
+    def address_components
+      @data["address"] || {}
+    end
+  end
+end

data/lib/geocoder/results/mapzen.rb

@@ -0,0 +1,5 @@
+require 'geocoder/results/pelias'
+
+module Geocoder::Result
+  class Mapzen < Pelias; end
+end

data/lib/geocoder/results/pelias.rb

@@ -0,0 +1,58 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Pelias < Base
+    def address(format = :full)
+      properties['label']
+    end
+
+    def city
+      locality
+    end
+
+    def coordinates
+      geometry['coordinates'].reverse
+    end
+
+    def country_code
+      properties['country_a']
+    end
+
+    def postal_code
+      properties['postalcode'].to_s
+    end
+
+    def province
+      state
+    end
+
+    def state
+      properties['region']
+    end
+
+    def state_code
+      properties['region_a']
+    end
+
+    def self.response_attributes
+      %w[county confidence country gid id layer localadmin locality neighborhood]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        properties[a]
+      end
+    end
+
+    private
+
+    def geometry
+      @data.fetch('geometry', {})
+    end
+
+    def properties
+      @data.fetch('properties', {})
+    end
+  end
+end
+

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-04-01 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,8 +62,11 @@ files:
 - lib/geocoder/lookups/google_places_details.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
+- lib/geocoder/lookups/ipinfo_io.rb
+- lib/geocoder/lookups/latlon.rb
 - lib/geocoder/lookups/mapbox.rb
 - lib/geocoder/lookups/mapquest.rb
+- lib/geocoder/lookups/mapzen.rb
 - lib/geocoder/lookups/maxmind.rb
 - lib/geocoder/lookups/maxmind_geoip2.rb
 - lib/geocoder/lookups/maxmind_local.rb
@@ -71,12 +74,12 @@ files:
 - lib/geocoder/lookups/okf.rb
 - lib/geocoder/lookups/opencagedata.rb
 - lib/geocoder/lookups/ovi.rb
+- lib/geocoder/lookups/pelias.rb
 - lib/geocoder/lookups/pointpin.rb
 - lib/geocoder/lookups/postcode_anywhere_uk.rb
 - lib/geocoder/lookups/smarty_streets.rb
 - lib/geocoder/lookups/telize.rb
 - lib/geocoder/lookups/test.rb
-- lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
 - lib/geocoder/models/active_record.rb
 - lib/geocoder/models/base.rb
@@ -102,8 +105,11 @@ files:
 - lib/geocoder/results/google_places_details.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
+- lib/geocoder/results/ipinfo_io.rb
+- lib/geocoder/results/latlon.rb
 - lib/geocoder/results/mapbox.rb
 - lib/geocoder/results/mapquest.rb
+- lib/geocoder/results/mapzen.rb
 - lib/geocoder/results/maxmind.rb
 - lib/geocoder/results/maxmind_geoip2.rb
 - lib/geocoder/results/maxmind_local.rb
@@ -111,12 +117,12 @@ files:
 - lib/geocoder/results/okf.rb
 - lib/geocoder/results/opencagedata.rb
 - lib/geocoder/results/ovi.rb
+- lib/geocoder/results/pelias.rb
 - lib/geocoder/results/pointpin.rb
 - lib/geocoder/results/postcode_anywhere_uk.rb
 - lib/geocoder/results/smarty_streets.rb
 - lib/geocoder/results/telize.rb
 - lib/geocoder/results/test.rb
-- lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
 - lib/geocoder/sql.rb
 - lib/geocoder/stores/active_record.rb
@@ -127,7 +133,6 @@ files:
 - lib/geocoder/version.rb
 - lib/hash_recursive_merge.rb
 - lib/maxmind_database.rb
-- lib/oauth_util.rb
 - lib/tasks/geocoder.rake
 - lib/tasks/maxmind.rake
 homepage: http://www.rubygeocoder.com
@@ -150,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.

data/lib/geocoder/lookups/yahoo.rb

@@ -1,89 +0,0 @@
-require 'geocoder/lookups/base'
-require "geocoder/results/yahoo"
-require 'oauth_util'
-
-module Geocoder::Lookup
-  class Yahoo < Base
-
-    def name
-      "Yahoo BOSS"
-    end
-
-    def map_link_url(coordinates)
-      "http://maps.yahoo.com/#lat=#{coordinates[0]}&lon=#{coordinates[1]}"
-    end
-
-    def required_api_key_parts
-      ["consumer key", "consumer secret"]
-    end
-
-    def query_url(query)
-      parsed_url = URI.parse(raw_url(query))
-      o = OauthUtil.new
-      o.consumer_key = configuration.api_key[0]
-      o.consumer_secret = configuration.api_key[1]
-      base_url + o.sign(parsed_url).query_string
-    end
-
-    private # ---------------------------------------------------------------
-
-    def results(query)
-      Geocoder.log(:warn, "Yahoo BOSS Placefinder API will be discontinued March 31, 2016.")
-      return [] unless doc = fetch_data(query)
-      doc = doc['bossresponse']
-      if doc['responsecode'].to_i == 200
-        if doc['placefinder']['count'].to_i > 0
-          return doc['placefinder']['results']
-        else
-          return []
-        end
-      else
-        Geocoder.log(:warn, "Yahoo Geocoding API error: #{doc['responsecode']} (#{doc['reason']}).")
-        return []
-      end
-    end
-
-    ##
-    # Yahoo returns errors as XML even when JSON format is specified.
-    # Handle that here, without parsing the XML
-    # (which would add unnecessary complexity).
-    # Yahoo auth errors can also be cryptic, so add raw error desc
-    # to warning message.
-    #
-    def parse_raw_data(raw_data)
-      if raw_data.match(/^<\?xml/)
-        if raw_data.include?("Rate Limit Exceeded")
-          raise_error(Geocoder::OverQueryLimitError) || Geocoder.log(:warn, "Over API query limit.")
-        elsif raw_data =~ /<yahoo:description>(Please provide valid credentials.*)<\/yahoo:description>/i
-          raise_error(Geocoder::InvalidApiKey) || Geocoder.log(:warn, "Invalid API key. Error response: #{$1}")
-        end
-      else
-        super(raw_data)
-      end
-    end
-
-    def query_url_params(query)
-      lang = (query.language || configuration.language).to_s
-      lang += '_US' if lang == 'en'
-      {
-        :location => query.sanitized_text,
-        :flags => "JXTSR",
-        :gflags => "AC#{'R' if query.reverse_geocode?}",
-        :locale => lang,
-        :appid => configuration.api_key
-      }.merge(super)
-    end
-
-    def cache_key(query)
-      raw_url(query)
-    end
-
-    def base_url
-      "#{protocol}://yboss.yahooapis.com/geo/placefinder?"
-    end
-
-    def raw_url(query)
-      base_url + url_query_string(query)
-    end
-  end
-end

data/lib/geocoder/results/yahoo.rb

@@ -1,60 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Yahoo < Base
-
-    def address(format = :full)
-      (1..4).to_a.map{ |i| @data["line#{i}"] }.reject{ |i| i.nil? or i == "" }.join(", ")
-    end
-
-    def city
-      @data['city']
-    end
-
-    def state
-      @data['state']
-    end
-
-    def state_code
-      @data['statecode']
-    end
-
-    def country
-      @data['country']
-    end
-
-    def country_code
-      @data['countrycode']
-    end
-
-    def postal_code
-      @data['postal']
-    end
-
-    def address_hash
-      @data['hash']
-    end
-
-    def viewport
-      boundingbox = @data['boundingbox'] || fail
-      %w(south west north east).map{ |i| boundingbox[i].to_f }
-    end
-
-    def self.response_attributes
-      %w[quality offsetlat offsetlon radius boundingbox name
-        line1 line2 line3 line4 cross house street xstreet unittype unit
-        city state statecode country countrycode postal
-        neighborhood county countycode
-        level0 level1 level2 level3 level4 level0code level1code level2code
-        timezone areacode uzip hash woeid woetype]
-    end
-
-    response_attributes.each do |a|
-      unless method_defined?(a)
-        define_method a do
-          @data[a]
-        end
-      end
-    end
-  end
-end

data/lib/oauth_util.rb

@@ -1,112 +0,0 @@
-# A utility for signing an url using OAuth in a way that's convenient for debugging
-# Note: the standard Ruby OAuth lib is here http://github.com/mojodna/oauth
-# Source: http://gist.github.com/383159
-# License: http://gist.github.com/375593
-# Usage: see example.rb below
-#
-# NOTE: This file has been modified from the original Gist:
-#
-# 1. Fix to prevent param-array conversion, as mentioned in Gist comment.
-# 2. Query string escaping has been changed. See:
-#   https://github.com/alexreisner/geocoder/pull/360
-#
-
-require 'uri'
-require 'cgi'
-require 'openssl'
-require 'base64'
-
-class OauthUtil
-
-  attr_accessor :consumer_key, :consumer_secret, :token, :token_secret, :req_method, 
-                :sig_method, :oauth_version, :callback_url, :params, :req_url, :base_str
-
-  def initialize
-    @consumer_key = ''
-    @consumer_secret = ''
-    @token = ''
-    @token_secret = ''
-    @req_method = 'GET'
-    @sig_method = 'HMAC-SHA1'
-    @oauth_version = '1.0'
-    @callback_url = ''
-  end
-
-  # openssl::random_bytes returns non-word chars, which need to be removed. using alt method to get length
-  # ref http://snippets.dzone.com/posts/show/491
-  def nonce
-    Array.new( 5 ) { rand(256) }.pack('C*').unpack('H*').first
-  end
-
-  def percent_encode( string )
-
-    # ref http://snippets.dzone.com/posts/show/1260
-    return URI.escape( string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]") ).gsub('*', '%2A')
-  end
-
-  # @ref http://oauth.net/core/1.0/#rfc.section.9.2
-  def signature
-    key = percent_encode( @consumer_secret ) + '&' + percent_encode( @token_secret )
-
-    # ref: http://blog.nathanielbibler.com/post/63031273/openssl-hmac-vs-ruby-hmac-benchmarks
-    digest = OpenSSL::Digest.new( 'sha1' )
-    hmac = OpenSSL::HMAC.digest( digest, key, @base_str )
-
-    # ref http://groups.google.com/group/oauth-ruby/browse_thread/thread/9110ed8c8f3cae81
-    Base64.encode64( hmac ).chomp.gsub( /\n/, '' )
-  end
-
-  # sort (very important as it affects the signature), concat, and percent encode
-  # @ref http://oauth.net/core/1.0/#rfc.section.9.1.1
-  # @ref http://oauth.net/core/1.0/#9.2.1
-  # @ref http://oauth.net/core/1.0/#rfc.section.A.5.1
-  def query_string
-    pairs = []
-    @params.sort.each { | key, val | 
-      pairs.push( "#{ CGI.escape(key.to_s).gsub(/%(5B|5D)/n) { [$1].pack('H*') } }=#{ CGI.escape(val.to_s) }" )
-    }
-    pairs.join '&'
-  end
-
-  # organize params & create signature
-  def sign( parsed_url )
-
-    @params = {
-      'oauth_consumer_key' => @consumer_key,
-      'oauth_nonce' => nonce,
-      'oauth_signature_method' => @sig_method,
-      'oauth_timestamp' => Time.now.to_i.to_s,
-      'oauth_version' => @oauth_version
-    }
-
-    # if url has query, merge key/values into params obj overwriting defaults
-    if parsed_url.query
-      CGI.parse( parsed_url.query ).each do |k,v|
-        if v.is_a?(Array) && v.count == 1
-          @params[k] = v.first
-        else
-          @params[k] = v
-        end
-      end
-    end
-
-    # @ref http://oauth.net/core/1.0/#rfc.section.9.1.2
-    @req_url = parsed_url.scheme + '://' + parsed_url.host + parsed_url.path
-
-    # create base str. make it an object attr for ez debugging
-    # ref http://oauth.net/core/1.0/#anchor14
-    @base_str = [ 
-      @req_method, 
-      percent_encode( req_url ), 
-
-      # normalization is just x-www-form-urlencoded
-      percent_encode( query_string ) 
-
-    ].join( '&' )
-
-    # add signature
-    @params[ 'oauth_signature' ] = signature
-
-    return self
-  end
-end