geocoder 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a87e48d6ef8d83ba7431093b99731ed6488d901
-  data.tar.gz: 813db65901b6ce424544968d1cc8c1bfa78425a0
+  metadata.gz: 83f0267dc6d6f5b13f1a3a26f1c901e88618e9cc
+  data.tar.gz: d571a2205694b66dac921798eb8ae8c6d497a92e
 SHA512:
-  metadata.gz: 99aa2501a9fbc16abe3a0fd7b354b3d29f51653507f463a1692aebb00e1f41b8e3f9b41d1a2e493aadba7f42c44cd66c3082d3e9147732cb1703c92aa11fc354
-  data.tar.gz: 64094ce5902e6471e958810e4438feec04f6e9f7a9fdfd99a79262d3d1cf5a8b84196eb57c6ff3343cb2e262d650194ec23adb686f73e31f4df086c601c0656e
+  metadata.gz: 78e3b5fe48c4f6827e71345e85a6edfddbb14efcaa05ebdb57ad63f7f0f4b8bf4a653e9ab75da333ebec94eb9e14745b62181cf3f77e4b958dc2840549888017
+  data.tar.gz: 389bd66826e1f2878ff49d55cf6f6445b5b122ac99761cc9f5d6bdba29cfb4d4ee23cb77974972ab911a44ecbfc43ee1d913f3e8c01b6d15cd903e55e94529f4

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx
+  - rbx-2
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.mongoid-2.4.x
@@ -26,6 +26,6 @@ matrix:
     - rvm: jruby-19mode
       gemfile: gemfiles/Gemfile.mongoid-2.4.x
       env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: rbx
+    - rvm: rbx-2
       gemfile: gemfiles/Gemfile.mongoid-2.4.x
       env: SSL_CERT_DIR=/etc/ssl/certs

data/CHANGELOG.md

@@ -3,6 +3,12 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.2.2 (2014 Jun 12)
+
+* Add ability to specify language per query (thanks github.com/mkristian).
+* Handle Errno::ECONNREFUSED exceptions like TimeoutError exceptions.
+* Switch to 'unstructured' query format for Bing API (thanks github.com/lukewendling).
+
 1.2.1 (2014 May 12)
 -------------------
 

data/README.md

@@ -388,8 +388,6 @@ The following is a comparison of the supported geocoding APIs. The "Limitations"
 
 #### Yahoo BOSS (`:yahoo`)
 
-Yahoo BOSS is **not a free service**. As of November 17, 2012 Yahoo no longer offers a free geocoding API.
-
 * **API key**: requires OAuth consumer key and secret (set `Geocoder.configure(:api_key => [key, secret])`)
 * **Key signup**: http://developer.yahoo.com/boss/geo/
 * **Quota**: unlimited, but subject to usage fees
@@ -578,6 +576,7 @@ Data Science Toolkit provides an API whose reponse format is like Google's but w
 * **Documentation**: http://github.com/fiorix/freegeoip/blob/master/README.md
 * **Terms of Service**: ?
 * **Limitations**: ?
+* **Notes**: If you are running your own local instance of the FreeGeoIP service you can configure the host like this: `Geocoder.configure(freegeoip: {host: "..."})`.
 
 #### MaxMind Web Services (`:maxmind`)
 

data/lib/geocoder/lookups/base.rb

@@ -169,6 +169,8 @@ module Geocoder
         parse_raw_data fetch_raw_data(query)
       rescue SocketError => err
         raise_error(err) or warn "Geocoding API connection cannot be established."
+      rescue Errno::ECONNREFUSED => err
+        raise_error(err) or warn "Geocoding API connection refused."
       rescue TimeoutError => err
         raise_error(err) or warn "Geocoding API not responding fast enough " +
           "(use Geocoder.configure(:timeout => ...) to set limit)."

data/lib/geocoder/lookups/bing.rb

@@ -27,7 +27,9 @@ module Geocoder::Lookup
       if !query.reverse_geocode? and r = query.options[:region]
         url << "/#{r}"
       end
-      url + "/" + URI.escape(query.sanitized_text.strip) + "?"
+      # use the more forgiving 'unstructured' query format to allow special
+      # chars, newlines, brackets, typos.
+      url + "?q=" + URI.escape(query.sanitized_text.strip) + "&"
     end
 
     def results(query)

data/lib/geocoder/lookups/google.rb

@@ -44,7 +44,7 @@ module Geocoder::Lookup
       params = {
         (query.reverse_geocode? ? :latlng : :address) => query.sanitized_text,
         :sensor => "false",
-        :language => configuration.language
+        :language => (query.language || configuration.language)
       }
       unless (bounds = query.options[:bounds]).nil?
         params[:bounds] = bounds.map{ |point| "%f,%f" % point }.join('|')

data/lib/geocoder/lookups/nominatim.rb

@@ -37,7 +37,7 @@ module Geocoder::Lookup
       params = {
         :format => "json",
         :addressdetails => "1",
-        :"accept-language" => configuration.language
+        :"accept-language" => (query.language || configuration.language)
       }.merge(super)
       if query.reverse_geocode?
         lat,lon = query.coordinates

