andre-geokit 1.2.5 → 1.2.6

data/Manifest.txt

@@ -1,4 +1,5 @@
 .project
+History.txt
 Manifest.txt
 README.markdown
 Rakefile
@@ -10,8 +11,10 @@ test/test_base_geocoder.rb
 test/test_bounds.rb
 test/test_ca_geocoder.rb
 test/test_geoloc.rb
+test/test_geoplugin_geocoder.rb
 test/test_google_geocoder.rb
 test/test_google_reverse_geocoder.rb
+test/test_inflector.rb
 test/test_ipgeocoder.rb
 test/test_latlng.rb
 test/test_multi_geocoder.rb

data/README.markdown

@@ -16,8 +16,7 @@ Combine this gem with the [geokit-rails plugin](http://github.com/andre/geokit-r
 
 ## INSTALL
 
-    gem sources -a http://gems.github.com
-    sudo gem install andre-geokit
+    sudo gem install geokit
 
 ## QUICK START
 

data/Rakefile

@@ -2,19 +2,13 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/geokit'
+require './lib/geokit.rb'
 
-Hoe.new('Geokit', Geokit::VERSION) do |p|
-  # p.rubyforge_name = 'Geokitx' # if different than lowercase project name
-  p.developer('Andre Lewis and Bill Eisenhauer', 'andre@earthcode.com / bill_eisenhauer@yahoo.com')
+project=Hoe.new('geokit', Geokit::VERSION) do |p|
+  #p.rubyforge_name = 'geokit' # if different than lowercase project name
+  p.developer('Andre Lewis', 'andre@earthcode.com')
+  p.summary="Geokit provides geocoding and distance calculation in an easy-to-use API"
 end
 
-task :generate_gemspec do
-  system "rake debug_gem | grep -v \"(in \" > `basename \\`pwd\\``.gemspec"
-end
-
-task :update_manifest do
-  system "touch Manifest.txt; rake check_manifest | grep -v \"(in \" | patch"
-end
 
 # vim: syntax=Ruby

data/lib/geokit.rb

@@ -1,5 +1,5 @@
 module Geokit
-  VERSION = '1.2.0'
+  VERSION = '1.2.6'
   # These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
   @@default_units = :miles
   @@default_formula = :sphere
@@ -26,5 +26,5 @@ $: <<  path unless $:.include?(path)
 require 'geokit/geocoders'
 require 'geokit/mappable'
 
-# make old-style module name "GeoKit" equivilent to new-style "Geokit"
+# make old-style module name "GeoKit" equivalent to new-style "Geokit"
 GeoKit=Geokit

data/lib/geokit/geocoders.rb

@@ -105,7 +105,7 @@ module Geokit
       # empty one with a failed success code.
       def self.geocode(address)  
         res = do_geocode(address)
-        return res.success ? res : GeoLoc.new
+        return res.success? ? res : GeoLoc.new
       end  
       
       # Main method which calls the do_reverse_geocode template method which subclasses
@@ -113,7 +113,7 @@ module Geokit
       # empty one with a failed success code.
       def self.reverse_geocode(latlng)
         res = do_reverse_geocode(latlng)
-        return res.success ? res : GeoLoc.new        
+        return res.success? ? res : GeoLoc.new        
       end
       
       # Call the geocoder service using the timeout if configured.
@@ -400,7 +400,7 @@ module Geokit
           # Google can return multiple results as //Placemark elements. 
           # iterate through each and extract each placemark as a geoloc
           doc.each_element('//Placemark') do |e|
-            extracted_geoloc = extract_placemark(e) # g is now an instance of Geoloc
+            extracted_geoloc = extract_placemark(e) # g is now an instance of GeoLoc
             if geoloc.nil? 
               # first time through, geoloc is still nil, so we make it the geoloc we just extracted
               geoloc = extracted_geoloc 
@@ -492,7 +492,7 @@ module Geokit
       # longitude, city, and country code.  Sets the success attribute to false if the ip 
       # parameter does not match an ip address.  
       def self.do_geocode(ip)
-        return Geoloc.new if '0.0.0.0' == ip
+        return GeoLoc.new if '0.0.0.0' == ip
         return GeoLoc.new unless /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/.match(ip)
         url = "http://api.hostip.info/get_html.php?ip=#{ip}&position=true"
         response = self.call_geocoder_service(url)
@@ -550,7 +550,7 @@ module Geokit
           begin
             klass = Geokit::Geocoders.const_get "#{provider.to_s.capitalize}Geocoder"
             res = klass.send :geocode, address
-            return res if res.success
+            return res if res.success?
           rescue
             logger.error("Something has gone very wrong during geocoding, OR you have configured an invalid class name in Geokit::Geocoders::provider_order. Address: #{address}. Provider: #{provider}")
           end

data/lib/geokit/mappable.rb

@@ -112,7 +112,7 @@ module Geokit
       # Geocodes a location using the multi geocoder.
       def geocode(location)
         res = Geocoders::MultiGeocoder.geocode(location)
-        return res if res.success
+        return res if res.success?
         raise Geokit::Geocoders::GeocodeError      
       end
     
@@ -270,7 +270,7 @@ module Geokit
           return Geokit::LatLng.new(match[1],match[2])
         else
           res = Geokit::Geocoders::MultiGeocoder.geocode(thing)
-          return res if res.success
+          return res if res.success?
           raise Geokit::Geocoders::GeocodeError  
         end
       elsif thing.is_a?(Array) && thing.size==2
@@ -337,6 +337,10 @@ module Geokit
     def is_us?
       country_code == 'US'
     end
+    
+    def success?
+      success == true
+    end
 
     # full_address is provided by google but not by yahoo. It is intended that the google
     # geocoding method will provide the full address, whereas for yahoo it will be derived

data/test/test_base_geocoder.rb

@@ -17,6 +17,12 @@ end
 # Base class for testing geocoders.
 class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
 
+  class Geokit::Geocoders::TestGeocoder < Geokit::Geocoders::Geocoder
+    def self.do_get(url)
+      sleep(2)
+    end    
+  end
+
   # Defines common test fixtures.
   def setup
     @address = 'San Francisco, CA'    
@@ -28,14 +34,9 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
   end  
   
   def test_timeout_call_web_service
-    Geokit::Geocoders::Geocoder.class_eval do
-      def self.do_get(url)
-        sleep(2)
-      end
-    end
     url = "http://www.anything.com"
     Geokit::Geocoders::timeout = 1
-    assert_nil Geokit::Geocoders::Geocoder.call_geocoder_service(url)    
+    assert_nil Geokit::Geocoders::TestGeocoder.call_geocoder_service(url)    
   end
   
   def test_successful_call_web_service

data/test/test_geoloc.rb

@@ -13,6 +13,14 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
     assert @loc.is_us?
   end
   
+  def test_success
+    assert !@loc.success?
+    @loc.success = false
+    assert !@loc.success?
+    @loc.success = true
+    assert @loc.success?
+  end
+  
   def test_street_number
     @loc.street_address = '123 Spear St.'
     assert_equal '123', @loc.street_number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andre-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer