geokit 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  data.tar.gz: 09020bb1e0b4fd79479277c02fa59d3ce9b443b679df55822ac06a50cb3848dfd1e093d43e23a0f03736eead51e2126adaf62104b3dc3563799ab912bf837a55
-  metadata.gz: ad583bd4f48c42e5cc2880b7950e3f564ffc16f449efe359364892f23300cbe38803fd7435140329feaefacc85415b92428789e44ec5e7f8101e8f377013d14b
-SHA1: 
-  data.tar.gz: 657c7dbe8d563f7fc3ac2f3382d748bb1d551019
-  metadata.gz: c10facc376715511adf49805a214ad0bd5a38678
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzdhNTJlNWE1YTg5MWI5MjMyOTRjMmNhOTQ0YzdmZmU3MzVmNzVkNA==
+  data.tar.gz: !binary |-
+    OTE1ZTA5NTg4NmU3NDdjZWNkZWM0ZmVhYmE3NjkzYWIzMzMxMGI1ZQ==
+SHA512:
+  metadata.gz: !binary |-
+    ODdlMDUwNjQxNzk0MDJhODNmZGRlMzYzNDUyZmRiNDYwZDU0ZWYzOGUxNGU4
+    MWIxMTc3MDQ3ZTc1NDM5OTI0MzUxMjVmOTNkODliN2M5M2M1ZTM0NDE4ZTRh
+    OGIxN2ZlMGYxN2UxNGFkMDU5YzU3ZGUyNDQ1N2JkYjNhNThmZTA=
+  data.tar.gz: !binary |-
+    YTQyNWVlOTk5OWY4ODkxNjMxNDk0NDhhZGM1MGZiYjE5ODBlZDEzZGI0Zjc4
+    ZDBkNzQ3MTJmMWU5M2JjMjc5YzQ4ODM3NzBjYWNkZjEyY2ZhZDAwM2ExOTNk
+    NTM4M2M4ZDNhYTZkNDMyYzM5OGZiODJiNDBkNTJkMmU2Y2I1NTc=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.8.2
+
+* Fix due to name clash with dependency definitions in geokit 1.8.1
+* Standaride GeoLoc provider string
+
 ## 1.8.1
 
 * Change way keys/dependencies defined

data/lib/geokit/geocoders.rb

@@ -93,20 +93,28 @@ module Geokit
       # are responsible for implementing.  Returns a populated GeoLoc or an
       # empty one with a failed success code.
       def self.geocode(address, *args)
+        logger.debug "#{provider_name} geocoding. address: #{address}, args #{args}"
         do_geocode(address, *args) || GeoLoc.new
       rescue TooManyQueriesError, GeocodeError
         raise
       rescue
-        logger.error "Caught an error during #{self.class} geocoding call: #{$!}"
+        logger.error "Caught an error during #{provider_name} geocoding call: #{$!}"
         GeoLoc.new
       end
       # Main method which calls the do_reverse_geocode template method which subclasses
       # are responsible for implementing.  Returns a populated GeoLoc or an
       # empty one with a failed success code.
       def self.reverse_geocode(latlng)
+        logger.debug "#{provider_name} geocoding. latlng: #{latlng}"
         do_reverse_geocode(latlng) || GeoLoc.new
       end
 
+      def self.new_loc
+        loc = GeoLoc.new
+        loc.provider = Geokit::Inflector.underscore(provider_name)
+        loc
+      end
+
       # Call the geocoder service using the timeout if configured.
       def self.call_geocoder_service(url)
         Timeout::timeout(Geokit::Geocoders::request_timeout) { return self.do_get(url) } if Geokit::Geocoders::request_timeout
@@ -143,11 +151,17 @@ module Geokit
         Net::HTTP::new(*net_http_args).start { |http| http.request(req) }
       end
 
+      def self.provider_name
+        name.split('::').last.gsub(/Geocoder$/, '')
+      end
+
       def self.parse(format, body, *args)
