geocoder 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f0267dc6d6f5b13f1a3a26f1c901e88618e9cc
-  data.tar.gz: d571a2205694b66dac921798eb8ae8c6d497a92e
+  metadata.gz: 29ab290c8d6f4d7604e92add7c07f37b47b9f7c1
+  data.tar.gz: 6cbd84ac0eac3f768f68e69024232c3ab489ee48
 SHA512:
-  metadata.gz: 78e3b5fe48c4f6827e71345e85a6edfddbb14efcaa05ebdb57ad63f7f0f4b8bf4a653e9ab75da333ebec94eb9e14745b62181cf3f77e4b958dc2840549888017
-  data.tar.gz: 389bd66826e1f2878ff49d55cf6f6445b5b122ac99761cc9f5d6bdba29cfb4d4ee23cb77974972ab911a44ecbfc43ee1d913f3e8c01b6d15cd903e55e94529f4
+  metadata.gz: 29cebb43ee5215ccf28154c5e8f41985f5079cc6f765fedfae222e17379ecad604977ec5fc92f1f5ba9dd17c7d26f60c96df9a6b8372eced7d5a7814dc4b1c0b
+  data.tar.gz: 07e490262d72393456d1915dfb054b16448e454a6f14f1e910a21758547b73c6e03abd2dfa66a7b8966ec6758e91bd0ea3d1d00ee1a077b0202071ed59155acb

data/.travis.yml

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

data/CHANGELOG.md

@@ -3,6 +3,11 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
+1.2.3 (2014 June 11)
+
+* Add Telize IP address lookup (thanks github.com/lukeroberts1990).
+* Fix bug in Bing reverse geocoding (thanks github.com/nickelser).
+
 1.2.2 (2014 Jun 12)
 
 * Add ability to specify language per query (thanks github.com/mkristian).

data/README.md

@@ -306,7 +306,13 @@ If you're familiar with the results returned by the geocoding service you're usi
 Geocoding Service ("Lookup") Configuration
 ------------------------------------------
 
