geocoder 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbab97a77881d1d3e78e4016db9ed11c3592c96
-  data.tar.gz: e553d469d6d9e2148efdc12476c4a36d11f1096e
+  metadata.gz: 47da8a4b65f982fc2063b17aa979e48bd0747ff8
+  data.tar.gz: e248d9065a8228d98597639be3fb03cf012dc93b
 SHA512:
-  metadata.gz: 0f9e1bf14f86d2465efb15a9b2531bdc227cc7b5b73a096abb9510dcc4af83c36d28a718138b934f37b275b89b09f783610ea7990b92dd06db0493d90b2d35bd
-  data.tar.gz: 9e5e70a01776b4e2ab0baae341b8151dbc435ec20c3a5da7851b5c5f0c7df343d188a9092fe746c99ec653753cb9a9cd32d9c8aa22de02c95475bbc28f530ca2
+  metadata.gz: 5db5819f29c54c1923c31e80717ede54948f987fe086600f166a748b2b5b8c8d3cb021638f261792c95dfbeb13d7e243047e13351dc7edc205535b871b383361
+  data.tar.gz: 3bbf41ec2823259eeffe13e6d90a0aac72710a4dd4e728caca64ed9d7dc550a9306cae0bcf9cd19d9ba6b6797a7b51f1e2c9720ef0bb9f88e9878b547c951c0c

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.5 (2014 Sep 12)
+-------------------
+* Fix bugs in :opencagedata lookup (thanks github.com/duboff and kayakyakr).
+* Allow language to be set in model configuration (thanks github.com/viniciusnz).
+* Optimize lookup queries when using MaxMind Local (thanks github.com/gersmann).
+
 1.2.4 (2014 Aug 12)
 -------------------
 * Add ability to specify lat/lon column names with .near scope (thanks github.com/switzersc).

data/README.md

@@ -566,7 +566,7 @@ Data Science Toolkit provides an API whose reponse format is like Google's but w
 #### SmartyStreets (`:smarty_streets`)
 
 * **API key**: required
-* **Quota**: 10,000 free, 250/month then purchase at sliding scale. Unlimited free for nonprofits & startups
+* **Quota**: 10,000 free, 250/month then purchase at sliding scale.
 * **Region**: US
 * **SSL support**: yes
 * **Languages**: en

data/lib/generators/geocoder/maxmind/templates/migration/geolite_city.rb

@@ -5,7 +5,9 @@ class GeocoderMaxmindGeoliteCity < ActiveRecord::Migration
       t.column :end_ip_num, :bigint, null: false
       t.column :loc_id, :bigint, null: false
     end
+    add_index :maxmind_geolite_city_blocks, :loc_id
     add_index :maxmind_geolite_city_blocks, :start_ip_num, unique: true
+    add_index :maxmind_geolite_city_blocks, [:end_ip_num, :start_ip_num], unique: true, name: 'index_maxmind_geolite_city_blocks_on_end_ip_num_range'
 
     create_table :maxmind_geolite_city_location, id: false do |t|
       t.column :loc_id, :bigint, null: false

data/lib/geocoder/lookups/maxmind_local.rb

@@ -35,8 +35,8 @@ module Geocoder::Lookup
       elsif configuration[:package] == :city
         addr = IPAddr.new(query.text).to_i
         q = "SELECT l.country, l.region, l.city, l.latitude, l.longitude