+        logger.debug "#{provider_name} geocoding. Result: #{CGI.escape(body)}"
         case format
         when :json then parse_json(MultiJson.load(body), *args)
         when :xml  then parse_xml(REXML::Document.new(body), *args)
         when :yaml then parse_yaml(YAML::load(body), *args)
+        when :csv  then parse_csv(body.chomp.split(','), *args)
         end
       end
 
@@ -157,6 +171,12 @@ module Geokit
         end
       end
 
+      def self.process(format, url, *args)
+        res = call_geocoder_service(url)
+        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        parse format, res.body, *args
+      end
+
       def self.transcode_to_utf8(body)
         require 'iconv' unless String.method_defined?(:encode)
         if String.method_defined?(:encode)

data/lib/geokit/geocoders/base_ip.rb

@@ -30,6 +30,11 @@ module Geokit
         /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/.match(ip)
       end
 
+      def self.process(format, ip)
+        return GeoLoc.new unless valid_ip?(ip)
+        super(format, submit_url(ip))
+      end
+
       # Checks whether the IP address belongs to a private address range.
       #
       # This function is used to reduce the number of useless queries made to

data/lib/geokit/geocoders/bing.rb

@@ -13,7 +13,6 @@ module Geokit
         res = call_geocoder_service(url)
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         xml = transcode_to_utf8(res.body)
-        logger.debug "Bing geocoding. Address: #{address}. Result: #{xml}"
         parse :xml, xml
       end
 
@@ -38,8 +37,7 @@ module Geokit
 
       # extracts a single geoloc from a //Location element in the bing results xml
       def self.extract_location(xml)
-        loc                 = GeoLoc.new
-        loc.provider        = 'bing'
+        loc                 = new_loc
         set_address_components(loc, xml)
         set_precision(loc, xml)
         set_bounds(loc, xml)

data/lib/geokit/geocoders/ca_geocoder.rb

@@ -19,12 +19,7 @@ module Geokit
      # Template method which does the geocode lookup.
      def self.do_geocode(loc)
        raise ArgumentError('Geocoder.ca requires a GeoLoc argument') unless loc.is_a?(GeoLoc)
-       url = submit_url(loc)
-       res = call_geocoder_service(url)
-       return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-       xml = res.body
-       logger.debug "Geocoder.ca geocoding. Address: #{loc}. Result: #{xml}"
-       parse :xml, xml, loc
+       process :xml, submit_url(loc), loc
     end
 
     def self.parse_xml(xml, loc)

data/lib/geokit/geocoders/fcc.rb

@@ -7,11 +7,7 @@ module Geokit
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
         url = "http://data.fcc.gov/api/block/find?format=json&latitude=#{Geokit::Inflector::url_escape(latlng.lat.to_s)}&longitude=#{Geokit::Inflector::url_escape(latlng.lng.to_s)}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "FCC reverse-geocoding. LL: #{latlng}. Result: #{json}"
-        parse :json, json
+        process :json, url
       end
 
       # Template method which does the geocode lookup.
@@ -36,8 +32,7 @@ module Geokit
           raise Geokit::Geocoders::GeocodeError
         end
 
-        loc = GeoLoc.new
-        loc.provider      = 'fcc'
+        loc = new_loc
         loc.success       = true
         loc.precision     = 'block'
         loc.country_code  = 'US'

data/lib/geokit/geocoders/free_geo_ip.rb

@@ -5,11 +5,11 @@ module Geokit
       private
 
       def self.do_geocode(ip)
-        return GeoLoc.new unless valid_ip?(ip)
-        url = "http://freegeoip.net/xml/#{ip}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        parse :xml, res.body
+        process :xml, ip
+      end
+
+      def self.submit_url(ip)
+        "http://freegeoip.net/xml/#{ip}"
       end
 
       XML_MAPPINGS = {
@@ -22,8 +22,7 @@ module Geokit
       }
 
       def self.parse_xml(xml)
