RubyGems - graticule - Versions diffs - 2.5.0 → 2.6.0 - Mend

graticule 2.5.0 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
data/.travis.yml +9 -4
data/CHANGELOG.txt +3 -0
data/Gemfile +2 -1
data/graticule.gemspec +0 -1
data/lib/graticule/geocoder/geonames.rb +8 -3
data/lib/graticule/geocoder/google.rb +2 -2
data/lib/graticule/geocoder/mapbox.rb +12 -69
data/lib/graticule/version.rb +1 -1
data/test/fixtures/responses/mapbox/empty_results.json +8 -1
data/test/fixtures/responses/mapbox/no_results.json +8 -1
data/test/fixtures/responses/mapbox/success.json +229 -1
data/test/graticule/geocoder/geonames_test.rb +1 -8
data/test/graticule/geocoder/mapbox_test.rb +14 -12
metadata +3 -17

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47fedf16b0ffe4698090ec1155d88e251913daf4
-  data.tar.gz: f142b7298a24e38b1737e803661bf3aa8565de7b
+  metadata.gz: 91485c3b1e3be348db8ebfaafa69e7ce5b47f613
+  data.tar.gz: 60d765a0b7303994a982035ff0e0370ac36d02c6
 SHA512:
-  metadata.gz: 233a07082a35178fd72e240f07fc90f4b072dabbe6b6d070ea2a21cabc8299aadf16c6913c87804c7c7e6becb9575635fdbba1047c5dd10b6ef024509e87a326
-  data.tar.gz: c0aedc447cfb0150ef65465741123edeb6b630582fa395aed114d8de4c1e38c454bc493d88da9a72c0270a4fde1267db5b773ee25e6425fc23457b78775dbd1e
+  metadata.gz: 00eb32e2692ceae1a75b517c91b7ee73c0f7c360c3c95ab217af12cdde92a3c3532f52f1df28d658c7c9d260fdf3e497f1e860797d11abdbbb1fb1ae6435ae8d
+  data.tar.gz: f521c98c1472fcfd8331c22c9d593478b8136385047e4a7c3bc4dd4d690d690258ab4b47ad926a7f44eb5691f5d1b7c0c14d143dbac26fa3046442c9cbb397fc

data/.travis.yml CHANGED Viewed

@@ -1,17 +1,22 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
 before_install:
   - sudo apt-get install libxslt-dev libxml2-dev
+  - gem install bundler
 before_script:
   - cp test/config.yml.default test/config.yml
 only:
   - master
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 notifications:
   email: false
   webhooks:
     urls:
       - http://buildlight.collectiveidea.com/
-    on_start: true
+    on_start: always

data/CHANGELOG.txt CHANGED Viewed

@@ -1,3 +1,6 @@
+2.6.0 (2018-05-31)
+* Update Mapbox to use the current v5 API
 2.5.0 (2014-09-04)
 * Add Mapbox geocoder
 * Add Open MapQuest

data/Gemfile CHANGED Viewed

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

data/graticule.gemspec CHANGED Viewed

@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "i18n"
   spec.add_dependency "nokogiri-happymapper", ">= 0.5.9"
-  spec.add_dependency "json"
 end

data/lib/graticule/geocoder/geonames.rb CHANGED Viewed

@@ -3,12 +3,17 @@ module Graticule #:nodoc:
   module Geocoder #:nodoc:
     class Geonames < Base
-      def initialize
-        @url = URI.parse 'http://ws.geonames.org/timezone'
+      def initialize(username)
+        @url = URI.parse('http://ws.geonames.org/timezone')
+        @username = URI.encode(username)
       end
       def time_zone(location)
-        get :formatted => 'true', :style => 'full', :lat => location.latitude, :lng => location.longitude
+        get :formatted => 'true',
+            :style => 'full',
+            :lat => location.latitude,
+            :lng => location.longitude,
+            :username => @username
       end
     private

data/lib/graticule/geocoder/google.rb CHANGED Viewed

@@ -44,8 +44,8 @@ module Graticule #:nodoc:
                 @street_number = component["short_name"]
               when "route"
                 @route = component["short_name"]
-              when "locality"
-                @locality = component["long_name"]
+              when "locality", "sublocality"
+                @locality = component["long_name"]
               when "administrative_area_level_1"
                 @region = component["short_name"]
               when "country"

data/lib/graticule/geocoder/mapbox.rb CHANGED Viewed

@@ -1,7 +1,7 @@
-module Graticule
-  module Geocoder
+module Graticule #:nodoc:
+  module Geocoder #:nodoc:
     class Mapbox < Base