-Geocoder supports a variety of street and IP address geocoding services. The default lookups are `:google` for street addresses and `:freegeoip` for IP addresses. Please see the listing and comparison below for details on specific geocoding services (not all settings are supported by all services). Some common configuration options are:
+Geocoder supports a variety of street and IP address geocoding services. The default lookups are `:google` for street addresses and `:freegeoip` for IP addresses. Please see the listing and comparison below for details on specific geocoding services (not all settings are supported by all services).
+
+To create a Rails initializer with an example configuration:
+
+    rails generate geocoder:config
+
+Some common configuration options are:
 
     # config/initializers/geocoder.rb
     Geocoder.configure(
@@ -576,7 +582,18 @@ 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: "..."})`.
+* **Notes**: If you are [running your own local instance of the FreeGeoIP service](https://github.com/fiorix/freegeoip) you can configure the host like this: `Geocoder.configure(freegeoip: {host: "..."})`.
+
+#### Telize (`:telize`)
+
+* **API key**: none
+* **Quota**: none
+* **Region**: world
+* **SSL support**: no
+* **Languages**: English
+* **Documentation**: http://www.telize.com/
+* **Terms of Service**: ?
+* **Limitations**: ?
 
 #### MaxMind Web Services (`:maxmind`)
 
@@ -614,12 +631,12 @@ This lookup provides methods for geocoding IP addresses without making a call to
 
 You can generate ActiveRecord migrations and download and import data via provided rake tasks:
 
-    rails generate geocoder:maxmind:geolite_city
+    rails generate geocoder:maxmind:geolite PACKAGE=city
 
-    rake geocoder:maxmind:geolite_city:download
-    rake geocoder:maxmind:geolite_city:extract
-    rake geocoder:maxmind:geolite_city:insert
-    rake geocoder:maxmind:geolite_city:load # runs the above three in sequence
+    rake geocoder:maxmind:geolite:download PACKAGE=city
+    rake geocoder:maxmind:geolite:extract PACKAGE=city
+    rake geocoder:maxmind:geolite:insert PACKAGE=city
+    rake geocoder:maxmind:geolite:load PACKAGE=city # runs the above three in sequence
 
 You can replace `city` with `country` in any of the above tasks, generators, and configurations.
 

data/lib/geocoder/lookup.rb

@@ -47,10 +47,11 @@ module Geocoder
     #
     def ip_services
       [
+        :baidu_ip,
         :freegeoip,
         :maxmind,
         :maxmind_local,
-        :baidu_ip
+        :telize
       ]
     end
 

data/lib/geocoder/lookups/bing.rb

@@ -24,12 +24,17 @@ module Geocoder::Lookup
 
     def base_url(query)
       url = "#{protocol}://dev.virtualearth.net/REST/v1/Locations"
-      if !query.reverse_geocode? and r = query.options[:region]
-        url << "/#{r}"
+
+      if !query.reverse_geocode?
+        if r = query.options[:region]
+          url << "/#{r}"
+        end
+        # use the more forgiving 'unstructured' query format to allow special
+        # chars, newlines, brackets, typos.
+        url + "?q=" + URI.escape(query.sanitized_text.strip) + "&"
+      else
+        url + "/#{URI.escape(query.sanitized_text.strip)}?"
       end
-      # 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/telize.rb

@@ -0,0 +1,36 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/telize'
+
+module Geocoder::Lookup
+  class Telize < Base
+
+    def name
+      "Telize"
+    end
+
+    def query_url(query)
+      #currently doesn't support HTTPS
+      "http://www.telize.com/geoip/#{query.sanitized_text}"
+    end
+
+    private # ---------------------------------------------------------------
+
+    def results(query)
+      # don't look up a loopback address, just return the stored result
+      return [reserved_result(query.text)] if query.loopback_ip_address?
+      if (doc = fetch_data(query)).nil? or doc['code'] == 401 or empty_result?(doc)
+        []
+      else
+        [doc]
+      end
+    end
+
+    def empty_result?(doc)
+      !doc.is_a?(Hash) or doc.keys == ["ip"]
+    end
+
+    def reserved_result(ip)
+      {"message" => "Input string is not a valid IP address", "code" => 401}
+    end
+  end
+end

data/lib/geocoder/results/telize.rb

@@ -0,0 +1,45 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Telize < Base
+
+    def address(format = :full)
+      s = state_code.to_s == "" ? "" : ", #{state_code}"
+      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
+    end
+
+    def city
+      @data['city']
+    end
+
+    def state
+      @data['region']
+    end
+
+    def state_code
+      @data['region_code']
+    end
+
+    def country
+      @data['country']
+    end
+
+    def country_code
+      @data['country_code']
+    end
+
+    def postal_code
+      @data['postal_code']
+    end
+
+    def self.response_attributes
+      %w[timezone isp dma_code area_code ip asn continent_code country_code3]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a]
+      end
+    end
+  end
+end

data/lib/geocoder/version.rb

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

data/test/fixtures/telize_10_10_10_10

@@ -0,0 +1 @@
+{"ip":"10.10.10.10"}

data/test/fixtures/telize_555_555_555_555

@@ -0,0 +1,4 @@
+{
+"message": "Input string is not a valid IP address",
+"code": 401
+}

data/test/fixtures/telize_74_200_247_59

@@ -0,0 +1 @@
+{"timezone":"America\/Chicago","isp":"Layered Technologies, Inc.","region_code":"TX","country":"United States","dma_code":"0","area_code":"0","region":"Texas","ip":"74.200.247.59","asn":"AS22576","continent_code":"NA","city":"Plano","postal_code":"75093","longitude":-96.8134,"latitude":33.0347,"country_code":"US","country_code3":"USA"}

data/test/fixtures/telize_no_results

@@ -0,0 +1 @@
+{"ip":"10.10.10.10"}

data/test/test_helper.rb

@@ -143,6 +143,13 @@ module Geocoder
       end
     end
 
+    class Telize
+      private
+      def default_fixture_filename
+        "telize_74_200_247_59"
+      end
+    end
+
     class Maxmind
       private
       def default_fixture_filename

data/test/unit/lookup_test.rb

@@ -23,7 +23,7 @@ class LookupTest < GeocoderTestCase
 
   def test_query_url_contains_values_in_params_hash
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :freegeoip || l == :maxmind_local # does not use query string
+      next if [:freegeoip, :maxmind_local, :telize].include? l # does not use query string
       set_api_key!(l)
       url = Geocoder::Lookup.get(l).query_url(Geocoder::Query.new(
         "test", :params => {:one_in_the_hand => "two in the bush"}

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\?q=45.423733/, url)
+    assert_match(/Locations\/45.423733/, url)
   end
 
   def test_result_components

data/test/unit/lookups/telize_test.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
+require 'test_helper'
+
+class TelizeTest < GeocoderTestCase
+
+  def setup
+    Geocoder.configure(ip_lookup: :telize)
+  end
+
+  def test_result_on_ip_address_search
+    result = Geocoder.search("74.200.247.59").first
+    assert result.is_a?(Geocoder::Result::Telize)
+  end
+
+  def test_result_components
+    result = Geocoder.search("74.200.247.59").first
+    assert_equal "Plano, TX 75093, United States", result.address
+  end
+
+  def test_no_results
+    results = Geocoder.search("10.10.10.10")
+    assert_equal 0, results.length
+  end
+
+  def test_invalid_address
+    results = Geocoder.search("555.555.555.555")
+    assert_equal 0, results.length
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-11 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,
@@ -67,6 +67,7 @@ files:
 - lib/geocoder/lookups/nominatim.rb
 - lib/geocoder/lookups/ovi.rb
 - lib/geocoder/lookups/smarty_streets.rb
+- lib/geocoder/lookups/telize.rb
 - lib/geocoder/lookups/test.rb
 - lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
@@ -98,6 +99,7 @@ files:
 - lib/geocoder/results/nominatim.rb
 - lib/geocoder/results/ovi.rb
 - lib/geocoder/results/smarty_streets.rb
+- lib/geocoder/results/telize.rb
 - lib/geocoder/results/test.rb
 - lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
@@ -170,6 +172,10 @@ files:
 - test/fixtures/smarty_streets_11211
 - test/fixtures/smarty_streets_madison_square_garden
 - test/fixtures/smarty_streets_no_results
+- test/fixtures/telize_10_10_10_10
+- test/fixtures/telize_555_555_555_555
+- test/fixtures/telize_74_200_247_59
+- test/fixtures/telize_no_results
 - test/fixtures/yahoo_error
 - test/fixtures/yahoo_invalid_key
 - test/fixtures/yahoo_madison_square_garden
@@ -206,6 +212,7 @@ files:
 - test/unit/lookups/maxmind_test.rb
 - test/unit/lookups/nominatim_test.rb
 - test/unit/lookups/smarty_streets_test.rb
+- test/unit/lookups/telize_test.rb
 - test/unit/lookups/yahoo_test.rb
 - test/unit/method_aliases_test.rb
 - test/unit/model_test.rb