geokit 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 964d3db61abcfa9bbe2d95d74cfbd6dff9455184
-  data.tar.gz: ac8c3ac65b9f0348f92a482ccd216d4b9e6e3a5a
-SHA512:
-  metadata.gz: a7ad5b2491c7bd77d6704fd9e50c35d8860c013ee0e11e41f4e6e5d039a417166f664784e4895dca3fc876e748b91f17a0402d3be5ea66227270f52891d0ddf3
-  data.tar.gz: b88419201129e2cfb85ddd5301414cdb76cc69079895206e78a225a149e51f6dadb71ddc0ca032e95bfb64f257856dcb5858659b2cbe671f31e5400c20622a5f
+--- 
+SHA512: 
+  data.tar.gz: 09020bb1e0b4fd79479277c02fa59d3ce9b443b679df55822ac06a50cb3848dfd1e093d43e23a0f03736eead51e2126adaf62104b3dc3563799ab912bf837a55
+  metadata.gz: ad583bd4f48c42e5cc2880b7950e3f564ffc16f449efe359364892f23300cbe38803fd7435140329feaefacc85415b92428789e44ec5e7f8101e8f377013d14b
+SHA1: 
+  data.tar.gz: 657c7dbe8d563f7fc3ac2f3382d748bb1d551019
+  metadata.gz: c10facc376715511adf49805a214ad0bd5a38678

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.8.1
+
+* Change way keys/dependencies defined
+
 ## 1.8.0
 
 * Added Bing Geocoder

data/README.markdown

@@ -107,14 +107,15 @@ If you're using this gem by itself, here are the configuration options:
     # This is your yahoo application key for the Yahoo Geocoder.
     # See http://developer.yahoo.com/faq/index.html#appid
     # and http://developer.yahoo.com/maps/rest/V1/geocode.html
-    Geokit::Geocoders::yahoo = 'REPLACE_WITH_YOUR_YAHOO_KEY'
+    Geokit::Geocoders::YahooGeocoder.key = 'REPLACE_WITH_YOUR_YAHOO_KEY'
+    Geokit::Geocoders::YahooGeocoder.secret = 'REPLACE_WITH_YOUR_YAHOO_SECRET'
 
     # This is your Google Maps geocoder keys (all optional).
     # See http://www.google.com/apis/maps/signup.html
     # and http://www.google.com/apis/maps/documentation/#Geocoding_Examples
-    Geokit::Geocoders::google_client_id = ''
-    Geokit::Geocoders::google_cryptographic_key = ''
-    Geokit::Geocoders::google_channel = ''
+    Geokit::Geocoders::GoogleGeocoder.client_id = ''
+    Geokit::Geocoders::GoogleGeocoder.cryptographic_key = ''
+    Geokit::Geocoders::GoogleGeocoder.channel = ''
 
     # You can also set multiple API KEYS for different domains that may be directed to this same application.
     # The domain from which the current user is being directed will automatically be updated for Geokit via
@@ -127,7 +128,7 @@ If you're using this gem by itself, here are the configuration options:
     # usage tied to an account, the value should be set to username:password.
     # See http://geocoder.us
     # and http://geocoder.us/user/signup
-    Geokit::Geocoders::geocoder_us = false
+    Geokit::Geocoders::UsGeocoder.key = 'username:password'
 
     # This is your authorization key for geocoder.ca.
     # To use the free service, the value can be set to nil or false.  For
@@ -135,7 +136,13 @@ If you're using this gem by itself, here are the configuration options:
     # Geocoder.ca.
     # See http://geocoder.ca
     # and http://geocoder.ca/?register=1
-    Geokit::Geocoders::geocoder_ca = false
+    Geokit::Geocoders::CaGeocoder.key = 'KEY'
+
+    # Most other geocoders need either no setup or a key
+    Geokit::Geocoders::BingGeocoder.key = ''
+    Geokit::Geocoders::GeonamesGeocoder.key = ''
+    Geokit::Geocoders::MapQuestGeocoder.key = ''
+    Geokit::Geocoders::YandexGeocoder.key = ''
 
     # require "external_geocoder.rb"
     # Please see the section "writing your own geocoders" for more information.