data/lib/geocoder/lookups/yahoo.rb

@@ -62,11 +62,13 @@ module Geocoder::Lookup
     end
 
     def query_url_params(query)
+      lang = (query.language || configuration.language).to_s
+      lang += '_US' if lang == 'en'
       {
         :location => query.sanitized_text,
         :flags => "JXTSR",
         :gflags => "AC#{'R' if query.reverse_geocode?}",
-        :locale => "#{configuration.language}_US",
+        :locale => lang,
         :appid => configuration.api_key
       }.merge(super)
     end

data/lib/geocoder/lookups/yandex.rb

@@ -46,7 +46,7 @@ module Geocoder::Lookup
       {
         :geocode => q,
         :format => "json",
-        :plng => "#{configuration.language}", # supports ru, uk, be
+        :plng => "#{query.language || configuration.language}", # supports ru, uk, be
         :key => configuration.api_key
       }.merge(super)
     end

data/lib/geocoder/query.rb

@@ -98,6 +98,10 @@ module Geocoder
       coordinates?
     end
 
+    def language
+      options[:language]
+    end
+
     private # ----------------------------------------------------------------
 
     def params_given?

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/test_helper.rb

@@ -110,6 +110,7 @@ module Geocoder
       def make_api_request(query)
         raise TimeoutError if query.text == "timeout"
         raise SocketError if query.text == "socket_error"
+        raise Errno::ECONNREFUSED if query.text == "connection_refused"
         read_fixture fixture_for_query(query)
       end
     end

data/test/unit/error_handling_test.rb

@@ -41,4 +41,16 @@ class ErrorHandlingTest < GeocoderTestCase
       end
     end
   end
+
+  def test_always_raise_connection_refused_error
+    Geocoder.configure(:always_raise => [Errno::ECONNREFUSED])
+    Geocoder::Lookup.all_services_except_test.each do |l|
+      next if l == :maxmind_local # local, does not raise timeout
+      lookup = Geocoder::Lookup.get(l)
+      set_api_key!(l)
+      assert_raises Errno::ECONNREFUSED do
+        lookup.send(:results, Geocoder::Query.new("connection_refused"))
+      end
+    end
+  end
 end

data/test/unit/lookup_test.rb

@@ -56,6 +56,23 @@ class LookupTest < GeocoderTestCase
     end
   end
 
+  {
+    :google => :language,
+    :google_premier => :language,
+    :nominatim => :"accept-language",
+    :yahoo => :locale,
+    :yandex => :plng
+  }.each do |l,p|
+    define_method "test_passing_language_to_#{l}_query_overrides_configuration_value" do
+      set_api_key!(l)
+      url = Geocoder::Lookup.get(l).query_url(Geocoder::Query.new(
+        "test", :language => 'xxxx'
+      ))
+      assert_match(/#{p}=xxxx/, url,
+        "Param passed to #{l} lookup does not override configuration value")
+    end
+  end
+
   def test_raises_exception_on_invalid_key
     Geocoder.configure(:always_raise => [Geocoder::InvalidApiKey])
     #Geocoder::Lookup.all_services_except_test.each do |l|

data/test/unit/lookups/bing_test.rb

@@ -12,7 +12,7 @@ class BingTest < GeocoderTestCase
   def test_query_for_reverse_geocode
     lookup = Geocoder::Lookup::Bing.new
     url = lookup.query_url(Geocoder::Query.new([45.423733, -75.676333]))
-    assert_match(/Locations\/45.423733/, url)
+    assert_match(/Locations\?q=45.423733/, url)
   end
 
   def test_result_components
@@ -33,7 +33,7 @@ class BingTest < GeocoderTestCase
       "manchester",
       :region => "uk"
     ))
-    assert_match(/Locations\/uk\/manchester/, url)
+    assert_match(/Locations\/uk\?q=manchester/, url)
     assert_no_match(/query/, url)
   end
 
@@ -42,7 +42,7 @@ class BingTest < GeocoderTestCase
     url = lookup.query_url(Geocoder::Query.new(
       "manchester"
     ))
-    assert_match(/Locations\/manchester/, url)
+    assert_match(/Locations\?q=manchester/, url)
     assert_no_match(/query/, url)
   end
 
@@ -52,7 +52,7 @@ class BingTest < GeocoderTestCase
       "manchester, lancashire",
       :region => "uk"
     ))
-    assert_match(/Locations\/uk\/manchester,%20lancashire/, url)
+    assert_match(/Locations\/uk\?q=manchester,%20lancashire/, url)
     assert_no_match(/query/, url)
   end
 
@@ -62,7 +62,7 @@ class BingTest < GeocoderTestCase
       " manchester, lancashire ",
       :region => "uk"
     ))
-    assert_match(/Locations\/uk\/manchester,%20lancashire/, url)
+    assert_match(/Locations\/uk\?q=manchester,%20lancashire/, url)
     assert_no_match(/query/, url)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,