-        loc = GeoLoc.new
-        loc.provider = 'freegeoip'
+        loc = new_loc
         set_mappings(loc, xml.elements['Response'], XML_MAPPINGS)
         loc.success = !!loc.city && !loc.city.empty?
         loc

data/lib/geokit/geocoders/geo_plugin.rb

@@ -5,11 +5,11 @@ module Geokit
       private
 
       def self.do_geocode(ip)
-        return GeoLoc.new unless valid_ip?(ip)
-        url = "http://www.geoplugin.net/xml.gp?ip=#{ip}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        parse :xml, res.body
+        process :xml, ip
+      end
+
+      def self.submit_url(ip)
+        "http://www.geoplugin.net/xml.gp?ip=#{ip}"
       end
 
       XML_MAPPINGS = {
@@ -21,8 +21,7 @@ module Geokit
       }
 
       def self.parse_xml(xml)
-        loc = GeoLoc.new
-        loc.provider = 'geoPlugin'
+        loc = new_loc
         set_mappings(loc, xml.elements['geoPlugin'], XML_MAPPINGS)
         loc.success = !!loc.city && !loc.city.empty?
         loc

data/lib/geokit/geocoders/geonames.rb

@@ -9,13 +9,7 @@ module Geokit
 
       # Template method which does the geocode lookup.
       def self.do_geocode(address)
-        url = submit_url(address)
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-
-        xml = res.body
-        logger.debug "Geonames geocoding. Address: #{address}. Result: #{xml}"
-        parse :xml, xml
+        process :xml, submit_url(address)
       end
 
       def self.submit_url(address)
@@ -42,8 +36,7 @@ module Geokit
 
       def self.parse_xml(xml)
         return GeoLoc.new unless xml.elements['geonames/totalResultsCount'].text.to_i > 0
-        loc = GeoLoc.new
-        loc.provider = 'genomes'
+        loc = new_loc
         # only take the first result
         set_mappings(loc, xml.elements['geonames/code'], XML_MAPPINGS)
         loc.success = true

data/lib/geokit/geocoders/google.rb

@@ -8,11 +8,7 @@ module Geokit
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
         url = submit_url("/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(latlng.ll)}")
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "Google reverse-geocoding. LL: #{latlng}. Result: #{CGI.escape(json)}"
-        parse :json, json
+        process :json, url
       end
 
       # Template method which does the geocode lookup.
@@ -48,11 +44,7 @@ module Geokit
 
         res = call_geocoder_service(url)
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-
-        json = res.body
-        logger.debug "Google geocoding. Address: #{address}. Result: #{CGI.escape(json)}"
-
-        parse :json, json
+        parse :json, res.body
       end
 
       # This code comes from Googles Examples
@@ -71,8 +63,8 @@ module Geokit
 
       def self.submit_url(query_string)
         if client_id && cryptographic_key
-          channel = channel ? "&channel=#{channel}" : ''
-          urlToSign = query_string + "&client=#{client_id}" + channel
+          channel_string = channel ? "&channel=#{channel}" : ''
+          urlToSign = query_string + "&client=#{client_id}" + channel_string
           signature = sign_gmap_bus_api_url(urlToSign, cryptographic_key)
           "http://maps.googleapis.com" + urlToSign + "&signature=#{signature}"
         else
@@ -138,8 +130,7 @@ module Geokit
       }
 
       def self.single_json_to_geoloc(addr)
-        loc = GeoLoc.new
-        loc.provider = 'google'
+        loc = new_loc
         loc.success = true
         loc.full_address = addr['formatted_address']
 

data/lib/geokit/geocoders/ip.rb

@@ -11,15 +11,19 @@ module Geokit
       # parameter does not match an ip address.
       def self.do_geocode(ip)
         return GeoLoc.new unless valid_ip?(ip)
-        url = "http://api.hostip.info/get_html.php?ip=#{ip}&position=true"
+        url = submit_url(ip)
         res = call_geocoder_service(url)