data/lib/geokit/geocoders.rb

@@ -32,24 +32,11 @@ module Geokit
   module Geocoders
     @@proxy = nil
     @@request_timeout = nil
-    @@bing = 'REPLACE_WITH_YOUR_BING_KEY'
-    @@bing_options = {}
-    @@yahoo_consumer_key = 'REPLACE_WITH_YOUR_YAHOO_BOSS_OAUTH_CONSUMER_KEY'
-    @@yahoo_consumer_secret = 'REPLACE_WITH_YOUR_YAHOO_BOSS_OAUTH_CONSUMER_SECRET'
-    @@yandex = nil
-    @@mapquest = 'REPLACE_WITH_YOUR_MAPQUEST_KEY'
-    @@google_client_id = nil
-    @@google_cryptographic_key = nil
-    @@google_channel = nil
-    @@geocoder_us = false
-    @@geocoder_ca = false
-    @@geonames = false
     @@provider_order = [:google,:us]
     @@ip_provider_order = [:geo_plugin,:ip]
     @@logger=Logger.new(STDOUT)
     @@logger.level=Logger::INFO
     @@domain = nil
-    @@osm = 'REPLACE_WITH_YOUR_OSM_KEY' #if needed
 
     def self.__define_accessors
       class_variables.each do |v|
@@ -89,6 +76,19 @@ module Geokit
     # The Geocoder base class which defines the interface to be used by all
     # other geocoders.
     class Geocoder
+      def self.config(*attrs)
+        attrs.each do |attr|
+          class_eval <<-METHOD
+            @@#{attr} = nil
+            def self.#{attr}=(value)
+              @@#{attr} = value
+            end
+            def self.#{attr}
+              @@#{attr}
+            end
+          METHOD
+        end
+      end
       # Main method which calls the do_geocode template method which subclasses
       # are responsible for implementing.  Returns a populated GeoLoc or an
       # empty one with a failed success code.

data/lib/geokit/geocoders/bing.rb

@@ -3,6 +3,7 @@ module Geokit
     # Bing geocoder implementation.  Requires the Geokit::Geocoders::bing variable to
     # contain a Bing Maps API key.  Conforms to the interface set by the Geocoder class.
     class BingGeocoder < Geocoder
+      config :key, :options
 
       private
 
@@ -17,11 +18,10 @@ module Geokit
       end
 
       def self.submit_url(address)
-        options = Geokit::Geocoders::bing_options
         culture = options && options[:culture]
         culture_string = culture ? "&c=#{culture}" : ''
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address_str)}?key=#{Geokit::Geocoders::bing}#{culture_string}&o=xml"
+        "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address_str)}?key=#{key}#{culture_string}&o=xml"
       end
 
       def self.parse_xml(xml)

data/lib/geokit/geocoders/ca_geocoder.rb

@@ -12,6 +12,7 @@
 module Geokit
  module Geocoders
    class CaGeocoder < Geocoder
+     config :key
 
      private
 
@@ -41,7 +42,7 @@ module Geokit
        args << "city=#{Geokit::Inflector::url_escape(loc.city)}" if loc.city
        args << "prov=#{loc.state}" if loc.state
        args << "postal=#{loc.zip}" if loc.zip
-       args << "auth=#{Geokit::Geocoders::geocoder_ca}" if Geokit::Geocoders::geocoder_ca
+       args << "auth=#{key}" if key
        args << "geoit=xml"
        'http://geocoder.ca/?' + args.join('&')
      end

data/lib/geokit/geocoders/geonames.rb

@@ -3,6 +3,7 @@ module Geokit
     # Another geocoding web service
     # http://www.geonames.org
     class GeonamesGeocoder < Geocoder
