geocoder 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29ab290c8d6f4d7604e92add7c07f37b47b9f7c1
-  data.tar.gz: 6cbd84ac0eac3f768f68e69024232c3ab489ee48
+  metadata.gz: 6fbab97a77881d1d3e78e4016db9ed11c3592c96
+  data.tar.gz: e553d469d6d9e2148efdc12476c4a36d11f1096e
 SHA512:
-  metadata.gz: 29cebb43ee5215ccf28154c5e8f41985f5079cc6f765fedfae222e17379ecad604977ec5fc92f1f5ba9dd17c7d26f60c96df9a6b8372eced7d5a7814dc4b1c0b
-  data.tar.gz: 07e490262d72393456d1915dfb054b16448e454a6f14f1e910a21758547b73c6e03abd2dfa66a7b8966ec6758e91bd0ea3d1d00ee1a077b0202071ed59155acb
+  metadata.gz: 0f9e1bf14f86d2465efb15a9b2531bdc227cc7b5b73a096abb9510dcc4af83c36d28a718138b934f37b275b89b09f783610ea7990b92dd06db0493d90b2d35bd
+  data.tar.gz: 9e5e70a01776b4e2ab0baae341b8151dbc435ec20c3a5da7851b5c5f0c7df343d188a9092fe746c99ec653753cb9a9cd32d9c8aa22de02c95475bbc28f530ca2

data/CHANGELOG.md

@@ -3,13 +3,19 @@ Changelog
 
 Major changes to Geocoder for each release. Please see the Git log for complete list of changes.
 
-1.2.3 (2014 June 11)
+1.2.4 (2014 Aug 12)
+-------------------
+* Add ability to specify lat/lon column names with .near scope (thanks github.com/switzersc).
+* Add OpenCageData geocoder (thanks github.com/mtmail).
+* Remove CloudMade geocoder.
 
+1.2.3 (2014 Jul 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).
 * Handle Errno::ECONNREFUSED exceptions like TimeoutError exceptions.
 * Switch to 'unstructured' query format for Bing API (thanks github.com/lukewendling).

data/README.md

@@ -272,6 +272,10 @@ lower bound (ie. think of a donut, or ring) by using the `:min_radius` option:
 
     box = Geocoder::Calculations.bounding_box(center_point, distance, :min_radius => 10.5)
 
+With ActiveRecord, you can specify alternate latitude and longitude column names for a geocoded model (useful if you store multiple sets of coordinates for each object):
+
+    Venue.near("Paris", 50, latitude: :secondary_latitude, longitude: :secondary_longitude)
+
 
 Advanced Geocoding
 ------------------
@@ -427,6 +431,17 @@ The following is a comparison of the supported geocoding APIs. The "Limitations"
 * **Terms of Service**: http://wiki.openstreetmap.org/wiki/Nominatim_usage_policy
 * **Limitations**: Please limit request rate to 1 per second and include your contact information in User-Agent headers (eg: `Geocoder.configure(:http_headers => { "User-Agent" => "your contact info" })`). Data licensed under CC-BY-SA (you must provide attribution).
 
+#### OpenCageData (`:opencagedata`)
+
+* **API key**: required
+* **Key signup**: http://geocoder.opencagedata.com
+* **Quota**: 2500 requests / day, then ability to purchase more (free during beta)
+* **Region**: world
+* **SSL support**: yes
+* **Languages**: worldwide
+* **Documentation**: http://geocoder.opencagedata.com/api.html
+* **Limitations**: Data licensed under CC-BY-SA or (you must provide attribution).
+
 #### Yandex (`:yandex`)
 
 * **API key**: none
@@ -537,17 +552,6 @@ Data Science Toolkit provides an API whose reponse format is like Google's but w
 * **Limitations**: Only good for non-commercial use. For commercial usage please check http://developer.baidu.com/map/question.htm#qa0013
 * **Notes**: To use Baidu set `Geocoder.configure(:lookup => :baidu, :api_key => "your_api_key")`.
 