-        ensure_utf8_encoding(res)
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
+        ensure_utf8_encoding(res)
         body = res.body
         body = body.encode('UTF-8') if body.respond_to? :encode
         parse :yaml, body
       end
 
+      def self.submit_url(ip)
+        "http://api.hostip.info/get_html.php?ip=#{ip}&position=true"
+      end
+
       # Converts the body to YAML since its in the form of:
       #
       # Country: UNITED STATES (US)
@@ -29,8 +33,7 @@ module Geokit
       #
       # then instantiates a GeoLoc instance to populate with location data.
       def self.parse_yaml(yaml) # :nodoc:
-        loc = GeoLoc.new
-        loc.provider = 'hostip'
+        loc = new_loc
         loc.city, loc.state = yaml['City'].split(', ')
         loc.country, loc.country_code = yaml['Country'].split(' (')
         loc.lat = yaml['Latitude']

data/lib/geokit/geocoders/mapquest.rb

@@ -11,22 +11,14 @@ module Geokit
       def self.do_reverse_geocode(latlng)
         latlng=LatLng.normalize(latlng)
         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
-        logger.debug "MapQuest reverse-geocoding. LL: #{latlng}. Result: #{json}"
-        parse :json, json, latlng
+        process :json, url
       end
 
       # 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=#{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
-        logger.debug "Mapquest geocoding. Address: #{address}. Result: #{json}"
-        parse :json, json
+        process :json, url
       end
 
       def self.parse_json(results)
@@ -46,10 +38,9 @@ module Geokit
       end
 
       def self.extract_geoloc(result_json)
-        loc = GeoLoc.new
-        loc.lat            = result_json['latLng']['lat']
-        loc.lng            = result_json['latLng']['lng']
-        loc.provider       = 'mapquest'
+        loc = new_loc
+        loc.lat = result_json['latLng']['lat']
+        loc.lng = result_json['latLng']['lng']
         set_address_components(result_json, loc)
         set_precision(result_json, loc)
         loc.success = true

data/lib/geokit/geocoders/maxmind.rb

@@ -1,25 +1,21 @@
 module Geokit
   module Geocoders
-
-  @@geoip_data_path = 'DEFINE_THE_PATH_TO_GeoLiteCity.dat'
-  __define_accessors
-
     # Provides geocoding based upon an IP address.  The underlying web service is MaxMind
     class MaxmindGeocoder < Geocoder
+      config :geoip_data_path # path to GeoLiteCity.dat
+
       private
 
       def self.do_geocode(ip)
-        res = GeoIP.new(Geokit::Geocoders::geoip_data_path).city(ip)
+        res = GeoIP.new(geoip_data_path).city(ip)
 
-        loc = GeoLoc.new(
-          :provider => 'maxmind_city',
-          :lat      => res.latitude,
-          :lng      => res.longitude,
-          :city     => res.city_name,
-          :state    => res.region_name,
-          :zip      => res.postal_code,
-          :country_code => res.country_code2
-        )
+        loc = new_loc
+        loc.lat          = res.latitude
+        loc.lng          = res.longitude
+        loc.city         = res.city_name
+        loc.state        = res.region_name
+        loc.zip          = res.postal_code
+        loc.country_code = res.country_code2
 
         loc.success = ( res.longitude.kind_of?(Numeric) && res.latitude.kind_of?(Numeric) )
         loc

data/lib/geokit/geocoders/openstreetmap.rb

@@ -15,11 +15,7 @@ module Geokit
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
 
         url = "http://nominatim.openstreetmap.org/search?format=json#{options_str}&addressdetails=1&q=#{Geokit::Inflector::url_escape(address_str)}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "OSM geocoding. Address: #{address}. Result: #{json}"
-        parse :json, json
+        process :json, url
       end
 
       def self.do_reverse_geocode(latlng, options = {})
