new version

setup.py

@@ -42,7 +42,7 @@
 
 setuptools.setup(
     name = "instagram_api",
-    version = "0.1.3",
+    version = "0.1.4",
     author = "Hive Solutions Lda.",
     author_email = "development@hive.pt",
     description = "Instagram API Client",

src/examples/base.py

@@ -42,7 +42,7 @@
 import instagram
 
 def get_api():
-    return instagram.Api(
+    return instagram.API(
         client_id = appier.conf("INSTAGRAM_ID"),
         client_secret = appier.conf("INSTAGRAM_SECRET"),
         redirect_url = appier.conf("INSTAGRAM_REDIRECT_URL")

src/instagram/__init__.py

@@ -40,8 +40,8 @@
 from . import tag
 from . import user
 
-from .base import BASE_URL, Api
-from .media import MediaApi
-from .subscription import SubscriptionApi
-from .tag import TagApi
-from .user import UserApi
+from .base import BASE_URL, API
+from .media import MediaAPI
+from .subscription import SubscriptionAPI
+from .tag import TagAPI
+from .user import UserAPI

src/instagram/base.py

@@ -67,16 +67,16 @@
 """ The list of permissions to be used to create the
 scope string for the oauth value """
 
-class Api(
-    appier.OAuth2Api,
-    tag.TagApi,
-    user.UserApi,
-    media.MediaApi,
-    subscription.SubscriptionApi
+class API(
+    appier.OAuth2API,
+    tag.TagAPI,
+    user.UserAPI,
+    media.MediaAPI,
+    subscription.SubscriptionAPI
 ):
 
     def __init__(self, *args, **kwargs):
-        appier.OAuth2Api.__init__(self, *args, **kwargs)
+        appier.OAuth2API.__init__(self, *args, **kwargs)
         self.client_id = appier.conf("INSTAGRAM_ID", CLIENT_ID)
         self.client_secret = appier.conf("INSTAGRAM_SECRET", CLIENT_SECRET)
         self.redirect_url = appier.conf("INSTAGRAM_REDIRECT_URL", REDIRECT_URL)

src/instagram/media.py

@@ -37,7 +37,7 @@
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
-class MediaApi(object):
+class MediaAPI(object):
 
     def get_media(self, id):
         url = self.base_url + "v1/media/%s" % id

src/instagram/subscription.py

@@ -37,7 +37,7 @@
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
-class SubscriptionApi(object):
+class SubscriptionAPI(object):
 
     def subscribe(self, object = "tag", aspect = "media", object_id = None, callback_url = None):
         url = self.base_url + "v1/subscriptions"

src/instagram/tag.py

@@ -37,7 +37,7 @@
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
-class TagApi(object):
+class TagAPI(object):
 
     def media_tag(self, tag):
         url = self.base_url + "v1/tags/%s/media/recent" % tag

src/instagram/user.py

@@ -37,7 +37,7 @@
 __license__ = "Apache License, Version 2.0"
 """ The license for the module """
 
-class UserApi(object):
+class UserAPI(object):
 
     def get_user(self, user_id):
         url = self.base_url + "v1/users/%s" % user_id