+      config :key
 
       private
 
@@ -23,8 +24,8 @@ module Geokit
         address_str.gsub!(/,/, " ")
         params = "/postalCodeSearch?placename=#{Geokit::Inflector::url_escape(address_str)}&maxRows=10"
 
-        if Geokit::Geocoders::geonames
-          "http://ws.geonames.net#{params}&username=#{Geokit::Geocoders::geonames}"
+        if key
+          "http://ws.geonames.net#{params}&username=#{key}"
         else
           "http://ws.geonames.org#{params}"
         end

data/lib/geokit/geocoders/google.rb

@@ -1,6 +1,7 @@
 module Geokit
   module Geocoders
     class GoogleGeocoder < Geocoder
+      config :client_id, :cryptographic_key, :channel
 
       private
       # Template method which does the reverse-geocode lookup.
@@ -69,10 +70,10 @@ module Geokit
 
 
       def self.submit_url(query_string)
-        if Geokit::Geocoders::google_client_id && Geokit::Geocoders::google_cryptographic_key
-          channel = Geokit::Geocoders::google_channel ? "&channel=#{Geokit::Geocoders::google_channel}" : ''
-          urlToSign = query_string + "&client=#{Geokit::Geocoders::google_client_id}" + channel
-          signature = sign_gmap_bus_api_url(urlToSign, Geokit::Geocoders::google_cryptographic_key)
+        if client_id && cryptographic_key
+          channel = channel ? "&channel=#{channel}" : ''
+          urlToSign = query_string + "&client=#{client_id}" + channel
+          signature = sign_gmap_bus_api_url(urlToSign, cryptographic_key)
           "http://maps.googleapis.com" + urlToSign + "&signature=#{signature}"
         else
           "http://maps.google.com" + query_string

data/lib/geokit/geocoders/mapquest.rb

@@ -3,13 +3,14 @@ module Geokit
     # MapQuest geocoder implementation.  Requires the Geokit::Geocoders::mapquest variable to
     # contain a MapQuest API key.  Conforms to the interface set by the Geocoder class.
     class MapQuestGeocoder < Geocoder
+      config :key
 
       private
 
       # Template method which does the reverse-geocode lookup.
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
-        url = "http://www.mapquestapi.com/geocoding/v1/reverse?key=#{Geokit::Geocoders::mapquest}&location=#{latlng.lat},#{latlng.lng}"
+        url = "http://www.mapquestapi.com/geocoding/v1/reverse?key=#{key}&location=#{latlng.lat},#{latlng.lng}"
         res = call_geocoder_service(url)
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         json = res.body
@@ -20,7 +21,7 @@ module Geokit
       # Template method which does the geocode lookup.
       def self.do_geocode(address)
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        url = "http://www.mapquestapi.com/geocoding/v1/address?key=#{Geokit::Geocoders::mapquest}&location=#{Geokit::Inflector::url_escape(address_str)}"
+        url = "http://www.mapquestapi.com/geocoding/v1/address?key=#{key}&location=#{Geokit::Inflector::url_escape(address_str)}"
         res = call_geocoder_service(url)
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         json = res.body

data/lib/geokit/geocoders/us_geocoder.rb

@@ -4,14 +4,15 @@
 module Geokit
  module Geocoders
     class UsGeocoder < Geocoder
+      config :key
 
       private
       def self.do_geocode(address)
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
 
         query = (address_str =~ /^\d{5}(?:-\d{4})?$/ ? "zip" : "address") + "=#{Geokit::Inflector::url_escape(address_str)}"
-        url = if Geokit::Geocoders::geocoder_us
-          "http://#{Geokit::Geocoders::geocoder_us}@geocoder.us/member/service/csv/geocode"
+        url = if key
+          "http://#{key}@geocoder.us/member/service/csv/geocode"
         else
           "http://geocoder.us/service/csv/geocode"
         end

