geocoder 1.2.7 → 1.2.8

data/lib/geocoder/results/maxmind_geoip2.rb

@@ -0,0 +1,9 @@
+require 'geocoder/results/geoip2'
+
+module Geocoder::Result
+  class MaxmindGeoip2 < Geoip2
+    # MindmindGeoip2 has the same results as Geoip2 because both are from MaxMind's GeoIP2 Precision Services
+    # See http://dev.maxmind.com/geoip/geoip2/web-services/ The difference being that Maxmind calls the service
+    # directly while GeoIP2 uses Hive::GeoIP2. See https://github.com/desuwa/hive_geoip2
+  end
+end

data/lib/geocoder/results/yandex.rb

@@ -12,9 +12,9 @@ module Geocoder::Result
     end
 
     def city
-      if state.empty? and address_details.has_key? 'Locality'
+      if state.empty? and address_details and address_details.has_key? 'Locality'
         address_details['Locality']['LocalityName']
-      elsif sub_state.empty? and address_details.has_key? 'AdministrativeArea' and
+      elsif sub_state.empty? and address_details and address_details.has_key? 'AdministrativeArea' and
           address_details['AdministrativeArea'].has_key? 'Locality'
         address_details['AdministrativeArea']['Locality']['LocalityName']
       elsif not sub_state_city.empty?
@@ -33,7 +33,7 @@ module Geocoder::Result
     end
 
     def state
-      if address_details['AdministrativeArea']
+      if address_details and address_details['AdministrativeArea']
         address_details['AdministrativeArea']['AdministrativeAreaName']
       else
         ""
@@ -41,7 +41,7 @@ module Geocoder::Result
     end
 
     def sub_state
-      if !state.empty? and address_details['AdministrativeArea']['SubAdministrativeArea']
+      if !state.empty? and address_details and address_details['AdministrativeArea']['SubAdministrativeArea']
         address_details['AdministrativeArea']['SubAdministrativeArea']['SubAdministrativeAreaName']
       else
         ""
@@ -75,7 +75,7 @@ module Geocoder::Result
     end
 
     def sub_state_city
-      if !sub_state.empty? and address_details['AdministrativeArea']['SubAdministrativeArea'].has_key? 'Locality'
+      if !sub_state.empty? and address_details and address_details['AdministrativeArea']['SubAdministrativeArea'].has_key? 'Locality'
         address_details['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName'] || ""
       else
         ""

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-03-21 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,18 +21,14 @@ 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
-- examples/sidekiq_worker.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
@@ -47,6 +43,7 @@ files:
 - lib/geocoder/configuration_hash.rb
 - lib/geocoder/exceptions.rb
 - lib/geocoder/ip_address.rb
+- lib/geocoder/logger.rb
 - lib/geocoder/lookup.rb
 - lib/geocoder/lookups/baidu.rb
 - lib/geocoder/lookups/baidu_ip.rb
@@ -65,6 +62,7 @@ files:
 - lib/geocoder/lookups/here.rb
 - lib/geocoder/lookups/mapquest.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
@@ -102,6 +100,7 @@ files:
 - lib/geocoder/results/here.rb
 - lib/geocoder/results/mapquest.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
@@ -126,146 +125,6 @@ files:
 - lib/oauth_util.rb
 - lib/tasks/geocoder.rake
 - lib/tasks/maxmind.rake
