fixed mark seen and mark read support

tschellenbach · tschellenbach · commit 539e615acb73 · 2015-01-05T14:05:30.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,13 @@
  Change history
 ================
 
+2.1.3
+=====
+:release-date: 2015-01-05
+:by: Thierry Schellenbach
+
+* Bugfix, mark_seen and mark_read now work
+
 2.1.0
 =====
 :release-date: 2014-12-19
diff --git a/stream/__init__.py b/stream/__init__.py
@@ -5,7 +5,7 @@
 __copyright__ = 'Copyright 2014, Thierry Schellenbach'
 __credits__ = ['Thierry Schellenbach, mellowmorning.com, @tschellenbach']
 __license__ = 'BSD'
-__version__ = '2.1.2'
+__version__ = '2.1.3'
 __maintainer__ = 'Thierry Schellenbach'
 __email__ = 'thierryschellenbach@gmail.com'
 __status__ = 'Production'
diff --git a/stream/feed.py b/stream/feed.py
@@ -96,9 +96,10 @@ def get(self, **params):
             # slow pagination using offset
             feed.get(limit=10, offset=10)
         '''
-        mark_read = params.get('mark_read')
-        if isinstance(mark_read, (list, tuple)):
-            params['mark_read'] = ','.join(mark_read)
+        for field in ['mark_read', 'mark_seen']:
+            value = params.get(field)
+            if isinstance(value, (list, tuple)):
+                params[field] = ','.join(value)
         response = self.client.get(
             self.feed_url, params=params, signature=self.signature)
         return response
diff --git a/stream/tests.py b/stream/tests.py
@@ -365,9 +365,29 @@ def test_mark_read(self):
         for activity in activities:
             self.assertFalse(activity['is_read'])
         activities = notification_feed.get(mark_read=True)['results']
+        activities = notification_feed.get(limit=2)['results']
+        self.assertTrue(activities[0]['is_read'])
+        self.assertTrue(activities[1]['is_read'])
+            
+    def test_mark_seen(self):
+        notification_feed = getfeed('notification', 'py3')
+        activity_data = {'actor': 1, 'verb': 'tweet', 'object': 1}
+        activity_id = notification_feed.add_activity(activity_data)['id']
+        activity_data = {'actor': 2, 'verb': 'add', 'object': 2}
+        activity_id_two = notification_feed.add_activity(activity_data)['id']
+        activity_data = {'actor': 3, 'verb': 'watch', 'object': 3}
+        activity_id_three = notification_feed.add_activity(activity_data)['id']
         activities = notification_feed.get(limit=3)['results']
         for activity in activities:
-            self.assertTrue(activity['is_read'])
+            self.assertFalse(activity['is_seen'])
+            
+        activities = notification_feed.get(limit=3)['results']
+        activities = notification_feed.get(mark_seen=[activities[0]['id'], activities[1]['id']])['results']
+        activities = notification_feed.get(limit=3)['results']
+        # is the seen state correct
+        self.assertTrue(activities[0]['is_seen'])
+        self.assertTrue(activities[1]['is_seen'])
+        self.assertFalse(activities[2]['is_seen'])
 
     def test_mark_read_by_id(self):
         notification_feed = getfeed('notification', 'py2')
