Merge lp:~robru/friends/twitter-retweet into lp:friends

[Robert Bruce Park]

Fix Twitter.retweet (LP: #1168427)

Fixes Twitter.retweet method, which wasn't supplying sender name / avatar correctly due to the information being missing from twitter.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/friends-ci/28/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/28/console

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

review: Needs Fixing (continuous-integration)

[lp:~robru/friends/twitter-retweet]

190. By Robert Bruce Park on 2013-04-12

Add twitter-retweet.dat data file.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Great!

review: Approve

=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py	2013-04-03 03:47:39 +0000
+++ friends/protocols/twitter.py	2013-04-12 22:22:26 +0000
@@ -78,6 +78,11 @@
         self._account.secret_token = authdata.get('TokenSecret')
         self._account.user_id = authdata.get('UserId')
         self._account.user_name = authdata.get('ScreenName')
+        user = self._showuser(self._account.user_id)
+        self._account.user_full_name = user.get('name', '')
+        self._account.avatar_url = (user.get('profile_image_url_https') or
+                                    user.get('profile_image_url') or
+                                    '')
 
     def _get_url(self, url, data=None):
         """Access the Twitter API with correct OAuth signed headers."""
@@ -284,6 +289,15 @@
         """Republish somebody else's tweet with your name on it."""
         url = self._retweet.format(message_id)
         tweet = self._get_url(url, dict(trim_user='true'))
+        user = tweet.get('user', {}) or tweet.get('sender', {})
+
+        # Fill in the blanks...
+        user.update(
+            name=self._account.user_full_name,
+            screen_name=self._account.user_name,
+            profile_image_url=self._account.avatar_url,
+        )
+
         return self._publish_tweet(tweet)
 
 # https://dev.twitter.com/docs/api/1.1/post/friendships/destroy
@@ -356,7 +370,8 @@
 # https://dev.twitter.com/docs/api/1.1/get/users/show
     def _showuser(self, uid):
         """Get all the information about a twitter user."""
-        url = self._api_base.format(endpoint="users/show") + "?user_id={}".format(uid)
+        url = self._api_base.format(
+            endpoint='users/show') + '?user_id={}'.format(uid)
         return self._get_url(url)
 
     def _create_contact(self, userdata):
 
=== added file 'friends/tests/data/twitter-retweet.dat'
--- friends/tests/data/twitter-retweet.dat	1970-01-01 00:00:00 +0000
+++ friends/tests/data/twitter-retweet.dat	2013-04-12 22:22:26 +0000
@@ -0,0 +1,1 @@
+{"place":null,"user":{"id_str":"836242932","id":836242932},"retweet_count":6,"created_at":"Fri Apr 12 20:23:14 +0000 2013","geo":null,"contributors":null,"retweeted":true,"id_str":"322807141108944896","coordinates":null,"truncated":false,"retweeted_status":{"place":null,"user":{"id_str":"45840709","id":45840709},"retweet_count":6,"created_at":"Fri Apr 12 16:52:59 +0000 2013","geo":null,"contributors":null,"retweeted":true,"id_str":"322754231591387136","coordinates":null,"truncated":false,"in_reply_to_status_id":null,"in_reply_to_screen_name":null,"possibly_sensitive":false,"favorited":false,"text":"Reading 'Core utility apps visual exploration' at Design http:\/\/t.co\/36tT53C37n","in_reply_to_status_id_str":null,"source":"\u003Ca href=\"http:\/\/twitter.com\/tweetbutton\" rel=\"nofollow\"\u003ETweet Button\u003C\/a\u003E","id":322754231591387136,"in_reply_to_user_id_str":null,"entities":{"hashtags":[],"user_mentions":[],"urls":[{"url":"http:\/\/t.co\/36tT53C37n","display_url":"design.canonical.com\/2013\/04\/core-u\u2026","indices":[57,79],"expanded_url":"http:\/\/design.canonical.com\/2013\/04\/core-utility-apps-visual-exploration\/"}]},"in_reply_to_user_id":null},"in_reply_to_status_id":null,"in_reply_to_screen_name":null,"possibly_sensitive":false,"favorited":false,"text":"RT @ubuntudesigners: Reading 'Core utility apps visual exploration' at Design http:\/\/t.co\/36tT53C37n","in_reply_to_status_id_str":null,"source":"\u003Ca href=\"http:\/\/www.ubuntu.com\" rel=\"nofollow\"\u003EUbuntu Online Accounts\u003C\/a\u003E","id":322807141108944896,"in_reply_to_user_id_str":null,"entities":{"hashtags":[],"user_mentions":[{"name":"Ubuntu Designers","screen_name":"ubuntudesigners","id_str":"45840709","indices":[3,19],"id":45840709}],"urls":[{"url":"http:\/\/t.co\/36tT53C37n","display_url":"design.canonical.com\/2013\/04\/core-u\u2026","indices":[78,100],"expanded_url":"http:\/\/design.canonical.com\/2013\/04\/core-utility-apps-visual-exploration\/"}]},"in_reply_to_user_id":null}
 
=== modified file 'friends/tests/mocks.py'
--- friends/tests/mocks.py	2013-04-05 01:02:42 +0000
+++ friends/tests/mocks.py	2013-04-12 22:22:26 +0000
@@ -119,6 +119,7 @@
     def __init__(self, service=None, account_id=88):
         self.access_token = None
         self.secret_token = None
+        self.avatar_url = None
         self.user_full_name = None
         self.user_name = None
         self.user_id = None
 
=== modified file 'friends/tests/test_identica.py'
--- friends/tests/test_identica.py	2013-04-03 03:47:39 +0000
+++ friends/tests/test_identica.py	2013-04-12 22:22:26 +0000
@@ -169,12 +169,13 @@
             dict(trim_user='true'))
 
     def test_retweet(self):
