* Added photos to past events

* Bumped version to 0.0.4

Author: estebistec

README.rst

@@ -34,3 +34,4 @@ Example Usage
     u'Steven Cummings'
     >>> an_attendee.photo.thumb_url
     u'http://photos1.meetupstatic.com/photos/member/2/e/f/5/thumb_16212021.jpeg'
+    >>> last_meetup.photos[0].url

docs/changelog.rst

@@ -4,10 +4,16 @@ Changelog
 Releases
 --------
 
+* `Release 0.0.4 - August 21, 2011`_
 * `Release 0.0.3 - August 13, 2011`_
 * `Release 0.0.2 - August 13, 2011`_
 * `Release 0.0.1 - August 7, 2011`_
 
+Release 0.0.4 - August 21, 2011
+-------------------------------
+
+* Added photos to past events.
+
 Release 0.0.3 - August 13, 2011
 -------------------------------
 

pythonkc_meetups/client.py

@@ -12,6 +12,7 @@
 from pythonkc_meetups.exceptions import PythonKCMeetupsRateLimitExceeded
 from pythonkc_meetups.parsers import parse_event
 from pythonkc_meetups.parsers import parse_member_from_rsvp
+from pythonkc_meetups.parsers import parse_photo
 import httplib2
 import json
 import mimeparse
@@ -21,6 +22,7 @@
 MEETUP_API_HOST = 'https://api.meetup.com'
 EVENTS_URL = MEETUP_API_HOST + '/2/events.json'
 RSVPS_URL = MEETUP_API_HOST + '/2/rsvps.json'
+PHOTOS_URL = MEETUP_API_HOST + '/2/photos.json'
 GROUP_URLNAME = 'pythonkc'
 
 
@@ -99,14 +101,19 @@ def get_attendees(event):
             return (self.get_event_attendees(event['id']) 
                     if 'id' in event else None)
 
+        def get_photos(event):
+            return (self.get_event_photos(event['id'])
+                    if 'id' in event else None)
+
         query = urllib.urlencode({'key': self._api_key,
                                   'group_urlname': GROUP_URLNAME,
                                   'status': 'past',
                                   'desc': 'true'})
         url = '{0}?{1}'.format(EVENTS_URL, query)
         data = self._http_get_json(url)
         events = data['results']
-        return [parse_event(event, get_attendees(event)) for event in events]
+        return [parse_event(event, get_attendees(event), get_photos(event)) 
+                for event in events]
 
     def get_event_attendees(self, event_id):
         """
@@ -137,6 +144,35 @@ def get_event_attendees(self, event_id):
         rsvps = data['results']
         return [parse_member_from_rsvp(rsvp) for rsvp in rsvps]
 
+    def get_event_photos(self, event_id):
+        """
+        Get photos for the identified event.
+
+        Parameters
+        ----------
+        event_id
+            ID of the event to get photos for.
+
+        Returns
+        -------
+        List of ``pythonkc_meetups.types.MeetupPhoto``.
+
+        Exceptions
+        ----------
+        * PythonKCMeetupsBadJson
+        * PythonKCMeetupsBadResponse
+        * PythonKCMeetupsMeetupDown
+        * PythonKCMeetupsNotJson
+        * PythonKCMeetupsRateLimitExceeded
+
+        """
+        query = urllib.urlencode({'key': self._api_key,
+                                  'event_id': event_id})
+        url = '{0}?{1}'.format(PHOTOS_URL, query)
+        data = self._http_get_json(url)
+        photos = data['results']
+        return [parse_photo(photo) for photo in photos]
+
     def _http_get_json(self, url):
         """
         Make an HTTP GET request to the specified URL, check that it returned a

pythonkc_meetups/parsers.py

@@ -10,12 +10,12 @@
 from dateutil.tz import tzutc
 from pythonkc_meetups.types import MeetupEvent
 from pythonkc_meetups.types import MeetupMember
-from pythonkc_meetups.types import MeetupMemberPhoto
+from pythonkc_meetups.types import MeetupPhoto
 from pythonkc_meetups.types import MeetupVenue
 import datetime
 
 
-def parse_event(data, attendees=None):
+def parse_event(data, attendees=None, photos=None):
     """
     Parse a ``MeetupEvent`` from the given response data.
 
@@ -35,8 +35,9 @@ def parse_event(data, attendees=None):
         maybe_rsvp_count=data.get('maybe_rsvp_count', None),
         event_url=data.get('event_url', None),
         photo_url=data.get('photo_url', None),
-        venue=parse_venue(data.get('venue', None)),
-        attendees=attendees
+        venue=parse_venue(data['venue']) if 'venue' in data else None,
+        attendees=attendees,
+        photos=photos
     )
 
 
@@ -46,24 +47,22 @@ def parse_venue(data):
 
     Returns
     -------
-    A `pythonkc_meetups.types.`MeetupVenue`` if non-empty data is given,
-    otherwise ``None``.
+    A `pythonkc_meetups.types.`MeetupVenue``.
 
     """
