geocoder 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ba97fb2510ac5e0f739b4f7a11825f9d9bf277
-  data.tar.gz: d69a73fd1c4a6536170ac28563475def5ffed69e
+  metadata.gz: 8a859b82bf025e96ae97b006af3874e58766556b
+  data.tar.gz: 00eb37dfc6a988d08e3d4a2adcb924d0a778d9fa
 SHA512:
-  metadata.gz: a09fa3752902e9422511ea4b30b038e8b91f6a6c6ad37aad0d979864ca610b0c5e5ab80fc9b0aff94dca4bcf493056e8d84a9d1433abc3b4a6385fd1fced6ea5
-  data.tar.gz: 77e358b416b3862952f8210f9a5752e0b1e11dc8247ed3f13966fe79c64af98fd7ef31a2b5310fb9fc36bfc98bde3330cf96baca1949229e99d159d724807856
+  metadata.gz: 71456df3a167a0aaa7511c4e61869519d5dd05716d7db7be38801e997525d3d257df5511a772206a7495392b2d65fcc88a5793744cf1360bc1579af83da0e227
+  data.tar.gz: 95faab5c456a219888ad92ba6cd64c6e27a7bc19cfd729ae2997b9e61849f247acd95f9e6c47f616530fee59d879c23b1496d83fe2d6db735c0552d858b6de6e

data/CHANGELOG.md

@@ -3,6 +3,13 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.4.0 (2016 Sep  8)
+-------------------
+* Only consider an object geocoded if both lat and lon are present (previously was sufficient to have only one of the two) (thanks github.com/mltsy).
+* Add support in :geocodio lookup for Canadian addresses (thanks github.com/bolandrm).
+* Add support for SQLite extensions, if present (thanks github.com/stevecj).
+* Always include Geocoder in Rack::Request, if defined (thanks github.com/wjordan).
+
 1.3.7 (2016 Jun  9)
 -------------------
 * Fix Ruby 1.9, 2.0 incompatibility (thanks github.com/ebouchut).

data/lib/geocoder/lookups/ipinfo_io.rb

@@ -42,7 +42,14 @@ module Geocoder::Lookup
     end
 
     def reserved_result(ip)
-      {"message" => "Input string is not a valid IP address", "code" => 401}
+      {
+        "ip"           => ip,
+        "city"         => "",
+        "region"       => "",
+        "country"      => "",
+        "loc"          => "0,0",
+        "postal"       => ""
+      }
     end
 
     def query_url_params(query)

data/lib/geocoder/lookups/maxmind_geoip2.rb

@@ -15,7 +15,7 @@ module Geocoder::Lookup
     end
 
     def query_url(query)
-      "#{protocol}://geoip.maxmind.com/geoip/v2.1/#{configured_service!}/#{URI.escape(query.sanitized_text.strip)}"
+      "#{protocol}://geoip.maxmind.com/geoip/v2.1/#{configured_service!}/#{query.sanitized_text.strip}"
     end
 
     private # ---------------------------------------------------------------

data/lib/geocoder/request.rb

@@ -78,8 +78,5 @@ module Geocoder
   end
 end
 
-if defined?(ActionDispatch::Request)
-  ActionDispatch::Request.__send__(:include, Geocoder::Request)
-elsif defined?(Rack::Request)
-  Rack::Request.__send__(:include, Geocoder::Request)
-end
+ActionDispatch::Request.__send__(:include, Geocoder::Request) if defined?(ActionDispatch::Request)
+Rack::Request.__send__(:include, Geocoder::Request) if defined?(Rack::Request)

data/lib/geocoder/results/geocodio.rb

@@ -24,16 +24,24 @@ module Geocoder::Result
     alias_method :state_code, :state
 
     def zip
-      address_components["zip"]
+      # Postal code is not returned for Canada geocode results
+      address_components["zip"] || ""
     end
     alias_method :postal_code, :zip
 
     def country
-      "United States" # Geocodio only supports the US
+      # Geocodio supports US and Canada, however they don't return the full
+      # country name.
+
+      if country_code == "CA"
+        "Canada"
+      else
+        "United States"
+      end
     end
 
     def country_code
-      "US" # Geocodio only supports the US
+      address_components['country']
     end
 
     def city

data/lib/geocoder/results/ipinfo_io.rb

@@ -8,7 +8,7 @@ module Geocoder::Result
     end
 
     def coordinates
