Merge lp:~robru/friends/tco into lp:friends

[Robert Bruce Park]

Resolve t.co links, with test coverage. (LP: #1166080)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robru/friends/tco]

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

Fix a bug where it would not resolve TCO links at the beginning of the message.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robru/friends/tco]

191. By Robert Bruce Park on 2013-04-13

Don't default to empty string for the substitute URL.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

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-13 18:18:23 +0000
@@ -120,9 +120,22 @@
         permalink = self._tweet_permalink.format(
             user_id=screen_name,
             tweet_id=tweet_id)
+
+        message = tweet.get('text', '')
+
+        # Resolve t.co links.
+        entities = tweet.get('entities', {})
+        for url in (entities.get('urls', []) + entities.get('media', [])):
+            begin, end = url.get('indices', (None, None))
+            destination = (url.get('expanded_url') or
+                           url.get('display_url') or
+                           url.get('url'))
+            if None not in (begin, end, destination):
+                message = message[:begin] + destination + message[end:]
+
         self._publish(
             message_id=tweet_id,
-            message=tweet.get('text', ''),
+            message=message,
             timestamp=iso8601utc(parsetime(tweet.get('created_at', ''))),
             stream=stream,
             sender=user.get('name', ''),

=== 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-13 18:18:23 +0000
@@ -143,7 +143,8 @@
              'messages', 'Raffi Krikorian', '8285392', 'raffi', False,
              '2012-08-28T21:08:15Z', 'lecturing at the "analyzing big data '
              'with twitter" class at @cal with @othman  '
-             '<a href="http://t.co/bfj7zkDJ">http://t.co/bfj7zkDJ</a>',
+             '<a href="http://blogs.ischool.berkeley.edu/i290-abdt-s12/">'
+             'http://blogs.ischool.berkeley.edu/i290-abdt-s12/</a>',
              GLib.get_user_cache_dir() +
              '/friends/avatars/0219effc03a3049a622476e6e001a4014f33dc31',
              'https://twitter.com/raffi/status/240556426106372096',