# Copyright 2015 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Define API Topics."""

import base64

from gcloud._helpers import _rfc3339_to_datetime


class Message(object):
    """Messages can be published to a topic and received by subscribers.

    See:
    https://cloud.google.com/pubsub/reference/rest/v1/PubsubMessage

    :type data: bytes
    :param data: the payload of the message

    :type message_id: string
    :param message_id: An ID assigned to the message by the API.

    :type attributes: dict or None
    :param attributes: Extra metadata associated by the publisher with the
                       message.
    """
    def __init__(self, data, message_id, attributes=None):
        self.data = data
        self.message_id = message_id
        self._attributes = attributes

    @property
    def attributes(self):
        """Lazily-constructed attribute dictionary"""
        if self._attributes is None:
            self._attributes = {}
        return self._attributes

    @property
    def timestamp(self):
        """Return sortable timestamp from attributes, if passed.

        Allows sorting messages in publication order (assuming consistent
        clocks across all publishers).

        :rtype: :class:`datetime.datetime`
        :returns: timestamp (in UTC timezone) parsed from RFC 3339 timestamp
        :raises: ValueError if timestamp not in ``attributes``, or if it does
                 not match the RFC 3339 format.
        """
        stamp = self.attributes.get('timestamp')
        if stamp is None:
            raise ValueError('No timestamp')
        return _rfc3339_to_datetime(stamp)

    @classmethod
    def from_api_repr(cls, api_repr):
        """Factory:  construct message from API representation.

        :type api_repr: dict or None
        :param api_repr: The API representation of the message
        """
        data = base64.b64decode(api_repr['data'])
        return cls(data=data, message_id=api_repr['messageId'],
                   attributes=api_repr.get('attributes'))

gcloud/pubsub/message.py
# Copyright 2015 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Define API Topics."""

import base64

from gcloud._helpers import _rfc3339_to_datetime


class Message(object):
    """Messages can be published to a topic and received by subscribers.

    See:
    https://cloud.google.com/pubsub/reference/rest/v1/PubsubMessage

    :type data: bytes
    :param data: the payload of the message

    :type message_id: string
    :param message_id: An ID assigned to the message by the API.

    :type attributes: dict or None
    :param attributes: Extra metadata associated by the publisher with the
                       message.
    """
    def __init__(self, data, message_id, attributes=None):
        self.data = data
        self.message_id = message_id
        self._attributes = attributes

    @property
    def attributes(self):
        """Lazily-constructed attribute dictionary"""
        if self._attributes is None:
            self._attributes = {}
        return self._attributes

    @property
    def timestamp(self):
        """Return sortable timestamp from attributes, if passed.

        Allows sorting messages in publication order (assuming consistent
        clocks across all publishers).

        :rtype: :class:`datetime.datetime`
        :returns: timestamp (in UTC timezone) parsed from RFC 3339 timestamp
        :raises: ValueError if timestamp not in ``attributes``, or if it does
                 not match the RFC 3339 format.
        """
        stamp = self.attributes.get('timestamp')
        if stamp is None:
            raise ValueError('No timestamp')
        return _rfc3339_to_datetime(stamp)

    @classmethod
    def from_api_repr(cls, api_repr):
        """Factory:  construct message from API representation.

        :type api_repr: dict or None
        :param api_repr: The API representation of the message
        """
        data = base64.b64decode(api_repr.get('data', b''))
        return cls(data=data, message_id=api_repr['messageId'],
                   attributes=api_repr.get('attributes'))