-#### CloudMade (`:cloudmade`)
-
-* **API key**: required
-* **Quota**: 100,000 free requests, then purchase 100,000 more for $15
-* **Region**: world
-* **SSL support**: yes ($5 per 100,000 requests)
-* **Languages**: en
-* **Documentation**: http://cloudmade.com/documentation/geocoding
-* **Terms of Service**: http://cloudmade.com/api-terms-of-service
-* **Limitations**: ?
-
 #### Geocodio (`:geocodio`)
 
 * **API key**: required
@@ -584,6 +588,18 @@ Data Science Toolkit provides an API whose reponse format is like Google's but w
 * **Limitations**: ?
 * **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: "..."})`.
 
+#### Pointpin (`:pointpin`)
+
+* **API key**: required
+* **Quota**: 50,000/mo for €9 through 1m/mo for €49
+* **Region**: world
+* **SSL support**: yes
+* **Languages**: English
+* **Documentation**: https://pointp.in/docs/get-started
+* **Terms of Service**: https://pointp.in/terms
+* **Limitations**: ?
+* **Notes**: To use Pointpin set `Geocoder.configure(:ip_lookup => :pointpin, :api_key => "your_pointpin_api_key")`.
+
 #### Telize (`:telize`)
 
 * **API key**: none

data/lib/geocoder/lookup.rb

@@ -32,10 +32,10 @@ module Geocoder
         :yandex,
         :nominatim,
         :mapquest,
+        :opencagedata,
         :ovi,
         :here,
         :baidu,
-        :cloudmade,
         :geocodio,
         :smarty_streets,
         :test
@@ -51,7 +51,8 @@ module Geocoder
         :freegeoip,
         :maxmind,
         :maxmind_local,
-        :telize
+        :telize,
+        :pointpin
       ]
     end
 

data/lib/geocoder/lookups/base.rb

@@ -99,7 +99,7 @@ module Geocoder
       # Object used to make HTTP requests.
       #
       def http_client
-        protocol = "http#{'s' if configuration.use_https}"
+        protocol = "http#{'s' if use_ssl?}"
         proxy_name = "#{protocol}_proxy"
         if proxy = configuration.send(proxy_name)
           proxy_url = !!(proxy =~ /^#{protocol}/) ? proxy : protocol + '://' + proxy
@@ -198,7 +198,7 @@ module Geocoder
       # Set in configuration but not available for every service.
       #
       def protocol
-        "http" + (configuration.use_https ? "s" : "")
+        "http" + (use_ssl? ? "s" : "")
       end
 
       def valid_response?(response)
@@ -249,6 +249,9 @@ module Geocoder
         elsif response.code.to_i == 402
           raise_error(Geocoder::OverQueryLimitError) ||
             warn("Geocoding API error: 402 Payment Required")
+        elsif response.code.to_i == 429
+          raise_error(Geocoder::OverQueryLimitError) ||
+            warn("Geocoding API error: 429 Too Many Requests")
         end
       end
 
@@ -262,7 +265,7 @@ module Geocoder
           args = [uri.host, uri.port]
           args = args.push(uri.user, uri.password) unless uri.user.nil? or uri.password.nil?
           opts = {}
-          opts[:use_ssl] = true if configuration.use_https
+          opts[:use_ssl] = use_ssl?
 
           http_client.start(*args, opts) do |client|
             client.get(uri.request_uri, configuration.http_headers)
@@ -270,6 +273,10 @@ module Geocoder
         end
       end
 
+      def use_ssl?
+        configuration.use_https
+      end
+
       def check_api_key_configuration!(query)
         key_parts = query.lookup.required_api_key_parts
         if key_parts.size > Array(configuration.api_key).size

data/lib/geocoder/lookups/opencagedata.rb

@@ -0,0 +1,58 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/opencagedata'
+
+module Geocoder::Lookup
+  class Opencagedata < Base
+
+    def name
+      "OpenCageData"
+    end
+
+    def query_url(query)
+      "#{protocol}://api.opencagedata.com/geocode/v1/json?key=#{configuration.api_key}&q=#{url_query_string(query)}"
+    end
+
+    def required_api_key_parts
+      ["key"]
+    end
+
+    private
+
+    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
+        raise_error(Geocoder::InvalidRequest, messages) ||
+          warn("Opencagedata Geocoding API error: #{messages}")
+      when 403 # Key related error
+        raise_error(Geocoder::InvalidApiKey, messages) ||
+          warn("Opencagedata Geocoding API error: #{messages}")
+      when 402 # Quata Exceeded
+          raise_error(Geocoder::OverQueryLimitError, messages) ||
+          warn("Opencagedata Geocoding API error: #{messages}")
+      when 500 # Unknown error
+        raise_error(Geocoder::Error, messages) ||
+          warn("Opencagedata Geocoding API error: #{messages}")
+      end
+
+      return doc["results"]
+    end
+
+    def query_url_params(query)
+      params = {
+        :query => query.sanitized_text,
+        :language => (query.language || configuration.language)
+      }.merge(super)
+
+      unless (bounds = query.options[:bounds]).nil?
+        params[:bounds] = bounds.map{ |point| "%f,%f" % point }.join(',')
+      end
+
+      params
+    end
+
+  end
+end

data/lib/geocoder/lookups/pointpin.rb

@@ -0,0 +1,68 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/pointpin'
+
+module Geocoder::Lookup
+  class Pointpin < Base
+
+    def name
+      "Pointpin"
+    end
+
+    def required_api_key_parts
+      ["key"]
+    end
+
+    def query_url(query)
+      "#{ protocol }://geo.pointp.in/#{ api_key }/json/#{ query.sanitized_text }"
+    end
+
+  private
+
+    def results(query)
+      # don't look up a loopback address, just return the stored result
+      return [] if query.loopback_ip_address?
+      doc = fetch_data(query)
+      if doc and doc.is_a?(Hash)
+        if !data_contains_error?(doc)
+          return [doc]
+        elsif doc['error']
+          case doc['error']
+          when "Invalid IP address"
+            raise_error(Geocoder::InvalidRequest) || warn("Invalid Pointpin request.")
+          when "Invalid API key"
+            raise_error(Geocoder::InvalidApiKey) || warn("Invalid Pointpin API key.")
+          when "Address not found"
+            warn("Address not found.")
+          end
+        else
+          raise_error(Geocoder::Error) || warn("Pointpin server error")
+        end
+      end
+      
+      return []
+    end
+
+    def data_contains_error?(parsed_data)
+      parsed_data.keys.include?('error')
+    end
+
+    def reserved_result(ip)
+      {
+        "ip"           => ip,
+        "city"         => "",
+        "region_code"  => "",
+        "region_name"  => "",
+        "metrocode"    => "",
+        "zipcode"      => "",
+        "latitude"     => "0",
+        "longitude"    => "0",
+        "country_name" => "Reserved",
+        "country_code" => "RD"
+      }
+    end
+
+    def api_key
+      configuration.api_key
+    end
+  end
+end

data/lib/geocoder/lookups/telize.rb

@@ -15,6 +15,10 @@ module Geocoder::Lookup
 
     private # ---------------------------------------------------------------
 
+    def use_ssl?
+      false
+    end
+
     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?

data/lib/geocoder/results/geocodio.rb

@@ -45,7 +45,7 @@ module Geocoder::Result
     end
 
     def coordinates
-      ['lat', 'lng'].map{ |i| location[i] } if location
+      ['lat', 'lng'].map{ |i| location[i].to_f } if location
     end
 
     def accuracy

data/lib/geocoder/results/opencagedata.rb

@@ -0,0 +1,82 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Opencagedata < Base
+
+    def poi
+      %w[stadium bus_stop tram_stop].each do |key|
+        return @data['components'][key] if @data['components'].key?(key)
+      end
+      return nil
+    end
+
+    def house_number
+      @data['components']['house_number']
+    end
+
+    def address
+      @data['formatted']
+    end
+
+    def street
+      %w[road pedestrian highway].each do |key|
+        return @data['components'][key] if @data['components'].key?(key)
+      end
+      return nil
+    end
+
+    def city
+      %w[city town village hamlet].each do |key|
+        return @data['components'][key] if @data['components'].key?(key)
+      end
+      return nil
+    end
+
+    def village
+      @data['components']['village']
+    end
+
+
+    def state
+      @data['components']['state']
+    end
+
+    alias_method :state_code, :state
+
+    def postal_code
+      @data['components']['postcode'].to_s
+    end
+
+    def county
+      @data['components']['county']
+    end
+
+    def country
+      @data['components']['country']
+    end
+
+    def country_code
+      @data['components']['country_code']
+    end
+
+    def suburb
+      @data['components']['suburb']
+    end
+
+    def coordinates
+      [@data['lat'].to_f, @data['lon'].to_f]
+    end
+    def self.response_attributes
+      %w[boundingbox license 
+        formatted stadium]
+    end
+
+    response_attributes.each do |a|
+      unless method_defined?(a)
+        define_method a do
+          @data[a]
+        end
+      end
+    end
+  end
+end

data/lib/geocoder/results/pointpin.rb

@@ -0,0 +1,44 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Pointpin < Base
+
+    def address
+      [ city_name, state, postal_code, country ].select{ |i| i.to_s != "" }.join(", ")
+    end
+
+    def city
+      @data['city_name']
+    end
+
+    def state
+      @data['region_name']
+    end
+
+    def state_code
+      @data['region_code']
+    end
+
+    def country
+      @data['country_name']
+    end
+
+    def country_code
+      @data['country_code']
+    end
+
+    def postal_code
+      @data['postcode']
+    end
+
+    def self.response_attributes
+      %w[continent_code ip country_code country_name region_name city_name postcode latitude longitude time_zone languages]
+    end
+
+    response_attributes.each do |a|
+      define_method a do
+        @data[a]
+      end
+    end
+  end
+end

data/lib/geocoder/stores/active_record.rb

@@ -115,6 +115,8 @@ module Geocoder::Store
         if options[:units]
           options[:units] = options[:units].to_sym
         end
+        latitude_attribute = options[:latitude] || geocoder_options[:latitude]
+        longitude_attribute = options[:longitude] || geocoder_options[:longitude]
         options[:units] ||= (geocoder_options[:units] || Geocoder.config.units)
         select_distance = options.fetch(:select_distance, true)
         options[:order] = "" if !select_distance && !options.include?(:order)
@@ -126,8 +128,8 @@ module Geocoder::Store
 
         b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
         args = b + [
-          full_column_name(geocoder_options[:latitude]),
-          full_column_name(geocoder_options[:longitude])
+          full_column_name(latitude_attribute),
+          full_column_name(longitude_attribute)
         ]
         bounding_box_conditions = Geocoder::Sql.within_bounding_box(*args)
 
@@ -157,8 +159,8 @@ module Geocoder::Store
         Geocoder::Sql.send(
           method_prefix + "_distance",
           latitude, longitude,
-          full_column_name(geocoder_options[:latitude]),
-          full_column_name(geocoder_options[:longitude]),
+          full_column_name(options[:latitude] || geocoder_options[:latitude]),
+          full_column_name(options[:longitude]|| geocoder_options[:longitude]),
           options
         )
       end
@@ -176,8 +178,8 @@ module Geocoder::Store
           Geocoder::Sql.send(
             method_prefix + "_bearing",
             latitude, longitude,
-            full_column_name(geocoder_options[:latitude]),
-            full_column_name(geocoder_options[:longitude]),
+            full_column_name(options[:latitude] || geocoder_options[:latitude]),
+            full_column_name(options[:longitude]|| geocoder_options[:longitude]),
             options
           )
         end

data/lib/geocoder/version.rb

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

data/test/fixtures/geocodio_1101_pennsylvania_ave

@@ -1 +1 @@
-{"input":{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC"},"results":[{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC","zip":"20004"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC, 20004","location":{"lat":38.895019,"lng":-77.028095},"accuracy":1},{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC","zip":"20004"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC, 20004","location":{"lat":38.895016122449,"lng":-77.028084377551},"accuracy":0.8}]}
+{"input":{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC"},"results":[{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC","zip":"20004"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC, 20004","location":{"lat":"38.895019","lng":"-77.028095"},"accuracy":1},{"address_components":{"number":"1101","street":"Pennsylvania","suffix":"Ave","postdirectional":"NW","city":"Washington","state":"DC","zip":"20004"},"formatted_address":"1101 Pennsylvania Ave NW, Washington DC, 20004","location":{"lat":"38.895016122449","lng":"-77.028084377551"},"accuracy":0.8}]}

data/test/fixtures/opencagedata_invalid_api_key

@@ -0,0 +1,25 @@
+{
+    "licenses": [
+        {
+            "name": "CC-BY-SA",
+            "url": "http://creativecommons.org/licenses/by-sa/3.0/"
+        },
+        {
+            "name": "ODbL",
+            "url": "http://opendatacommons.org/licenses/odbl/summary/"
+        }
+    ],
+    "results": [ ],
+    "status": {
+        "code": 403,
+        "message": "invalid API key"
+    },
+    "thanks": "For using an OpenCage Data API",
+    "timestamp": {
+        "created_http": "Thu, 07 Aug 2014 14:26:28 GMT",
+        "created_unix": 1407421588
+    },
+    "total_results": 0,
+    "we_are_hiring": "http://lokku.com/#jobs"
+
+}

data/test/fixtures/opencagedata_invalid_request

@@ -0,0 +1,26 @@
+{
+
+    "licenses": [
+        {
+            "name": "CC-BY-SA",
+            "url": "http://creativecommons.org/licenses/by-sa/3.0/"
+        },
+        {
+            "name": "ODbL",
+            "url": "http://opendatacommons.org/licenses/odbl/summary/"
+        }
+    ],
+    "results": [ ],
+    "status": {
+        "code": 400,
+        "message": "Attribute (format) does not pass the type constraint because: not a valid format"
+    },
+    "thanks": "For using an OpenCage Data API",
+    "timestamp": {
+        "created_http": "Thu, 07 Aug 2014 14:27:29 GMT",
+        "created_unix": 1407421649
+    },
+    "total_results": 0,
+    "we_are_hiring": "http://lokku.com/#jobs"
+
+}

data/test/fixtures/opencagedata_madison_square_garden

@@ -0,0 +1,73 @@
+{
+   "licenses" : [
+      {
+         "name" : "CC-BY-SA",
+         "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
+      },
+      {
+         "name" : "ODbL",
+         "url" : "http://opendatacommons.org/licenses/odbl/summary/"
+      }
+   ],
+   "rate" : {
+      "limit" : 2500,
+      "remaining" : 2488,
+      "reset" : 1407369600
+   },
+   "results" : [
+      {
+         "annotations" : {
+            "OSM" : {
+               "url" : "http://www.openstreetmap.org/?mlat=40.75052&mlon=-73.99355#map=17/40.75052/-73.99355"
+            },
+            "timezone" : {
+               "name" : "America/New_York",
+               "now_in_dst" : 1,
+               "offset_sec" : -14400,
+               "offset_string" : -400,
+               "short_name" : "EDT"
+            }
+         },
+         "bounds" : {
+            "northeast" : {
+               "lat" : 40.751161,
+               "lng" : -73.9925922
+            },
+            "southwest" : {
+               "lat" : 40.7498531,
+               "lng" : -73.9944444
+            }
+         },
+         "components" : {
+            "country" : "United States of America",
+            "country_code" : "US",
+            "county" : "New York County",
+            "house_number" : 46,
+            "neighbourhood" : "Koreatown",
+            "postcode" : 10011,
+            "road" : "West 31st Street",
+            "city": "New York City",
+            "stadium" : "Madison Square Garden",
+            "state" : "New York",
+            "state_district" : "New York City"
+         },
+         "confidence" : 10,
+         "formatted" : "46, West 31st Street, Koreatown, New York County, 10011, New York City, New York, United States of America, Madison Square Garden",
+         "geometry" : {
+            "lat" : 40.7505247,
+            "lng" : -73.9935500942432
+         }
+      }
+   ],
+   "status" : {
+      "code" : 200,
+      "message" : "OK"
+   },
+   "thanks" : "For using an OpenCage Data API",
+   "timestamp" : {
+      "created_http" : "Wed, 06 Aug 2014 12:53:59 GMT",
+      "created_unix" : 1407329639
+   },
+   "total_results" : 1,
+   "we_are_hiring" : "http://lokku.com/#jobs"
+}

data/test/fixtures/opencagedata_no_results

@@ -0,0 +1,29 @@
+{
+   "licenses" : [
+      {
+         "name" : "CC-BY-SA",
+         "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
+      },
+      {
+         "name" : "ODbL",
+         "url" : "http://opendatacommons.org/licenses/odbl/summary/"
+      }
+   ],
+   "rate" : {
+      "limit" : 2500,
+      "remaining" : 2487,
+      "reset" : 1407369600
+   },
+   "results" : [],
+   "status" : {
+      "code" : 200,
+      "message" : "OK"
+   },
+   "thanks" : "For using an OpenCage Data API",
+   "timestamp" : {
+      "created_http" : "Wed, 06 Aug 2014 12:56:03 GMT",
+      "created_unix" : 1407329763
+   },
+   "total_results" : 0,
+   "we_are_hiring" : "http://lokku.com/#jobs"
+}

data/test/fixtures/opencagedata_over_limit

@@ -0,0 +1,31 @@
+{
+
+    "licenses": [
+        {
+            "name": "CC-BY-SA",
+            "url": "http://creativecommons.org/licenses/by-sa/3.0/"
+        },
+        {
+            "name": "ODbL",
+            "url": "http://opendatacommons.org/licenses/odbl/summary/"
+        }
+    ],
+    "rate": {
+        "limit": 1,
+        "remaining": 0,
+        "reset": null
+    },
+    "results": [ ],
+    "status": {
+        "code": 402,
+        "message": "quota exceeded"
+    },
+    "thanks": "For using an OpenCage Data API",
+    "timestamp": {
+        "created_http": "Thu, 07 Aug 2014 13:59:19 GMT",
+        "created_unix": 1407419959
+    },
+    "total_results": 0,
+    "we_are_hiring": "http://lokku.com/#jobs"
+
+}

data/test/fixtures/pointpin_10_10_10_10

@@ -0,0 +1 @@
+{"error":"Address not found"}

data/test/fixtures/pointpin_555_555_555_555

@@ -0,0 +1 @@
+{"error":"Invalid IP address"}

data/test/fixtures/pointpin_80_111_555_555

@@ -0,0 +1 @@
+{"ip":"80.111.555.555","continent_code":"EU","country_code":"IE","country_name":"Ireland","region_name":"Dublin City","region_code":"D8","city_name":"Dublin","postcode":"8","latitude":53.3331,"longitude":-6.2489,"time_zone":"Europe/Dublin"}

data/test/fixtures/pointpin_no_results

@@ -0,0 +1 @@
+{"error":"Address not found"}

data/test/integration/http_client_test.rb

@@ -22,4 +22,10 @@ class HttpClientTest < Test::Unit::TestCase
     results = Geocoder.search "27701"
     assert_not_nil results.first
   end
+
+  def test_ssl_opt_out
+    Geocoder.configure(ip_lookup: :telize, use_https: true)
+    results = Geocoder.search "74.200.247.59"
+    assert_not_nil results.first
+  end
 end

data/test/test_helper.rb

@@ -150,6 +150,13 @@ module Geocoder
       end
     end
 
+    class Pointpin
+      private
+      def default_fixture_filename
+        "pointpin_80_111_555_555"
+      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 [:freegeoip, :maxmind_local, :telize].include? l # does not use query string
+      next if [:freegeoip, :maxmind_local, :telize, :pointpin].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"}
@@ -87,7 +87,7 @@ class LookupTest < GeocoderTestCase
   def test_returns_empty_array_on_invalid_key
     silence_warnings do
       #Geocoder::Lookup.all_services_except_test.each do |l|
-      [:bing, :yahoo, :yandex, :maxmind, :cloudmade, :baidu, :baidu_ip].each do |l|
+      [:bing, :yahoo, :yandex, :maxmind, :baidu, :baidu_ip].each do |l|
         Geocoder.configure(:lookup => l)
         set_api_key!(l)
         assert_equal [], Geocoder.search("invalid key")
@@ -119,6 +119,12 @@ class LookupTest < GeocoderTestCase
     assert_match "ak=MY_KEY", g.query_url(Geocoder::Query.new("Madison Square Garden, New York, NY  10001, United States"))
   end
 
+  def test_pointpin_api_key
+    Geocoder.configure(:api_key => "MY_KEY")
+    g = Geocoder::Lookup::Pointpin.new
+    assert_match "/MY_KEY/", g.query_url(Geocoder::Query.new("232.65.123.94"))
+  end
+
   def test_google_api_key
     Geocoder.configure(:api_key => "MY_KEY")
     g = Geocoder::Lookup::Google.new

data/test/unit/lookups/geocodio_test.rb

@@ -19,7 +19,7 @@ class GeocodioTest < GeocoderTestCase
     assert_equal "NW", result.postdirectional
     assert_equal "Washington", result.city
     assert_equal "1101 Pennsylvania Ave NW, Washington DC, 20004", result.formatted_address
-    assert_equal({ "lat" => 38.895019, "lng" => -77.028095 }, result.location)
+    assert_equal({ "lat" => "38.895019", "lng" => "-77.028095" }, result.location)
   end
 
   def test_no_results

data/test/unit/lookups/opencagedata_test.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
+require 'test_helper'
+
+class OpencagedataTest < GeocoderTestCase
+
+  def setup
+    Geocoder.configure(lookup: :opencagedata)
+    set_api_key!(:opencagedata)
+  end
+
+  def test_result_components
+    result = Geocoder.search("Madison Square Garden, New York, NY").first
+    assert_equal "West 31st Street", result.street
+    assert_match /46, West 31st Street, Koreatown, New York County, 10011, New York City, New York, United States of America/, result.address
+
+  end
+
+  def test_opencagedata_query_url_contains_bounds
+    lookup = Geocoder::Lookup::Opencagedata.new
+    url = lookup.query_url(Geocoder::Query.new(
+      "Some street",
+      :bounds => [[40.0, -120.0], [39.0, -121.0]]
+    ))
+    assert_match(/bounds=40.0+%2C-120.0+%2C39.0+%2C-121.0+/, url)
+  end
+
+
+  def test_no_results
+    results = Geocoder.search("no results")
+    assert_equal 0, results.length
+  end
+
+
+  def test_opencagedata_reverse_url
+    query = Geocoder::Query.new([45.423733, -75.676333])
+    assert_match /\bquery=45.423733%2C-75.676333\b/, query.url
+  end
+
+
+
+  def test_raises_exception_when_invalid_request
+    Geocoder.configure(always_raise: [Geocoder::InvalidRequest])
+    assert_raises Geocoder::InvalidRequest do
+      Geocoder.search("invalid request")
+    end
+  end
+
+  def test_raises_exception_when_invalid_api_key
+    Geocoder.configure(always_raise: [Geocoder::InvalidApiKey])
+    assert_raises Geocoder::InvalidApiKey do
+      Geocoder.search("invalid api key")
+    end
+  end
+
+
+  def test_raises_exception_when_over_query_limit
+    Geocoder.configure(:always_raise => [Geocoder::OverQueryLimitError])
+    l = Geocoder::Lookup.get(:opencagedata)
+    assert_raises Geocoder::OverQueryLimitError do
+      l.send(:results, Geocoder::Query.new("over limit"))
+    end
+  end
+end

data/test/unit/lookups/pointpin_test.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
+require 'test_helper'
+
+class PointpinTest < GeocoderTestCase
+
+  def setup
+    Geocoder.configure(ip_lookup: :pointpin, api_key: "abc123")
+  end
+
+  def test_result_on_ip_address_search
+    result = Geocoder.search("80.111.555.555").first
+    assert result.is_a?(Geocoder::Result::Pointpin)
+  end
+
+  def test_result_components
+    result = Geocoder.search("80.111.555.555").first
+    assert_equal "Dublin, Dublin City, 8, Ireland", 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

data/test/unit/lookups/telize_test.rb

@@ -27,4 +27,10 @@ class TelizeTest < GeocoderTestCase
     results = Geocoder.search("555.555.555.555")
     assert_equal 0, results.length
   end
+
+  def test_uses_http_even_if_use_https_true
+    Geocoder.configure(use_https: true)
+    result = Geocoder.search("74.200.247.59").first
+    assert result.is_a?(Geocoder::Result::Telize)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-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,
@@ -51,7 +51,6 @@ files:
 - lib/geocoder/lookups/baidu_ip.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
-- lib/geocoder/lookups/cloudmade.rb
 - lib/geocoder/lookups/dstk.rb
 - lib/geocoder/lookups/esri.rb
 - lib/geocoder/lookups/freegeoip.rb
@@ -65,7 +64,9 @@ files:
 - lib/geocoder/lookups/maxmind.rb
 - lib/geocoder/lookups/maxmind_local.rb
 - lib/geocoder/lookups/nominatim.rb
+- lib/geocoder/lookups/opencagedata.rb
 - lib/geocoder/lookups/ovi.rb
+- lib/geocoder/lookups/pointpin.rb
 - lib/geocoder/lookups/smarty_streets.rb
 - lib/geocoder/lookups/telize.rb
 - lib/geocoder/lookups/test.rb
@@ -83,7 +84,6 @@ files:
 - lib/geocoder/results/baidu_ip.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
-- lib/geocoder/results/cloudmade.rb
 - lib/geocoder/results/dstk.rb
 - lib/geocoder/results/esri.rb
 - lib/geocoder/results/freegeoip.rb
@@ -97,7 +97,9 @@ files:
 - lib/geocoder/results/maxmind.rb
 - lib/geocoder/results/maxmind_local.rb
 - lib/geocoder/results/nominatim.rb
+- lib/geocoder/results/opencagedata.rb
 - lib/geocoder/results/ovi.rb
+- lib/geocoder/results/pointpin.rb
 - lib/geocoder/results/smarty_streets.rb
 - lib/geocoder/results/telize.rb
 - lib/geocoder/results/test.rb
@@ -167,8 +169,17 @@ files:
 - test/fixtures/nominatim_madison_square_garden
 - test/fixtures/nominatim_no_results
 - test/fixtures/nominatim_over_limit
+- test/fixtures/opencagedata_invalid_api_key
+- test/fixtures/opencagedata_invalid_request
+- test/fixtures/opencagedata_madison_square_garden
+- test/fixtures/opencagedata_no_results
+- test/fixtures/opencagedata_over_limit
 - test/fixtures/ovi_madison_square_garden
 - test/fixtures/ovi_no_results
+- test/fixtures/pointpin_10_10_10_10
+- test/fixtures/pointpin_555_555_555_555
+- test/fixtures/pointpin_80_111_555_555
+- test/fixtures/pointpin_no_results
 - test/fixtures/smarty_streets_11211
 - test/fixtures/smarty_streets_madison_square_garden
 - test/fixtures/smarty_streets_no_results
@@ -211,6 +222,8 @@ files:
 - test/unit/lookups/maxmind_local_test.rb
 - test/unit/lookups/maxmind_test.rb
 - test/unit/lookups/nominatim_test.rb
+- test/unit/lookups/opencagedata_test.rb
+- test/unit/lookups/pointpin_test.rb
 - test/unit/lookups/smarty_streets_test.rb
 - test/unit/lookups/telize_test.rb
 - test/unit/lookups/yahoo_test.rb

data/lib/geocoder/lookups/cloudmade.rb

@@ -1,35 +0,0 @@
-require 'geocoder/lookups/base'
-require 'geocoder/results/cloudmade'
-
-module Geocoder::Lookup
-  class Cloudmade < Base
-
-    def name
-      "Cloudmade"
-    end
-
-    def query_url(query)
-      "http://geocoding.cloudmade.com/#{configuration.api_key}/geocoding/v2/find.js?#{url_query_string(query)}"
-    end
-
-    def required_api_key_parts
-      ["key"]
-    end
-
-    private
-
-    def results(query)
-      data = fetch_data(query)
-      (data && data['features']) || []
-    end
-
-    def query_url_params(query)
-      {
-        :query => query.sanitized_text,
-        :return_location => true,
-        :return_geometry => false
-      }.merge(super)
-    end
-
-  end
-end

data/lib/geocoder/results/cloudmade.rb

@@ -1,39 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Cloudmade < Base
-
-    def coordinates
-      @data["centroid"]["coordinates"]
-    end
-
-    def street
-      @data["location"]["road"]
-    end
-
-    def city
-      @data["location"]["city"]
-    end
-    
-    def state
-      @data["location"]["county"]
-    end
-    alias_method :state_code, :state
-
-    def country
-      @data["location"]["country"]
-    end
-    alias_method :country_code, :country
-
-    def postal_code
-      @data["location"]["postcode"]
-    end
-
-    def address
-      [street, city, state, postal_code, country].compact.reject{|s| s.length == 0 }.join(", ")
-    end
-
-  end
-end
-
-