graticule 2.0.1 → 2.1.0

data/lib/graticule.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 $:.unshift(File.dirname(__FILE__))
 
 require 'active_support'

data/lib/graticule/cli.rb

@@ -1,11 +1,12 @@
+# encoding: UTF-8
 require 'graticule'
 require 'optparse'
 
 module Graticule
-  
+
   # A command line interface for geocoding.  From the command line, run:
   #
-  #   geocode 49423 
+  #   geocode 49423
   #
   # Outputs:
   #
@@ -13,16 +14,16 @@ module Graticule
   #   # latitude: 42.7654, longitude: -86.1085
   #
   # == Usage: geocode [options] location
-  # 
-  # Options: 
+  #
+  # Options:
   #     -s, --service service            Geocoding service
   #     -a, --apikey apikey              API key for the selected service
   #     -h, --help                       Help
   class Cli
-    
+
     def self.start(args, out = STDOUT)
       options = { :service => :yahoo, :api_key => 'YahooDemo' }
-      
+
       OptionParser.new do |opts|
         opts.banner = "Usage: geocode [options] location"
         opts.separator ""
@@ -31,9 +32,9 @@ module Graticule
         opts.on("-s service", %w(yahoo google geocoder_us metacarta), "--service service", "Geocoding service") do |service|
           options[:service] = service
         end
-        
+
         opts.on("-a apikey", "--apikey apikey", "API key for the selected service")
-        
+
         opts.on_tail("-h", "--help", "Help") do
           puts opts
           exit
@@ -41,7 +42,7 @@ module Graticule
       end.parse! args
 
       options[:location] = args.join(" ")
-      
+
       result = Graticule.service(options[:service]).new(*options[:api_key].split(',')).locate(options[:location])
       location = (result.is_a?(Array) ? result.first : result)
       if location
@@ -57,8 +58,8 @@ module Graticule
         Graticule::Error => error
       $stderr.puts error.message
     end
-    
-    
+
+
   end
 end
 

data/lib/graticule/core_ext.rb

@@ -1,10 +1,11 @@
+# encoding: UTF-8
 module Graticule
   module RadiansAndDegrees
     # Convert from degrees to radians
     def to_radians
       ( self / 360.0 ) * Math::PI * 2
     end
-  
+
     # Convert from radians to degrees
     def to_degrees
       ( self * 360.0 ) / Math::PI / 2
@@ -12,4 +13,4 @@ module Graticule
   end
 end
 
-Numeric.send :include, Graticule::RadiansAndDegrees
+Numeric.send :include, Graticule::RadiansAndDegrees

data/lib/graticule/distance.rb

@@ -1,6 +1,7 @@
+# encoding: UTF-8
 module Graticule
   module Distance
-    
+
     EARTH_RADIUS = { :kilometers => 6378.135, :miles => 3963.1676 }
     # WGS-84 numbers
     EARTH_MAJOR_AXIS_RADIUS = { :kilometers => 6378.137, :miles => 3963.19059 }
@@ -9,7 +10,7 @@ module Graticule
     class DistanceFormula
       include Math
       extend Math
-       
+
       def initialize
         raise NotImplementedError
       end

data/lib/graticule/distance/haversine.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule
   module Distance
     #
@@ -7,7 +8,7 @@ module Graticule
     # for distance formulas.
     #
     class Haversine < DistanceFormula
-      
+
       # Calculate the distance between two Locations using the Haversine formula
       #
       #   Graticule::Distance::Haversine.distance(
@@ -25,9 +26,9 @@ module Graticule
         latitude_delta  = to_latitude - from_latitude
         longitude_delta = to_longitude - from_longitude
 
-        a = sin(latitude_delta/2)**2 + 
-            cos(from_latitude) * 
-            cos(to_latitude) * 
+        a = sin(latitude_delta/2)**2 +
+            cos(from_latitude) *
+            cos(to_latitude) *
             sin(longitude_delta/2)**2
 
         c = 2 * atan2(sqrt(a), sqrt(1-a))
@@ -37,4 +38,4 @@ module Graticule
 
     end
   end
-end
+end

data/lib/graticule/distance/spherical.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule
   module Distance
 
@@ -25,7 +26,7 @@ module Graticule
             Math.sin(from_latitude) *
             Math.sin(to_latitude) +
 
