geocoder 1.1.9 → 1.8.0

data/.travis.yml

@@ -1,27 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.mongoid-2.4.x
-env: SSL_CERT_DIR=/etc/ssl/certs
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: Gemfile
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 1.9.2
-      gemfile: Gemfile
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs 

data/Rakefile

@@ -1,25 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/*_test.rb'
-  test.verbose = true
-end
-
-Rake::TestTask.new(:integration) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/integration/*_test.rb'
-  test.verbose = true
-end
-
-task :default => [:test]
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Geocoder #{Geocoder::VERSION}"
-  rdoc.rdoc_files.include('*.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/examples/autoexpire_cache_dalli.rb

@@ -1,62 +0,0 @@
-# This class implements a cache with simple delegation to the the Dalli Memcached client
-# https://github.com/mperham/dalli
-#
-# A TTL is set on initialization
-
-class AutoexpireCacheDalli
-  def initialize(store, ttl = 86400)
-    @store = store
-    @keys = 'GeocoderDalliClientKeys'
-    @ttl = ttl
-  end
-
-  def [](url)
-    res = @store.get(url)
-    res = YAML::load(res) if res.present?
-    res
-  end
-
-  def []=(url, value)
-    if value.nil?
-      del(url)
-    else
-      key_cache_add(url) if @store.add(url, YAML::dump(value), @ttl)
-    end
-    value
-  end
-
-  def keys
-    key_cache
-  end
-
-  def del(url)
-    key_cache_delete(url) if @store.delete(url)
-  end
-
-  private
-
-  def key_cache
-    the_keys = @store.get(@keys)
-    if the_keys.nil?
-      @store.add(@keys, YAML::dump([]))
-      []
-    else
-      YAML::load(the_keys)
-    end
-  end
-
-  def key_cache_add(key)
-    @store.replace(@keys, YAML::dump(key_cache << key))
-  end
-
-  def key_cache_delete(key)
-    tmp = key_cache
-    tmp.delete(key)
-    @store.replace(@keys, YAML::dump(tmp))
-  end
-end
-
-# Here Dalli is set up as on Heroku using the Memcachier gem.
-# https://devcenter.heroku.com/articles/memcachier#ruby
-# On other setups you might have to specify your Memcached server in Dalli::Client.new
-Geocoder.configure(:cache => AutoexpireCacheDalli.new(Dalli::Client.new))

data/examples/autoexpire_cache_redis.rb

@@ -1,28 +0,0 @@
-# This class implements a cache with simple delegation to the Redis store, but
-# when it creates a key/value pair, it also sends an EXPIRE command with a TTL.
-# It should be fairly simple to do the same thing with Memcached.
-class AutoexpireCacheRedis
-  def initialize(store, ttl = 86400)
-    @store = store
-    @ttl = ttl
-  end
-
-  def [](url)
-    @store.[](url)
-  end
-
-  def []=(url, value)
-    @store.[]=(url, value)
-    @store.expire(url, @ttl)
-  end
-
-  def keys
-    @store.keys
-  end
-
-  def del(url)
-    @store.del(url)
-  end
-end
-
-Geocoder.configure(:cache => AutoexpireCacheRedis.new(Redis.new))

data/gemfiles/Gemfile.mongoid-2.4.x

@@ -1,15 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '..'
-
-group :development, :test do
-  gem 'rake'
-  gem 'mongoid', '2.4.11'
-  gem 'bson_ext', :platforms => :ruby
-
-  gem 'rails'
-
-  platforms :jruby do
-    gem 'jruby-openssl'
-  end
-end

data/lib/geocoder/lookups/geocoder_us.rb

@@ -1,39 +0,0 @@
-require 'geocoder/lookups/base'
-require "geocoder/results/geocoder_us"
-
-module Geocoder::Lookup
-  class GeocoderUs < Base
-
-    def name
-      "Geocoder.us"
-    end
-
-    def query_url(query)
-      if configuration.api_key
-        "http://#{configuration.api_key}@geocoder.us/member/service/csv/geocode?" + url_query_string(query)
-      else
-        "http://geocoder.us/service/csv/geocode?" + url_query_string(query)
-      end
-    end
-
-    private
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      if doc[0].to_s =~ /^(\d+)\:/
-        return []
-      else
-        return [doc.size == 5 ? ((doc[0..1] << nil) + doc[2..4]) : doc]
-      end
-    end
-
-    def query_url_params(query)
-      (query.text =~ /^\d{5}(?:-\d{4})?$/ ? {:zip => query} : {:address => query.sanitized_text}).merge(super)
-    end
-
-    def parse_raw_data(raw_data)
-      raw_data.chomp.split(',')
-    end
-  end
-end
-

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,86 +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)
-      {
-        :location => query.sanitized_text,
-        :flags => "JXTSR",
-        :gflags => "AC#{'R' if query.reverse_geocode?}",
-        :locale => "#{configuration.language}_US",
-        :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/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/hash_recursive_merge.rb

@@ -1,74 +0,0 @@
-# 
-# = Hash Recursive Merge
-# 
-# Merges a Ruby Hash recursively, Also known as deep merge.
-# Recursive version of Hash#merge and Hash#merge!.
-# 
-# Category::    Ruby
-# Package::     Hash
-# Author::      Simone Carletti <weppos@weppos.net>
-# Copyright::   2007-2008 The Authors
-# License::     MIT License
-# Link::        http://www.simonecarletti.com/
-# Source::      http://gist.github.com/gists/6391/
-#
-module HashRecursiveMerge
-
-  #
-  # Recursive version of Hash#merge!
-  # 
-  # Adds the contents of +other_hash+ to +hsh+, 
-  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
-  # 
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  # 
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #    
-  # Simply using Hash#merge! would return
-  # 
-  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  # 
-  def rmerge!(other_hash)
-    merge!(other_hash) do |key, oldval, newval|
-      oldval.class == self.class ? oldval.rmerge!(newval) : newval
-    end
-  end
-
-  #
-  # Recursive version of Hash#merge
-  # 
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  # 
-  # Compared with Hash#merge, this method provides a different approch
-  # for merging nasted hashes.
-  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
-  # includes the same key, the value is merged instead replaced with
-  # +other_hash+ value.
-  # 
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #    
-  # Simply using Hash#merge would return
-  # 
-  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  # 
-  def rmerge(other_hash)
-    r = {}
-    merge(other_hash) do |key, oldval, newval|
-      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
-    end
-  end
-
-end
-
-
-class Hash
-  include HashRecursiveMerge
-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::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