-      BASE_URL = "http://api.tiles.mapbox.com"
+      BASE_URL = "http://api.mapbox.com/geocoding/v5/mapbox.places"
       def initialize(api_key)
         @api_key = api_key
@@ -13,76 +13,25 @@ module Graticule
       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
+        attr_accessor :lat, :lon, :precision
-        def initialize(input)
+        def initialize(attributes)
           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
+          self.lon = attributes["center"][0]
+          self.lat = attributes["center"][1]
         end
       end
       def make_url(params)
         query = URI.escape(params[:q].to_s)
-        url   = "#{BASE_URL}/v3/#{@api_key}/geocode/#{query}.json"
+        url = "#{BASE_URL}/#{query}.json?access_token=#{@api_key}"
         URI.parse(url)
       end
       def check_error(response)
-        raise AddressError, 'unknown address' if (response["results"].nil? || response["results"].empty?)
+        raise AddressError, 'unknown address' if (response["features"].nil? || response["features"].empty?)
       end
       def prepare_response(response)
@@ -91,17 +40,11 @@ module Graticule
       def parse_response(response)
         # Pull data from the first result since we get a bunch
-        result = Result.new(response["results"][0])
+        result = Result.new(response["features"][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
+          :latitude  => result.lat,
+          :longitude => result.lon,
         )
       end
     end

data/lib/graticule/version.rb CHANGED Viewed

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

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

@@ -1 +1,8 @@
-{"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":[]}
+{
+  "type": "FeatureCollection",
+  "query": [
+    "asdfjkl"
+  ],
+  "features": [],
+  "attribution": "NOTICE: © 2017 Mapbox and its suppliers. All rights reserved. Use of this data is subject to the Mapbox Terms of Service (https://www.mapbox.com/about/maps/). This response and the information it contains may not be retained."
+}

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

@@ -1 +1,8 @@
-{"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>"}}
+{
+  "type": "FeatureCollection",
+  "query": [
+    "asdfjkl"
+  ],
+  "features": [],
+  "attribution": "NOTICE: © 2017 Mapbox and its suppliers. All rights reserved. Use of this data is subject to the Mapbox Terms of Service (https://www.mapbox.com/about/maps/). This response and the information it contains may not be retained."
+}

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

