geokit 1.7.0 → 1.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjliOWQ5MWNlMjNjZjE0MzgwYzg1MDgyMWEyNGM0Y2YzY2YzODU3MA==
+    MWVmODZiMjVhMTFlZjYwNGViY2EzYTBjNWQwMjMyNmE0MWRkMTMwZA==
   data.tar.gz: !binary |-
-    YzdiYzM4NmYyYTViMzg0MmM4Nzg0NTM1NDI4YzdkMmI1MjM5NmYzMg==
+    YTc2ZmM1N2FkOGM0OTM3ODU1ZWE5ZjQ0NjAxMjdhMDRiM2NkZGY3NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQyNGY3MDM4YTU5OGQ2OTUxMGE4YWFkMzU1ZmUzZTMzMWEzMTkzMjBmNzhj
-    NTVmY2NmZThjNmJmMmQ5NjhhYTc1MDMyZTEwMWIwZjU0YTkyZGQyZTM2YWU0
-    Y2FkZmUwNmQ5N2Y1ZmJhZDllODAzMTJhMGU0N2U0NTA4NjViZWQ=
+    Njg0YTQwYzRmMTIxZDhiYWVjMDJhZDI0M2UxNjYyNGNjZDc0NzI0NzNhMjcx
+    MTJkYjlhMmEyMzc3MDQwODIyZTIxOGE3NTkwOWVkOTgzMmU0YzgzYmU2ZDhi
+    Y2UwNDhhODM0NjkyODhjOGFjMTcwMTEyOTgxZDg1YjM4ZGYzN2Y=
   data.tar.gz: !binary |-
-    ZDg4N2UwODIxOTFmOGY3NGIzZGVjZGNiZjEwNDA0ZTM1NDA0YjRkODE2ZThi
-    Njk5NmZkOWUzZWIwZDJlMjcyZDMxYWVmMGUyNzVmNTQ3MmM5M2IzOWM5Y2Vh
-    ODhjNDY1MjcwZDU5MjYxNWM4OThlZmViYjg2MzUyZmViYzQyY2Q=
+    OWYwOGNjZTRmYjJhODg0NzMxMWQ2MDg2Y2UyMGUxMGNlYzU2YmU0YzJjNTk3
+    YzdhM2JmMjYwMWIzZGU0ZWE3NDU0YWEyMWI3ZTQ2M2U4ZjRlNGE5NzEzY2M0
+    N2Y1NDNiMzA2NjZlOGM3MTg0ZDk5YTM3ZWI0YTQwZjQ4NjFlY2E=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.7.1
+
+* Remove geoip require from MaxMind to avoid new dependency issues
+
 ## 1.7.0
 
 * Added Yahoo Boss, Yandex, RIPE and MaxMind Support

data/README.markdown

@@ -11,7 +11,7 @@ Geokit
 
 The Geokit gem provides:
 
- * Distance calculations between two points on the earth. Calculate the distance in miles, kilometers, or nautical miles, with all the trigonometry abstracted away by GeoKit.
+ * Distance calculations between two points on the earth. Calculate the distance in miles, kilometers, or nautical miles, with all the trigonometry abstracted away by Geokit.
  * Geocoding from multiple providers. It supports Google, Yahoo, Geocoder.us, and Geocoder.ca geocoders, and others. It provides a uniform response structure from all of them.
    It also provides a fail-over mechanism, in case your input fails to geocode in one service.
  * Rectangular bounds calculations: is a point within a given rectangular bounds?

data/lib/geokit.rb

@@ -24,6 +24,3 @@ path = File.expand_path(File.dirname(__FILE__))
 $:.unshift path unless $:.include?(path)
 require 'geokit/geocoders'
 require 'geokit/mappable'
-
-# make old-style module name "GeoKit" equivalent to new-style "Geokit"
-GeoKit=Geokit

data/lib/geokit/geocoders.rb

@@ -136,10 +136,10 @@ module Geokit
         req = Net::HTTP::Get.new(url)
         req.basic_auth(uri.user, uri.password) if uri.userinfo
         res = Net::HTTP::new(uri.host, uri.port,
-                GeoKit::Geocoders::proxy_addr,
-                GeoKit::Geocoders::proxy_port,
-                GeoKit::Geocoders::proxy_user,
-                GeoKit::Geocoders::proxy_pass).start { |http| http.request(req) }
+                Geokit::Geocoders::proxy_addr,
+                Geokit::Geocoders::proxy_port,
+                Geokit::Geocoders::proxy_user,
+                Geokit::Geocoders::proxy_pass).start { |http| http.request(req) }
         return res
       end
 

data/lib/geokit/services/fcc.rb

@@ -16,7 +16,7 @@ module Geokit
       # Template method which does the geocode lookup.
       #
       # ==== EXAMPLES
-      # ll=GeoKit::LatLng.new(40, -85)
+      # ll=Geokit::LatLng.new(40, -85)
       # Geokit::Geocoders::FCCGeocoder.geocode(ll) #
 
       # JSON result looks like this

data/lib/geokit/services/geonames.rb