@@ -31,11 +27,7 @@ module Geokit
         options_str << generate_param_for_option(:osm_id, options)
         options_str << generate_param_for_option(:json_callback, options)
         url = "http://nominatim.openstreetmap.org/reverse?format=json&addressdetails=1#{options_str}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "OSM reverse geocoding: Lat: #{latlng.lat}, Lng: #{latlng.lng}. Result: #{json}"
-        parse :json, json
+        process :json, url
       end
 
       def self.generate_param_for(param, value)
@@ -70,14 +62,12 @@ module Geokit
       end
 
       def self.extract_geoloc(result_json)
-        loc = GeoLoc.new
+        loc = new_loc
 
         # basic
         loc.lat = result_json['lat']
         loc.lng = result_json['lon']
 
-        loc.provider = 'osm'
-
         set_address_components(result_json['address'], loc)
         set_precision(result_json, loc)
         set_bounds(result_json['boundingbox'], loc)

data/lib/geokit/geocoders/ripe.rb

@@ -5,18 +5,17 @@ module Geokit
       private
 
       def self.do_geocode(ip)
-        return GeoLoc.new unless valid_ip?(ip)
-        url = "http://stat.ripe.net/data/geoloc/data.json?resource=#{ip}"
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        parse :json, res.body
+        process :json, ip
+      end
+
+      def self.submit_url(ip)
+        "http://stat.ripe.net/data/geoloc/data.json?resource=#{ip}"
       end
 
       def self.parse_json(json)
-        loc = GeoLoc.new
+        loc = new_loc
         data = json['data']['locations'][0]
 
-        loc.provider='RIPE'
         loc.lat = data['latitude']
         loc.lng = data['longitude']
         set_address_components(data, loc)

data/lib/geokit/geocoders/us_geocoder.rb

@@ -8,27 +8,17 @@ module Geokit
 
       private
       def self.do_geocode(address)
-        address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
+        process :csv, submit_url(address)
+      end
 
+      def self.submit_url(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 key
-          "http://#{key}@geocoder.us/member/service/csv/geocode"
-        else
-          "http://geocoder.us/service/csv/geocode"
-        end
-
-        url = "#{url}?#{query}"
-        res = call_geocoder_service(url)
-
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        data = res.body
-        logger.debug "Geocoder.us geocoding. Address: #{address}. Result: #{data}"
-        parse_csv data
+        base = key ? "http://#{key}@geocoder.us/member" : "http://geocoder.us"
+        "#{base}/service/csv/geocode?#{query}"
       end
 
-      def self.parse_csv(data)
-        array = data.chomp.split(',')
-
+      def self.parse_csv(array)
         loc = GeoLoc.new
         if array.length == 5
           loc.lat,loc.lng,loc.city,loc.state,loc.zip=array

data/lib/geokit/geocoders/yahoo.rb

@@ -20,12 +20,7 @@ module Geokit
 
       # Template method which does the geocode lookup.
       def self.do_geocode(address)
-        url = submit_url(address)
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        json = res.body
-        logger.debug "Yahoo geocoding. Address: #{address}. Result: #{json}"
-        parse :json, json
+        process :json, submit_url(address)
       end
 
       def self.parse_json(results)
@@ -44,10 +39,9 @@ module Geokit
       end
 
       def self.extract_geoloc(result_json)
-        loc = GeoLoc.new
+        loc = new_loc
         loc.lat      = result_json['latitude']
         loc.lng      = result_json['longitude']
-        loc.provider = 'yahoo'
         set_address_components(result_json, loc)
         set_precision(result_json, loc)
         loc.success  = true

data/lib/geokit/geocoders/yandex.rb

@@ -9,21 +9,18 @@ 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 = submit_url(address_str)
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        parse :json, res.body
+        process :json, submit_url(address)
       end
 
-      def self.submit_url(address_str)
+      def self.submit_url(address)
+        address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
         url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(address_str)}&format=json"
         url += "&key=#{key}" if key
         url
       end
 
       def self.parse_json(result)