data/lib/geokit/geocoders/yahoo.rb

@@ -3,6 +3,7 @@ module Geokit
     # Yahoo geocoder implementation.  Requires the Geokit::Geocoders::YAHOO variable to
     # contain a Yahoo API key.  Conforms to the interface set by the Geocoder class.
     class YahooGeocoder < Geocoder
+      config :key, :secret
 
       private
       def self.submit_url(address)
@@ -10,8 +11,8 @@ module Geokit
         query_string = "?q=#{Geokit::Inflector::url_escape(address_str)}&flags=J"
 
         o = OauthUtil.new
-        o.consumer_key = Geocoders::yahoo_consumer_key
-        o.consumer_secret = Geocoders::yahoo_consumer_secret
+        o.consumer_key = key
+        o.consumer_secret = secret
         base = "http://yboss.yahooapis.com/geo/placefinder"
         parsed_url = URI.parse("#{base}#{query_string}")
         "#{base}?#{o.sign(parsed_url).query_string}"

data/lib/geokit/geocoders/yandex.rb

@@ -3,6 +3,8 @@ module Geokit
     # Yandex geocoder implementation. Expects the Geokit::Geocoders::YANDEX variable to
     # contain a Yandex API key (optional). Conforms to the interface set by the Geocoder class.
     class YandexGeocoder < Geocoder
+      config :key
+
       private
 
       # Template method which does the geocode lookup.
@@ -16,7 +18,7 @@ module Geokit
 
       def self.submit_url(address_str)
         url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(address_str)}&format=json"
-        url += "&key=#{Geokit::Geocoders::yandex}" if Geokit::Geocoders::yandex
+        url += "&key=#{key}" if key
         url
       end
 

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

data/test/test_bing_geocoder.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::bing = 'AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7'
+Geokit::Geocoders::BingGeocoder.key = 'AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7'
 
 class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
 
@@ -15,7 +15,8 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   # the testing methods themselves
   def test_bing_full_address
     VCR.use_cassette('bing_full') do
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(@full_address)}?key=#{Geokit::Geocoders::bing}&o=xml"
+    key = Geokit::Geocoders::BingGeocoder.key
+    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(@full_address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(@full_address)
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city
@@ -30,7 +31,8 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address_au
     address = '440 King William Street, Adelaide, Australia'
     VCR.use_cassette('bing_full_au') do
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{Geokit::Geocoders::bing}&o=xml"
+    key = Geokit::Geocoders::BingGeocoder.key
+    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
     assert_equal "SA", res.state
     assert_equal "Adelaide", res.city
@@ -46,7 +48,8 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address_de
     address = "Platz der Republik 1, 11011 Berlin, Germany"
     VCR.use_cassette('bing_full_de') do
-    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{Geokit::Geocoders::bing}&o=xml"
+    key = Geokit::Geocoders::BingGeocoder.key
+    url = "http://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
     assert_equal "BE", res.state
     assert_equal "Berlin", res.city

data/test/test_ca_geocoder.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::geocoder_ca = "SOMEKEYVALUE"
+Geokit::Geocoders::CaGeocoder::key = "SOMEKEYVALUE"
 
 class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
 

data/test/test_google_geocoder.rb

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::google_client_id = nil
-Geokit::Geocoders::google_cryptographic_key = nil
-Geokit::Geocoders::google_channel = nil
-
 class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def setup
@@ -32,11 +28,11 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   # Example from:
   # https://developers.google.com/maps/documentation/business/webservices#signature_examples
   def test_google_signature_and_url
-    Geokit::Geocoders::google_client_id = 'clientID'
-    Geokit::Geocoders::google_cryptographic_key = 'vNIXE0xscrmjlyV-12Nj_BvUPaw='
+    Geokit::Geocoders::GoogleGeocoder.client_id = 'clientID'
+    Geokit::Geocoders::GoogleGeocoder.cryptographic_key = 'vNIXE0xscrmjlyV-12Nj_BvUPaw='
     url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, '/maps/api/geocode/json?address=New+York&sensor=false')
