hacked0ff-reverse_geocode 0.0.1 → 0.0.2

data/lib/reverse_geocode.rb

@@ -3,6 +3,8 @@ require 'uri'
 require 'json'
 
 class ReverseGeocode
+  GOOGLE_URI = "http://maps.google.com/maps/geo"
+
   class GeocodeError < StandardError
     ERRORS = {
       400 => "Bad Request",
@@ -16,7 +18,7 @@ class ReverseGeocode
     }
 
     def initialize(error_code)
-      super("#{error_code}: #{ERRORS[error_code]}")
+      super("#{error_code}: #{ERRORS[error_code] || 'Unknown Error'}")
     end
   end
 
@@ -49,17 +51,17 @@ class ReverseGeocode
   end
 
   def city
-    @city ||= placemark[1]/'AddressDetails'/'Country'/'AdministrativeArea'/'Locality'/'LocalityName'
+    @city ||= (placemark_by_accuracy(4)/'AddressDetails'/'Country'/'AdministrativeArea'/'AddressLine').first
   end
 
   def county
-    @county ||= (placemark[3]/'AddressDetails'/'Country'/'AdministrativeArea'/'AddressLine').first
+    @county ||= (placemark_by_accuracy(3)/'AddressDetails'/'Country'/'AdministrativeArea'/'AddressLine').first
   end
 
   private
 
   def first_placemark
-    placemark[0]
+    placemark_by_accuracy(8)
   end
 
   def first_administrative_area
@@ -70,8 +72,12 @@ class ReverseGeocode
     (response/"Placemark")
   end
 
+  def placemark_by_accuracy(accuracy)
+    placemark.detect { |x| (x/'AddressDetails'/'Accuracy').to_i == accuracy.to_i }
+  end
+
   def reverse_geocode_uri
-    URI.parse("http://maps.google.com/maps/geo?ll=#{URI.escape(lat.to_s)},#{URI.escape(long.to_s)}&output=json")
+    URI.parse("#{GOOGLE_URI}?ll=#{URI.escape(lat.to_s)},#{URI.escape(long.to_s)}")
   end
 
   def parse_json
@@ -90,3 +96,9 @@ end
 class Hash
   alias_method :/, :[]
 end
+
+class NilClass
+  def /(other)
+    raise ArgumentError, "Unknown method '/' called on nil with #{other.inspect}. Maybe you were looking for a Hash?"
+  end
+end

data/spec/reverse_geocode_spec.rb

@@ -124,6 +124,13 @@ describe "ReverseGeocode" do
     end
   end
 
+  describe '#placemark_by_accuracy' do
+    it 'should return the placemark with the given accuracy' do
+      (@reverse_geocode.send(:placemark_by_accuracy, 3)/'AddressDetails'/'Accuracy').to_i.should == 3
+
+    end
+  end
+
   describe "without a latitude or longitude" do
     it "should raise an ArgumentError" do
       lambda { ReverseGeocode.new(nil, 1) }.should raise_error(ArgumentError)
@@ -153,7 +160,7 @@ describe "ReverseGeocode" do
           @reverse_geocode.stub!(:parse_json).and_return(error_json(code))
         end
 
-        it "should raise a GeocodeError" do
+        it "should raise a GeocodeError with #{message}" do
           lambda {
             @reverse_geocode.send(:handle_response)
           }.should raise_error(ReverseGeocode::GeocodeError, "#{code}: #{message}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hacked0ff-reverse_geocode
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tommy Campbell & ReinH