Merge lp:~ken-vandine/friends/identica_favorites into lp:friends

[Ken VanDine]

Fixed endpoint for favorites on identica

Fixed endpoint for favorites on identica, no longer raising NotImplemented.

[Robert Bruce Park (robru)]

Weird, how did you figure this out? Did Identica update their API docs? Because I'm pretty sure at the time that I wrote that NotImplemented code for Identica, their API docs claimed that their favorites API was identical to Twitter's, but it just kept giving me 404s.

anywas, looks good, tests are passing.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/friends-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'friends/protocols/identica.py'
--- friends/protocols/identica.py	2013-02-05 01:11:35 +0000
+++ friends/protocols/identica.py	2013-04-03 03:50:29 +0000
@@ -36,6 +36,9 @@
     _search = _api_base.format(endpoint='search')
     _search_result_key = 'results'
 
+    _favorite = _api_base.format(endpoint='favorites/create/{}')
+    _del_favorite = _api_base.format(endpoint='favorites/destroy/{}')
+
     _tweet_permalink = 'http://identi.ca/notice/{tweet_id}'
 
     def _whoami(self, authdata):
@@ -54,14 +57,6 @@
         """Identi.ca does not have this feature."""
         raise NotImplementedError
 
-    def like(self, tweet_id):
-        """I get 404s on this in spite of Identi.ca's claim to support it."""
-        raise NotImplementedError
-
-    def unlike(self, tweet_id):
-        """I get 404s on this in spite of Identi.ca's claim to support it."""
-        raise NotImplementedError
-
     def tag(self, tweet_id):
         """Searching for hashtags gives non-hashtags in the results.
 

=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py	2013-04-02 21:46:47 +0000
+++ friends/protocols/twitter.py	2013-04-03 03:50:29 +0000
@@ -62,6 +62,9 @@
     _search = _api_base.format(endpoint='search/tweets')
     _search_result_key = 'statuses'
 
+    _favorite = _api_base.format(endpoint='favorites/create')
+    _del_favorite = _api_base.format(endpoint='favorites/destroy')
+
     _tweet_permalink = 'https://twitter.com/{user_id}/status/{tweet_id}'
 
     def __init__(self, account):
@@ -303,7 +306,7 @@
     @feature
     def like(self, message_id):
         """Announce to the world your undying love for a tweet."""
-        url = self._api_base.format(endpoint='favorites/create')
+        url = self._favorite.format(message_id)
         self._get_url(url, dict(id=message_id))
         self._inc_cell(message_id, 'likes')
         self._set_cell(message_id, 'liked', True)
@@ -313,7 +316,7 @@
     @feature
     def unlike(self, message_id):
         """Renounce your undying love for a tweet."""
-        url = self._api_base.format(endpoint='favorites/destroy')
+        url = self._del_favorite.format(message_id)
         self._get_url(url, dict(id=message_id))
         self._dec_cell(message_id, 'likes')
         self._set_cell(message_id, 'liked', False)

=== modified file 'friends/tests/test_dispatcher.py'
--- friends/tests/test_dispatcher.py	2013-03-20 01:19:39 +0000
+++ friends/tests/test_dispatcher.py	2013-04-03 03:50:29 +0000
@@ -198,9 +198,10 @@
                           'retweet', 'search', 'send', 'send_private',
                           'send_thread', 'tag', 'unfollow', 'unlike', 'user'])
         self.assertEqual(json.loads(self.dispatcher.GetFeatures('identica')),
-                         ['contacts', 'delete', 'follow', 'home', 'mentions',
-                          'private', 'receive', 'retweet', 'search', 'send',
-                          'send_private', 'send_thread', 'unfollow', 'user'])
+                         ['contacts', 'delete', 'follow', 'home', 'like', 
+                          'mentions', 'private', 'receive', 'retweet',
+                          'search', 'send', 'send_private', 'send_thread',
+                          'unfollow', 'unlike', 'user'])
         self.assertEqual(json.loads(self.dispatcher.GetFeatures('flickr')),
                          ['receive', 'upload'])
         self.assertEqual(json.loads(self.dispatcher.GetFeatures('foursquare')),

=== modified file 'friends/tests/test_identica.py'
--- friends/tests/test_identica.py	2013-04-02 21:41:53 +0000
+++ friends/tests/test_identica.py	2013-04-03 03:50:29 +0000
@@ -197,14 +197,6 @@
             'http://identi.ca/api/friendships/create.json',
             dict(screen_name='pumpichank', follow='true'))
 
-    def test_like(self):
-        self.protocol._get_url = mock.Mock()
-        self.assertRaises(NotImplementedError, self.protocol.like, '1234')
-
-    def test_unlike(self):
-        self.protocol._get_url = mock.Mock()
-        self.assertRaises(NotImplementedError, self.protocol.unlike, '1234')
-
     def test_tag(self):
         self.protocol._get_url = mock.Mock(
             return_value=dict(statuses=['tweet']))
@@ -240,6 +232,32 @@
             )
         self.assertEqual(userdata, {"name":"Alice"})
 
+    def test_like(self):
+        get_url = self.protocol._get_url = mock.Mock()
+        inc_cell = self.protocol._inc_cell = mock.Mock()
+        set_cell = self.protocol._set_cell = mock.Mock()
+
+        self.assertEqual(self.protocol.like('1234'), '1234')
+
+        inc_cell.assert_called_once_with('1234', 'likes')
+        set_cell.assert_called_once_with('1234', 'liked', True)
+        get_url.assert_called_with(
+            'http://identi.ca/api/favorites/create/1234.json',
+            dict(id='1234'))
+
+    def test_unlike(self):
+        get_url = self.protocol._get_url = mock.Mock()
+        dec_cell = self.protocol._dec_cell = mock.Mock()
+        set_cell = self.protocol._set_cell = mock.Mock()
+
+        self.assertEqual(self.protocol.unlike('1234'), '1234')
+
+        dec_cell.assert_called_once_with('1234', 'likes')
+        set_cell.assert_called_once_with('1234', 'liked', False)
+        get_url.assert_called_with(
+            'http://identi.ca/api/favorites/destroy/1234.json',
+            dict(id='1234'))
+
     def test_create_contact(self, *mocks):
         # Receive the users friends.
         bare_contact = {'name': 'Alice Bob',