geokit 1.7.0.rc1 → 1.7.0

data/test/test_maxmind_geocoder.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
+
+  def setup
+    super
+    @ip = '118.210.47.142'
+  end
+
+  def test_ip
+    VCR.use_cassette('maxmind_ip') do
+    res = Geokit::Geocoders::MaxmindGeocoder.geocode(@ip)
+    assert_equal 'Adelaide', res.city
+    end
+  end
+
+end

data/test/test_yahoo_geocoder.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::yahoo = 'Yahoo'
+Geokit::Geocoders::yahoo_consumer_key = 'dj0yJmk9cXByQVN2WHZmTVhDJmQ9WVdrOVZscG1WVWhOTldrbWNHbzlNakF6TlRJME16UTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD0zNg--'
+Geokit::Geocoders::yahoo_consumer_secret = 'SECRET'
 
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     YAHOO_FULL=<<-EOF.strip
@@ -23,55 +24,59 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     @yahoo_city_loc = Geokit::GeoLoc.new(@yahoo_city_hash)
   end
 
+  def assert_yahoo_url(expected_url)
+    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
+  end
+
   # the testing methods themselves
   def test_yahoo_full_address
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_FULL)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_full') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@full_address))
+    assert_yahoo_url url
+    end
   end
 
   def test_yahoo_full_address_accuracy
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_FULL)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_full') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@full_address)
+    assert_yahoo_url url
     assert_equal 8, res.accuracy
+    end
   end
 
   def test_yahoo_full_address_with_geo_loc
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_FULL)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_full') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_full_loc))
+    assert_yahoo_url url
+    end
   end
 
   def test_yahoo_city
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_CITY)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_city') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
+    assert_yahoo_url url
+    end
   end
 
   def test_yahoo_city_accuracy
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_CITY)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_city') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    assert_yahoo_url url
     assert_equal 4, res.accuracy
+    end
   end
 
   def test_yahoo_city_with_geo_loc
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_CITY)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_city') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc))
+    assert_yahoo_url url
+    end
   end
 
   def test_no_results
@@ -79,18 +84,17 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     no_results_full_hash = {:street_address=>"ZZ", :city=>"ZZ", :state=>"ZZ"}
     no_results_full_loc = Geokit::GeoLoc.new(no_results_full_hash)
 
-    response = MockSuccess.new
-    response.expects(:body).returns(YAHOO_NO_RESULTS)
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(no_results_address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    VCR.use_cassette('yahoo_no_results') do
+    url = "http://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(no_results_address)}"
     result = Geokit::Geocoders::YahooGeocoder.geocode(no_results_address)
+    assert_yahoo_url url
     assert_equal ",", result.ll
+    end
   end
 
   def test_service_unavailable
     response = MockFailure.new
-    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
-    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).returns(response)
     assert !Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc).success
   end
 
@@ -98,18 +102,19 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   # next two methods do the assertions for both address-level and city-level lookups
   def do_full_address_assertions(res)
+
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city
-    assert_equal "37.792406,-122.39411", res.ll
+    assert_array_in_delta [37.792332, -122.393791], res.to_a
     assert res.is_us?
-    assert_equal "100 Spear St, San Francisco, CA, 94105-1522, US", res.full_address
+    assert_equal "100 Spear St, San Francisco, CA, 94105-1578, US", res.full_address
     assert_equal "yahoo", res.provider
   end
 
   def do_city_assertions(res)
     assert_equal "CA", res.state
     assert_equal "San Francisco", res.city
-    assert_equal "37.7742,-122.417068", res.ll
+    assert_array_in_delta [37.77713, -122.41964], res.to_a
     assert res.is_us?
     assert_equal "San Francisco, CA, US", res.full_address
     assert_nil res.street_address

data/test/test_yandex_geocoder.rb

