geocoder 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3067b487565dbc6f761d20315246d3524e350a4
-  data.tar.gz: a2e89172c147db3050c203e6507da323e54d8a58
+  metadata.gz: 71a3f14779563a0e64bcd6929d538dbbc46b41c3
+  data.tar.gz: 4a9b31b197ed4970caa46593b64afa68be37dc1d
 SHA512:
-  metadata.gz: 811f3224d6926014a1c910b605fd6644078c4808893552b8cedd31987650616323e54ba74564f20cbafbe61b39eb1b347e80912d69ab5c2f84153b4281800408
-  data.tar.gz: bc6301d8b24595749190b0d527ffcd8aecc1f8a804b1fc9cacc68bc7c61b92ea8f544940f09306a428653d65a28bc76536a7545cc76a5d3fd144e3a4c12aa86c
+  metadata.gz: f9160c54cdb4327cc02cb195865e0018c50a3f90879eff9f0db898f7f8d445e6d421d941c7e99ca9c3d51484cf726c8ec0c7ddeb0f23d1629d90a91548167457
+  data.tar.gz: c7b57fbb01fbe1f9a417dfb42c99dd151127824279e7dd56604b3eced51e24c6a5f795f312ed7ae90a81b3157e5ba0bf599692255702bc670dd28ecbf45f0d63

data/CHANGELOG.md

@@ -3,6 +3,10 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.4.2 (2017 Jan 31)
+-------------------
+* Fix bug that caused Model.near to return an incorrect query in some cases.
+
 1.4.1 (2016 Dec  2)
 -------------------
 * Add :location_iq lookup (thanks github.com/aleemuddin13 and glsignal).

data/README.md

@@ -15,8 +15,8 @@ Compatibility
 * Works very well outside of Rails, you just need to install either the `json` (for MRI) or `json_pure` (for JRuby) gem.
 
 