-    if data:
-        return MeetupVenue(
-            id=data.get('id', None),
-            name=data.get('name', None),
-            address_1=data.get('address_1', None),
-            address_2=data.get('address_2', None),
-            address_3=data.get('address_3', None),
-            city=data.get('city', None),
-            state=data.get('state', None),
-            zip=data.get('zip', None),
-            country=data.get('country', None),
-            lat=data.get('lat', None),
-            lon=data.get('lon', None)
-        )
+    return MeetupVenue(
+        id=data.get('id', None),
+        name=data.get('name', None),
+        address_1=data.get('address_1', None),
+        address_2=data.get('address_2', None),
+        address_3=data.get('address_3', None),
+        city=data.get('city', None),
+        state=data.get('state', None),
+        zip=data.get('zip', None),
+        country=data.get('country', None),
+        lat=data.get('lat', None),
+        lon=data.get('lon', None)
+    )
 
 
 def parse_member_from_rsvp(data):
@@ -78,33 +77,33 @@ def parse_member_from_rsvp(data):
     return MeetupMember(
         id=data['member'].get('member_id', None),
         name=data['member'].get('name', None),
-        photo=parse_member_photo(data.get('member_photo', None))
+        photo=(parse_photo(data['member_photo'])
+               if 'member_photo' in data else None)
     )
 
 
-def parse_member_photo(data):
+def parse_photo(data):
     """
-    Parse a ``MeetupMemberPhoto`` from the given response data.
+    Parse a ``MeetupPhoto`` from the given response data.
 
     Returns
     -------
-    A `pythonkc_meetups.types.`MeetupMemberPhoto`` if non-empty data is given,
-    otherwise ``None``.
+    A `pythonkc_meetups.types.`MeetupPhoto``.
 
     """
-    if data:
-        return MeetupMemberPhoto(
-            id=data.get('id', None),
-            url=data.get('photo_link', None),
-            highres_url=data.get('highres_link', None),
-            thumb_url=data.get('thumb_link', None)
-        )
+    return MeetupPhoto(
+        id=data.get('photo_id', data.get('id', None)),
+        url=data.get('photo_link', None),
+        highres_url=data.get('highres_link', None),
+        thumb_url=data.get('thumb_link', None)
+    )
 
 
 def parse_datetime(utc_timestamp_ms, utc_offset_ms):
     """
     Create a timezone-aware ``datetime.datetime`` from the given UTC timestamp
-    (in milliseconds), if provided. Also, the offset is applied, if given.
+    (in milliseconds), if provided. If an offest it given, it is applied to the
+    datetime returned.
 
     Parameters
     ----------

pythonkc_meetups/types.py

@@ -32,6 +32,8 @@
     URL of the event photo.
 attendees
     List of ``MeetupMember`` that attended this event if it was in the past.
+photos
+    List of ``MeetupPhoto`` from the event if it was in the past.
 
 MeetupVenue
 -----------
@@ -65,18 +67,18 @@
 name
     Full name (first & last) of the member.
 photo
-    A ``MeetupMemberPhoto`` containing URLs to this member's photo resources.
+    A ``MeetupPhoto`` containing URLs to this member's photo resources.
 
-MeetupMemberPhoto
------------------
+MeetupPhoto
+-----------
 id
-    Meetup.com ID for the member photo.
+    Meetup.com ID for the photo.
 url
-    URL of the member photo resource.
+    URL of the photo resource.
 highres_url
-    URL of the high-resolution version of the member photo.
+    URL of the high-resolution version of the photo.
 thumb_url
-    URL of the thumbnail version of the member photo.
+    URL of the thumbnail version of the photo.
 
 """
 
@@ -87,13 +89,13 @@
 MeetupEvent = namedtuple('MeetupEvent',
         ['id', 'name', 'description', 'time', 'status', 'venue',
          'yes_rsvp_count', 'maybe_rsvp_count', 'event_url', 'photo_url',
-         'attendees'])
+         'attendees', 'photos'])
 
 MeetupVenue = namedtuple('MeetupVenue',
         ['id', 'name', 'address_1', 'address_2', 'address_3', 'city', 'state',
          'zip', 'country', 'lat', 'lon'])
 
 MeetupMember = namedtuple('MeetupMember', ['id', 'name', 'photo'])
 
-MeetupMemberPhoto = namedtuple('MeetupMemberPhoto', 
+MeetupPhoto = namedtuple('MeetupPhoto', 
         ['id', 'url', 'highres_url', 'thumb_url'])

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='pythonkc-meetups',
-    version='0.0.3',
+    version='0.0.4',
     description='Provides PythonKC Meetup.com events.',
     license='MIT',
     url='https://github.com/pythonkc/pythonkc-meetups',