fixed an offset bug

monolith/client/__init__.py

@@ -30,7 +30,7 @@ def _iso2date(data):
 
 class Client(object):
 
-    def __init__(self, server):
+    def __init__(self, server, zero_fill=True):
         self.server = server.rstrip('/')
         self.session = requests.session()
         # getting monolith info
@@ -40,6 +40,7 @@ def __init__(self, server):
 
         self.es = self.server + info['es_endpoint']
         self.fields = info['fields']
+        self.zero_fill = zero_fill
 
     def __call__(self, field, start, end, interval=DAY, **terms):
         if isinstance(interval, str):
@@ -135,10 +136,11 @@ def __call__(self, field, start, end, interval=DAY, **terms):
 
             yield {'count': count, 'date': date_}
 
-        # yielding zeros
-        for date_ in drange:
-            if date_ not in dates:
-                yield {'count': 0, 'date': date_}
+        if self.zero_fill:
+            # yielding zeros
+            for date_ in drange:
+                if date_ not in dates:
+                    yield {'count': 0, 'date': date_}
 
 
 def main():

monolith/client/tests/test_client.py

@@ -39,6 +39,16 @@ def test_global_daily(self):
         hits = list(self.client('downloads_count', start, end))
         self.assertEqual(len(hits), 31)
 
+    def test_no_fill(self):
+        client = Client('http://0.0.0.0:6543', zero_fill=False)
+        hits = list(client('downloads_count', '2010-01-01', '2010-01-31'))
+        self.assertEqual(len(hits), 0)
+
+        # zero fill by default
+        client = Client('http://0.0.0.0:6543')
+        hits = list(client('downloads_count', '2010-01-01', '2010-01-31'))
+        self.assertEqual(len(hits), 31)
+
     def test_global_weekly(self):
         hits = list(self.client('downloads_count', start, end,
                                 interval='week'))

monolith/client/tests/test_util.py

@@ -11,9 +11,9 @@ def setUp(self):
         self.end = datetime.date(2012, 05, 01)
 
     def test_iterdays(self):
-        # 486 days : 365 in 2011 + 4 months in 2012
+        # 487 days : 365 in 2011 + 4 months in 2012
         res = list(iterdays(self.start, self.end))
-        self.assertEquals(len(res), 486)
+        self.assertEquals(len(res), 487)
 
     def test_iteryears(self):
         # 2 years

monolith/client/util.py

@@ -2,7 +2,7 @@
 
 
 def iterdays(start, end):
-    delta = (end - start).days
+    delta = (end - start).days + 1
     return (start + datetime.timedelta(n) for n in range(delta))