Do not include TZ information in queries

Same as twingly/twingly-search-api-ruby#69.

Re-record fixtures to get fixtures without published time bugs.

Author: walro

tests/fixtures/vcr_cassettes/search_for_spotify_on_sv_blogs.json

@@ -1,43 +1 @@
-{
-  "http_interactions": [
-    {
-      "request": {
-        "body": {
-          "string": "",
-          "encoding": "utf-8"
-        },
-        "headers": {
-          "Connection": "keep-alive",
-          "Accept-Encoding": "gzip, deflate",
-          "Accept": "*/*",
-          "User-Agent": "Twingly Search Python Client/1.2.1"
-        },
-        "method": "GET",
-        "uri": "https://api.twingly.com/blog/search/api/v3/search?q=something&apiKey=wrong"
-      },
-      "response": {
-        "body": {
-          "string": "<?xml version=\"1.0\" encoding=\"utf-8\"?><error code=\"40101\"><message>Unauthorized</message></error>",
-          "encoding": "utf-8"
-        },
-        "headers": {
-          "Content-Length": "97",
-          "Expires": "-1",
-          "Server": "nginx",
-          "Connection": "keep-alive",
-          "Pragma": "no-cache",
-          "Cache-Control": "no-cache",
-          "Date": "Sat, 13 May 2017 20:29:15 GMT",
-          "Content-Type": "application/xml; charset=utf-8"
-        },
-        "status": {
-          "message": "Unauthorized",
-          "code": 401
-        },
-        "url": "https://api.twingly.com/blog/search/api/v3/search?q=something&apiKey=wrong"
-      },
-      "recorded_at": "2017-05-13T20:29:14"
-    }
-  ],
-  "recorded_with": "betamax/0.8.0"
-}
+{"http_interactions": [{"request": {"body": {"string": "", "encoding": "utf-8"}, "headers": {"Connection": "keep-alive", "Accept-Encoding": "gzip, deflate", "Accept": "*/*", "User-Agent": "Twingly Search Python Client/2.1.0"}, "method": "GET", "uri": "https://api.twingly.com/blog/search/api/v3/search?q=something&apiKey=wrong"}, "response": {"body": {"string": "<?xml version=\"1.0\" encoding=\"utf-8\"?><error code=\"40101\"><message>Unauthorized</message></error>", "encoding": "utf-8"}, "headers": {"Content-Length": "97", "Expires": "-1", "Server": "nginx", "Connection": "keep-alive", "Pragma": "no-cache", "Cache-Control": "no-cache", "Date": "Mon, 16 Oct 2017 08:54:09 GMT", "Content-Type": "application/xml; charset=utf-8"}, "status": {"message": "Unauthorized", "code": 401}, "url": "https://api.twingly.com/blog/search/api/v3/search?q=something&apiKey=wrong"}, "recorded_at": "2017-10-16T08:54:09"}], "recorded_with": "betamax/0.5.1"}

tests/fixtures/vcr_cassettes/search_for_spotify_on_sv_blogs_from_query.json

@@ -68,5 +68,5 @@ def test_search_for_spotify_on_sv_blogs_using_query_object(self):
             result = c.execute_query(q)
             self.assertIsNotNone(result)
             self.assertEqual(result.incomplete_result, False)
-            self.assertEqual(result.number_of_matches_returned, 1)
-            self.assertEqual(len(result.posts), 1)
+            self.assertEqual(result.number_of_matches_returned, 20)
+            self.assertEqual(len(result.posts), 20)

tests/fixtures/vcr_cassettes/search_for_spotify_on_sv_blogs_using_query.json

@@ -58,14 +58,14 @@ def test_query_should_add_start_date(self):
         q.search_query = "spotify"
         q.start_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "UTC")
         query_string = q.build_query_string()
-        self.assertEqual(query_string, "spotify start-date:2012-12-28T09:01:22Z")
+        self.assertEqual(query_string, "spotify start-date:2012-12-28 09:01:22")
 
     def test_query_should_add_end_date(self):
         q = self._client.query()
         q.search_query = "spotify"
         q.end_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "UTC")
         query_string = q.build_query_string()
-        self.assertEqual(query_string, "spotify end-date:2012-12-28T09:01:22Z")
+        self.assertEqual(query_string, "spotify end-date:2012-12-28 09:01:22")
 
     def test_query_should_add_lang(self):
         q = self._client.query()
@@ -82,7 +82,7 @@ def test_query_should_build_query_string_with_deprecated_params(self):
         q.end_time = self.datetime_with_timezone(datetime(2013, 12, 28, 9, 1, 22), "UTC")
         query_string = q.build_query_string()
         self.assertEqual(query_string,
-                         "spotify lang:en start-date:2012-12-28T09:01:22Z end-date:2013-12-28T09:01:22Z")
+                         "spotify lang:en start-date:2012-12-28 09:01:22 end-date:2013-12-28 09:01:22")
 
     def test_query_should_build_query_string(self):
         q = self._client.query()
@@ -92,31 +92,31 @@ def test_query_should_build_query_string(self):
         q.end_time = self.datetime_with_timezone(datetime(2013, 12, 28, 9, 1, 22), "UTC")
         query_string = q.build_query_string()
         self.assertEqual(query_string,
-                         "spotify lang:en start-date:2012-12-28T09:01:22Z end-date:2013-12-28T09:01:22Z")
+                         "spotify lang:en start-date:2012-12-28 09:01:22 end-date:2013-12-28 09:01:22")
 
     def test_query_should_add_start_time(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.start_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "UTC")
-        self.assertIn("start-date:2012-12-28T09:01:22Z", q.build_query_string())
+        self.assertIn("start-date:2012-12-28 09:01:22", q.build_query_string())
 
     def test_query_using_start_time_without_timezone(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.start_time = datetime(2012, 12, 28, 9, 1, 22)
-        self.assertIn("start-date:2012-12-28T09:01:22Z", q.build_query_string())
+        self.assertIn("start-date:2012-12-28 09:01:22", q.build_query_string())
 
     def test_query_using_start_time_with_timezone_other_than_utc(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.start_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "Europe/Stockholm")
-        self.assertIn("start-date:2012-12-28T08:01:22Z", q.build_query_string())
+        self.assertIn("start-date:2012-12-28 08:01:22", q.build_query_string())
 
     def test_query_using_start_time_parsed_by_dateutil(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.start_time = dateutil.parser.parse("2012-12-28 09:01:22 -0800")
-        self.assertIn("start-date:2012-12-28T17:01:22Z", q.build_query_string())
+        self.assertIn("start-date:2012-12-28 17:01:22", q.build_query_string())
 
     def test_query_when_start_time_is_not_a_datetime(self):
         q = self._client.query()
@@ -127,25 +127,25 @@ def test_query_should_add_end_time(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.end_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "UTC")
-        self.assertIn("end-date:2012-12-28T09:01:22Z", q.build_query_string())
+        self.assertIn("end-date:2012-12-28 09:01:22", q.build_query_string())
 
     def test_query_using_end_time_without_timezone(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.end_time = datetime(2012, 12, 28, 9, 1, 22)
-        self.assertIn("end-date:2012-12-28T09:01:22Z", q.build_query_string())
+        self.assertIn("end-date:2012-12-28 09:01:22", q.build_query_string())
 
     def test_query_using_end_time_with_timezone_other_than_utc(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.end_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "Europe/Stockholm")
-        self.assertIn("end-date:2012-12-28T08:01:22Z", q.build_query_string())
+        self.assertIn("end-date:2012-12-28 08:01:22", q.build_query_string())
 
     def test_query_using_end_time_parsed_by_dateutil(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.end_time = dateutil.parser.parse("2012-12-28 09:01:22 +0800")
-        self.assertIn("2012-12-28T01:01:22Z", q.build_query_string())
+        self.assertIn("2012-12-28 01:01:22", q.build_query_string())
 
     def test_query_when_end_time_is_not_a_datetime(self):
         q = self._client.query()
@@ -156,7 +156,7 @@ def test_query_should_encode_url_parameters(self):
         q = self._client.query()
         q.pattern = "spotify"
         q.end_time = self.datetime_with_timezone(datetime(2012, 12, 28, 9, 1, 22), "UTC")
-        self.assertIn("end-date%3A2012-12-28T09%3A01%3A22Z", q.url_parameters())
+        self.assertIn("end-date%3A2012-12-28+09%3A01%3A22", q.url_parameters())
 
     def test_query_pattern(self):
         q = self._client.query()

tests/fixtures/vcr_cassettes/search_without_valid_api_key.json

@@ -19,4 +19,5 @@
 from .post import Post
 from .result import Result
 from .constants import TWINGLY_SEARCH_KEY
-from .constants import DATE_TIME_FORMAT
+from .constants import POST_DATE_TIME_FORMAT
+from .constants import QUERY_DATE_TIME_FORMAT

tests/test_client.py

@@ -2,4 +2,5 @@
 from __future__ import unicode_literals
 
 TWINGLY_SEARCH_KEY = 'TWINGLY_SEARCH_KEY'
-DATE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+POST_DATE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+QUERY_DATE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S'

tests/test_query.py

@@ -8,7 +8,7 @@
 from pytz import utc
 
 import twingly_search
-from twingly_search.constants import DATE_TIME_FORMAT
+from twingly_search.constants import POST_DATE_TIME_FORMAT
 
 
 class Post(object):
@@ -118,7 +118,7 @@ def set_values(self, params):
         self.longitude = self.coordinates.get("longitude", None)
 
     def _parse_time(self, time):
-        parsed_time = datetime.datetime.strptime(time, DATE_TIME_FORMAT)
+        parsed_time = datetime.datetime.strptime(time, POST_DATE_TIME_FORMAT)
         return utc.localize(parsed_time)
 
     def __unicode__(self):

twingly_search/__init__.py

@@ -4,7 +4,7 @@
 from pytz import utc
 
 import twingly_search
-from twingly_search.constants import DATE_TIME_FORMAT
+from twingly_search.constants import QUERY_DATE_TIME_FORMAT
 from twingly_search.errors import TwinglySearchQueryException
 
 try:
@@ -149,7 +149,7 @@ def _time_to_utc_string(self, time):
             return ''
 
         time_in_utc = self._time_to_utc(time)
-        result = time_in_utc.strftime(DATE_TIME_FORMAT)
+        result = time_in_utc.strftime(QUERY_DATE_TIME_FORMAT)
         return result
 
     def _time_to_utc(self, time):