Add ad_token to AdItem definition.

4 files changed, 8 insertions, 4 deletions

diff --git a/pandora/client.py b/pandora/client.py
index 3cc2538..4e27208 100644
--- a/pandora/client.py
+++ b/pandora/client.py
@@ -266,10 +266,10 @@ class APIClient(BaseAPIClient):
                                           "defined, got: '{}'"
                                           .format(station_id))
 
-        ad_metadata = self.get_ad_metadata(ad_token)
-        ad_metadata["stationId"] = station_id
-
-        return AdItem.from_json(self, ad_metadata)
+        ad_item = AdItem.from_json(self, self.get_ad_metadata(ad_token))
+        ad_item.station_id = station_id
+        ad_item.ad_token = ad_token
+        return ad_item
 
     def get_ad_metadata(self, ad_token):
         return self("ad.getAdMetadata",
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index 75c971b..ae60740 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -221,6 +221,7 @@ class AdItem(PlaylistModel):
     image_url = Field("imageUrl")
     click_through_url = Field("clickThroughUrl")
     station_id = Field("stationId")
+    ad_token = Field("adToken")
 
     @property
     def is_ad(self):
diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index 58fca74..cf486e0 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -105,6 +105,7 @@ class TestGettingAds(TestCase):
 
             ad_item = client.get_ad_item('id_mock', 'token_mock')
             assert ad_item.station_id == 'id_mock'
+            assert ad_item.ad_token == 'token_mock'
 
             ad_metadata_mock.assert_has_calls([call("ad.getAdMetadata",
                                                       adToken='token_mock',
diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py
index 538cee5..495bb8e 100644
--- a/tests/test_pandora/test_models.py
+++ b/tests/test_pandora/test_models.py
@@ -225,6 +225,8 @@ class TestAdItem(TestCase):
         api_client_mock = Mock(spec=APIClient)
         api_client_mock.default_audio_quality = APIClient.HIGH_AUDIO_QUALITY
         self.result = AdItem.from_json(api_client_mock, self.JSON_DATA)
+        self.result.station_id = 'station_id_mock'
+        self.result.ad_token = 'token_mock'
 
     def test_is_ad_is_true(self):
         assert self.result.is_ad is True