Merge pull request #151 from epyatopal/master

http://ipinfo.io/ provider added

Author: DenisCarriere

docs/providers/IpinfoIo.md

@@ -0,0 +1,49 @@
+# IpinfoIo (IP Address)
+
+## Python Example
+
+```python
+>>> import geocoder
+>>> g = geocoder.ipinfoio('199.7.157.0')
+>>> g.latlng
+[45.413140, -75.656703]
+>>> g.city
+'Toronto'
+...
+```
+
+To retrieve your own IP address, simply have `''` as the input.
+
+```python
+>>> import geocoder
+>>> g = geocoder.ipinfoio('')
+>>> g.latlng
+[45.413140, -75.656703]
+>>> g.ip
+'199.7.157.0'
+...
+```
+
+## Geocoder Attributes
+
+```
+g.address        g.ip          g.postal         g.y
+g.city           g.json        g.lat            g.provider
+g.content        g.latlng      g.state
+g.country        g.lng         g.status
+g.debug          g.location    g.status_code
+g.error          g.ok          g.url
+g.geometry       g.params      g.wkt
+g.headers        g.parse       g.x
+```
+
+## Parameters
+
+* :param location: Your search IP Address you want geocoded.
+* :param location: (optional) `''` will return your current IP address's location.
+
+## References
+
+* [GitHub Repo](https://github.com/DenisCarriere/geocoder)
+* [GitHub Wiki](https://github.com/DenisCarriere/geocoder/wiki)
+* [IpinfoIo](https://ipinfo.io)

geocoder/__init__.py

@@ -35,7 +35,7 @@
 # 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, freegeoip, ottawa, here, baidu, w3w, yandex  # noqa
+from geocoder.api import maxmind, ipinfoio, freegeoip, ottawa, here, baidu, w3w, yandex  # noqa
 
 # EXTRAS
 from geocoder.api import timezone, elevation, ip, canadapost, reverse, distance, location  # noqa

geocoder/api.py

@@ -16,6 +16,7 @@
 from geocoder.google import Google
 from geocoder.mapbox import Mapbox
 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
@@ -61,6 +62,7 @@ def get(location, **kwargs):
             'reverse': MapboxReverse,
         },
         'maxmind': {'geocode': Maxmind},
+        'ipinfoio': {'geocode': IpinfoIo},
         'geonames': {'geocode': Geonames},
         'freegeoip': {'geocode': FreeGeoIP},
         'w3w': {
@@ -101,7 +103,6 @@ def get(location, **kwargs):
     else:
         if method not in options[provider]:
             raise ValueError("Invalid method")
-
     return options[provider][method](location, **kwargs)
 
 
@@ -341,6 +342,16 @@ def maxmind(location='me', **kwargs):
     return get(location, provider='maxmind', **kwargs)
 
 
+def ipinfoio(location='', **kwargs):
+    """IpinfoIo 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)
+
+
 def freegeoip(location, **kwargs):
     """FreeGeoIP Provider
 

geocoder/ipinfoio.py

@@ -0,0 +1,89 @@
+#!/usr/bin/python
+# coding: utf8
+
+from __future__ import absolute_import
+from geocoder.base import Base
+
+
+class IpinfoIo(Base):
+    """
+    API Reference
+    -------------
+    https://ipinfo.io
+    """
+    provider = 'ipinfoio'
+    method = 'geocode'
+    def __init__(self, location='', **kwargs):
+        self.location = location
+        self.url = 'http://ipinfo.io/{0}/json'.format(self.location)
+        self._initialize(**kwargs)
+        self._ipinfoio_catch_errors()
+
+    def _ipinfoio_catch_errors(self):
+        error = self.content.get('error')
+        if error:
+            code = self.content.get('code')
+            self.error = code
+
+    def _exceptions(self):
+        subdivisions = self.content.get('subdivisions')
+        if subdivisions:
+            self.content['subdivision'] = subdivisions[0]
+
+        # Grab all names in [en] and place them in self.parse
+        for key, value in self.content.items():
+            if isinstance(value, dict):
+                for minor_key, minor_value in value.items():
+                    if minor_key == 'names':
+                        self.parse[key] = minor_value['en']
+
+    @property
+    def lat(self):
+        return self.parse.get('loc').split(',')[0]
+
+    @property
+    def lng(self):
+         return self.parse.get('loc').split(',')[1]
+
+    @property
+    def address(self):
+        if self.city:
+            return '{0}, {1}, {2}'.format(self.city, self.state, self.country)
+        elif self.state:
+            return '{0}, {1}'.format(self.state, self.country)
+        elif self.country:
+            return '{0}'.format(self.country)
+        else:
+            return ''
+
+    @property
+    def postal(self):
+        return self.parse.get('postal')
+
+    @property
+    def city(self):
+        return self.parse.get('city')
+
+    @property
+    def state(self):
+        return self.parse.get('region')
+
+    @property
+    def country(self):
+        return self.parse.get('country')
+
+    @property
+    def hostname(self):
+        return self.parse.get('hostname')
+
+    @property
+    def ip(self):
+        return self.parse.get('ip')
+
+    @property
+    def org(self):
+        return self.parse.get('org')
+
+if __name__ == '__main__':
+    g = IpinfoIo('')
+    g.debug()