-            Math.cos(from_latitude) * 
+            Math.cos(from_latitude) *
             Math.cos(to_latitude) *
             Math.cos(to_longitude - from_longitude)
         ) * EARTH_RADIUS[units.to_sym]
@@ -46,7 +47,7 @@ module Graticule
           ) * #{Graticule::Distance::EARTH_RADIUS[options[:units].to_sym]})
         }.gsub("\n", '').squeeze(" ")
       end
-  
+
     end
   end
-end
+end

data/lib/graticule/distance/vincenty.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule
   module Distance
 
@@ -73,4 +74,4 @@ module Graticule
   
     end
   end
-end
+end

data/lib/graticule/geocoder.rb

@@ -1,7 +1,8 @@
+# encoding: UTF-8
 require 'happymapper'
 
 module Graticule
-  
+
   # Get a geocoder for the given service
   #
   #   geocoder = Graticule.service(:google).new "api_key"
@@ -11,7 +12,7 @@ module Graticule
   def self.service(name)
     Geocoder.const_get name.to_s.camelize
   end
-  
+
   # Base error class
   class Error < RuntimeError; end
   class CredentialsError < Error; end

data/lib/graticule/geocoder/base.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'open-uri'
 
 module Graticule #:nodoc:
@@ -22,7 +23,7 @@ module Graticule #:nodoc:
     # perform URL customization, override +make_url+.
     #
     #   class FakeGeocoder < Base
-    #   
+    #
     #     def initialize(appid)
     #       @appid = appid
     #       @url = URI.parse 'http://example.com/test'
@@ -31,22 +32,22 @@ module Graticule #:nodoc:
     #     def locate(query)
     #       get :q => query
     #     end
-    #   
+    #
     #   private
-    #   
+    #
     #     def check_error(xml)
     #       raise Error, xml.elements['error'].text if xml.elements['error']
     #     end
-    #   
+    #
     #     def make_url(params)
     #       params[:appid] = @appid
     #       super params
     #     end
-    #   
+    #
     #     def parse_response(response)
     #       # return Location
     #     end
-    #   
+    #
     #   end
     #
     class Base
@@ -55,9 +56,9 @@ module Graticule #:nodoc:
       def initialize
         raise NotImplementedError
       end
-      
+
     private
-    
+
       def location_from_params(params)
         case params
         when Location then params
@@ -95,7 +96,7 @@ module Graticule #:nodoc:
         url.query = escaped_params.join '&'
         return url
       end
-      
+
       # Override to convert the response to something besides a String, which
       # will get passed to +check_error+ and +parse_response+.
       def prepare_response(response)

data/lib/graticule/geocoder/bogus.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
     # Bogus geocoder that can be used for test purposes
@@ -5,10 +6,10 @@ module Graticule #:nodoc:
       # A queue of canned responses
       class_attribute :responses
       self.responses = []
-      
+
       # A default location to use if the responses queue is empty
-      class_inheritable_accessor :default
-      
+      class_attribute :default
+
       def locate(address)
         responses.shift || default || Location.new(:street => address)
       end

data/lib/graticule/geocoder/freethepostcode.rb

@@ -1,6 +1,7 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
-    
+
     #  freethepostcode.org (http://www.freethepostcode.org/) is a
     #  free service to convert UK postcodes into geolocation data.
     #
@@ -17,13 +18,13 @@ module Graticule #:nodoc:
       def locate(postcode)
         get :postcode => postcode
       end
-      
+
     private
 
       def prepare_response(response)
         response.split("\n")[1]
       end
-      
+
       def parse_response(response)
         data = response.split
         Location.new(:latitude => data[0].to_f, :longitude => data[1].to_f, :precision => :unknown)
@@ -32,7 +33,7 @@ module Graticule #:nodoc:
       def check_error(response)
         raise AddressError, 'unknown address' if response.blank?
       end
-      
+
     end
   end
 end

data/lib/graticule/geocoder/geocoder_ca.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
@@ -12,9 +13,9 @@ module Graticule #:nodoc:
       def locate(address)
         get :locate => address.is_a?(String) ? address : location_from_params(address).to_s(:country => false)
       end
-      
+
     private
-    
+
       class Response
         include HappyMapper
         tag 'geodata'
