geocoder 1.2.6 → 1.6.1

data/lib/geocoder/lookups/ovi.rb

@@ -1,62 +0,0 @@
-require 'geocoder/lookups/base'
-require 'geocoder/results/ovi'
-
-module Geocoder::Lookup
-  class Ovi < Base
-
-    def name
-      "Ovi"
-    end
-
-    def required_api_key_parts
-      []
-    end
-
-    def query_url(query)
-      "#{protocol}://lbs.ovi.com/search/6.2/#{if query.reverse_geocode? then 'reverse' end}geocode.json?" + url_query_string(query)
-    end
-
-    private # ---------------------------------------------------------------
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      return [] unless doc['Response'] && doc['Response']['View']
-      if r=doc['Response']['View']
-        return [] if r.nil? || !r.is_a?(Array) || r.empty?
-        return r.first['Result']
-      end
-      []
-    end
-
-    def query_url_params(query)
-      options = {
-        :gen=>1,
-        :app_id=>api_key,
-        :app_code=>api_code
-      }
-
-      if query.reverse_geocode?
-        super.merge(options).merge(
-          :prox=>query.sanitized_text,
-          :mode=>:retrieveAddresses
-        )
-      else
-        super.merge(options).merge(
-          :searchtext=>query.sanitized_text
-        )
-      end
-    end
-
-    def api_key
-      if a=configuration.api_key
-        return a.first if a.is_a?(Array)
-      end
-    end
-
-    def api_code
-      if a=configuration.api_key
-        return a.last if a.is_a?(Array)
-      end
-    end
-  end
-end

data/lib/geocoder/lookups/yahoo.rb

@@ -1,88 +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)
-      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
-        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) || warn("Over API query limit.")
-        elsif raw_data =~ /<yahoo:description>(Please provide valid credentials.*)<\/yahoo:description>/i
-          raise_error(Geocoder::InvalidApiKey) || 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/geocoder_us.rb

@@ -1,39 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class GeocoderUs < Base
-    def coordinates
-      [@data[0].to_f, @data[1].to_f]
-    end
-
-    def address(format = :full)
-      "#{street_address}, #{city}, #{state} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
-    end
-
-    def street_address
-      @data[2]
-    end
-
-    def city
-      @data[3]
-    end
-
-    def state
-      @data[4]
-    end
-
-    alias_method :state_code, :state
-
-    def postal_code
-      @data[5]
-    end
-
-    def country
-      'United States'
-    end
-
-    def country_code
-      'US'
-    end
-  end
-end

data/lib/geocoder/results/okf.rb

@@ -1,106 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Okf < Base
-
-    def coordinates
-      ['lat', 'lng'].map{ |i| geometry['location'][i] }
-    end
-
-    def address(format = :full)
-      formatted_address
-    end
-
-    def city
-      fields = [:locality, :sublocality,
-        :administrative_area_level_3,
-        :administrative_area_level_2]
-      fields.each do |f|
-        if entity = address_components_of_type(f).first
-          return entity['long_name']
-        end
-      end
-      return nil # no appropriate components found
-    end
-
-  def state
-    ""
-  end
-
-  def sub_state
-    ""
-  end
-
-  def state_code
-    ""
-  end
-
-    def country
-      if country = address_components_of_type(:country).first
-        country['long_name']
-      end
-    end
-
-    def country_code
-      if country = address_components_of_type(:country).first
-        country['short_name']
-      end
-    end
-
-    def postal_code
-      if postal = address_components_of_type(:postal_code).first
-        postal['long_name']
-      end
-    end
-
-    def route
-      if route = address_components_of_type(:route).first
-        route['long_name']
-      end
-    end
-
-    def street_number
-      if street_number = address_components_of_type(:street_number).first
-        street_number['long_name']
-      end
-    end
-
-    def street_address
-      [route, street_number].compact.join(' ')
-    end
-
-    def types
-      @data['types']
-    end
-
-    def formatted_address
-      @data['formatted_address']
-    end
-
-    def address_components
-      @data['address_components']
-    end
-
-    ##
-    # Get address components of a given type. Valid types are defined in
-    # Google's Geocoding API documentation and include (among others):
-    #
-    #   :street_number
-    #   :locality
-    #   :neighborhood
-    #   :route
-    #   :postal_code
-    #
-    def address_components_of_type(type)
-      address_components.select{ |c| c['types'].include?(type.to_s) }
-    end
-
-    def geometry
-      @data['geometry']
-    end
-
-    def precision
-      geometry['location_type'] if geometry
-    end
-  end
-end

data/lib/geocoder/results/ovi.rb

@@ -1,62 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Ovi < Base
-
-    ##
-    # A string in the given format.
-    #
-    def address(format = :full)
-      address_data['Label']
-    end
-
-    ##
-    # A two-element array: [lat, lon].
-    #
-    def coordinates
-      fail unless d = @data['Location']['DisplayPosition']
-      [d['Latitude'].to_f, d['Longitude'].to_f]
-    end
-
-    def state
-      address_data['County']
-    end
-
-    def province
-      address_data['County']
-    end
-
-    def postal_code
-      address_data['PostalCode']
-    end
-
-    def city
-      address_data['City']
-    end
-
-    def state_code
-      address_data['State']
-    end
-
-    def province_code
-      address_data['State']
-    end
-
-    def country
-      fail unless d = address_data['AdditionalData']
-      if v = d.find{|ad| ad['key']=='CountryName'}
-        return v['value']
-      end
-    end
-
-    def country_code
-      address_data['Country']
-    end
-
-    private # ----------------------------------------------------------------
-
-    def address_data
-      @data['Location']['Address'] || fail
-    end
-  end
-end

data/lib/geocoder/results/yahoo.rb

@@ -1,55 +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 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