@@ -0,0 +1,93 @@
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__), 'helper')
+
+# Geokit::Geocoders::yandex = 'yandex'
+
+class YandexGeocoderTest < BaseGeocoderTest #:nodoc: all
+    YANDEX_FULL=<<-EOF.strip
+      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Москва, улица Новый Арбат, дом 24","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Москва, улица Новый Арбат, 24","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Москва, улица Новый Арбат, 24","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва","Thoroughfare":{"ThoroughfareName":"улица Новый Арбат","Premise":{"PremiseNumber":"24"}}}}}}},"description":"Москва, Россия","name":"улица Новый Арбат, 24","boundedBy":{"Envelope":{"lowerCorner":"37.585565 55.751928","upperCorner":"37.589662 55.754238"}},"Point":{"pos":"37.587614 55.753083"}}}]}}}
+    EOF
+
+    YANDEX_REGION=<<-EOF.strip
+      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Ростов-на-Дону, ул. Станиславского, д.21","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","CountryNameCode":"RU","CountryName":"Россия","AdministrativeArea":{"AdministrativeAreaName":"Ростовская область","Locality":{"LocalityName":"город Ростов-на-Дону","Thoroughfare":{"ThoroughfareName":"улица Станиславского","Premise":{"PremiseNumber":"21"}}}}}}}},"description":"город Ростов-на-Дону, Ростовская область, Россия","name":"улица Станиславского, 21","boundedBy":{"Envelope":{"lowerCorner":"39.701349 47.214507","upperCorner":"39.705446 47.217298"}},"Point":{"pos":"39.703398 47.215903"}}}]}}}
+    EOF
+
+    YANDEX_CITY=<<-EOF.strip
+      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"город Москва","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Россия, Москва","precision":"other","AddressDetails":{"Country":{"AddressLine":"Москва","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва"}}}}},"description":"Россия","name":"Москва","boundedBy":{"Envelope":{"lowerCorner":"37.182743 55.490667","upperCorner":"37.964969 56.01074"}},"Point":{"pos":"37.617761 55.755773"}}}]}}}
+    EOF
+
+    YANDEX_NO_RESULTS=<<-EOF.strip
+      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"ZZ, ZZ, ZZ","found":"0","results":"10"}},"featureMember":[]}}}
+    EOF
+
+  def setup
+    super
+    @full_address = "Москва, улица Новый Арбат, дом 24"
+    @address = "город Москва"
+  end
+
+  # the testing methods themselves
+  def test_yandex_full_address
+    response = MockSuccess.new
+    response.expects(:body).returns(YANDEX_FULL)
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(@full_address)}&format=json"
+    Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YandexGeocoder.geocode(@full_address)
+
+    assert_equal "yandex", res.provider
+    assert_equal "улица Новый Арбат, 24", res.street_address
+    assert_equal "Москва", res.city
+    assert_equal 55.753083, res.lat
+    assert_equal 37.587614, res.lng
+    assert_equal "RU", res.country_code
+    assert res.success
+  end
+
+  def test_yandex_full_address_with_region
+    region_address = "Ростов-на-Дону, ул. Станиславского, д.21"
+    response = MockSuccess.new
+    response.expects(:body).returns(YANDEX_REGION)
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(region_address)}&format=json"
+    Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YandexGeocoder.geocode(region_address)
+
+    assert_equal "yandex", res.provider
+    assert_equal "улица Станиславского, 21", res.street_address
+    assert_equal "город Ростов на Дону", res.city
+    assert_equal "Ростовская область", res.state
+    assert_equal 47.215903, res.lat
+    assert_equal 39.703398, res.lng
+    assert_equal "RU", res.country_code
+    assert res.success
+  end
+
+  def test_yandex_city
+    response = MockSuccess.new
+    response.expects(:body).returns(YANDEX_CITY)
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(@address)}&format=json"
+    Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    res = Geokit::Geocoders::YandexGeocoder.geocode(@address)
+
+    assert_equal "yandex", res.provider
+    assert_equal "city", res.precision
+    assert_equal "Москва", res.city
+    assert_equal 55.755773, res.lat
+    assert_equal 37.617761, res.lng
+    assert_equal "RU", res.country_code
+    assert res.success
+  end
+
+
+  def test_no_results
+    no_results_address = "ZZ, ZZ, ZZ"
+    # no_results_full_hash = {:street_address=>"ZZ", :city=>"ZZ", :state=>"ZZ"}
+    # no_results_full_loc = Geokit::GeoLoc.new(no_results_full_hash)
+
+    response = MockSuccess.new
+    response.expects(:body).returns(YANDEX_NO_RESULTS)
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(no_results_address)}&format=json"
+    Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
+    result = Geokit::Geocoders::YandexGeocoder.geocode(no_results_address)
+    assert_equal ",", result.ll
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.7.0.rc1
+  version: 1.7.0
 platform: ruby
 authors:
 - Michael Noack, James Cox, Andre Lewis & Bill Eisenhauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -94,13 +94,54 @@ dependencies:
     - - ! '>='
       - !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
+  prerelease: false
+  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
+  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:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
@@ -112,7 +153,17 @@ files:
 - Manifest.txt
 - README.markdown
 - Rakefile
-- ext/mkrf_conf.rb
+- data/GeoLiteCity.dat
+- fixtures/vcr_cassettes/google3_city.yml
+- fixtures/vcr_cassettes/google3_country_code_biased_result.yml
+- fixtures/vcr_cassettes/google3_full.yml
+- fixtures/vcr_cassettes/google3_full_short.yml
+- fixtures/vcr_cassettes/google3_language_response_fr.yml
+- fixtures/vcr_cassettes/google3_multi.yml
+- fixtures/vcr_cassettes/google3_reverse_madrid.yml
+- fixtures/vcr_cassettes/yahoo_city.yml
+- fixtures/vcr_cassettes/yahoo_full.yml
+- fixtures/vcr_cassettes/yahoo_no_results.yml
 - geokit.gemspec
 - lib/geokit.rb
 - lib/geokit/geocoders.rb
@@ -126,9 +177,12 @@ files:
 - lib/geokit/services/google.rb
 - lib/geokit/services/google3.rb
 - lib/geokit/services/ip.rb
+- lib/geokit/services/maxmind.rb
 - lib/geokit/services/openstreetmap.rb
+- lib/geokit/services/ripe.rb
 - lib/geokit/services/us_geocoder.rb
 - lib/geokit/services/yahoo.rb
+- lib/geokit/services/yandex.rb
 - lib/geokit/version.rb
 - test/helper.rb
 - test/test_base_geocoder.rb
@@ -142,13 +196,15 @@ files:
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
+- test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb
 - test/test_multi_ip_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
 - test/test_polygon_contains.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
-homepage: http://geokit.org
+- test/test_yandex_geocoder.rb
+homepage: http://github.com/geokit/geokit
 licenses:
 - MIT
 metadata: {}
@@ -165,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -187,9 +243,11 @@ test_files:
 - test/test_inflector.rb
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
+- test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb
 - test/test_multi_ip_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
 - test/test_polygon_contains.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
+- test/test_yandex_geocoder.rb

data/ext/mkrf_conf.rb

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-begin
-  Gem::Command.build_args = ARGV
-  rescue NoMethodError
-end
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_VERSION < "1.9"
-    inst.install "iconv"
-  end
-rescue
-  exit(1)
-end