-Rails 4.1 Note
---------------
+Note on Rails 4.1 and Greater
+-----------------------------
 
 Due to [a change in ActiveRecord's `count` method](https://github.com/rails/rails/pull/10710) you will need to use `count(:all)` to explicitly count all columns ("*") when using a `near` scope. Using `near` and calling `count` with no argument will cause exceptions in many cases.
 
@@ -402,7 +402,7 @@ The following is a comparison of the supported geocoding APIs. The "Limitations"
 #### Google (`:google`)
 
 * **API key**: optional, but quota is higher if key is used (use of key requires HTTPS so be sure to set: `:use_https => true` in `Geocoder.configure`)
-* **Key signup**: https://console.developers.google.com//flows/enableapi?apiid=geocoding_backend&keyType=SERVER_SIDE
+* **Key signup**: https://console.developers.google.com/flows/enableapi?apiid=geocoding_backend&keyType=SERVER_SIDE
 * **Quota**: 2,500 requests/24 hrs, 5 requests/second
 * **Region**: world
 * **SSL support**: yes (required if key is used)
@@ -516,7 +516,7 @@ The [Google Places Details API](https://developers.google.com/places/documentati
 #### Mapbox (`:mapbox`)
 
 * **API key**: required
-* **Dataset**: Uses `mapbox.places` dataset by default.  Specific the `mapbox.places-permanent` dataset by setting: `Geocoder.configure(:mapbox => {:dataset => "mapbox.places-permanent"})`
+* **Dataset**: Uses `mapbox.places` dataset by default.  Specify the `mapbox.places-permanent` dataset by setting: `Geocoder.configure(:mapbox => {:dataset => "mapbox.places-permanent"})`
 * **Key signup**: https://www.mapbox.com/pricing/
 * **Quota**: depends on plan
 * **Region**: complete coverage of US and Canada, partial coverage elsewhere (see for details: https://www.mapbox.com/developers/api/geocoding/#coverage)

data/lib/geocoder/calculations.rb

@@ -42,7 +42,12 @@ module Geocoder
     # Returns true if all given arguments are valid latitude/longitude values.
     #
     def coordinates_present?(*args)
-      args.all? { |a| a.is_a? Numeric and !a.to_f.nan? }
+      args.each do |a|
+        # note that Float::NAN != Float::NAN
+        # still, this could probably be improved:
+        return false if (!a.is_a?(Numeric) or a.to_s == "NaN")
+      end
+      true
     end
 
     ##
@@ -392,8 +397,13 @@ module Geocoder
     def extract_coordinates(point)
       case point
       when Array
-        if point.size == 2 and coordinates_present?(*point)
-          return point.map {|coords| coords.to_f}
+        if point.size == 2
+          lat, lon = point
+          if !lat.nil? && lat.respond_to?(:to_f) and
+            !lon.nil? && lon.respond_to?(:to_f)
+          then
+            return [ lat.to_f, lon.to_f ]
+          end
         end
       when String
         point = Geocoder.coordinates(point) and return point

data/lib/geocoder/lookups/smarty_streets.rb

@@ -15,7 +15,7 @@ module Geocoder::Lookup
       if zipcode_only?(query)
         "#{protocol}://us-zipcode.api.smartystreets.com/lookup?#{url_query_string(query)}"
       else
-        "#{protocol}://api.smartystreets.com/street-address?#{url_query_string(query)}"
+        "#{protocol}://us-street.api.smartystreets.com/street-address?#{url_query_string(query)}"
       end
     end
 

data/lib/geocoder/results/nominatim.rb

@@ -4,9 +4,7 @@ module Geocoder::Result
   class Nominatim < Base
 
     def poi
-      %w[building university school hospital mall hotel restaurant stadium bus_stop tram_stop].each do |key|
-        return @data['address'][key] if @data['address'].key?(key)
-      end
+      return @data['address'][place_type] if @data['address'].key?(place_type)
       return nil
     end
 

data/lib/geocoder/results/yandex.rb

@@ -25,11 +25,19 @@ module Geocoder::Result
     end
 
     def country
-      address_details['CountryName']
+      if address_details
+        address_details['CountryName']
+      else
+        ""
+      end
     end
 
     def country_code
-      address_details['CountryNameCode']
+      if address_details
+        address_details['CountryNameCode']
+      else
+        ""
+      end
     end
 
     def state

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/lib/tasks/geocoder.rake

@@ -1,3 +1,5 @@
+require "geocoder/models/mongoid" 
+
 namespace :geocode do
   desc "Geocode all objects without coordinates."
   task :all => :environment do
@@ -8,22 +10,28 @@ namespace :geocode do
     raise "Please specify a CLASS (model)" unless class_name
     klass = class_from_string(class_name)
     batch = (batch.to_i unless batch.nil?) || 1000
+    orm = (klass < Geocoder::Model::Mongoid) ? 'mongoid' : 'active_record'
     reverse = false unless reverse.to_s.downcase == 'true'
 
-    if reverse
-      klass.not_reverse_geocoded.find_each(batch_size: batch) do |obj|
-        obj.reverse_geocode; obj.save
-        sleep(sleep_timer.to_f) unless sleep_timer.nil?
+    geocode_record = lambda { |obj|
+      reverse ? obj.reverse_geocode : obj.geocode
+      obj.save
+      sleep(sleep_timer.to_f) unless sleep_timer.nil?
+    }
+
+    scope = reverse ? klass.not_reverse_geocoded : klass.not_geocoded
+    if orm == 'mongoid'
+      scope.each do |obj|
+        geocode_record.call(obj)
       end
-    else
-      klass.not_geocoded.find_each(batch_size: batch) do |obj|
-        obj.geocode; obj.save
-        sleep(sleep_timer.to_f) unless sleep_timer.nil?
+    elsif orm == 'active_record'
+      scope.find_each(batch_size: batch) do |obj|
+        geocode_record.call(obj)
       end
     end
+
   end
 end
-
 ##
 # Get a class object from the string given in the shell environment.
 # Similar to ActiveSupport's +constantize+ method.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-01-31 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,
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.