-        loc = GeoLoc.new
+        loc = new_loc
 
         coll = result["response"]["GeoObjectCollection"]
         return loc unless coll["metaDataProperty"]["GeocoderResponseMetaData"]["found"].to_i > 0
@@ -31,9 +28,9 @@ module Geokit
         l = coll["featureMember"][0]["GeoObject"]
 
         loc.success = true
-        loc.provider = "yandex"
-        loc.lng = l["Point"]["pos"].split(" ").first
-        loc.lat = l["Point"]["pos"].split(" ").last
+        ll = l["Point"]["pos"].split(" ")
+        loc.lng = ll.first
+        loc.lat = ll.last
 
         country = l["metaDataProperty"]["GeocoderMetaData"]["AddressDetails"]["Country"]
         locality = country["Locality"] || country["AdministrativeArea"]["Locality"] || country["AdministrativeArea"]["SubAdministrativeArea"]["Locality"] rescue nil

data/lib/geokit/version.rb

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

data/test/test_geo_plugin_geocoder.rb

@@ -1,9 +1,28 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
+  IP_SUCCESS=<<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<geoPlugin>
+    <geoplugin_city>Belo Horizonte</geoplugin_city>
+    <geoplugin_region>Minas Gerais</geoplugin_region>
+    <geoplugin_areaCode>0</geoplugin_areaCode>
+    <geoplugin_dmaCode>0</geoplugin_dmaCode>
+    <geoplugin_countryCode>BR</geoplugin_countryCode>
+    <geoplugin_countryName>Brazil</geoplugin_countryName>
+    <geoplugin_continentCode>SA</geoplugin_continentCode>
+    <geoplugin_latitude>-19.916700</geoplugin_latitude>
+    <geoplugin_longitude>-43.933300</geoplugin_longitude>
+    <geoplugin_currencyCode>BRL</geoplugin_currencyCode>
+    <geoplugin_currencySymbol>&#82;&#36;</geoplugin_currencySymbol>
+    <geoplugin_currencyConverter>2.2575001717</geoplugin_currencyConverter>
+</geoPlugin>
+    EOF
+
   def setup
     super
     @ip = '74.125.237.209'
+    @success.provider = "geo_plugin"
   end
 
   def assert_url(expected_url)
@@ -20,4 +39,35 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal res.country_code, 'US'
     end
   end
+
+  def test_successful_lookup
+    success = MockSuccess.new
+    success.expects(:body).returns(IP_SUCCESS)
+    url = 'http://www.geoplugin.net/xml.gp?ip=200.150.38.66'
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = Geokit::Geocoders::GeoPluginGeocoder.geocode('200.150.38.66')
+    assert_not_nil location
+    assert_equal(-19.916700, location.lat)
+    assert_equal(-43.933300, location.lng)
+    assert_equal "Belo Horizonte", location.city
+    assert_equal "Minas Gerais", location.state
+    assert_equal "BR", location.country_code
+    assert_equal "geo_plugin", location.provider
+    assert location.success?
+  end
+
+  def test_invalid_ip
+    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
+    assert_not_nil location
+    assert !location.success?
+  end
+
+  def test_service_unavailable
+    failure = MockFailure.new
+    url = 'http://www.geoplugin.net/xml.gp?ip=69.10.10.10'
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("69.10.10.10")
+    assert_not_nil location
+    assert !location.success?
+  end
 end

data/test/test_ipgeocoder.rb

@@ -45,7 +45,7 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def setup
     super
-    @success.provider = "hostip"
+    @success.provider = "ip"
   end
 
   def test_successful_lookup
@@ -60,7 +60,7 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "Sugar Grove", location.city
     assert_equal "IL", location.state
     assert_equal "US", location.country_code
-    assert_equal "hostip", location.provider
+    assert_equal "ip", location.provider
     assert location.success?
   end
 
@@ -76,7 +76,7 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "Bor\303\245s", location.city
     assert_nil location.state
     assert_equal "SE", location.country_code
