Merge branch 'lcarvalho-master'

Author: heatonjb

fixtures/media_shortcode.json

@@ -0,0 +1,89 @@
+{
+    "meta": {
+        "code": 200
+    },
+    "data": {
+        "attribution": null,
+        "tags":    [
+            "alegria"
+        ],
+        "type": "image",
+        "location": null,
+        "comments": {
+            "count": 79623,
+            "data":    []
+        },
+        "filter": "Normal",
+        "created_time": "1401623658",
+        "link": "http://instagram.com/p/os1NQjxtvF/",
+        "likes": {
+            "count": 370660,
+            "data": [
+                 {
+                    "username": "wakamario0904",
+                    "profile_picture": "http://images.ak.instagram.com/profiles/profile_395645793_75sq_1400392412.jpg",
+                    "id": "395645793",
+                    "full_name": "$☆<-W@ka M@rio->☆$"
+                },
+                 {
+                    "username": "musaed_ms3",
+                    "profile_picture": "http://images.ak.instagram.com/profiles/profile_1353197338_75sq_1401757650.jpg",
+                    "id": "1353197338",
+                    "full_name": "Musaed"
+                },
+                 {
+                    "username": "kerllancritiina_",
+                    "profile_picture": "http://images.ak.instagram.com/profiles/profile_405413316_75sq_1401764697.jpg",
+                    "id": "405413316",
+                    "full_name": "Kerllan Santos"
+                },
+                 {
+                    "username": "marccelaaa",
+                    "profile_picture": "http://images.ak.instagram.com/profiles/profile_327540205_75sq_1401046535.jpg",
+                    "id": "327540205",
+                    "full_name": "Marcela Funes"
+                }
+            ]
+        },
+        "images": {
+            "low_resolution": {
+                "url": "http://scontent-a.cdninstagram.com/hphotos-xpf1/t51.2885-15/10432037_1487631304805008_1552236767_a.jpg",
+                "width": 306,
+                "height": 306
+            },
+            "thumbnail": {
+                "url": "http://scontent-a.cdninstagram.com/hphotos-xpf1/t51.2885-15/10432037_1487631304805008_1552236767_s.jpg",
+                "width": 150,
+                "height": 150
+            },
+            "standard_resolution": {
+                "url": "http://scontent-a.cdninstagram.com/hphotos-xpf1/t51.2885-15/10432037_1487631304805008_1552236767_n.jpg",
+                "width": 640,
+                "height": 640
+            }
+        },
+        "users_in_photo":    [],
+        "caption": {
+            "created_time": "1401623658",
+            "text": "Bom diaaaaa !! #alegria #Alegria",
+            "from": {
+                "username": "neymarjr",
+                "profile_picture": "http://images.ak.instagram.com/profiles/profile_26669533_75sq_1396546465.jpg",
+                "id": "26669533",
+                "full_name": "Nj"
+            },
+            "id": "733194849033313209"
+        },
+        "user_has_liked": false,
+        "id": "733194846952938437_26669533",
+        "user": {
+            "username": "neymarjr",
+            "website": "",
+            "profile_picture": "http://images.ak.instagram.com/profiles/profile_26669533_75sq_1396546465.jpg",
+            "full_name": "Nj",
+            "bio": "",
+            "id": "26669533"
+        }
+    }
+}
+

instagram/client.py

@@ -1,6 +1,6 @@
 import oauth2
 from bind import bind_method
-from models import Media, User, Location, Tag, Comment, Relationship
+from models import MediaShortcode, Media, User, Location, Tag, Comment, Relationship
 
 MEDIA_ACCEPT_PARAMETERS = ["count", "max_id"]
 SEARCH_ACCEPT_PARAMETERS = ["q", "count"]
@@ -38,6 +38,13 @@ def __init__(self, *args, **kwargs):
                 accepts_parameters=SEARCH_ACCEPT_PARAMETERS + ['lat', 'lng', 'min_timestamp', 'max_timestamp', 'distance'],
                 root_class=Media)
 
+    media_shortcode = bind_method(
+                path="/media/shortcode/{shortcode}",
+                accepts_parameters=['shortcode'],
+                response_type="entry",
+                root_class=MediaShortcode)
+
+
     media_likes = bind_method(
                 path="/media/{media_id}/likes",
                 accepts_parameters=['media_id'],

instagram/models.py

@@ -109,6 +109,14 @@ def object_from_dictionary(cls, entry):
         return new_media
 
 
+class MediaShortcode(Media):
+
+    def __init__(self, shortcode=None, **kwargs):
+        self.shortcode = shortcode
+        for key, value in kwargs.iteritems():
+            setattr(self, key, value)
+
+
 class Tag(ApiModel):
     def __init__(self, name, **kwargs):
         self.name = name

tests.py

@@ -99,6 +99,10 @@ def test_media_search(self):
         self.client_only_api.media_search(lat=37.7,lng=-122.22)
         self.api.media_search(lat=37.7,lng=-122.22)
 
+    def test_media_shortcode(self):
+        self.client_only_api.media_shortcode('os1NQjxtvF')
+        self.api.media_shortcode('os1NQjxtvF')
+
     def test_media_likes(self):
         self.client_only_api.media_likes(media_id=4)