-- test/fixtures/baidu_invalid_key
-- test/fixtures/baidu_ip_202_198_16_3
-- test/fixtures/baidu_ip_invalid_key
-- test/fixtures/baidu_ip_no_results
-- 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/cloudmade_invalid_key
-- test/fixtures/cloudmade_madison_square_garden
-- test/fixtures/cloudmade_no_results
-- 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/geocodio_1101_pennsylvania_ave
-- test/fixtures/geocodio_bad_api_key
-- test/fixtures/geocodio_invalid
-- test/fixtures/geocodio_no_results
-- test/fixtures/geocodio_over_query_limit
-- 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/google_places_details_invalid_request
-- test/fixtures/google_places_details_madison_square_garden
-- test/fixtures/google_places_details_no_results
-- test/fixtures/google_places_details_no_reviews
-- test/fixtures/google_places_details_no_types
-- test/fixtures/here_madison_square_garden
-- test/fixtures/here_no_results
-- 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/nominatim_over_limit
-- test/fixtures/okf_kirstinmaki
-- test/fixtures/okf_no_results
-- test/fixtures/opencagedata_invalid_api_key
-- test/fixtures/opencagedata_invalid_request
-- test/fixtures/opencagedata_madison_square_garden
-- test/fixtures/opencagedata_no_results
-- test/fixtures/opencagedata_over_limit
-- test/fixtures/ovi_madison_square_garden
-- test/fixtures/ovi_no_results
-- test/fixtures/pointpin_10_10_10_10
-- test/fixtures/pointpin_555_555_555_555
-- test/fixtures/pointpin_80_111_555_555
-- test/fixtures/pointpin_no_results
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_WR26NJ
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_generic_error
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_hampshire
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_key_limit_exceeded
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_no_results
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_romsey
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_unknown_key
-- test/fixtures/smarty_streets_11211
-- test/fixtures/smarty_streets_madison_square_garden
-- test/fixtures/smarty_streets_no_results
-- test/fixtures/telize_10_10_10_10
-- test/fixtures/telize_555_555_555_555
-- test/fixtures/telize_74_200_247_59
-- test/fixtures/telize_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_canada_rue_dupuis_14
-- test/fixtures/yandex_invalid_key
-- test/fixtures/yandex_kremlin
-- test/fixtures/yandex_new_york
-- test/fixtures/yandex_no_administrative_area
-- test/fixtures/yandex_no_city_and_town
-- test/fixtures/yandex_no_results
-- test/integration/http_client_test.rb
-- test/mongoid_test_helper.rb
-- test/test_helper.rb
-- test/unit/active_record_test.rb
-- test/unit/cache_test.rb
-- test/unit/calculations_test.rb
-- test/unit/configuration_test.rb
-- test/unit/error_handling_test.rb
-- test/unit/geocoder_test.rb
-- test/unit/https_test.rb
-- test/unit/ip_address_test.rb
-- test/unit/lookup_test.rb
-- test/unit/lookups/bing_test.rb
-- test/unit/lookups/dstk_test.rb
-- test/unit/lookups/esri_test.rb
-- test/unit/lookups/freegeoip_test.rb
-- test/unit/lookups/geocoder_ca_test.rb
-- test/unit/lookups/geocodio_test.rb
-- test/unit/lookups/geoip2_test.rb
-- test/unit/lookups/google_places_details_test.rb
-- test/unit/lookups/google_premier_test.rb
-- test/unit/lookups/google_test.rb
-- test/unit/lookups/mapquest_test.rb
-- test/unit/lookups/maxmind_local_test.rb
-- test/unit/lookups/maxmind_test.rb
-- test/unit/lookups/nominatim_test.rb
-- test/unit/lookups/okf_test.rb
-- test/unit/lookups/opencagedata_test.rb
-- test/unit/lookups/pointpin_test.rb
-- test/unit/lookups/postcode_anywhere_uk_test.rb
-- test/unit/lookups/smarty_streets_test.rb
-- test/unit/lookups/telize_test.rb
-- test/unit/lookups/yahoo_test.rb
-- test/unit/method_aliases_test.rb
-- test/unit/model_test.rb
-- test/unit/mongoid_test.rb
-- test/unit/near_test.rb
-- test/unit/oauth_util_test.rb
-- test/unit/proxy_test.rb
-- test/unit/query_test.rb
-- test/unit/rake_task_test.rb
-- test/unit/request_test.rb
-- test/unit/result_test.rb
-- test/unit/test_mode_test.rb
 homepage: http://www.rubygeocoder.com
 licenses:
 - MIT

data/.gitignore

@@ -1,6 +0,0 @@
-pkg/*
-rdoc/*
-*.gem
-.bundle
-Gemfile.lock
-api_keys.yml

data/.travis.yml

@@ -1,32 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - 2.2.0
-  - jruby-19mode
-  - rbx-2
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.mongoid-2.4.x
-env: SSL_CERT_DIR=/etc/ssl/certs
-matrix:
-  exclude:
-    - 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: 2.1.2
-      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
-    - rvm: rbx-2
-      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/unit/**/*_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/sidekiq_worker.rb

@@ -1,16 +0,0 @@
-# This class implements a Sidekiq worker for performing geocoding
-# asynchronously. Do something like this in your controller:
-#
-# if @object.save
-#   GeocoderWorker.perform_async(@object.id)
-# end
-#
-class GeocoderWorker
-  include Sidekiq::Worker
-
-  def perform(object_id)
-    object = Object.find(object_id)
-    object.geocode
-    object.save!
-  end
-end

data/gemfiles/Gemfile.mongoid-2.4.x

@@ -1,16 +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 'geoip'
-
-  gem 'rails'
-
-  platforms :jruby do
-    gem 'jruby-openssl'
-  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"
-}