graticule 2.4.0 → 2.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 47fedf16b0ffe4698090ec1155d88e251913daf4
+  data.tar.gz: f142b7298a24e38b1737e803661bf3aa8565de7b
+SHA512:
+  metadata.gz: 233a07082a35178fd72e240f07fc90f4b072dabbe6b6d070ea2a21cabc8299aadf16c6913c87804c7c7e6becb9575635fdbba1047c5dd10b6ef024509e87a326
+  data.tar.gz: c0aedc447cfb0150ef65465741123edeb6b630582fa395aed114d8de4c1e38c454bc493d88da9a72c0270a4fde1267db5b773ee25e6425fc23457b78775dbd1e

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
+before_install:
+  - sudo apt-get install libxslt-dev libxml2-dev
 before_script:
   - cp test/config.yml.default test/config.yml
 only:

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+2.5.0 (2014-09-04)
+* Add Mapbox geocoder
+* Add Open MapQuest
+* Use Nokogiri
+
 2.4.0 (--)
 * Update MapQuest handler to use the current API
 

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem 'mocha'
 gem 'rake'
 gem 'rdoc'
+gem "minitest", "~> 4.0"

data/README.md

@@ -8,6 +8,7 @@ Graticule
 
 Graticule is a geocoding API for looking up address coordinates and performing distance calculations. It supports many popular APIs:
 
+* Mapbox
 * Yahoo
 * Google
 * MapQuest
