geokit 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 808d2beadd1bc97170d5cac5db18a8130dff73e0
-  data.tar.gz: fda085fa6fd111a572028f41d6cf944ff7605e08
+SHA256:
+  metadata.gz: c61de87b4682789d1cceb478c63669cc2788f8476247314b8f481bc3382f90df
+  data.tar.gz: dfc7a3232b2f7ad0184660e8e5338961289a52418b08efac90eac911a84a3978
 SHA512:
-  metadata.gz: 16f2a6b0346097f2f7da712d8a485d4811ed4dccf0de330fcc85e4f07b61845f51a2aff976ad43f619494d5aafd0f452860f74a7b550bc3ee1a018cf4d20a972
-  data.tar.gz: 1408272ef2d052118dadbbd8c2b3ec7cf785b1e0164d58767fa5960b501584396bd9f19b9d05fb53e949c774f0d1d1fcb405d1606d82ec2d7a34286e566622a1
+  metadata.gz: eae3182ab6e7f4dbf337bca53288a76c5b9b71a2d32f7741bd6362605a0d9a0cec63d264cb382a026e7b05c2bee08ed4375db5b0ae7479311b2b3fdd366c80dd
+  data.tar.gz: a7c576f5ad8b23463e5730c79cbe0591e9cde53d0031e49e75b23903af6b9f48df87a0ce1fb5ac8472265cf7bf7ac535bc9a4c166b34931966ecd4ff44d30728

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1' ]
+    name: Test w/ Ruby ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: |
+        gem install bundler -v '~>1'
+        bundle install --jobs 4 --retry 3
+    - name: Test
+      run: bundle exec rake test

data/.hound.yml

@@ -1,2 +1,2 @@
-ruby:
+rubocop:
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -63,7 +63,7 @@ Performance/StringReplacement:
     - 'lib/geokit/inflectors.rb'
 
 # Offense count: 1
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - 'lib/geokit/geocoders/mapbox.rb'
 
@@ -79,7 +79,7 @@ Style/Alias:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-Style/AlignArray:
+Layout/AlignArray:
   Exclude:
     - 'lib/geokit/geo_loc.rb'
 
@@ -87,7 +87,7 @@ Style/AlignArray:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: with_first_parameter, with_fixed_indentation
-Style/AlignParameters:
+Layout/AlignParameters:
   Exclude:
     - 'lib/geokit/lat_lng.rb'
     - 'test/test_google_geocoder.rb'
@@ -151,33 +151,32 @@ Style/Documentation:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
 
 # Offense count: 2
 Style/DoubleNegation:
   Exclude:
-    - 'lib/geokit/geocoders/free_geo_ip.rb'
     - 'lib/geokit/geocoders/geo_plugin.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAdjacentOneLineDefs.
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Exclude:
     - 'lib/geokit/geocoders.rb'
     - 'lib/geokit/geocoders/opencage.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/EmptyLines:
+Layout/EmptyLines:
   Exclude:
     - 'test/test_google_geocoder.rb'
 
 # Offense count: 15
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   Exclude:
     - 'lib/geokit/geocoders/bing.rb'
     - 'lib/geokit/geocoders/yahoo.rb'
@@ -201,7 +200,7 @@ Style/IfInsideElse:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: normal, rails
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Exclude:
     - 'test/test_google_geocoder.rb'
     - 'test/test_openstreetmap_geocoder.rb'
@@ -222,7 +221,7 @@ Style/MethodCallWithoutArgsParentheses:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: aligned, indented
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: false
 
 # Offense count: 21
@@ -230,7 +229,6 @@ Style/MultilineOperationIndentation:
 Style/MutableConstant:
   Exclude:
     - 'lib/geokit/geocoders/bing.rb'
-    - 'lib/geokit/geocoders/free_geo_ip.rb'
     - 'lib/geokit/geocoders/geo_plugin.rb'
     - 'lib/geokit/geocoders/geonames.rb'
     - 'lib/geokit/geocoders/google.rb'
@@ -259,7 +257,7 @@ Style/ParallelAssignment:
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
 # NameWhitelist: is_a?
-Style/PredicateName:
+Naming/PredicateName:
   Exclude:
     - 'lib/geokit/geo_loc.rb'
 
@@ -285,13 +283,13 @@ Style/RescueModifier:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/geokit/geocoders/bing.rb'
     - 'lib/geokit/geocoders/yahoo.rb'
@@ -299,7 +297,7 @@ Style/SpaceAroundOperators:
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Exclude:
     - 'test/test_mappable.rb'
 