-    Geokit::Geocoders::google_client_id = nil
-    Geokit::Geocoders::google_cryptographic_key = nil
+    Geokit::Geocoders::GoogleGeocoder.client_id = nil
+    Geokit::Geocoders::GoogleGeocoder.cryptographic_key = nil
     assert_equal 'http://maps.googleapis.com/maps/api/geocode/json?address=New+York&sensor=false&client=clientID&signature=KrU1TzVQM7Ur0i8i7K3huiw3MsA=', url
   end
 

data/test/test_openstreetmap_geocoder.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::osm = 'OSM'
-
 class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
   OSM_FULL=<<-EOF.strip
       [{"place_id":"425554497","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","boundingbox":["37.792341","37.792441","-122.394074","-122.393974"],"lat":"37.792391","lon":"-122.394024","display_name":"100, Spear Street, Financial District, San Francisco, California, 94105, United States of America","class":"place","type":"house","address":{"house_number":"100","road":"Spear Street","place":"Financial District","city":"San Francisco","county":"San Francisco","state":"California","postcode":"94105","country":"United States of America","country_code":"us"}}]

data/test/test_us_geocoder.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::geocoder_us = nil
+Geokit::Geocoders::UsGeocoder.key = nil
 
 class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
 

data/test/test_yahoo_geocoder.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::yahoo_consumer_key = 'dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--'
-Geokit::Geocoders::yahoo_consumer_secret = 'SECRET'
+Geokit::Geocoders::YahooGeocoder.key = 'dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--'
+Geokit::Geocoders::YahooGeocoder.secret = 'SECRET'
 
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup

data/test/test_yandex_geocoder.rb

@@ -1,8 +1,6 @@
 # encoding: UTF-8
 require File.join(File.dirname(__FILE__), 'helper')
 
-# Geokit::Geocoders::yandex = 'yandex'
-
 class YandexGeocoderTest < BaseGeocoderTest #:nodoc: all
     YANDEX_FULL=<<-EOF.strip
       {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Москва, улица Новый Арбат, дом 24","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Москва, улица Новый Арбат, 24","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Москва, улица Новый Арбат, 24","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва","Thoroughfare":{"ThoroughfareName":"улица Новый Арбат","Premise":{"PremiseNumber":"24"}}}}}}},"description":"Москва, Россия","name":"улица Новый Арбат, 24","boundedBy":{"Envelope":{"lowerCorner":"37.585565 55.751928","upperCorner":"37.589662 55.754238"}},"Point":{"pos":"37.587614 55.753083"}}}]}}}

metadata

@@ -1,9 +1,9 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: geokit
-version: !ruby/object:Gem::Version
-  version: 1.8.0
+version: !ruby/object:Gem::Version 
+  version: 1.8.1
 platform: ruby
-authors:
+authors: 
 - Michael Noack
 - James Cox
 - Andre Lewis
@@ -11,143 +11,98 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+
+date: 2013-12-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.3.2
   type: :runtime
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "1.0"
   type: :development
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id004 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: simplecov-rcov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: coveralls
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: vcr
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id004
   type: :development
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Geokit provides geocoding and distance calculation in an easy-to-use
-  API
-email:
+  requirement: *id010
+description: Geokit provides geocoding and distance calculation in an easy-to-use API
+email: 
 - michael+geokit@noack.com.au
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -227,32 +182,30 @@ files:
 - test/test_yahoo_geocoder.rb
 - test/test_yandex_geocoder.rb
 homepage: http://github.com/geokit/geokit
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.markdown
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: 'Geokit: encoding and distance calculation gem'
-test_files:
+summary: "Geokit: encoding and distance calculation gem"
+test_files: 
 - test/helper.rb
 - test/test_base_geocoder.rb
 - test/test_bing_geocoder.rb