@@ -44,7 +45,7 @@ geocoder = Graticule.service(:google).new "api_key"
 location = geocoder.locate("61 East 9th Street, Holland, MI")
 ```
 
-For specific service documentation, please visit the [RDOCS -- rdoc.info link].
+For specific service documentation, please visit the [documentation](http://rdoc.info/github/collectiveidea/graticule).
 
 #### Distance Calculation
 
@@ -101,7 +102,7 @@ Here are some ways you can contribute:
 
 ### Submitting an Issue
 
-We use the [GitHub issue tracker](https://github.com/collectiveidea/graticule/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. When submitting a bug report, please include a [Gist](https://gist.github.com/) that includes a stack trace and any details that may be necessary to reproduce the bug, including your gem version, Ruby version, and operating system. 
+We use the [GitHub issue tracker](https://github.com/collectiveidea/graticule/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. When submitting a bug report, please include a [Gist](https://gist.github.com/) that includes a stack trace and any details that may be necessary to reproduce the bug, including your gem version, Ruby version, and operating system.
 
 ### Submitting a Pull Request
 

data/graticule.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.name    = "graticule"
   spec.version = Graticule::VERSION
 
-  spec.authors     = ["Brandon Keepers", "Daniel Morrison", "Collective Idea"]
-  spec.email       = ["brandon@opensoul.org", "daniel@collectiveidea.com", "code@collectiveidea.com"]
+  spec.authors     = ["Brandon Keepers", "Daniel Morrison", "Jason Roelofs", "Collective Idea"]
+  spec.email       = ["brandon@opensoul.org", "daniel@collectiveidea.com", "jasongroelofs@gmail.com", "code@collectiveidea.com"]
   spec.description = "Graticule is a geocoding API that provides a common interface to all the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta."
   spec.summary     = "API for using all the popular geocoding services"
   spec.homepage    = "https://github.com/collectiveidea/graticule"
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
   spec.add_dependency "i18n"
-  spec.add_dependency "happymapper", ">= 0.3.0"
+  spec.add_dependency "nokogiri-happymapper", ">= 0.5.9"
   spec.add_dependency "json"
 end
 

data/lib/graticule.rb

@@ -1,8 +1,12 @@
 # encoding: UTF-8
 $:.unshift(File.dirname(__FILE__))
 
-require 'active_support'
-require 'active_support/core_ext'
+require 'active_support/inflections'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/with_options'
+require 'active_support/core_ext/string/inflections'
 
 require 'graticule/version'
 require 'graticule/core_ext'
@@ -24,6 +28,7 @@ require 'graticule/geocoder/freethepostcode'
 require 'graticule/geocoder/multimap'
 require 'graticule/geocoder/mapquest'
 require 'graticule/geocoder/simple_geo'
+require 'graticule/geocoder/mapbox'
 require 'graticule/distance'
 require 'graticule/distance/haversine'
 require 'graticule/distance/spherical'

data/lib/graticule/geocoder/base.rb

@@ -81,7 +81,6 @@ module Graticule #:nodoc:
         check_error(response)
         return parse_response(response)
       rescue OpenURI::HTTPError => e
-        raise e.inspect
         check_error(prepare_response(e.io.read))
         raise
       end

data/lib/graticule/geocoder/geocoder_us.rb

@@ -33,9 +33,9 @@ module Graticule #:nodoc:
       class Point
         include HappyMapper
         tag 'Point'
-        namespace 'http://www.w3.org/2003/01/geo/wgs84_pos#'
+        namespace 'geo'
 
-        element :description, String, :namespace => 'http://purl.org/dc/elements/1.1/'
+        element :description, String, :namespace => 'dc'
         element :longitude,   Float,  :tag => 'long'
         element :latitude,    Float,  :tag => 'lat'
       end

data/lib/graticule/geocoder/mapbox.rb

@@ -0,0 +1,109 @@
+module Graticule
+  module Geocoder
+    class Mapbox < Base
+      BASE_URL = "http://api.tiles.mapbox.com"
+
+      def initialize(api_key)
+        @api_key = api_key
+      end
+
+      def locate(address)
+        get :q => address
+      end
+
+      protected
+
+      # A result looks like:
+      # [
+      #   {
+      #     "id"=>"address.110173544177",
+      #     "lon"=>-122.02912,
+      #     "lat"=>37.33054,
+      #     "name"=>"1 Infinite Loop",
+      #     "type"=>"address"
+      #   }, {
+      #     "id"=>"mapbox-places.95014",
+      #     "name"=>"Cupertino",
+      #     "type"=>"city"
+      #   }, {
+      #     "id"=>"province.1112151813",
+      #     "name"=>"California",
+      #     "type"=>"province"
+      #   }, {
+      #     "id"=>"country.4150104525",
+      #     "name"=>"United States",
+      #     "type"=>"country"
+      #   }
+      # ]
+      class Result
+        attr_accessor :lat, :lon, :address, :city, :province, :country, :precision, :postal_code
+
+        def initialize(input)
+          self.precision = ::Graticule::Precision::Unknown
+          self.lat = input.first["lat"]
+          self.lon = input.first["lon"]
+
+          input.each do |tuple|
+            case tuple["type"]
+              when "zipcode"
+                self.postal_code = tuple["name"]
+                set_higher_precision(::Graticule::Precision::PostalCode)
+              when "address"
+                self.address = tuple["name"]
+                set_higher_precision(::Graticule::Precision::Address)
+              when "city"
+                self.city = tuple["name"]
+                set_higher_precision(::Graticule::Precision::Locality)
+                self.postal_code = tuple["id"].split(".")[1]
+              when "province"
+                self.province = tuple["name"]
+                set_higher_precision(::Graticule::Precision::Region)
+              when "country"
+                self.country = tuple["name"]
+                set_higher_precision(::Graticule::Precision::Country)
+            end
+          end
+        end
+
+        private
+
+        def set_higher_precision(p)
+          if self.precision < p
+            self.precision = p
+          end
+        end
+      end
+
+      def make_url(params)
+        query = URI.escape(params[:q].to_s)
+        url   = "#{BASE_URL}/v3/#{@api_key}/geocode/#{query}.json"
+
+        URI.parse(url)
+      end
+
+      def check_error(response)
+        raise AddressError, 'unknown address' if (response["results"].nil? || response["results"].empty?)
+      end
+
+      def prepare_response(response)
+        JSON.parse(response)
+      end
+
+      def parse_response(response)
+        # Pull data from the first result since we get a bunch
+        result = Result.new(response["results"][0])
+
+        Location.new(
+          :latitude    => result.lat,
+          :longitude   => result.lon,
+          :street      => result.address,
+          :locality    => result.city,
+          :region      => result.province,
+          :postal_code => result.postal_code,
+          :country     => result.country,
+          :precision   => result.precision
+        )
+      end
+    end
+  end
+end

data/lib/graticule/geocoder/mapquest.rb

@@ -11,9 +11,14 @@ module Graticule #:nodoc:
     #
     class Mapquest < Base
 
-      def initialize(api_key)
+      def initialize(api_key, open = false, restrict_to_country = nil)
         @api_key = api_key
-        @url = URI.parse('http://www.mapquestapi.com/geocoding/v1/address')
+        @url = if open
+                 URI.parse('http://open.mapquestapi.com/geocoding/v1/address')
+               else
+                 URI.parse('http://www.mapquestapi.com/geocoding/v1/address')
+               end
+        @country_filter = restrict_to_country
       end
 
       # Locates +address+ returning a Location
@@ -97,7 +102,11 @@ module Graticule #:nodoc:
 
       # Extracts a location from +xml+.
       def parse_response(response) #:nodoc:
-        addr = response.result.locations.addresses.first
+        if @country_filter
+          addr = response.result.locations.addresses.select{|address| address.country == @country_filter}.first
+        else
+          addr = response.result.locations.addresses.first
+        end
         Location.new(
           :latitude    => addr.latitude,
           :longitude   => addr.longitude,

data/lib/graticule/geocoder/yandex.rb

@@ -36,11 +36,28 @@ module Graticule #:nodoc:
 
     private
 
+      class Country
+        include HappyMapper
+
+        register_namespace "xmlns", "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"
+
+        tag "Country"
+
+        element :street,      String, :deep => true, :tag => 'ThoroughfareName'
+        element :locality,    String, :deep => true, :tag => 'LocalityName'
+        element :region,      String, :deep => true, :tag => 'AdministrativeAreaName'
+        element :postal_code, String, :deep => true, :tag => 'PostalCodeNumber'
+        element :country,     String, :deep => true, :tag => 'CountryNameCode'
+      end
+
       class GeocoderMetaData
         include HappyMapper
 
-        tag 'GeocoderMetaData'
-        namespace 'http://maps.yandex.ru/geocoder/1.x'
+        register_namespace "xmlns", "http://maps.yandex.ru/geocoder/1.x"
+
+        tag "GeocoderMetaData"
+
+        has_one :address, Country
 
         element :kind, String, :tag => 'kind'
       end
@@ -48,8 +65,9 @@ module Graticule #:nodoc:
       class FeatureMember
         include HappyMapper
 
-        tag 'featureMember'
-        namespace 'http://www.opengis.net/gml'
+        register_namespace "xmlns", "http://www.opengis.net/gml"
+
+        tag "featureMember"
 
         has_one :geocoder_meta_data, GeocoderMetaData
 
@@ -57,14 +75,6 @@ module Graticule #:nodoc:
 
         element :coordinates, String, :tag => 'pos', :deep => true
 
-        with_options :deep => true, :namespace => 'urn:oasis:names:tc:ciq:xsdschema:xAL:2.0' do |map|
-          map.element :street,      String, :tag => 'ThoroughfareName'
-          map.element :locality,    String, :tag => 'LocalityName'
-          map.element :region,      String, :tag => 'AdministrativeAreaName'
-          map.element :postal_code, String, :tag => 'PostalCodeNumber'
-          map.element :country,     String, :tag => 'CountryNameCode'
-        end
-
         def coordinates=(coordinates)
           @longitude, @latitude = coordinates.split(' ').map { |v| v.to_f }
         end
@@ -78,6 +88,7 @@ module Graticule #:nodoc:
         include HappyMapper
 
         tag 'error'
+
         element :status, Integer, :tag => 'status'
         element :message, String, :tag => 'message'
       end
@@ -85,9 +96,19 @@ module Graticule #:nodoc:
       class Response
         include HappyMapper
 
+        register_namespace 'xmlns', 'http://maps.yandex.ru/ymaps/1.x'
+
         tag 'GeoObjectCollection'
+
         has_many :feature_members, FeatureMember
 
+        with_nokogiri_config do |config|
+          config.nsclean
+          config.strict
+          config.dtdload
+          config.dtdvalid
+        end
+
         def status
           200
         end
@@ -102,9 +123,9 @@ module Graticule #:nodoc:
         Location.new(
           :latitude    => result.latitude,
           :longitude   => result.longitude,
-          :street      => result.street,
-          :locality    => result.locality,
-          :country     => result.country,
+          :street      => result.geocoder_meta_data.address.street,
+          :locality    => result.geocoder_meta_data.address.locality,
+          :country     => result.geocoder_meta_data.address.country,
           :precision   => result.precision
         )
       end

data/lib/graticule/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Graticule
-  VERSION = '2.4.0' unless defined?(::Graticule::VERSION)
+  VERSION = '2.5.0' unless defined?(::Graticule::VERSION)
 end

data/test/fixtures/responses/mapbox/empty_results.json

@@ -0,0 +1 @@
+{"query":["asdfjkl"],"attribution":{"mapbox-places":"<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox &copy; OpenStreetMap</a> <a class='mapbox-improve-map' href='https://www.mapbox.com/map-feedback/' target='_blank'>Improve this map</a>"},"results":[]}

data/test/fixtures/responses/mapbox/no_results.json

@@ -0,0 +1 @@
+{"query":["asdfjkl"],"attribution":{"mapbox-places":"<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox &copy; OpenStreetMap</a> <a class='mapbox-improve-map' href='https://www.mapbox.com/map-feedback/' target='_blank'>Improve this map</a>"}}

data/test/fixtures/responses/mapbox/success.json

@@ -0,0 +1 @@
+{"query":["1","infinite","loop","cupertino","ca"],"attribution":{"mapbox-places":"<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox &copy; OpenStreetMap</a> <a class='mapbox-improve-map' href='https://www.mapbox.com/map-feedback/' target='_blank'>Improve this map</a>"},"results":[[{"id":"address.110173544177","lon":-122.02912,"lat":37.33054,"name":"1 Infinite Loop","type":"address"},{"id":"mapbox-places.95014","name":"Cupertino","type":"city"},{"id":"province.1112151813","name":"California","type":"province"},{"id":"country.4150104525","name":"United States","type":"country"}]]}

data/test/fixtures/responses/mapquest/multi_country_success.xml

@@ -0,0 +1,171 @@
+<response>
+<info>
+<statusCode>0</statusCode>
+<messages/>
+<copyright>
+<imageUrl>http://api.mqcdn.com/res/mqlogo.gif</imageUrl>
+<imageAltText>© 2014 MapQuest, Inc.</imageAltText>
+<text>© 2014 MapQuest, Inc.</text>
+</copyright>
+</info>
+<results>
+<result>
+<providedLocation>
+<location>12345 US</location>
+</providedLocation>
+<locations>
+<location>
+<street/>
+<adminArea5 type="City">Us</adminArea5>
+<adminArea3 type="State">Ile-de-France</adminArea3>
+<adminArea4 type="County">Pontoise</adminArea4>
+<postalCode/>
+<adminArea1 type="Country">FR</adminArea1>
+<geocodeQuality>CITY</geocodeQuality>
+<geocodeQualityCode>A5XXX</geocodeQualityCode>
+<dragPoint>false</dragPoint>
+<sideOfStreet>N</sideOfStreet>
+<displayLatLng>
+<latLng>
+<lat>49.100945</lat>
+<lng>1.967247</lng>
+</latLng>
+</displayLatLng>
+<linkId>0</linkId>
+<type>s</type>
+<latLng>
+<lat>49.100945</lat>
+<lng>1.967247</lng>
+</latLng>
+<mapUrl>
+<![CDATA[
+http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luub2hutnq,8w=o5-9utlur&type=map&size=225,160&pois=purple-1,49.1009451,1.9672466,0,0|&center=49.1009451,1.9672466&zoom=12&rand=-1921049987
+]]>
+</mapUrl>
+</location>
+<location>
+<street/>
+<adminArea5 type="City">Us</adminArea5>
+<adminArea3 type="State">Bourgogne</adminArea3>
+<adminArea4 type="County">Louhans</adminArea4>
+<postalCode/>
+<adminArea1 type="Country">FR</adminArea1>
+<geocodeQuality>CITY</geocodeQuality>
+<geocodeQualityCode>A5XXX</geocodeQualityCode>
+<dragPoint>false</dragPoint>
+<sideOfStreet>N</sideOfStreet>
+<displayLatLng>
+<latLng>
+<lat>46.818792</lat>
+<lng>5.281419</lng>
+</latLng>
+</displayLatLng>
+<linkId>0</linkId>
+<type>s</type>
+<latLng>
+<lat>46.818792</lat>
+<lng>5.281419</lng>
+</latLng>
+<mapUrl>
+<![CDATA[
+http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luub2hutnq,8w=o5-9utlur&type=map&size=225,160&pois=purple-2,46.8187918,5.2814186,0,0|&center=46.8187918,5.2814186&zoom=12&rand=-1921049987
+]]>
+</mapUrl>
+</location>
+<location>
+<street/>
+<adminArea5 type="City">Us</adminArea5>
+<adminArea3 type="State"/>
+<adminArea4 type="County"/>
+<postalCode/>
+<adminArea1 type="Country">ID</adminArea1>
+<geocodeQuality>CITY</geocodeQuality>
+<geocodeQualityCode>A5XXX</geocodeQualityCode>
+<dragPoint>false</dragPoint>
+<sideOfStreet>N</sideOfStreet>
+<displayLatLng>
+<latLng>
+<lat>-2.771829</lat>
+<lng>132.186285</lng>
+</latLng>
+</displayLatLng>
+<linkId>0</linkId>
+<type>s</type>
+<latLng>
+<lat>-2.771829</lat>
+<lng>132.186285</lng>
+</latLng>
+<mapUrl>
+<![CDATA[
+http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luub2hutnq,8w=o5-9utlur&type=map&size=225,160&pois=purple-3,-2.771829,132.1862852,0,0|&center=-2.771829,132.1862852&zoom=12&rand=-1921049987
+]]>
+</mapUrl>
+</location>
+<location>
+<street/>
+<adminArea5 type="City"/>
+<adminArea3 type="State">LA</adminArea3>
+<adminArea4 type="County">Ascension Parish</adminArea4>
+<postalCode>12345</postalCode>
+<adminArea1 type="Country">US</adminArea1>
+<geocodeQuality>ZIP</geocodeQuality>
+<geocodeQualityCode>Z1XXA</geocodeQualityCode>
+<dragPoint>false</dragPoint>
+<sideOfStreet>N</sideOfStreet>
+<displayLatLng>
+<latLng>
+<lat>30.280046</lat>
+<lng>-90.786583</lng>
+</latLng>
+</displayLatLng>
+<linkId>0</linkId>
+<type>s</type>
+<latLng>
+<lat>30.280046</lat>
+<lng>-90.786583</lng>
+</latLng>
+<mapUrl>
+<![CDATA[
+http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luub2hutnq,8w=o5-9utlur&type=map&size=225,160&pois=purple-4,30.2800464733256,-90.7865829472683,0,0|&center=30.2800464733256,-90.7865829472683&zoom=12&rand=-1921049987
+]]>
+</mapUrl>
+</location>
+<location>
+<street/>
+<adminArea5 type="City">Uz</adminArea5>
+<adminArea3 type="State">Midi-Pyrénées</adminArea3>
+<adminArea4 type="County">Argelès-Gazost</adminArea4>
+<postalCode/>
+<adminArea1 type="Country">FR</adminArea1>
+<geocodeQuality>CITY</geocodeQuality>
+<geocodeQualityCode>A5XXX</geocodeQualityCode>
+<dragPoint>false</dragPoint>
+<sideOfStreet>N</sideOfStreet>
+<displayLatLng>
+<latLng>
+<lat>42.966369</lat>
+<lng>-0.085232</lng>
+</latLng>
+</displayLatLng>
+<linkId>0</linkId>
+<type>s</type>
+<latLng>
+<lat>42.966369</lat>
+<lng>-0.085232</lng>
+</latLng>
+<mapUrl>
+<![CDATA[
+http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luub2hutnq,8w=o5-9utlur&type=map&size=225,160&pois=purple-5,42.9663688,-0.0852324,0,0|&center=42.9663688,-0.0852324&zoom=12&rand=-1921049987
+]]>
+</mapUrl>
+</location>
+</locations>
+</result>
+</results>
+<options>
+<maxResults>-1</maxResults>
+<thumbMaps>true</thumbMaps>
+<ignoreLatLngInput>false</ignoreLatLngInput>
+<boundingBox/>
+</options>
+</response>

data/test/graticule/geocoder/mapbox_test.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+require 'test_helper'
+
+module Graticule
+  module Geocoder
+    class MapboxTest < Test::Unit::TestCase
+      def setup
+        @geocoder = Mapbox.new("api_key")
+      end
+
+      def test_locate_success
+        URI::HTTP.responses << response("mapbox", "success", "json")
+
+        expected = Location.new(
+          :country     => "United States",
+          :latitude    => 37.33054,
+          :longitude   => -122.02912,
+          :street      => "1 Infinite Loop",
+          :locality    => "Cupertino",
+          :region      => "California",
+          :postal_code => "95014",
+          :precision   => :address
+        )
+
+        actual = @geocoder.locate("1 Infinite Loop, Cupertino, CA")
+
+        assert_equal(expected, actual)
+      end
+
+      def test_locate_not_found
+        URI::HTTP.responses << response("mapbox", "empty_results", "json")
+
+        assert_raises(AddressError) { @geocoder.locate 'asdfjkl' }
+      end
+      
+      def test_no_results_returned
+        URI::HTTP.responses << response("mapbox", "no_results", "json")
+
+        assert_raises(AddressError) { @geocoder.locate 'asdfjkl' }
+      end
+    end
+  end
+end

data/test/graticule/geocoder/mapquest_test.rb

@@ -7,10 +7,10 @@ module Graticule
       def setup
         URI::HTTP.responses = []
         URI::HTTP.uris = []
-        @geocoder = Mapquest.new('api_key')
       end
 
       def test_success
+        @geocoder = Mapquest.new('api_key')
         prepare_response(:success)
         location = Location.new(
           :country => "US",
@@ -26,6 +26,7 @@ module Graticule
       end
 
       def test_multi_result
+        @geocoder = Mapquest.new('api_key')
         prepare_response(:multi_result)
         location = Location.new(
           :country => "US",
@@ -40,6 +41,22 @@ module Graticule
         assert_equal(location, @geocoder.locate('217 Union St., NY'))
       end
 
+      def test_multi_country
+        @geocoder = Mapquest.new('api_key', false, 'US')
+        prepare_response(:multi_country_success)
+        location = Location.new(
+            :country => "US",
+            :latitude => 30.280046,
+            :locality => "",
+            :longitude => -90.786583,
+            :postal_code => "12345",
+            :precision => :postal_code,
+            :region => "LA",
+            :street => nil
+        )
+        assert_equal(location, @geocoder.locate('12345 us'))
+      end
+
       def test_query_construction
         request = Mapquest::Request.new("217 Union St., NY", "api_key")
         query = %Q{key=api_key&outFormat=xml&inFormat=kvp&location=217%20Union%20St.,%20NY}

metadata

@@ -1,80 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: graticule
 version: !ruby/object:Gem::Version
-  version: 2.4.0
-  prerelease: 
+  version: 2.5.0
 platform: ruby
 authors:
 - Brandon Keepers
 - Daniel Morrison
+- Jason Roelofs
 - Collective Idea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: happymapper
+  name: nokogiri-happymapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Graticule is a geocoding API that provides a common interface to all
@@ -82,15 +74,16 @@ description: Graticule is a geocoding API that provides a common interface to al
 email:
 - brandon@opensoul.org
 - daniel@collectiveidea.com
+- jasongroelofs@gmail.com
 - code@collectiveidea.com
 executables:
 - geocode
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .travis.yml
+- ".autotest"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.txt
 - Gemfile
 - LICENSE.txt
@@ -115,6 +108,7 @@ files:
 - lib/graticule/geocoder/google.rb
 - lib/graticule/geocoder/host_ip.rb
 - lib/graticule/geocoder/local_search_maps.rb
+- lib/graticule/geocoder/mapbox.rb
 - lib/graticule/geocoder/mapquest.rb
 - lib/graticule/geocoder/multi.rb
 - lib/graticule/geocoder/multimap.rb
@@ -153,6 +147,10 @@ files:
 - test/fixtures/responses/local_search_maps/empty.txt
 - test/fixtures/responses/local_search_maps/not_found.txt
 - test/fixtures/responses/local_search_maps/success.txt
+- test/fixtures/responses/mapbox/empty_results.json
+- test/fixtures/responses/mapbox/no_results.json
+- test/fixtures/responses/mapbox/success.json
+- test/fixtures/responses/mapquest/multi_country_success.xml
 - test/fixtures/responses/mapquest/multi_result.xml
 - test/fixtures/responses/mapquest/success.xml
 - test/fixtures/responses/multimap/missing_params.xml
@@ -174,6 +172,7 @@ files:
 - test/graticule/geocoder/google_test.rb
 - test/graticule/geocoder/host_ip_test.rb
 - test/graticule/geocoder/local_search_maps_test.rb
+- test/graticule/geocoder/mapbox_test.rb
 - test/graticule/geocoder/mapquest_test.rb
 - test/graticule/geocoder/multi_test.rb
 - test/graticule/geocoder/multimap_test.rb
@@ -188,27 +187,26 @@ files:
 homepage: https://github.com/collectiveidea/graticule
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: API for using all the popular geocoding services
 test_files:
 - test/config.yml.default
@@ -237,6 +235,10 @@ test_files:
 - test/fixtures/responses/local_search_maps/empty.txt
 - test/fixtures/responses/local_search_maps/not_found.txt
 - test/fixtures/responses/local_search_maps/success.txt
+- test/fixtures/responses/mapbox/empty_results.json
+- test/fixtures/responses/mapbox/no_results.json
+- test/fixtures/responses/mapbox/success.json
+- test/fixtures/responses/mapquest/multi_country_success.xml
 - test/fixtures/responses/mapquest/multi_result.xml
 - test/fixtures/responses/mapquest/success.xml
 - test/fixtures/responses/multimap/missing_params.xml
@@ -258,6 +260,7 @@ test_files:
 - test/graticule/geocoder/google_test.rb
 - test/graticule/geocoder/host_ip_test.rb
 - test/graticule/geocoder/local_search_maps_test.rb
+- test/graticule/geocoder/mapbox_test.rb
 - test/graticule/geocoder/mapquest_test.rb
 - test/graticule/geocoder/multi_test.rb
 - test/graticule/geocoder/multimap_test.rb
@@ -269,4 +272,3 @@ test_files:
 - test/graticule/precision_test.rb
 - test/mocks/uri.rb
 - test/test_helper.rb
-has_rdoc: