Merge pull request #375 from bear/fix/issue374

tweet_volume not being populated for Trend objects

Author: jeremylow

doc/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 ---------
 
+Version 3.2
+===========
+
+What's Changed
+--------------
+
+* :py:func:`twitter.models.Trend`'s `volume` attribute has been renamed `tweet_volume` in line with Twitter's naming convention. This change should allow users to access the number of tweets being tweeted for a given Trend.
+
 Version 3.1
 ==========
 

testdata/models/models_trend.json

@@ -1 +1 @@
-{"name":"#ChangeAConsonantSpoilAMovie","url":"http:\\/\\/twitter.com\\/search?q=%23ChangeAConsonantSpoilAMovie","promoted_content":null,"query":"%23ChangeAConsonantSpoilAMovie","tweet_volume":null}
+{"name":"#ChangeAConsonantSpoilAMovie","url":"http:\\/\\/twitter.com\\/search?q=%23ChangeAConsonantSpoilAMovie","promoted_content":null,"query":"%23ChangeAConsonantSpoilAMovie","tweet_volume":104403}

tests/test_models.py

@@ -116,6 +116,8 @@ def test_trend(self):
             self.fail(e)
         self.assertTrue(trend.AsJsonString())
         self.assertTrue(trend.AsDict())
+        self.assertEqual(trend.tweet_volume, 104403)
+        self.assertEqual(trend.volume, trend.tweet_volume)
 
     def test_url(self):
         url = twitter.Url.NewFromJsonDict(self.URL_SAMPLE_JSON)

twitter/models.py

@@ -208,7 +208,7 @@ def __init__(self, **kwargs):
             'query': None,
             'timestamp': None,
             'url': None,
-            'volume': None,
+            'tweet_volume': None,
         }
 
         for (param, default) in self.param_defaults.items():
@@ -220,6 +220,10 @@ def __repr__(self):
             self.timestamp,
             self.url)
 
+    @property
+    def volume(self):
+        return self.tweet_volume
+
 
 class Hashtag(TwitterModel):