-    assert_equal "hostip", location.provider
+    assert_equal "ip", location.provider
     assert location.success?
   end
 
@@ -93,7 +93,7 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "São José Do Rio Prêto", location.city
     assert_nil location.state
     assert_equal "BR", location.country_code
-    assert_equal "hostip", location.provider
+    assert_equal "ip", location.provider
     assert location.success?
   end
 

metadata

@@ -1,9 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geokit
-version: !ruby/object:Gem::Version 
-  version: 1.8.1
+version: !ruby/object:Gem::Version
+  version: 1.8.2
 platform: ruby
-authors: 
+authors:
 - Michael Noack
 - James Cox
 - Andre Lewis
@@ -11,98 +11,143 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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 
+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
         version: 1.3.2
   type: :runtime
-  name: multi_json
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id004 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  name: simplecov
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
-  name: simplecov-rcov
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
-  name: rake
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
-  name: mocha
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
-  name: coveralls
   prerelease: false
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
-  name: vcr
   prerelease: false
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id004
+  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'
   type: :development
+  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'
+  type: :development
   prerelease: false
-  requirement: *id010
-description: Geokit provides geocoding and distance calculation in an easy-to-use API
-email: 
+  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:
 - michael+geokit@noack.com.au
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -167,7 +212,6 @@ files:
 - test/test_geo_plugin_geocoder.rb
 - test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
-- test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
@@ -182,30 +226,32 @@ 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: 
-  - *id004
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 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
@@ -216,7 +262,6 @@ test_files:
 - test/test_geo_plugin_geocoder.rb
 - test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
-- test/test_geoplugin_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb

data/test/test_geoplugin_geocoder.rb

@@ -1,58 +0,0 @@
-require File.join(File.dirname(__FILE__), 'helper')
-
-class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
-
-  IP_SUCCESS=<<-EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<geoPlugin>
-    <geoplugin_city>Belo Horizonte</geoplugin_city>
-    <geoplugin_region>Minas Gerais</geoplugin_region>
-    <geoplugin_areaCode>0</geoplugin_areaCode>
-    <geoplugin_dmaCode>0</geoplugin_dmaCode>
-    <geoplugin_countryCode>BR</geoplugin_countryCode>
-    <geoplugin_countryName>Brazil</geoplugin_countryName>
-    <geoplugin_continentCode>SA</geoplugin_continentCode>
-    <geoplugin_latitude>-19.916700</geoplugin_latitude>
-    <geoplugin_longitude>-43.933300</geoplugin_longitude>
-    <geoplugin_currencyCode>BRL</geoplugin_currencyCode>
-    <geoplugin_currencySymbol>&#82;&#36;</geoplugin_currencySymbol>
-    <geoplugin_currencyConverter>2.2575001717</geoplugin_currencyConverter>
-</geoPlugin>
-    EOF
-
-  def setup
-    super
-    @success.provider = "geoPlugin"
-  end
-
-  def test_successful_lookup
-    success = MockSuccess.new
-    success.expects(:body).returns(IP_SUCCESS)
-    url = 'http://www.geoplugin.net/xml.gp?ip=200.150.38.66'
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode('200.150.38.66')
-    assert_not_nil location
-    assert_equal(-19.916700, location.lat)
-    assert_equal(-43.933300, location.lng)
-    assert_equal "Belo Horizonte", location.city
-    assert_equal "Minas Gerais", location.state
-    assert_equal "BR", location.country_code
-    assert_equal "geoPlugin", location.provider
-    assert location.success?
-  end
-
-  def test_invalid_ip
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
-    assert_not_nil location
-    assert !location.success?
-  end
-
-  def test_service_unavailable
-    failure = MockFailure.new
-    url = 'http://www.geoplugin.net/xml.gp?ip=10.10.10.10'
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("10.10.10.10")
-    assert_not_nil location
-    assert !location.success?
-  end
-end