data/test/fixtures/baidu_invalid_key

@@ -1 +0,0 @@
-{"results":[],"status":5,"msg":"AK Illegal or Not Exist:"}

data/test/fixtures/baidu_ip_202_198_16_3

@@ -1,19 +0,0 @@
-{
-  "address": "CN|北京|北京|None|CHINANET|1|None",
-  "content": {
-    "address": "北京市", 
-    "address_detail": {
-      "city": "北京市",
-      "city_code": 131,
-    "district": "", 
-    "province": "北京市",
-    "street": "",
-    "street_number": ""
-    },
-    "point": {
-      "x": "116.39564504",
-      "y": "39.92998578"
-    }
-  },
-  "status": 0
-} 

data/test/fixtures/baidu_ip_invalid_key

@@ -1 +0,0 @@
-{"status":5,"uid":null,"sk":null,"logformat":null}

data/test/fixtures/baidu_ip_no_results

@@ -1 +0,0 @@
-{"status":0, "content":{}}

data/test/fixtures/baidu_no_results

@@ -1 +0,0 @@
-{"status":0,"result":[]}

data/test/fixtures/baidu_reverse

@@ -1 +0,0 @@
-{"status":0,"result":{"location":{"lng":121.48789948569,"lat":31.249161555654},"formatted_address":"上海市闸北区天潼路619号","business":"七浦路,海宁路,北京东路","addressComponent":{"city":"上海市","district":"闸北区","province":"上海市","street":"天潼路","street_number":"619号"},"cityCode":289}}

data/test/fixtures/baidu_shanghai_pearl_tower

@@ -1,12 +0,0 @@
-{
-	"status":0,
-		"result":{
-			"location":{
-				"lng":116.30814954222,
-				"lat":40.056885091681
-			},
-			"precise":1,
-			"confidence":80,
-			"level":"\u5546\u52a1\u5927\u53a6"
-		}
-}

data/test/fixtures/bing_invalid_key

@@ -1 +0,0 @@
-{"authenticationResultCode":"InvalidCredentials","brandLogoUri":"http:\\/\\/dev.virtualearth.net\\/Branding\\/logo_powered_by.png","copyright":"Copyright \xC2\xA9 2012 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","errorDetails":["Access was denied. You may have entered your credentials incorrectly, or you might not have access to the requested resource or operation."],"resourceSets":[],"statusCode":401,"statusDescription":"Unauthorized","traceId":"5c539f6e70c44b2e858741b6c932318e|EWRM001670|02.00.83.1900|"}

data/test/fixtures/bing_madison_square_garden

@@ -1,40 +0,0 @@
-{
-   "authenticationResultCode":"ValidCredentials",
-   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
-   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
-   "resourceSets":[
-      {
-         "estimatedTotal":1,
-         "resources":[
-            {
-               "__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1",
-               "bbox":[
-                  40.744944289326668,
-                  -74.002353921532631,
-                  40.755675807595253,
-                  -73.983625397086143
-               ],
-               "name":"Madison Square Garden, NY",
-               "point":{
-                  "type":"Point",
-                  "coordinates":[
-                     40.75031,
-                     -73.99299
-                  ]
-               },
-               "address":{
-                  "adminDistrict":"NY",
-                  "countryRegion":"United States",
-                  "formattedAddress":"Madison Square Garden, NY",
-                  "locality":"New York"
-               },
-               "confidence":"High",
-               "entityType":"Stadium"
-            }
-         ]
-      }
-   ],
-   "statusCode":200,
-   "statusDescription":"OK",
-   "traceId":"55094ee53c8d45e789794014666328cd|CH1M001466|02.00.82.2800|CH1MSNVM001396, CH1MSNVM001370, CH1MSNVM001397"
-}

data/test/fixtures/bing_no_results

@@ -1,16 +0,0 @@
-{
-   "authenticationResultCode":"ValidCredentials",
-   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
-   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
-   "resourceSets":[
-      {
-         "estimatedTotal":0,
-         "resources":[
-
-         ]
-      }
-   ],
-   "statusCode":200,
-   "statusDescription":"OK",
-   "traceId":"907b76a307bc49129a489de3d4c992ea|CH1M001463|02.00.82.2800|CH1MSNVM001383, CH1MSNVM001358, CH1MSNVM001397"
-}

data/test/fixtures/bing_reverse

@@ -1,42 +0,0 @@
-{
-   "authenticationResultCode":"ValidCredentials",
-   "brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png",
-   "copyright":"Copyright © 2011 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.",
-   "resourceSets":[
-      {
-         "estimatedTotal":1,
-         "resources":[
-            {
-               "__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1",
-               "bbox":[
-                  45.419835111675845,
-                  -75.683656128790716,
-                  45.4275605468172,
-                  -75.66898098334994
-               ],
-               "name":"291 Rue Somerset E, Ottawa, ON, K1N",
-               "point":{
-                  "type":"Point",
-                  "coordinates":[
-                     45.423697829246521,
-                     -75.676318556070328
-                  ]
-               },
-               "address":{
-                  "addressLine":"291 Rue Somerset E",
-                  "adminDistrict":"ON",
-                  "countryRegion":"Canada",
-                  "formattedAddress":"291 Rue Somerset E, Ottawa, ON, K1N",
-                  "locality":"Ottawa",
-                  "postalCode":"K1N"
-               },
-               "confidence":"Medium",
-               "entityType":"Address"
-            }
-         ]
-      }
-   ],
-   "statusCode":200,
-   "statusDescription":"OK",
-   "traceId":"27bd5ed659e64ba6970c4144f1d4ea94|CH1M001470|02.00.82.2800|CH1MSNVM001396, CH1MSNVM001374"
-}

data/test/fixtures/cloudmade_invalid_key

@@ -1 +0,0 @@
-Forbidden request