-        get_url = self.protocol._get_url = mock.Mock(return_value='tweet')
+        tweet=dict(tweet='twit')
+        get_url = self.protocol._get_url = mock.Mock(return_value=tweet)
         publish = self.protocol._publish_tweet = mock.Mock()
 
         self.protocol.retweet('1234')
 
-        publish.assert_called_with('tweet')
+        publish.assert_called_with(tweet)
         get_url.assert_called_with(
             'http://identi.ca/api/statuses/retweet/1234.json',
             dict(trim_user='true'))
 
=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-04-02 21:46:47 +0000
+++ friends/tests/test_twitter.py	2013-04-12 22:22:26 +0000
@@ -69,12 +69,17 @@
     @mock.patch('friends.utils.authentication.Authentication.login',
                 return_value=dict(AccessToken='some clever fake data',
                                   TokenSecret='sssssshhh!',
-                                  UserId='rickygervais',
-                                  ScreenName='Ricky Gervais'))
+                                  UserId='1234',
+                                  ScreenName='stephenfry'))
+    @mock.patch('friends.protocols.twitter.Twitter._showuser',
+                return_value=dict(name='Stephen Fry',
+                                  profile_image_url='http://example.com/me.jpg'))
     def test_successful_authentication(self, *mocks):
         self.assertTrue(self.protocol._login())
-        self.assertEqual(self.account.user_name, 'Ricky Gervais')
-        self.assertEqual(self.account.user_id, 'rickygervais')
+        self.assertEqual(self.account.avatar_url, 'http://example.com/me.jpg')
+        self.assertEqual(self.account.user_full_name, 'Stephen Fry')
+        self.assertEqual(self.account.user_name, 'stephenfry')
+        self.assertEqual(self.account.user_id, '1234')
         self.assertEqual(self.account.access_token, 'some clever fake data')
         self.assertEqual(self.account.secret_token, 'sssssshhh!')
 
@@ -440,17 +445,52 @@
             dict(trim_user='true'))
 
     def test_retweet(self):
-        get_url = self.protocol._get_url = mock.Mock(return_value='tweet')
+        tweet = dict(tweet='twit')
+        get_url = self.protocol._get_url = mock.Mock(return_value=tweet)
         publish = self.protocol._publish_tweet = mock.Mock(
             return_value='tweet permalink')
 
         self.assertEqual(self.protocol.retweet('1234'), 'tweet permalink')
 
-        publish.assert_called_with('tweet')
+        publish.assert_called_with(tweet)
         get_url.assert_called_with(
             'https://api.twitter.com/1.1/statuses/retweet/1234.json',
             dict(trim_user='true'))
 
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'twitter-retweet.dat'))
+    @mock.patch('friends.protocols.twitter.Twitter._login',
+                return_value=True)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    def test_retweet_with_data(self, *mocks):
+        self.account.access_token = 'access'
+        self.account.secret_token = 'secret'
+        self.account.user_name = 'some_guy'
+        self.account.user_full_name = 'Guy Man'
+        self.account.avatar_url = 'http://example.com/me.jpg'
+        self.account.auth.parameters = dict(
+            ConsumerKey='key',
+            ConsumerSecret='secret')
+        self.assertEqual(0, TestModel.get_n_rows())
+        self.assertEqual(
+            self.protocol.retweet('240558470661799936'),
+            'https://twitter.com/some_guy/status/322807141108944896')
+        self.assertEqual(1, TestModel.get_n_rows())
+
+        expected_row = [
+            'twitter', 88, '322807141108944896',
+            'messages', 'Guy Man', '836242932', 'some_guy', True,
+            '2013-04-12T20:23:14Z', 'RT @ubuntudesigners: Reading \'Core utility'
+            ' apps visual exploration\' at Design <a href="http://t.co/'
+            '36tT53C37n">http://t.co/36tT53C37n</a>',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/6e8af1e6860da04a6f42cb1e6934e191f7c38c6d',
+            'https://twitter.com/some_guy/status/322807141108944896',
+            0, False, '', '', '', '', '', '', '', 0.0, 0.0,
+            ]
+        self.assertEqual(list(TestModel.get_row(0)), expected_row)
+
     def test_unfollow(self):
         get_url = self.protocol._get_url = mock.Mock()