-          FROM maxmind_geolite_city_location l JOIN maxmind_geolite_city_blocks b USING (loc_id)
-          WHERE b.start_ip_num <= #{addr} AND #{addr} <= b.end_ip_num"
+          FROM maxmind_geolite_city_location l WHERE l.loc_id = (SELECT b.loc_id FROM maxmind_geolite_city_blocks b
+          WHERE b.start_ip_num <= #{addr} AND #{addr} <= b.end_ip_num)"
         format_result(q, [:country_name, :region_name, :city_name, :latitude, :longitude])
       elsif configuration[:package] == :country
         addr = IPAddr.new(query.text).to_i

data/lib/geocoder/lookups/opencagedata.rb

@@ -9,7 +9,7 @@ module Geocoder::Lookup
     end
 
     def query_url(query)
-      "#{protocol}://api.opencagedata.com/geocode/v1/json?key=#{configuration.api_key}&q=#{url_query_string(query)}"
+      "#{protocol}://api.opencagedata.com/geocode/v1/json?key=#{configuration.api_key}&#{url_query_string(query)}"
     end
 
     def required_api_key_parts
@@ -21,7 +21,7 @@ module Geocoder::Lookup
     def results(query)
       return [] unless doc = fetch_data(query)
       # return doc["results"]
-      
+
       messages = doc['status']['message']
       case doc['status']['code']
       when 400 # Error with input
@@ -43,7 +43,7 @@ module Geocoder::Lookup
 
     def query_url_params(query)
       params = {
-        :query => query.sanitized_text,
+        :q => query.sanitized_text,
         :language => (query.language || configuration.language)
       }.merge(super)
 

data/lib/geocoder/models/active_record.rb

@@ -17,7 +17,8 @@ module Geocoder
           :geocode_block => block,
           :units         => options[:units],
           :method        => options[:method],
-          :lookup        => options[:lookup]
+          :lookup        => options[:lookup],
+          :language      => options[:language]
         )
       end
 
@@ -33,7 +34,8 @@ module Geocoder
           :reverse_block   => block,
           :units           => options[:units],
           :method          => options[:method],
-          :lookup          => options[:lookup]
+          :lookup          => options[:lookup],
+          :language        => options[:language]
         )
       end
 

data/lib/geocoder/models/mongo_base.rb

@@ -20,7 +20,8 @@ module Geocoder
           :units         => options[:units],
           :method        => options[:method],
           :skip_index    => options[:skip_index] || false,
-          :lookup        => options[:lookup]
+          :lookup        => options[:lookup],
+          :language      => options[:language]
         )
       end
 
@@ -36,7 +37,8 @@ module Geocoder
           :units           => options[:units],
           :method          => options[:method],
           :skip_index      => options[:skip_index] || false,
-          :lookup          => options[:lookup]
+          :lookup          => options[:lookup],
+          :language        => options[:language]
         )
       end
 

data/lib/geocoder/results/opencagedata.rb

@@ -64,7 +64,7 @@ module Geocoder::Result
     end
 
     def coordinates
-      [@data['lat'].to_f, @data['lon'].to_f]
+      [@data['geometry']['lat'].to_f, @data['geometry']['lng'].to_f]
     end
     def self.response_attributes
       %w[boundingbox license 

data/lib/geocoder/stores/base.rb

@@ -101,7 +101,7 @@ module Geocoder
           return
         end
 
-        query_options = [:lookup, :ip_lookup].inject({}) do |hash, key|
+        query_options = [:lookup, :ip_lookup, :language].inject({}) do |hash, key|
           if options.has_key?(key)
             val = options[key]
             hash[key] = val.respond_to?(:call) ? val.call(self) : val

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/test/unit/lookups/opencagedata_test.rb

@@ -34,7 +34,7 @@ class OpencagedataTest < GeocoderTestCase
 
   def test_opencagedata_reverse_url
     query = Geocoder::Query.new([45.423733, -75.676333])
-    assert_match /\bquery=45.423733%2C-75.676333\b/, query.url
+    assert_match /\bq=45.423733%2C-75.676333\b/, query.url
   end
 
 

data/test/unit/result_test.rb

@@ -56,7 +56,9 @@ class ResultTest < GeocoderTestCase
     m = "Lookup #{Geocoder.config.lookup} does not support %s attribute."
     assert result.coordinates.is_a?(Array),    m % "coordinates"
     assert result.latitude.is_a?(Float),       m % "latitude"
+    assert result.latitude != 0.0,             m % "latitude"
     assert result.longitude.is_a?(Float),      m % "longitude"
+    assert result.longitude != 0.0,            m % "longitude"
     assert result.city.is_a?(String),          m % "city"
     assert result.state.is_a?(String),         m % "state"
     assert result.state_code.is_a?(String),    m % "state_code"

metadata

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