geocoder 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a9925e759e3cd83f49edbe16d9258f047d4706
-  data.tar.gz: 647fe2e7bc4731707a75dde07c8eec629622821a
+  metadata.gz: 6a87e48d6ef8d83ba7431093b99731ed6488d901
+  data.tar.gz: 813db65901b6ce424544968d1cc8c1bfa78425a0
 SHA512:
-  metadata.gz: 1515913cc2e937453458d947421278666ffda78d9388480080fb3af5978cd0a7efd89a5272f33fdfb46e9b89899b675d3064b276cf8b8e97091ce6b218d91f7f
-  data.tar.gz: f76ddc572cfb359718ee5da19451462bfeb442a4986560afb6837444756dcfbaf32d3a36025977d08ab68f9e7f9223ef236ec5c354240932c93b90e42dbb1a3b
+  metadata.gz: 99aa2501a9fbc16abe3a0fd7b354b3d29f51653507f463a1692aebb00e1f41b8e3f9b41d1a2e493aadba7f42c44cd66c3082d3e9147732cb1703c92aa11fc354
+  data.tar.gz: 64094ce5902e6471e958810e4438feec04f6e9f7a9fdfd99a79262d3d1cf5a8b84196eb57c6ff3343cb2e262d650194ec23adb686f73e31f4df086c601c0656e

data/CHANGELOG.md

@@ -3,8 +3,14 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.2.1 (2014 May 12)
+-------------------
+
+* Fix: correctly handle encoding of MaxMind API responses (thanks github.com/hydrozen, gonzoyumo).
+* Fixes to :maxmind_local database structure (thanks github.com/krakatoa).
+
 1.2.0 (2014 Apr 16)
------------
+-------------------
 
 * DROP SUPPORT for Ruby 1.8.x.
 * Add :here lookup (thanks github.com/christoph-buente).

data/README.md

@@ -660,8 +660,12 @@ By default the prefix is `geocoder:`
 
 If you need to expire cached content:
 
-    Geocoder.cache.expire("http://...") # expire cached result for a URL
-    Geocoder.cache.expire(:all)         # expire all cached results
+    Geocoder::Lookup.get(Geocoder.config[:lookup]).cache.expire(:all)  # expire cached results for current Lookup
+    Geocoder::Lookup.get(:google).cache.expire("http://...")           # expire cached result for a specific URL
+    Geocoder::Lookup.get(:google).cache.expire(:all)                   # expire cached results for Google Lookup
+    # expire all cached results for all Lookups.
+    # Be aware that this methods spawns a new Lookup object for each Service
+    Geocoder::Lookup.all_services.each{|service| Geocoder::Lookup.get(service).cache.expire(:all)}
 
 Do *not* include the prefix when passing a URL to be expired. Expiring `:all` will only expire keys with the configured prefix (won't kill every entry in your key/value store).
 

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

@@ -22,6 +22,7 @@ class GeocoderMaxmindGeoliteCity < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :maxmind_geolite_city
+    drop_table :maxmind_geolite_city_location
+    drop_table :maxmind_geolite_city_blocks
   end
 end

data/lib/geocoder/lookups/maxmind.rb

@@ -71,7 +71,9 @@ module Geocoder::Lookup
     end
 
     def parse_raw_data(raw_data)
-      CSV.parse_line raw_data
+      # Maxmind just returns text/plain as csv format but according to documentation,
+      # we get ISO-8859-1 encoded string. We need to convert it.
+      CSV.parse_line raw_data.force_encoding("ISO-8859-1").encode("UTF-8")
     end
 
     def reserved_result

data/lib/geocoder/lookups/maxmind_local.rb

@@ -34,10 +34,10 @@ module Geocoder::Lookup
         result.nil? ? [] : [result.to_hash]
       elsif configuration[:package] == :city
         addr = IPAddr.new(query.text).to_i
-        q = "SELECT l.country, l.region, l.city
+        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"
-        format_result(q, [:country_name, :region_name, :city_name])
+        format_result(q, [:country_name, :region_name, :city_name, :latitude, :longitude])
       elsif configuration[:package] == :country
         addr = IPAddr.new(query.text).to_i
         q = "SELECT country, country_code FROM maxmind_geolite_country

data/lib/geocoder/version.rb

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

data/lib/maxmind_database.rb

@@ -83,7 +83,7 @@ module Geocoder
       case package
       when :geolite_city_csv
         # use the last two in case multiple versions exist
-        files = Dir.glob(File.join(dir, "GeoLiteCity_*/*.csv"))[-2..-1]
+        files = Dir.glob(File.join(dir, "GeoLiteCity_*/*.csv"))[-2..-1].sort
         Hash[*files.zip(["maxmind_geolite_city_blocks", "maxmind_geolite_city_location"]).flatten]
       when :geolite_country_csv
         {File.join(dir, "GeoIPCountryWhois.csv") => "maxmind_geolite_country"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-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,