Update IPInfo.io Provider

- Changed the provider name shorter from ipinfoio > ipinfo
- Added Command line support for ipinfo.
- Parsing lat & lng into floats instead of strings.
- Converted documentation to RST instead of Markdown.
- Catching errors if you enter incorrect IP address.
- Remove ipinfo exceptions, there isn't any.
- Added IPInfo in Index.rst for docs.

Author: DenisCarriere

README.rst

@@ -121,6 +121,7 @@ Providers
     GeoOttawa_, Ottawa
     Google_, World, Rate Limit
     HERE_, World, API key
+    IPInfo_, World
     Mapbox_, World, API key
     MapQuest_, World, API key
     MaxMind_, World
@@ -200,3 +201,4 @@ Please feel free to give any feedback on this module. If you find any bugs or an
 .. _What3Words: http://geocoder.readthedocs.org/providers/What3Words.html
 .. _CanadaPost: http://geocoder.readthedocs.org/providers/CanadaPost.html
 .. _GeoNames: http://geocoder.readthedocs.org/providers/GeoNames.html
+.. _IPInfo: http://geocoder.readthedocs.org/providers/IPInfo.html

docs/index.rst

@@ -75,6 +75,7 @@ Detailed information about each individual provider that are within Geocoder.
     providers/Geocoder-ca.rst
     providers/GeoOttawa.rst
     providers/HERE.rst
+    providers/IPInfo.rst
 
 
 Contributor Guide

docs/providers/IPInfo.rst

@@ -0,0 +1,59 @@
+IP Info.io (IP Address)
+=======================
+
+Use the ipinfo.io IP lookup API to quickly and simply integrate IP geolocation 
+into your script or website. Save yourself the hassle of setting up local GeoIP 
+libraries and having to remember to regularly update the data.
+
+Examples
+~~~~~~~~
+
+Basic Geocoding
+---------------
+
+.. code-block:: python
+
+    >>> import geocoder
+    >>> g = geocoder.ipinfo('199.7.157.0')
+    >>> g.latlng
+    [45.413140, -75.656703]
+    >>> g.city
+    'Toronto'
+    >>> g.json
+    ...
+
+Lookup your own IP
+------------------
+
+To retrieve your own IP address, simply have `''` as the input.
+
+.. code-block:: python
+
+    >>> import geocoder
+    >>> g = geocoder.ipinfo('')
+    >>> g.latlng
+    [45.413140, -75.656703]
+    >>> g.ip
+    '199.7.157.0'
+    >>> g.json
+    ...
+
+Command Line Interface
+----------------------
+
+.. code-block:: bash
+
+    $ geocode '199.7.157.0' --provider ipinfo | jq .
+
+Parameters
+~~~~~~~~~~
+
+- `location`: Your search location you want geocoded.
+- `location`: (optional) `''` will return your current IP address's location.
+- `method`: (default=geocode) Use the following:
+  - geocode
+
+References
+~~~~~~~~~~
+
+- `IpinfoIo <https://ipinfo.io>`_

docs/providers/IpinfoIo.md

@@ -28,14 +28,14 @@
 __title__ = 'geocoder'
 __author__ = 'Denis Carriere'
 __author_email__ = 'carriere.denis@gmail.com'
-__version__ = '1.5.2'
+__version__ = '1.5.3'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2013-2015 Denis Carriere'
 
 # CORE
 from geocoder.api import get, yahoo, bing, geonames, mapquest, google, mapbox  # noqa
 from geocoder.api import nokia, osm, tomtom, geolytica, arcgis, opencage  # noqa
-from geocoder.api import maxmind, ipinfoio, freegeoip, ottawa, here, baidu, w3w, yandex  # noqa
+from geocoder.api import maxmind, ipinfo, freegeoip, ottawa, here, baidu, w3w, yandex  # noqa
 
 # EXTRAS
 from geocoder.api import timezone, elevation, ip, canadapost, reverse, distance, location  # noqa

geocoder/__init__.py

@@ -15,8 +15,8 @@
 from geocoder.yandex import Yandex
 from geocoder.google import Google
 from geocoder.mapbox import Mapbox
+from geocoder.ipinfo import Ipinfo
 from geocoder.maxmind import Maxmind
-from geocoder.ipinfoio import IpinfoIo
 from geocoder.location import Location
 from geocoder.opencage import OpenCage
 from geocoder.geonames import Geonames
@@ -37,63 +37,66 @@
 from geocoder.opencage_reverse import OpenCageReverse
 
 
