geocoder 1.1.9 → 1.3.7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.3.7
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2016-06-09 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,
@@ -21,28 +21,34 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - bin/geocode
 - examples/autoexpire_cache_dalli.rb
 - examples/autoexpire_cache_redis.rb
 - examples/cache_bypass.rb
-- gemfiles/Gemfile.mongoid-2.4.x
+- examples/reverse_geocode_job.rb
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
+- lib/generators/geocoder/maxmind/geolite_city_generator.rb
+- lib/generators/geocoder/maxmind/geolite_country_generator.rb
+- lib/generators/geocoder/maxmind/templates/migration/geolite_city.rb
+- lib/generators/geocoder/maxmind/templates/migration/geolite_country.rb
 - lib/geocoder.rb
 - lib/geocoder/cache.rb
 - lib/geocoder/calculations.rb
 - lib/geocoder/cli.rb
 - lib/geocoder/configuration.rb
 - lib/geocoder/configuration_hash.rb
+- lib/geocoder/esri_token.rb
 - lib/geocoder/exceptions.rb
+- lib/geocoder/ip_address.rb
+- lib/geocoder/kernel_logger.rb
+- lib/geocoder/logger.rb
 - lib/geocoder/lookup.rb
 - lib/geocoder/lookups/baidu.rb
+- lib/geocoder/lookups/baidu_ip.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
 - lib/geocoder/lookups/dstk.rb
@@ -50,14 +56,32 @@ files:
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
 - lib/geocoder/lookups/geocoder_us.rb
+- lib/geocoder/lookups/geocodio.rb
+- lib/geocoder/lookups/geoip2.rb
+- lib/geocoder/lookups/geoportail_lu.rb
 - lib/geocoder/lookups/google.rb
+- 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
 - 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
 - lib/geocoder/lookups/nominatim.rb
+- 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
@@ -68,6 +92,7 @@ files:
 - lib/geocoder/railtie.rb
 - lib/geocoder/request.rb
 - lib/geocoder/results/baidu.rb
+- lib/geocoder/results/baidu_ip.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
 - lib/geocoder/results/dstk.rb
@@ -75,14 +100,32 @@ files:
 - lib/geocoder/results/freegeoip.rb
 - lib/geocoder/results/geocoder_ca.rb
 - lib/geocoder/results/geocoder_us.rb
+- lib/geocoder/results/geocodio.rb
+- lib/geocoder/results/geoip2.rb
+- lib/geocoder/results/geoportail_lu.rb
 - lib/geocoder/results/google.rb
+- 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
 - 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
 - lib/geocoder/results/nominatim.rb
+- 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
@@ -92,81 +135,12 @@ files:
 - lib/geocoder/stores/mongoid.rb
 - lib/geocoder/version.rb
 - lib/hash_recursive_merge.rb
-- lib/oauth_util.rb
+- lib/maxmind_database.rb
 - lib/tasks/geocoder.rake