@@ -13,8 +13,8 @@ module Geokit
         address_str.gsub!(/,/, " ")
         params = "/postalCodeSearch?placename=#{Geokit::Inflector::url_escape(address_str)}&maxRows=10"
 
-        if(GeoKit::Geocoders::geonames)
-          url = "http://ws.geonames.net#{params}&username=#{GeoKit::Geocoders::geonames}"
+        if(Geokit::Geocoders::geonames)
+          url = "http://ws.geonames.net#{params}&username=#{Geokit::Geocoders::geonames}"
         else
           url = "http://ws.geonames.org#{params}"
         end

data/lib/geokit/services/maxmind.rb

@@ -1,5 +1,3 @@
-require "geoip"
-
 module Geokit
   module Geocoders
 

data/lib/geokit/services/us_geocoder.rb

@@ -10,8 +10,8 @@ module Geokit
         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 Geokit::Geocoders::geocoder_us
+          "http://#{Geokit::Geocoders::geocoder_us}@geocoder.us/member/service/csv/geocode"
         else
           "http://geocoder.us/service/csv/geocode"
         end

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

data/test/test_geoplugin_geocoder.rb

@@ -29,8 +29,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     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')
+    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)
@@ -42,7 +42,7 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_invalid_ip
-    location = GeoKit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
+    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
     assert_not_nil location
     assert !location.success?
   end
@@ -50,8 +50,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   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")
+    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

data/test/test_inflector.rb

@@ -20,7 +20,7 @@ class InflectorTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_url_escape
-    assert_equal '%E4%B8%8A%E6%B5%B7%E5%B8%82%E5%BE%90%E6%B1%87%E5%8C%BA%E6%BC%95%E6%BA%AA%E5%8C%97%E8%B7%AF1111%E5%8F%B7', GeoKit::Inflector.url_escape('上海市徐汇区漕溪北路1111号')
+    assert_equal '%E4%B8%8A%E6%B5%B7%E5%B8%82%E5%BE%90%E6%B1%87%E5%8C%BA%E6%BC%95%E6%BA%AA%E5%8C%97%E8%B7%AF1111%E5%8F%B7', Geokit::Inflector.url_escape('上海市徐汇区漕溪北路1111号')
     assert_equal '%C3%BC%C3%B6%C3%A4', Geokit::Inflector.url_escape('üöä')
   end
 end

data/test/test_ipgeocoder.rb

@@ -52,8 +52,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     success = MockSuccess.new
     success.expects(:body).returns(IP_SUCCESS)
     url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = GeoKit::Geocoders::IpGeocoder.geocode('12.215.42.19')
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = Geokit::Geocoders::IpGeocoder.geocode('12.215.42.19')
     assert_not_nil location
     assert_equal 41.7696, location.lat
     assert_equal(-88.4588, location.lng)
@@ -68,8 +68,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     success = MockSuccess.new
     success.expects(:body).returns(IP_UNICODED)
     url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = GeoKit::Geocoders::IpGeocoder.geocode('12.215.42.19')
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = Geokit::Geocoders::IpGeocoder.geocode('12.215.42.19')
     assert_not_nil location
     assert_equal 57.7167, location.lat
     assert_equal 12.9167, location.lng
@@ -85,8 +85,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     success.stubs(:body).returns(IP_LATIN)
     success.stubs(:[]).with('content-type').returns('text/plain; charset=iso-8859-1')
     url = 'http://api.hostip.info/get_html.php?ip=201.23.177.144&position=true'
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = GeoKit::Geocoders::IpGeocoder.geocode('201.23.177.144')
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
+    location = Geokit::Geocoders::IpGeocoder.geocode('201.23.177.144')
     assert_not_nil location
     assert_equal -20.8, location.lat
     assert_equal -49.3833, location.lng
@@ -101,24 +101,24 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     failure = MockSuccess.new
     failure.expects(:body).returns(IP_FAILURE)
     url = 'http://api.hostip.info/get_html.php?ip=128.178.0.0&position=true'
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = GeoKit::Geocoders::IpGeocoder.geocode("128.178.0.0")
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = Geokit::Geocoders::IpGeocoder.geocode("128.178.0.0")
     assert_not_nil location
     assert !location.success?
   end
 
   def test_private_ips
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
     PRIVATE_IPS_TO_TEST.each do |ip|
-      location = GeoKit::Geocoders::IpGeocoder.geocode(ip)
+      location = Geokit::Geocoders::IpGeocoder.geocode(ip)
       assert_not_nil location
       assert !location.success?
     end
   end
 
   def test_invalid_ip
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
-    location = GeoKit::Geocoders::IpGeocoder.geocode("blah")
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
+    location = Geokit::Geocoders::IpGeocoder.geocode("blah")
     assert_not_nil location
     assert !location.success?
   end
@@ -126,8 +126,8 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_service_unavailable
     failure = MockFailure.new
     url = 'http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true'
-    GeoKit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = GeoKit::Geocoders::IpGeocoder.geocode("12.215.42.19")
+    Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
+    location = Geokit::Geocoders::IpGeocoder.geocode("12.215.42.19")
     assert_not_nil location
     assert !location.success?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Michael Noack, James Cox, Andre Lewis & Bill Eisenhauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json