+options = {
+    'osm': {'geocode': Osm},
+    'here': {
+        'geocode': Here,
+        'reverse': HereReverse,
+    },
+    'baidu': {'geocode': Baidu},
+    'yahoo': {'geocode': Yahoo},
+    'tomtom': {'geocode': Tomtom},
+    'arcgis': {'geocode': Arcgis},
+    'ottawa': {'geocode': Ottawa},
+    'mapbox': {
+        'geocode': Mapbox,
+        'reverse': MapboxReverse,
+    },
+    'maxmind': {'geocode': Maxmind},
+    'ipinfo': {'geocode': Ipinfo},
+    'geonames': {'geocode': Geonames},
+    'freegeoip': {'geocode': FreeGeoIP},
+    'w3w': {
+        'geocode': W3W,
+        'reverse': W3WReverse,
+    },
+    'yandex': {
+        'geocode': Yandex,
+        'reverse': YandexReverse,
+    },
+    'mapquest': {
+        'geocode': Mapquest,
+        'reverse': MapquestReverse,
+    },
+    'geolytica': {'geocode': Geolytica},
+    'canadapost': {'geocode': Canadapost},
+    'opencage': {
+        'geocode': OpenCage,
+        'reverse': OpenCageReverse,
+    },
+    'bing': {
+        'geocode': Bing,
+        'reverse': BingReverse,
+    },
+    'google': {
+        'geocode': Google,
+        'reverse': GoogleReverse,
+        'timezone': Timezone,
+        'elevation': Elevation,
+    },
+}
+
+
 def get(location, **kwargs):
     """Get Geocode
 
     :param ``location``: Your search location you want geocoded.
     :param ``provider``: The geocoding engine you want to use.
+
     :param ``method``: Define the method (geocode, method).
     """
     provider = kwargs.get('provider', 'bing').lower().strip()
     method = kwargs.get('method', 'geocode').lower().strip()
-    options = {
-        'osm': {'geocode': Osm},
-        'here': {
-            'geocode': Here,
-            'reverse': HereReverse,
-        },
-        'baidu': {'geocode': Baidu},
-        'yahoo': {'geocode': Yahoo},
-        'tomtom': {'geocode': Tomtom},
-        'arcgis': {'geocode': Arcgis},
-        'ottawa': {'geocode': Ottawa},
-        'mapbox': {
-            'geocode': Mapbox,
-            'reverse': MapboxReverse,
-        },
-        'maxmind': {'geocode': Maxmind},
-        'ipinfoio': {'geocode': IpinfoIo},
-        'geonames': {'geocode': Geonames},
-        'freegeoip': {'geocode': FreeGeoIP},
-        'w3w': {
-            'geocode': W3W,
-            'reverse': W3WReverse,
-        },
-        'yandex': {
-            'geocode': Yandex,
-            'reverse': YandexReverse,
-        },
-        'mapquest': {
-            'geocode': Mapquest,
-            'reverse': MapquestReverse,
-        },
-        'geolytica': {'geocode': Geolytica},
-        'canadapost': {'geocode': Canadapost},
-        'opencage': {
-            'geocode': OpenCage,
-            'reverse': OpenCageReverse,
-        },
-        'bing': {
-            'geocode': Bing,
-            'reverse': BingReverse,
-        },
-        'google': {
-            'geocode': Google,
-            'reverse': GoogleReverse,
-            'timezone': Timezone,
-            'elevation': Elevation,
-        },
-    }
     if isinstance(location, (list, dict)) and method == 'geocode':
         raise ValueError("Location should be a string")
 
@@ -342,14 +345,14 @@ def maxmind(location='me', **kwargs):
     return get(location, provider='maxmind', **kwargs)
 
 
-def ipinfoio(location='', **kwargs):
-    """IpinfoIo Provider
+def ipinfo(location='', **kwargs):
+    """IP Info.io Provider
 
     :param location: Your search IP Address you want geocoded.
     :param location: (optional) if left blank will return your
                                 current IP address's location.
     """
-    return get(location, provider='ipinfoio', **kwargs)
+    return get(location, provider='ipinfo', **kwargs)
 
 
 def freegeoip(location, **kwargs):

geocoder/api.py

@@ -23,7 +23,7 @@ class Base(object):
                 'xy', 'northeast', 'northwest', 'southeast', 'southwest',
                 'road_long', 'city_long', 'state_long', 'country_long',
                 'postal_town_long', 'province_long', 'road_long',
-                'street_long', 'interpolated']
+                'street_long', 'interpolated', 'method', 'geometry']
     fieldnames = []
     error = None
     status_code = None
@@ -87,7 +87,8 @@ def _connect(self, **kwargs):
             )
             self.status_code = r.status_code
             self.url = r.url
-            self.content = r.json()
+            if r.content:
+                self.status_code = 200
         except KeyboardInterrupt:
             sys.exit()
         except requests.exceptions.SSLError:

geocoder/base.py

@@ -1,16 +1,16 @@
 #!/usr/bin/python
 # coding: utf8
 
+from __future__ import absolute_import
 import click
 import json
 import geocoder
 import os
 import fileinput
+from geocoder.api import options
 
 
-providers = ['google', 'bing', 'osm', 'here', 'w3w', 'opencage', 'yandex',
-             'arcgis', 'tomtom', 'mapquest', 'maxmind', 'baidu', 'canadapost',
-             'freegeoip', 'geolytica', 'ottawa', 'geonames', 'yahoo', 'mapbox']
+providers = options.keys()
 methods = ['geocode', 'reverse', 'elevation', 'timezone']
 outputs = ['json', 'osm', 'geojson', 'wkt']
 units = ['kilometers', 'miles', 'feet', 'meters']