-- test/active_record_test.rb
-- test/cache_test.rb
-- test/calculations_test.rb
-- test/configuration_test.rb
-- test/custom_block_test.rb
-- test/error_handling_test.rb
-- test/fixtures/baidu_invalid_key
-- test/fixtures/baidu_no_results
-- test/fixtures/baidu_reverse
-- test/fixtures/baidu_shanghai_pearl_tower
-- test/fixtures/bing_invalid_key
-- test/fixtures/bing_madison_square_garden
-- test/fixtures/bing_no_results
-- test/fixtures/bing_reverse
-- test/fixtures/esri_madison_square_garden
-- test/fixtures/esri_no_results
-- test/fixtures/esri_reverse
-- test/fixtures/freegeoip_74_200_247_59
-- test/fixtures/freegeoip_no_results
-- test/fixtures/geocoder_ca_madison_square_garden
-- test/fixtures/geocoder_ca_no_results
-- test/fixtures/geocoder_ca_reverse
-- test/fixtures/geocoder_us_madison_square_garden
-- test/fixtures/geocoder_us_no_results
-- test/fixtures/google_garbage
-- test/fixtures/google_madison_square_garden
-- test/fixtures/google_no_city_data
-- test/fixtures/google_no_locality
-- test/fixtures/google_no_results
-- test/fixtures/google_over_limit
-- test/fixtures/mapquest_error
-- test/fixtures/mapquest_invalid_api_key
-- test/fixtures/mapquest_invalid_request
-- test/fixtures/mapquest_madison_square_garden
-- test/fixtures/mapquest_no_results
-- test/fixtures/maxmind_24_24_24_21
-- test/fixtures/maxmind_24_24_24_22
-- test/fixtures/maxmind_24_24_24_23
-- test/fixtures/maxmind_24_24_24_24
-- test/fixtures/maxmind_74_200_247_59
-- test/fixtures/maxmind_invalid_key
-- test/fixtures/maxmind_no_results
-- test/fixtures/nominatim_madison_square_garden
-- test/fixtures/nominatim_no_results
-- test/fixtures/ovi_madison_square_garden
-- test/fixtures/ovi_no_results
-- test/fixtures/yahoo_error
-- test/fixtures/yahoo_invalid_key
-- test/fixtures/yahoo_madison_square_garden
-- test/fixtures/yahoo_no_results
-- test/fixtures/yahoo_over_limit
-- test/fixtures/yandex_invalid_key
-- test/fixtures/yandex_kremlin
-- test/fixtures/yandex_no_city_and_town
-- test/fixtures/yandex_no_results
-- test/geocoder_test.rb
-- test/https_test.rb
-- test/integration/smoke_test.rb
-- test/lookup_test.rb
-- test/method_aliases_test.rb
-- test/mongoid_test.rb
-- test/mongoid_test_helper.rb
-- test/near_test.rb
-- test/oauth_util_test.rb
-- test/proxy_test.rb
-- test/query_test.rb
-- test/request_test.rb
-- test/result_test.rb
-- test/services_test.rb
-- test/test_helper.rb
-- test/test_mode_test.rb
+- lib/tasks/maxmind.rake
 homepage: http://www.rubygeocoder.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -174,17 +148,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.

data/.gitignore

@@ -1,5 +0,0 @@
-pkg/*
-rdoc/*
-*.gem
-.bundle
-Gemfile.lock

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/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/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/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::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/active_record_test.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-require 'test_helper'
-
-class ActiveRecordTest < Test::Unit::TestCase
-
-  def test_exclude_condition_when_model_has_a_custom_primary_key
-    venue = VenuePlus.new(*venue_params(:msg))
-
-    # just call private method directly so we don't have to stub .near scope
-    conditions = venue.class.send(:add_exclude_condition, ["fake_condition"], venue)
-
-    assert_match( /#{VenuePlus.primary_key}/, conditions.join)
-  end
-
-end

data/test/cache_test.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-require 'test_helper'
-
-class CacheTest < Test::Unit::TestCase
-
-  def test_second_occurrence_of_request_is_cache_hit
-    Geocoder.configure(:cache => {})
-    Geocoder::Lookup.all_services_except_test.each do |l|
-      Geocoder.configure(:lookup => l)
-      set_api_key!(l)
-      results = Geocoder.search("Madison Square Garden")
-      assert !results.first.cache_hit,
-        "Lookup #{l} returned erroneously cached result."
-      results = Geocoder.search("Madison Square Garden")
-      assert results.first.cache_hit,
-        "Lookup #{l} did not return cached result."
-    end
-  end
-
-  def test_google_over_query_limit_does_not_hit_cache
-    Geocoder.configure(:cache => {})
-    Geocoder.configure(:lookup => :google)
-    set_api_key!(:google)
-    Geocoder.configure(:always_raise => :all)
-    assert_raises Geocoder::OverQueryLimitError do
-      Geocoder.search("over limit")
-    end
-    lookup = Geocoder::Lookup.get(:google)
-    assert_equal false, lookup.instance_variable_get(:@cache_hit)
-    assert_raises Geocoder::OverQueryLimitError do
-      Geocoder.search("over limit")
-    end
-    assert_equal false, lookup.instance_variable_get(:@cache_hit)
-  end
-end