@@ -25,25 +26,25 @@ module Graticule #:nodoc:
         element :locality, String, :deep => true, :tag => 'city'
         element :postal_code, String, :tag => 'postal'
         element :region, String, :deep => true, :tag => 'prov'
-        
+
         class Error
           include HappyMapper
           tag 'error'
           element :code, Integer
           element :description, String
         end
-        
+
         has_one :error, Error
-        
+
         def street
           [street_number, street_name].join(' ')
         end
       end
-      
+
       def prepare_response(xml)
         Response.parse(xml, :single => true)
       end
-      
+
       def parse_response(response) #:nodoc:
         Location.new(
           :latitude  => response.latitude,

data/lib/graticule/geocoder/geocoder_us.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
@@ -27,13 +28,13 @@ module Graticule #:nodoc:
       def locate(address)
         get :address => address.is_a?(String) ? address : location_from_params(address).to_s(:country => false)
       end
-      
+
     private
       class Point
         include HappyMapper
         tag 'Point'
         namespace 'http://www.w3.org/2003/01/geo/wgs84_pos#'
-        
+
         element :description, String, :namespace => 'http://purl.org/dc/elements/1.1/'
         element :longitude,   Float,  :tag => 'long'
         element :latitude,    Float,  :tag => 'lat'

data/lib/graticule/geocoder/geonames.rb

@@ -1,30 +1,31 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
     class Geonames < Base
-      
+
       def initialize
         @url = URI.parse 'http://ws.geonames.org/timezone'
       end
-      
+
       def time_zone(location)
-        get :formatted => 'true', :style => 'full', :lat => location.latitude, :lng => location.longitude        
+        get :formatted => 'true', :style => 'full', :lat => location.latitude, :lng => location.longitude
       end
-      
-    private 
+
+    private
       class Status
         include HappyMapper
         tag 'status'
         attribute :message, String
         attribute :value, String
       end
-      
+
       class Response
         include HappyMapper
         tag 'geonames'
         element :timezoneId, String, :deep => true
         has_one :status, Status
       end
-      
+
       def prepare_response(xml)
         Response.parse(xml, :single => true)
       end
@@ -32,7 +33,7 @@ module Graticule #:nodoc:
       def parse_response(response) #:nodoc:
         response.timezoneId
       end
-      
+
       # Extracts and raises an error from +xml+, if any.
       def check_error(response) #:nodoc:
         if response && response.status

data/lib/graticule/geocoder/google.rb

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
-  
+
     # First you need a Google Maps API key.  You can register for one here:
     # http://www.google.com/apis/maps/signup.html
-    # 
+    #
     #   gg = Graticule.service(:google).new(MAPS_API_KEY)
     #   location = gg.locate '1600 Amphitheater Pkwy, Mountain View, CA'
     #   p location.coordinates
@@ -11,7 +12,7 @@ module Graticule #:nodoc:
     #
     class Google < Base
       # http://www.google.com/apis/maps/documentation/#Geocoding_HTTP_Request
-    
+
       # http://www.google.com/apis/maps/documentation/reference.html#GGeoAddressAccuracy
       PRECISION = {
         0 => Precision::Unknown,      # Unknown location.
@@ -44,15 +45,15 @@ module Graticule #:nodoc:
 
         attribute :accuracy, Integer, :tag => 'Accuracy'
       end
-    
+
       class Placemark
         include HappyMapper
         tag 'Placemark'
         element :coordinates, String, :deep => true
         has_one :address, Address
-      
+
         attr_reader :longitude, :latitude
-        
+
         with_options :deep => true, :namespace => 'urn:oasis:names:tc:ciq:xsdschema:xAL:2.0' do |map|
           map.element :street,      String, :tag => 'ThoroughfareName'
           map.element :locality,    String, :tag => 'LocalityName'
@@ -60,27 +61,27 @@ module Graticule #:nodoc:
           map.element :postal_code, String, :tag => 'PostalCodeNumber'
           map.element :country,     String, :tag => 'CountryNameCode'
         end
-      
+
         def coordinates=(coordinates)
           @longitude, @latitude, _ = coordinates.split(',').map { |v| v.to_f }
         end
-      
+
         def accuracy
           address.accuracy if address
         end
-      
+
         def precision
           PRECISION[accuracy] || :unknown
         end
       end
-    
+
       class Response
         include HappyMapper
         tag 'Response'
         element :code, Integer, :tag => 'code', :deep => true
         has_many :placemarks, Placemark
       end
-      
+
       def prepare_response(xml)
         Response.parse(xml, :single => true)
       end

data/lib/graticule/geocoder/host_ip.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'yaml'
 
 module Graticule #:nodoc:
@@ -13,14 +14,14 @@ module Graticule #:nodoc:
       def locate(address)
         get :ip => address, :position => true
       end
-    
+
     private
-    
+
       def prepare_response(response)
         # add new line so YAML.load doesn't puke
         YAML.load(response + "\n")
       end
-      
+
       def parse_response(response) #:nodoc:
         Location.new.tap do |location|
           location.latitude = response['Latitude']

data/lib/graticule/geocoder/local_search_maps.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
@@ -5,20 +6,20 @@ module Graticule #:nodoc:
     #
     # See http://emad.fano.us/blog/?p=277
     class LocalSearchMaps < Base
-    
+
       def initialize
         @url = URI.parse 'http://geo.localsearchmaps.com/'
       end
-    
+
       # This web service will handle some addresses outside the US
       # if given more structured arguments than just a string address
       # So allow input as a hash for the different arguments (:city, :country, :zip)
       def locate(params)
         get params.is_a?(String) ? {:loc => params} : map_attributes(location_from_params(params))
       end
-      
+
     private
-    
+
       def map_attributes(location)
         mapping = {:street => :street, :locality => :city, :region => :state, :postal_code => :zip, :country => :country}
         mapping.keys.inject({}) do |result,attribute|
@@ -26,7 +27,7 @@ module Graticule #:nodoc:
           result
         end
       end
-    
+
       def check_error(js)
         case js
         when nil
@@ -35,12 +36,12 @@ module Graticule #:nodoc:
           raise AddressError, 'Location not found'
         end
       end
-    
+
       def parse_response(js)
         coordinates = js.match(/map.centerAndZoom\(new GPoint\((.+?), (.+?)\)/)
         Location.new(:longitude => coordinates[1].to_f, :latitude => coordinates[2].to_f)
       end
-      
+
     end
   end
 end

data/lib/graticule/geocoder/mapquest.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
@@ -6,10 +7,10 @@ module Graticule #:nodoc:
     # http://developer.mapquest.com/Home/Register?_devAPISignup_WAR_devAPISignup_action=signup&_devAPISignup_WAR_devAPISignup_clientType=Developer
     #
     # mq = Graticule.service(:mapquest).new(CLIENT_ID, PASSWORD)
-    # location = gg.locate('44 Allen Rd., Lovell, ME 04051') 
+    # location = gg.locate('44 Allen Rd., Lovell, ME 04051')
     # [42.78942, -86.104424]
     #
-    class Mapquest < Base 
+    class Mapquest < Base
       # I would link to the documentation here, but there is none that will do anything but confuse you.
 
       PRECISION = {
@@ -48,7 +49,7 @@ module Graticule #:nodoc:
         url.query = URI.escape(query)
         url
       end
-      
+
       class Address
         include HappyMapper
         tag 'GeoAddress'
@@ -60,18 +61,18 @@ module Graticule #:nodoc:
         element :postal_code, String, :tag => 'PostalCode'
         element :country, String, :tag => 'AdminArea1'
         element :result_code, String, :tag => 'ResultCode'
-        
+
         def precision
           PRECISION[result_code.to_s[0,2]] || :unknown
         end
       end
-      
+
       class Result
         include HappyMapper
         tag 'GeocodeResponse'
         has_many :addresses, Address, :deep => true
       end
-      
+
       def prepare_response(xml)
         Result.parse(xml, :single => true)
       end

data/lib/graticule/geocoder/multi.rb

@@ -1,9 +1,10 @@
+# encoding: UTF-8
 require 'timeout'
 
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
     class Multi
-      
+
       # The Multi geocoder allows you to use multiple geocoders in succession.
       #
       #   geocoder = Graticule.service(:multi).new(
@@ -30,10 +31,10 @@ module Graticule #:nodoc:
       #
       def initialize(*geocoders, &acceptable)
         @options = {:timeout => 10, :async => false}.merge(geocoders.extract_options!)
-        @acceptable = acceptable || lambda { true }
-        @geocoders = geocoders.flatten
+        @acceptable = acceptable || Proc.new { true }
+        @geocoders = geocoders
       end
-      
+
       def locate(address)
         @lookup = @options[:async] ? ParallelLookup.new : SerialLookup.new
         last_error = nil
@@ -53,16 +54,16 @@ module Graticule #:nodoc:
         end
         @lookup.result || raise(last_error || AddressError.new("Couldn't find '#{address}' with any of the services"))
       end
-      
+
       class SerialLookup #:nodoc:
         def initialize
           @blocks = []
         end
-        
+
         def perform(&block)
           @blocks << block
         end
-        
+
         def result
           result = nil
           @blocks.detect do |block|
@@ -71,19 +72,19 @@ module Graticule #:nodoc:
           result
         end
       end
-      
+
       class ParallelLookup #:nodoc:
         def initialize
           @threads = []
           @monitor = Monitor.new
         end
-        
+
         def perform(&block)
           @threads << Thread.new do
             self.result = block.call
           end
         end
-        
+
         def result=(result)
           if result
             @monitor.synchronize do
@@ -92,7 +93,7 @@ module Graticule #:nodoc:
             end
           end
         end
-        
+
         def result
           @threads.each(&:join)
           @result

data/lib/graticule/geocoder/multimap.rb

@@ -1,14 +1,15 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
 
     # Multimap geocoding API
-    
+
     class Multimap < Base
-      
+
       # This precision information is not complete.
       # More details should be implemented from:
       # http://www.multimap.com/share/documentation/clientzone/gqcodes.htm
-      
+
       PRECISION = {
         6 => Precision::Country,
         5 => Precision::Region,
@@ -17,39 +18,39 @@ module Graticule #:nodoc:
         2 => Precision::Street,
         1 => Precision::Address
       }
-      
+
       # Web services initializer.
       #
       # The +api_key+ is the Open API key that uniquely identifies your
       # application.
       #
       # See http://www.multimap.com/openapi/
-      
+
       def initialize(api_key)
         @api_key = api_key
         @url = URI.parse "http://clients.multimap.com/API/geocode/1.2/#{@api_key}"
       end
-      
+
       # Returns a location for an address in the form of a String, Hash or Location.
-      
+
       def locate(address)
         location = address.is_a?(String) ? address : location_from_params(address)
         case location
         when String
           get :qs => location
         when Location
-          get "street" => location.street, 
-              "region" => location.region, 
-              "city" => location.locality, 
-              "postalCode" => location.postal_code, 
+          get "street" => location.street,
+              "region" => location.region,
+              "city" => location.locality,
+              "postalCode" => location.postal_code,
               "countryCode" => location.country
         end
       end
-      
+
       class Address
         include HappyMapper
         tag 'Location'
-        
+
         attribute :quality, Integer, :tag => 'geocodeQuality'
         element :street, String, :tag => 'Street', :deep => true
         element :locality, String, :tag => 'Area', :deep => true
@@ -58,23 +59,23 @@ module Graticule #:nodoc:
         element :country, String, :tag => 'CountryCode', :deep => true
         element :latitude, Float, :tag => 'Lat', :deep => true
         element :longitude, Float, :tag => 'Lon', :deep => true
-        
+
         def precision
           PRECISION[quality] || :unknown
         end
       end
-      
+
       class Result
         include HappyMapper
         tag 'Results'
         attribute :error, String, :tag => 'errorCode'
         has_many :addresses, Address
       end
-      
+
       def prepare_response(xml)
         Result.parse(xml, :single => true)
       end
-      
+
       def parse_response(result)
         addr = result.addresses.first
         Location.new(
@@ -88,11 +89,11 @@ module Graticule #:nodoc:
           :precision   => addr.precision
         )
       end
-      
+
       def check_error(result)
         raise Error, result.error unless result.error.blank?
       end
-      
+
     end
   end
 end

data/lib/graticule/geocoder/simple_geo.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'json'
 
 module Graticule

data/lib/graticule/geocoder/yahoo.rb

@@ -1,6 +1,7 @@
+# encoding: UTF-8
 module Graticule #:nodoc:
   module Geocoder #:nodoc:
-  
+
     # Yahoo geocoding API.
     #
     # http://developer.yahoo.com/maps/rest/V1/geocode.html
@@ -42,13 +43,13 @@ module Graticule #:nodoc:
         # yahoo pukes on line breaks
         get :location => location.gsub("\n", ', ')
       end
-    
+
     private
-    
+
       class Address
         include HappyMapper
         tag 'Result'
-        
+
         attribute :precision, String
         attribute :warning, String
         element :latitude, Float, :tag => 'Latitude'
@@ -58,24 +59,24 @@ module Graticule #:nodoc:
         element :region, String, :tag => 'State'
         element :postal_code, String, :tag => 'Zip'
         element :country, String, :tag => 'Country'
-        
+
         def precision
           PRECISION[@precision] || :unknown
         end
       end
-      
+
       class Result
         include HappyMapper
         tag 'ResultSet'
         has_many :addresses, Address
       end
-      
+
       class Error
         include HappyMapper
         tag 'Error'
         element :message, String, :tag => 'Message'
       end
-      
+
       def parse_response(response) # :nodoc:
         addr = Result.parse(response, :single => true).addresses.first
         Location.new(
@@ -108,6 +109,6 @@ module Graticule #:nodoc:
       end
 
     end
-    
+
   end
 end

data/lib/graticule/location.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule
 
   # A geographic location
@@ -9,7 +10,7 @@ module Graticule
 
     def initialize(attrs = {})
       attrs.each do |key,value|
-        self.send("#{key}=", value)
+        self.send("#{key}=", value.respond_to?(:force_encoding) ? value.force_encoding('UTF-8') : value)
       end
       self.precision ||= :unknown
     end

data/lib/graticule/precision.rb

@@ -1,10 +1,11 @@
+# encoding: UTF-8
 module Graticule
-  
+
   # Used to compare the precision of different geocoded locations
   class Precision
     include Comparable
     attr_reader :name
-    
+
     NAMES = [
       :unknown,
       :country,
@@ -15,12 +16,12 @@ module Graticule
       :address,
       :premise
     ]
-    
+
     def initialize(name)
       @name = name.to_sym
       raise ArgumentError, "#{name} is not a valid precision. Use one of #{NAMES.inspect}" unless NAMES.include?(@name)
     end
-    
+
     Unknown    = Precision.new(:unknown)
     Country    = Precision.new(:country)
     Region     = Precision.new(:region)
@@ -29,16 +30,16 @@ module Graticule
     Street     = Precision.new(:street)
     Address    = Precision.new(:address)
     Premise    = Precision.new(:premise)
-    
+
     def to_s
       @name.to_s
     end
-    
+
     def <=>(other)
       other = Precision.new(other) unless other.is_a?(Precision)
       NAMES.index(self.name) <=> NAMES.index(other.name)
     end
-    
+
     def ==(other)
       (self <=> other) == 0
     end

data/lib/graticule/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Graticule
-  VERSION = '2.0.1' unless defined?(::Graticule::VERSION)
+  VERSION = '2.1.0' unless defined?(::Graticule::VERSION)
 end

metadata

@@ -1,119 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: graticule
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 - Daniel Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-28 00:00:00 -05:00
-default_executable: geocode
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-08-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70239866982580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: activesupport
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70239866982580
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70239866981940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: i18n
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70239866981940
+- !ruby/object:Gem::Dependency
+  name: happymapper
+  requirement: &70239866981260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.0
-  requirement: *id003
   type: :runtime
-  name: happymapper
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70239866981260
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70239866980440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: json
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70239866980440
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70239866979600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: mocha
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70239866979600
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70239866978740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
   prerelease: false
-description: Graticule is a geocoding API that provides a common interface to all the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.
+  version_requirements: *70239866978740
+description: Graticule is a geocoding API that provides a common interface to all
+  the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.
 email: brandon@opensoul.org
-executables: 
+executables:
 - geocode
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - bin/geocode
 - lib/graticule/cli.rb
 - lib/graticule/core_ext.rb
@@ -143,42 +116,38 @@ files:
 - CHANGELOG.txt
 - LICENSE.txt
 - README.textile
-has_rdoc: true
 homepage: http://github.com/collectiveidea/graticule
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --inline-source
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -334130965420677482
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -334130965420677482
 requirements: []
-
 rubyforge_project: graticule
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: API for using all the popular geocoding services.
 test_files: []
-