@@ -307,14 +305,14 @@ Style/SpaceBeforeFirstArg:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
-Style/SpaceInsideStringInterpolation:
+Layout/SpaceInsideStringInterpolation:
   Exclude:
     - 'lib/geokit/geocoders/yahoo.rb'
 
@@ -339,11 +337,21 @@ Style/TrailingCommaInArguments:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 # SupportedStyles: comma, consistent_comma, no_comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Exclude:
+    - 'lib/geokit/geo_loc.rb'
+    - 'lib/geokit/geocoders/bing.rb'
+    - 'lib/geokit/geocoders/geo_plugin.rb'
+    - 'lib/geokit/geocoders/geocodio.rb'
+    - 'lib/geokit/geocoders/geonames.rb'
+    - 'lib/geokit/geocoders/google.rb'
+    - 'lib/geokit/geocoders/yahoo.rb'
+    - 'test/test_ipgeocoder.rb'
+
+Style/TrailingCommaInHashLiteral:
   Exclude:
     - 'lib/geokit/geo_loc.rb'
     - 'lib/geokit/geocoders/bing.rb'
-    - 'lib/geokit/geocoders/free_geo_ip.rb'
     - 'lib/geokit/geocoders/geo_plugin.rb'
     - 'lib/geokit/geocoders/geocodio.rb'
     - 'lib/geokit/geocoders/geonames.rb'
@@ -354,5 +362,5 @@ Style/TrailingCommaInLiteral:
 # Offense count: 6
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: snake_case, camelCase
-Style/VariableName:
+Naming/VariableName:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.14.0
+
+* Introduced NoSuchGeocoderError. If you try call a geocoder like :bogus that doesn't exist, an error will be returned.
+* Upgraded to coveralls_reborn
+* Replaced deprecated URI.escape with CGI.escape
+* Fixed old mocha incompatability, now calls mocha/test_unit and not mocha/setup
+* Bumped minimum Ruby version
+
 ## 1.13.1
 
 **Existing Geocoder Changes**

data/README.markdown

@@ -1,11 +1,11 @@
 Geokit
 ======
 