gcloud/pubsub/message.py
diff --git a/gcloud/pubsub/message.py b/gcloud/pubsub/message.py
index e8db230aa7b6..832a5d554c44 100644
--- a/gcloud/pubsub/message.py
+++ b/gcloud/pubsub/message.py
@@ -71,6 +71,6 @@ def from_api_repr(cls, api_repr):
         :type api_repr: dict or None
         :param api_repr: The API representation of the message
         """
-        data = base64.b64decode(api_repr['data'])
+        data = base64.b64decode(api_repr.get('data', b''))
         return cls(data=data, message_id=api_repr['messageId'],
                    attributes=api_repr.get('attributes'))
diff --git a/gcloud/pubsub/test_message.py b/gcloud/pubsub/test_message.py
index 693f34405289..7bdc245ea2a9 100644
--- a/gcloud/pubsub/test_message.py
+++ b/gcloud/pubsub/test_message.py
@@ -42,31 +42,6 @@ def test_ctor_w_attributes(self):
         self.assertEqual(message.message_id, MESSAGE_ID)
         self.assertEqual(message.attributes, ATTRS)
 
-    def test_from_api_repr_no_attributes(self):
-        from base64 import b64encode as b64
-        DATA = b'DEADBEEF'
-        B64_DATA = b64(DATA)
-        MESSAGE_ID = '12345'
-        api_repr = {'data': B64_DATA, 'messageId': MESSAGE_ID}
-        message = self._getTargetClass().from_api_repr(api_repr)
-        self.assertEqual(message.data, DATA)
-        self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attributes, {})
-
-    def test_from_api_repr_w_attributes(self):
-        from base64 import b64encode as b64
-        DATA = b'DEADBEEF'
-        B64_DATA = b64(DATA)
-        MESSAGE_ID = '12345'
-        ATTRS = {'a': 'b'}
-        api_repr = {'data': B64_DATA,
-                    'messageId': MESSAGE_ID,
-                    'attributes': ATTRS}
-        message = self._getTargetClass().from_api_repr(api_repr)
-        self.assertEqual(message.data, DATA)
-        self.assertEqual(message.message_id, MESSAGE_ID)
-        self.assertEqual(message.attributes, ATTRS)
-
     def test_timestamp_no_attributes(self):
         DATA = b'DEADBEEF'
         MESSAGE_ID = b'12345'
@@ -102,3 +77,36 @@ def test_timestamp_w_timestamp_in_attributes(self):
         message = self._makeOne(data=DATA, message_id=MESSAGE_ID,
                                 attributes=ATTRS)
         self.assertEqual(message.timestamp, timestamp)
+
+    def test_from_api_repr_missing_data(self):
+        MESSAGE_ID = '12345'
+        api_repr = {'messageId': MESSAGE_ID}
+        message = self._getTargetClass().from_api_repr(api_repr)
+        self.assertEqual(message.data, b'')
+        self.assertEqual(message.message_id, MESSAGE_ID)
+        self.assertEqual(message.attributes, {})
+
+    def test_from_api_repr_no_attributes(self):
+        from base64 import b64encode as b64
+        DATA = b'DEADBEEF'
+        B64_DATA = b64(DATA)
+        MESSAGE_ID = '12345'
+        api_repr = {'data': B64_DATA, 'messageId': MESSAGE_ID}
+        message = self._getTargetClass().from_api_repr(api_repr)
+        self.assertEqual(message.data, DATA)
+        self.assertEqual(message.message_id, MESSAGE_ID)
+        self.assertEqual(message.attributes, {})
+
+    def test_from_api_repr_w_attributes(self):
+        from base64 import b64encode as b64
+        DATA = b'DEADBEEF'
+        B64_DATA = b64(DATA)
+        MESSAGE_ID = '12345'
+        ATTRS = {'a': 'b'}
+        api_repr = {'data': B64_DATA,
+                    'messageId': MESSAGE_ID,
+                    'attributes': ATTRS}
+        message = self._getTargetClass().from_api_repr(api_repr)
+        self.assertEqual(message.data, DATA)
+        self.assertEqual(message.message_id, MESSAGE_ID)
+        self.assertEqual(message.attributes, ATTRS)

pubsub fails if data key is not present
If a message is published with a string of 0 length (`topic.publish( '', url=url, title=title)`) when the message is received there is no data field in the message and a key error is thrown when trying to transform the message from the PubSub API representation.

https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/gcloud/pubsub/message.py#L74

```
Traceback (most recent call last):
File "/en_notifications/en_notifications.py", line 51, in <module>
received = PS_SUBSCRIPTION.pull(max_messages=PULL_COUNT)
File "/usr/local/lib/python2.7/dist-packages/gcloud/pubsub/subscription.py", line 212, in pull
File "/usr/local/lib/python2.7/dist-packages/gcloud/pubsub/message.py", line 74, in from_api_repr
for info in response.get('receivedMessages', ())]
data = base64.b64decode(api_repr['data'])
KeyError: 'data'
```