-      @data['loc'].split(",").map(&:to_f)
+      @data['loc'].to_s.split(",").map(&:to_f)
     end
 
     def city
@@ -36,7 +36,7 @@ module Geocoder::Result
     end
 
     def self.response_attributes
-      %w['ip', 'region', 'postal']
+      %w(ip region postal)
     end
 
     response_attributes.each do |a|

data/lib/geocoder/sql.rb

@@ -4,8 +4,8 @@ module Geocoder
 
     ##
     # Distance calculation for use with a database that supports POWER(),
-    # SQRT(), PI(), and trigonometric functions SIN(), COS(), ASIN(),
-    # ATAN2(), DEGREES(), and RADIANS().
+    # SQRT(), PI(), and trigonometric functions SIN(), COS(), ASIN(), 
+    # ATAN2().
     #
     # Based on the excellent tutorial at:
     # http://www.scribd.com/doc/2569355/Geo-Distance-Search-with-MySQL
@@ -59,6 +59,9 @@ module Geocoder
     # and an options hash which must include a :bearing value
     # (:linear or :spherical).
     #
+    # For use with a database that supports MOD() and trigonometric functions
+    # SIN(), COS(), ASIN(), ATAN2().
+    #
     # Based on:
     # http://www.beginningspatial.com/calculating_bearing_one_point_another
     #

data/lib/geocoder/stores/active_record.rb

@@ -138,7 +138,7 @@ module Geocoder::Store
         ]
         bounding_box_conditions = Geocoder::Sql.within_bounding_box(*args)
 
-        if using_sqlite?
+        if using_unextended_sqlite?
           conditions = bounding_box_conditions
         else
           min_radius = options.fetch(:min_radius, 0).to_f
@@ -160,7 +160,7 @@ module Geocoder::Store
       # capabilities (trig functions?).
       #
       def distance_sql(latitude, longitude, options = {})
-        method_prefix = using_sqlite? ? "approx" : "full"
+        method_prefix = using_unextended_sqlite? ? "approx" : "full"
         Geocoder::Sql.send(
           method_prefix + "_distance",
           latitude, longitude,
@@ -179,7 +179,7 @@ module Geocoder::Store
           options[:bearing] = Geocoder.config.distances
         end
         if options[:bearing]
-          method_prefix = using_sqlite? ? "approx" : "full"
+          method_prefix = using_unextended_sqlite? ? "approx" : "full"
           Geocoder::Sql.send(
             method_prefix + "_bearing",
             latitude, longitude,
@@ -225,8 +225,20 @@ module Geocoder::Store
         conditions
       end
 
+      def using_unextended_sqlite?
+        using_sqlite? && !using_sqlite_with_extensions?
+      end
+
       def using_sqlite?
-        connection.adapter_name.match(/sqlite/i)
+        !!connection.adapter_name.match(/sqlite/i)
+      end
+
+      def using_sqlite_with_extensions?
+        connection.adapter_name.match(/sqlite/i) &&
+          defined?(::SqliteExt) &&
+          %W(MOD POWER SQRT PI SIN COS ASIN ATAN2).all?{ |fn_name|
+            connection.raw_connection.function_created?(fn_name)
+          }
       end
 
       def using_postgres?
@@ -244,7 +256,7 @@ module Geocoder::Store
       # Value which can be passed to where() to produce no results.
       #
       def false_condition
-        using_sqlite? ? 0 : "false"
+        using_unextended_sqlite? ? 0 : "false"
       end
 
       ##

data/lib/geocoder/stores/base.rb

@@ -6,7 +6,7 @@ module Geocoder
       # Is this object geocoded? (Does it have latitude and longitude?)
       #
       def geocoded?
-        to_coordinates.compact.size > 0
+        to_coordinates.compact.size == 2
       end
 
       ##

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.3.7"
+  VERSION = "1.4.0"
 end

data/lib/tasks/geocoder.rake

@@ -7,7 +7,7 @@ namespace :geocode do
     reverse = ENV['REVERSE'] || ENV['reverse']
     raise "Please specify a CLASS (model)" unless class_name
     klass = class_from_string(class_name)
-    batch = batch.to_i unless batch.nil?
+    batch = (batch.to_i unless batch.nil?) || 1000
     reverse = false unless reverse.to_s.downcase == 'true'
 
     if reverse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-09-08 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,