@@ -1 +1,229 @@
-{"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"}]]}
+{
+  "type": "FeatureCollection",
+  "query": [
+    "1",
+    "infinite",
+    "loop",
+    "cupertino",
+    "ca"
+  ],
+  "features": [
+    {
+      "id": "address.6395221899832142",
+      "type": "Feature",
+      "place_type": [
+        "address"
+      ],
+      "relevance": 1,
+      "properties": {},
+      "text": "Infinite Loop",
+      "place_name": "1 Infinite Loop, Cupertino, California 95014, United States",
+      "center": [
+        -122.03023,
+        37.331524
+      ],
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.03023,
+          37.331524
+        ]
+      },
+      "address": "1",
+      "context": [
+        {
+          "id": "postcode.17583069324210830",
+          "text": "95014"
+        },
+        {
+          "id": "place.8489369485676010",
+          "wikidata": "Q189471",
+          "text": "Cupertino"
+        },
+        {
+          "id": "region.3591",
+          "short_code": "US-CA",
+          "wikidata": "Q99",
+          "text": "California"
+        },
+        {
+          "id": "country.3145",
+          "short_code": "us",
+          "wikidata": "Q30",
+          "text": "United States"
+        }
+      ]
+    },
+    {
+      "id": "place.8489369485676010",
+      "type": "Feature",
+      "place_type": [
+        "place"
+      ],
+      "relevance": 0.5,
+      "properties": {
+        "wikidata": "Q189471"
+      },
+      "text": "Cupertino",
+      "place_name": "Cupertino, California, United States",
+      "bbox": [
+        -122.143825004601,
+        37.2479929816717,
+        -121.995539980292,
+        37.3415970152769
+      ],
+      "center": [
+        -122.0323,
+        37.323
+      ],
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.0323,
+          37.323
+        ]
+      },
+      "context": [
+        {
+          "id": "region.3591",
+          "short_code": "US-CA",
+          "wikidata": "Q99",
+          "text": "California"
+        },
+        {
+          "id": "country.3145",
+          "short_code": "us",
+          "wikidata": "Q30",
+          "text": "United States"
+        }
+      ]
+    },
+    {
+      "id": "neighborhood.285073",
+      "type": "Feature",
+      "place_type": [
+        "neighborhood"
+      ],
+      "relevance": 0.49,
+      "properties": {},
+      "text": "Calvert",
+      "place_name": "Calvert, Cupertino, California 95014, United States",
+      "bbox": [
+        -122.024501,
+        37.316342,
+        -121.986694,
+        37.331914
+      ],
+      "center": [
+        -122.0138,
+        37.3258
+      ],
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.0138,
+          37.3258
+        ]
+      },
+      "context": [
+        {
+          "id": "postcode.17583069324210830",
+          "text": "95014"
+        },
+        {
+          "id": "place.8489369485676010",
+          "wikidata": "Q189471",
+          "text": "Cupertino"
+        },
+        {
+          "id": "region.3591",
+          "short_code": "US-CA",
+          "wikidata": "Q99",
+          "text": "California"
+        },
+        {
+          "id": "country.3145",
+          "short_code": "us",
+          "wikidata": "Q30",
+          "text": "United States"
+        }
+      ]
+    },
+    {
+      "id": "country.3179",
+      "type": "Feature",
+      "place_type": [
+        "country"
+      ],
+      "relevance": 0.3333333333333333,
+      "properties": {
+        "wikidata": "Q16",
+        "short_code": "ca"
+      },
+      "text": "Canada",
+      "place_name": "Canada",
+      "bbox": [
+        -141.10275,
+        39.943435,
+        -47.597809,
+        86.553514
+      ],
+      "center": [
+        -105.750596,
+        55.585901
+      ],
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -105.750596,
+          55.585901
+        ]
+      }
+    },
+    {
+      "id": "place.7943223081734240",
+      "type": "Feature",
+      "place_type": [
+        "place"
+      ],
+      "relevance": 0.3333333333333333,
+      "properties": {
+        "wikidata": "Q36312"
+      },
+      "text": "Calgary",
+      "place_name": "Calgary, Alberta, Canada",
+      "bbox": [
+        -114.315773841495,
+        50.842824406804,
+        -113.859901837937,
+        51.2124248116277
+      ],
+      "center": [
+        -114.0626,
+        51.0531
+      ],
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -114.0626,
+          51.0531
+        ]
+      },
+      "context": [
+        {
+          "id": "region.219693",
+          "short_code": "CA-AB",
+          "wikidata": "Q1951",
+          "text": "Alberta"
+        },
+        {
+          "id": "country.3179",
+          "short_code": "ca",
+          "wikidata": "Q16",
+          "text": "Canada"
+        }
+      ]
+    }
+  ],
+  "attribution": "NOTICE: © 2017 Mapbox and its suppliers. All rights reserved. Use of this data is subject to the Mapbox Terms of Service (https://www.mapbox.com/about/maps/). This response and the information it contains may not be retained."
+}

data/test/graticule/geocoder/geonames_test.rb CHANGED Viewed

@@ -7,14 +7,7 @@ module Graticule
       def setup
         URI::HTTP.responses = []
         URI::HTTP.uris = []
-        @geocoder = Geonames.new
-      end
-      def test_time_zone
-        return unless prepare_response(:success)
-        chicago = Location.new(:latitude => 41.85, :longitude => -87.65)
-        assert_equal 'America/Chicago', @geocoder.time_zone(chicago)
+        @geocoder = Geonames.new("demo")
       end
       def test_time_zone

data/test/graticule/geocoder/mapbox_test.rb CHANGED Viewed

@@ -5,21 +5,17 @@ module Graticule
   module Geocoder
     class MapboxTest < Test::Unit::TestCase
       def setup
+        URI::HTTP.responses = []
+        URI::HTTP.uris = []
         @geocoder = Mapbox.new("api_key")
       end
       def test_locate_success
-        URI::HTTP.responses << response("mapbox", "success", "json")
+        prepare_response(:success)
         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
+          :latitude    => 37.331524,
+          :longitude   => -122.03023,
         )
         actual = @geocoder.locate("1 Infinite Loop, Cupertino, CA")
@@ -28,16 +24,22 @@ module Graticule
       end
       def test_locate_not_found
-        URI::HTTP.responses << response("mapbox", "empty_results", "json")
+        prepare_response(:empty_results)
         assert_raises(AddressError) { @geocoder.locate 'asdfjkl' }
       end
       def test_no_results_returned
-        URI::HTTP.responses << response("mapbox", "no_results", "json")
+        prepare_response(:no_results)
         assert_raises(AddressError) { @geocoder.locate 'asdfjkl' }
       end
+      protected
+      def prepare_response(id = :success)
+        URI::HTTP.responses << response('mapbox', id, 'json')
+      end
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graticule
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,20 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.9
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Graticule is a geocoding API that provides a common interface to all
   the popular services, including Google, Yahoo, Geocoder.us, and MetaCarta.
 email:
@@ -204,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.6.3
 signing_key:
 specification_version: 4
 summary: API for using all the popular geocoding services