Merge lp:~robru/friends/facebook-stories into lp:~super-friends/friends/raring

[Robert Bruce Park]

Fix the publishing of Facebook Stories (LP: #1155785)

This is a very simple change, but I had to expand the facebook mock data by quite a bit in order to include a test case for this, so I ended up with quite a large diff for an effectively 1-line change.

[Robert Bruce Park (robru)]

Ken, just be aware that this is going to increase the amount of mock data that appears in the model when you run 'friends-dispatcher --test', so landing this may break your qml-friends tests, depending on how they're written (any tests that check for the number of rows present, or the specific values at specific model indexes will probably need to be updated).

[Ken VanDine (ken-vandine)]

Looks great!

review: Approve

=== modified file 'friends/protocols/facebook.py'
--- friends/protocols/facebook.py	2013-03-14 02:27:36 +0000
+++ friends/protocols/facebook.py	2013-03-16 01:05:27 +0000
@@ -71,7 +71,7 @@
         args = dict(
             message_id=message_id,
             stream=stream,
-            message=entry.get('message', ''),
+            message=entry.get('message', '') or entry.get('story', ''),
             icon_uri=entry.get('icon', ''),
             link_picture=entry.get('picture', ''),
             link_name=entry.get('name', ''),

=== modified file 'friends/tests/data/facebook-full.dat'
--- friends/tests/data/facebook-full.dat	2013-03-14 00:52:23 +0000
+++ friends/tests/data/facebook-full.dat	2013-03-16 01:05:27 +0000
@@ -262,6 +262,101 @@
         ],
         "count": 11
       }
+    },
+    {
+      "id": "104443_100085049977",
+      "from": {
+        "name": "Guy Frenchie",
+        "id": "1244414"
+      },
+      "story": "Guy Frenchie did some things with some stuff.",
+      "story_tags": {
+        "0": [
+          {
+            "id": "1244414",
+            "name": "Guy Frenchie",
+            "offset": 0,
+            "length": 16,
+            "type": "user"
+          }
+        ],
+        "26": [
+          {
+            "id": "37067557",
+            "name": "somebody",
+            "offset": 26,
+            "length": 10,
+            "type": "page"
+          }
+        ],
+        "48": [
+          {
+            "id": "50681138",
+            "name": "What do you think about things and stuff?",
+            "offset": 48,
+            "length": 52
+          }
+        ]
+      },
+      "icon": "https://fbstatic-a.akamaihd.net/rsrc.php/v2/yg/r/5PpICR5KcPe.png",
+      "actions": [
+        {
+          "name": "Comment",
+          "link": "https://www.facebook.com/1244414/posts/100085049977"
+        },
+        {
+          "name": "Like",
+          "link": "https://www.facebook.com/1244414/posts/100085049977"
+        }
+      ],
+      "privacy": {
+        "value": ""
+      },
+      "type": "question",
+      "object_id": "584616119",
+      "application": {
+        "name": "Questions",
+        "id": "101502535258"
+      },
+      "created_time": "2013-03-15T19:57:14+0000",
+      "updated_time": "2013-03-15T19:57:14+0000",
+      "likes": {
+        "data": [
+          {
+            "name": "Kevin Diner",
+            "id": "55520"
+          },
+          {
+            "name": "Bozo the Clown",
+            "id": "13960"
+          }
+        ],
+        "count": 3
+      },
+      "comments": {
+        "data": [
+          {
+            "id": "14446143_102008355988977_100927",
+            "from": {
+              "name": "Seymour Butts",
+              "id": "505677"
+            },
+            "message": "seems legit",
+            "created_time": "2013-03-13T12:20:19+0000",
+            "likes": 2
+          },
+          {
+            "id": "120143_1020035588977_1019440",
+            "from": {
+              "name": "Andre the Giant",
+              "id": "100390199"
+            },
+            "message": "Anybody want a peanut?",
+            "created_time": "2013-03-13T12:23:25+0000"
+          }
+        ],
+        "count": 22
+      }
     }
   ],
   "paging": {

=== modified file 'friends/tests/test_facebook.py'
--- friends/tests/test_facebook.py	2013-03-14 19:14:03 +0000
+++ friends/tests/test_facebook.py	2013-03-16 01:05:27 +0000
@@ -109,8 +109,8 @@
         # Receive the wall feed for a user.
         self.maxDiff = None
         self.account.access_token = 'abc'
-        self.assertEqual(self.protocol.receive(), 9)
-        self.assertEqual(TestModel.get_n_rows(), 9)
+        self.assertEqual(self.protocol.receive(), 12)
+        self.assertEqual(TestModel.get_n_rows(), 12)
         self.assertEqual(list(TestModel.get_row(0)), [
             'facebook',
             88,
@@ -197,6 +197,32 @@
             30.265384957204,
             -97.735604602521,
             ])
+        self.assertEqual(list(TestModel.get_row(9)), [
+            'facebook',
+            88,
+            '104443_100085049977',
+            'mentions',
+            'Guy Frenchie',
+            '1244414',
+            'Guy Frenchie',
+            False,
+            '2013-03-15T19:57:14Z',
+            'Guy Frenchie did some things with some stuff.',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/3f5e276af0c43f6411d931b829123825ede1968e',
+            'https://www.facebook.com/1244414',
+            3,
+            False,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0.0,
+            0.0,
+            ])
 
     # XXX We really need full coverage of the receive() method, including
     # cases where some data is missing, or can't be converted
@@ -214,18 +240,18 @@
         self.account.auth.parameters = dict(
             ConsumerKey='key',
             ConsumerSecret='secret')
-        self.assertEqual(self.protocol.home(), 9)
+        self.assertEqual(self.protocol.home(), 12)
 
         with open(self._root.format('facebook_ids'), 'r') as fd:
-            self.assertEqual(fd.read(), '{"messages": "2013-03-13T23:29:07Z"}')
+            self.assertEqual(fd.read(), '{"messages": "2013-03-15T19:57:14Z"}')
 
         follow = self.protocol._follow_pagination = mock.Mock()
         follow.return_value = []
-        self.assertEqual(self.protocol.home(), 9)
+        self.assertEqual(self.protocol.home(), 12)
         follow.assert_called_once_with(
             'https://graph.facebook.com/me/home',
             dict(limit=50,
-                 since='2013-03-13T23:29:07Z',
+                 since='2013-03-15T19:57:14Z',
                  access_token='access',
                  )
             )