-[![Gem Version](https://badge.fury.io/rb/geokit.png)](http://badge.fury.io/rb/geokit)
-[![Build Status](https://travis-ci.org/geokit/geokit.png?branch=master)](https://travis-ci.org/geokit/geokit)
-[![Coverage Status](https://coveralls.io/repos/geokit/geokit/badge.png)](https://coveralls.io/r/geokit/geokit)
-[![Dependency Status](https://gemnasium.com/geokit/geokit.png)](https://gemnasium.com/geokit/geokit)
-[![Code Climate](https://codeclimate.com/github/geokit/geokit.png)](https://codeclimate.com/github/geokit/geokit)
+[![Gem Version](https://badge.fury.io/rb/geokit.svg)](http://badge.fury.io/rb/geokit)
+[![Build Status](https://github.com/geokit/geokit/workflows/CI/badge.svg)](https://github.com/geokit/geokit/actions)
+[![Coverage Status](https://coveralls.io/repos/geokit/geokit/badge.svg)](https://coveralls.io/r/geokit/geokit)
+[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![Code Climate](https://codeclimate.com/github/geokit/geokit.svg)](https://codeclimate.com/github/geokit/geokit)
 
 ## DESCRIPTION
 
@@ -63,7 +63,6 @@ Combine this gem with the [geokit-rails](http://github.com/geokit/geokit-rails)
 * RIPE
 * MaxMind
 * Ipstack
-* freegeoip.net (deprecated, now Ipstack)
 * IP-API.com
 
 ### HTTPS-supporting geocoders
@@ -286,7 +285,7 @@ Multi Geocoder - provides failover for the physical location geocoders, and also
 ```
 
 ## MULTIPLE RESULTS
-Some geocoding services will return multple results if the there isn't one clear result.
+Some geocoding services will return multiple results if the there isn't one clear result.
 Geoloc can capture multiple results through its "all" method.
 
 ```ruby
@@ -314,14 +313,14 @@ between two points.
 LatLng is a simple container for latitude and longitude, but
 it's made more powerful by mixing in the above-mentioned Mappable
 module -- therefore, you can calculate easily the distance between two
-LatLng ojbects with `distance = first.distance_to(other)`
+LatLng objects with `distance = first.distance_to(other)`
 
 GeoLoc represents an address or location which
 has been geocoded. You can get the city, zipcode, street address, etc.
 from a GeoLoc object. GeoLoc extends LatLng, so you also get lat/lng
 AND the Mappable module goodness for free.
 
-geocoders.rb contains all the geocoder implemenations. All the gercoders
+geocoders.rb contains all the geocoder implementations. All the geocoders
 inherit from a common base (class Geocoder) and implement the private method
 do_geocode.
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 task :console do
-  sh "irb -rubygems -I lib -r geokit"
+  sh "irb -I lib -r geokit"
 end
 
 Rake::TestTask.new do |t|

data/fixtures/vcr_cassettes/bing_full.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://dev.virtualearth.net/REST/v1/Locations/100%20Spear%20St,%20San%20Francisco,%20CA,%2094105-1522,%20US?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
+    uri: https://dev.virtualearth.net/REST/v1/Locations/100+Spear+St,+San+Francisco,+CA,+94105-1522,+US?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/bing_full_au.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://dev.virtualearth.net/REST/v1/Locations/440%20King%20William%20Street,%20Adelaide,%20Australia?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
+    uri: https://dev.virtualearth.net/REST/v1/Locations/440+King+William+Street,+Adelaide,+Australia?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/bing_full_de.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://dev.virtualearth.net/REST/v1/Locations/Platz%20der%20Republik%201,%2011011%20Berlin,%20Germany?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
+    uri: https://dev.virtualearth.net/REST/v1/Locations/Platz+der+Republik+1,+11011+Berlin,+Germany?key=AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7&o=xml
     body:
       encoding: US-ASCII
       string: ''

data/fixtures/vcr_cassettes/opencage_reverse_cerdanyola.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.opencagedata.com/geocode/v1/json?key=someopencageapikey&no_annotations=1&query=41.493588,2.141879
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 27 Jan 2020 16:52:19 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      Vary:
+      - Accept-Encoding
+      Content-Length:
+      - '597'
+      Content-Type:
+      - application/json; charset=utf-8
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+    body:
+      encoding: UTF-8
+      string: '{"documentation":"https://opencagedata.com/api","licenses":[{"name":"see
+        attribution guide","url":"https://opencagedata.com/credits"}],"results":[{"bounds":{"northeast":{"lat":41.4950264,"lng":2.1415936},"southwest":{"lat":41.4925907,"lng":2.1411986}},"components":{"ISO_3166-1_alpha-2":"ES","ISO_3166-1_alpha-3":"ESP","_category":"road","_type":"road","continent":"Europe","country":"Spain","country_code":"es","county":"Vall\u00e8s
+        Occidental","neighbourhood":"Sant Mart\u00ed","political_union":"European
+        Union","postcode":"08290","road":"Passeig de la Riera","road_type":"residential","state":"Catalonia","suburb":"Can
+        Costa","town":"Cerdanyola del Vall\u00e8s"},"confidence":9,"formatted":"Passeig
+        de la Riera, 08290 Cerdanyola del Vall\u00e8s, Spain","geometry":{"lat":41.4936783,"lng":2.1413932}}],"status":{"code":200,"message":"OK"},"stay_informed":{"blog":"https://blog.opencagedata.com","twitter":"https://twitter.com/opencagedata"},"thanks":"For
+        using an OpenCage API","timestamp":{"created_http":"Mon, 27 Jan 2020 16:52:19
+        GMT","created_unix":1580143939},"total_results":1}'
+    http_version: 
+  recorded_at: Mon, 27 Jan 2020 16:52:19 GMT
+recorded_with: VCR 5.0.0

data/fixtures/vcr_cassettes/test_component_filtering_with_special_characters.yml

@@ -0,0 +1,126 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://maps.google.com/maps/api/geocode/json?address=S%C3%A3o%20Paulo&components=administrative_area:s%C3%A3o%20paulo%7Ccountry:br&sensor=false
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=UTF-8
+      Date:
+      - Wed, 03 Apr 2019 22:15:01 GMT
+      Pragma:
+      - no-cache
+      Expires:
+      - Fri, 01 Jan 1990 00:00:00 GMT
+      Cache-Control:
+      - no-cache, must-revalidate
+      Vary:
+      - Accept-Language
+      Access-Control-Allow-Origin:
+      - "*"
+      Server:
+      - mafe
+      X-Xss-Protection:
+      - '0'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Server-Timing:
+      - gfet4t7; dur=1
+      Alt-Svc:
+      - quic=":443"; ma=2592000; v="46,44,43,39"
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "results": [
+            {
+              "address_components": [
+                {
+                  "long_name": "São Paulo",
+                  "short_name": "São Paulo",
+                  "types": [
+                    "locality",
+                    "political"
+                  ]
+                },
+                {
+                  "long_name": "São Paulo",
+                  "short_name": "São Paulo",
+                  "types": [
+                    "administrative_area_level_2",
+                    "political"
+                  ]
+                },
+                {
+                  "long_name": "State of São Paulo",
+                  "short_name": "SP",
+                  "types": [
+                    "administrative_area_level_1",
+                    "political"
+                  ]
+                },
+                {
+                  "long_name": "Brazil",
+                  "short_name": "BR",
+                  "types": [
+                    "country",
+                    "political"
+                  ]
+                }
+              ],
+              "formatted_address": "São Paulo, State of São Paulo, Brazil",
+              "geometry": {
+                "bounds": {
+                  "northeast": {
+                    "lat": -23.3566039,
+                    "lng": -46.3650844
+                  },
+                  "southwest": {
+                    "lat": -24.0082209,
+                    "lng": -46.825514
+                  }
+                },
+                "location": {
+                  "lat": -23.5505199,
+                  "lng": -46.63330939999999
+                },
+                "location_type": "APPROXIMATE",
+                "viewport": {
+                  "northeast": {
+                    "lat": -23.3566039,
+                    "lng": -46.3650844
+                  },
+                  "southwest": {
+                    "lat": -24.0082209,
+                    "lng": -46.825514
+                  }
+                }
+              },
+              "place_id": "ChIJ0WGkg4FEzpQRrlsz_whLqZs",
+              "types": [
+                "locality",
+                "political"
+              ]
+            }
+          ],
+          "status": "OK"
+        }
+    http_version: 
+  recorded_at: Wed, 03 Apr 2019 22:15:01 GMT
+recorded_with: VCR 4.0.0

data/geokit.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://github.com/geokit/geokit'
   spec.license       = 'MIT'
 
-  spec.has_rdoc = true
   spec.rdoc_options = ['--main', 'README.markdown']
   spec.extra_rdoc_files = ['README.markdown']
 
@@ -22,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.9.3'
-  spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.add_development_dependency 'coveralls'
+  spec.required_ruby_version = '>= 2.5.9'
+  spec.add_development_dependency 'bundler', '>= 1.0'
+  spec.add_development_dependency 'coveralls_reborn'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pre-commit'
   spec.add_development_dependency 'rake'
@@ -35,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'typhoeus' # used in net_adapter
   spec.add_development_dependency 'vcr'
   # webmock 2 not yet compatible out of the box with VCR
-  spec.add_development_dependency 'webmock', '< 2' # used in vcr
+  spec.add_development_dependency 'webmock'#, '< 2' # used in vcr
 end

data/lib/geokit/geo_loc.rb

@@ -25,7 +25,7 @@ module Geokit
     # 100 Spear St, San Francisco, CA, 94101, US
     # Street number and street name are extracted from the street address
     # attribute if they don't exist
-    attr_accessor :state_name, :state_code, :zip, :country_code, :country
+    attr_accessor :county, :state_name, :state_code, :zip, :country_code, :country
     attr_accessor :all, :district, :sub_premise,
                   :neighborhood
     attr_writer :state, :full_address, :street_number, :street_name, :formatted_address
@@ -58,6 +58,7 @@ module Geokit
       @street_number = nil
       @street_name = nil
       @city = h[:city]
+      @county = h[:county]
       @state = h[:state]
       @state_code = h[:state_code]
       @state_name = h[:state_name]
@@ -109,9 +110,9 @@ module Geokit
     # gives you all the important fields as key-value pairs
     def hash
       res = {}
-      fields = [:success, :lat, :lng, :country_code, :city, :state, :zip,
-       :street_address, :district, :provider, :full_address, :is_us?,
-       :ll, :precision, :district_fips, :state_fips, :block_fips, :sub_premise]
+      fields = %i[success lat lng country_code city county state zip
+       street_address district provider full_address is_us?
+       ll precision district_fips state_fips block_fips sub_premise]
       fields.each { |s| res[s] = send(s.to_s) }
       res
     end
@@ -133,8 +134,8 @@ module Geokit
     end
 
     # Returns a comma-delimited string consisting of the street address, city,
-    # state, zip, and country code.  Only includes those attributes that are
-    # non-blank.
+    # state, zip, and country code. Only includes those attributes
+    # that are non-blank.
     def to_geocodeable_s
       a = [street_address, district, city, state, zip, country_code].compact
       a.delete_if { |e| !e || e == '' }
@@ -156,6 +157,7 @@ module Geokit
       ["Provider: #{provider}",
        "Street: #{street_address}",
        "City: #{city}",
+       "County: #{county}",
        "State: #{state}",
        "Zip: #{zip}",
        "Latitude: #{lat}",

data/lib/geokit/geocoders/bing.rb

@@ -21,7 +21,7 @@ module Geokit
         culture = options && options[:culture]
         culture_string = culture ? "&c=#{culture}" : ''
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        "#{protocol}://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address_str)}?key=#{key}#{culture_string}&o=xml"
+        "#{protocol}://dev.virtualearth.net/REST/v1/Locations/#{CGI.escape(address_str)}?key=#{key}#{culture_string}&o=xml"
       end
 
       def self.parse_xml(xml)

data/lib/geokit/geocoders/ca_geocoder.rb

@@ -35,7 +35,8 @@ module Geokit
 
       # Formats the request in the format acceptable by the CA geocoder.
       def self.submit_url(loc)
-        args = ["locate=#{Geokit::Inflector.url_escape(loc)}"]
+        loc_str = loc.is_a?(GeoLoc) ? loc.to_geocodeable_s : loc
+        args = ["locate=#{Geokit::Inflector.url_escape(loc_str)}"]
         args << "auth=#{key}" if key
         args << 'geoit=xml'
         'http://geocoder.ca/?' + args.join('&')

data/lib/geokit/geocoders/fcc.rb

@@ -38,6 +38,7 @@ module Geokit
         loc.country_code  = 'US'
         loc.district      = results['County']['name']
         loc.district_fips = results['County']['FIPS']
+        loc.county        = results['County']['name']
         loc.state         = results['State']['code']
         loc.state_fips    = results['State']['FIPS']
         loc.block_fips    = results['Block']['FIPS']

data/lib/geokit/geocoders/google.rb

@@ -108,7 +108,8 @@ module Geokit
 
       def self.construct_components_string_from_options(components={})
         unless components.empty?
-          "&components=#{components.to_a.map { |pair| pair.join(':').downcase }.join(CGI.escape('|'))}"
+          escaped_components = Geokit::Inflector.url_escape(components.to_a.map { |pair| pair.join(":").downcase }.join("|"))
+          "&components=#{escaped_components}"
         end
       end
 
@@ -215,6 +216,7 @@ module Geokit
             loc.country = comp['long_name']
           when types.include?('administrative_area_level_2')
             loc.district = comp['long_name']
+            loc.county = comp['long_name']
           when types.include?('neighborhood')
             loc.neighborhood = comp['short_name']
           # Use either sublocality or admin area level 3 if google does not return a city

data/lib/geokit/geocoders/opencage.rb

@@ -74,11 +74,15 @@ module Geokit
         loc.country        = address_data['country']
         loc.country_code   = address_data['country_code'].upcase if address_data['country_code']
         loc.state_name     = address_data['state']
+        loc.county         = address_data['county']
         loc.city           = address_data['city']
+        loc.city           = address_data['town'] if loc.city.nil? && address_data['town']
         loc.city           = address_data['county'] if loc.city.nil? && address_data['county']
         loc.zip            = address_data['postcode']
         loc.district       = address_data['city_district']
         loc.district       = address_data['state_district'] if loc.district.nil? && address_data['state_district']
+        loc.neighborhood   = address_data['neighbourhood']
+        loc.neighborhood   = address_data['suburb'] if loc.neighborhood.nil?
         loc.street_address = "#{address_data['road']} #{address_data['house_number']}".strip if address_data['road']
         loc.street_name    = address_data['road']
         loc.street_number  = address_data['house_number']

data/lib/geokit/geocoders/openstreetmap.rb

@@ -84,6 +84,7 @@ module Geokit
         loc.country = address_data['country']
         loc.country_code = address_data['country_code'].upcase if address_data['country_code']
         loc.state_name = address_data['state']
+        loc.county = address_data['county']
         loc.city = address_data['city']
         loc.city = address_data['county'] if loc.city.nil? && address_data['county']
         loc.zip = address_data['postcode']

data/lib/geokit/geocoders/yahoo.rb

@@ -113,7 +113,10 @@ class OauthUtil
 
   def percent_encode(string)
     # ref http://snippets.dzone.com/posts/show/1260
-    URI.escape(string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")).gsub('*', '%2A')
+    # puts string
+    # puts "---------\n\n\n\n"
+    # (URI::Parser.new).escape(string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")).gsub('*', '%2A')
+    CGI.escape(string)
   end
 
   # @ref http://oauth.net/core/1.0/#rfc.section.9.2