date spec wasn't allowing week intervals

Author: Richard Jones

CHANGES.txt

@@ -23,6 +23,7 @@ Fixed:
 - security check in mailgw (sf bug 1442145)
 - "clear this message" (sf bug 1429367)
 - escape all uses of "schema" in mysql backend (sf bug 1397569)
+- date spec wasn't allowing week intervals
 
 
 2006-02-10 1.1.0

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.195 2006-02-06 21:00:46 richard Exp $
+#$Id: back_anydbm.py,v 1.196 2006-03-03 02:02:50 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1591,7 +1591,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     l.append((STRING, k, re.compile(v, re.I)))
             elif isinstance(propclass, hyperdb.Date):
                 try:
-                    date_rng = propclass.range_from_raw (v, self.db)
+                    date_rng = propclass.range_from_raw(v, self.db)
                     l.append((DATE, k, date_rng))
                 except ValueError:
                     # If range creation fails - ignore that search parameter

roundup/backends/rdbms_common.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: rdbms_common.py,v 1.167 2006-02-09 23:53:11 richard Exp $
+#$Id: rdbms_common.py,v 1.168 2006-03-03 02:02:50 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2130,7 +2130,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 else:
                     try:
                         # Try to filter on range of dates
-                        date_rng = propclass.range_from_raw (v, self.db)
+                        date_rng = propclass.range_from_raw(v, self.db)
                         if date_rng.from_value:
                             where.append('_%s._%s >= %s'%(cn, k, a))
                             args.append(dc(date_rng.from_value))

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: date.py,v 1.83 2006-01-13 00:22:16 richard Exp $
+# $Id: date.py,v 1.84 2006-03-03 02:02:50 richard Exp $
 
 """Date, time and time interval handling.
 """
@@ -46,7 +46,7 @@ def _add_granularity(src, order, value = 1):
     |(?P<a>\d\d?)[/-](?P<b>\d\d?))?              # or mm-dd
     (?P<n>\.)?                                   # .
     (((?P<H>\d?\d):(?P<M>\d\d))?(:(?P<S>\d\d(\.\d+)?))?)?  # hh:mm:ss
-    (?P<o>[\d\smyd\-+]+)?                        # offset
+    (?P<o>[\d\smywd\-+]+)?                       # offset
 $''', re.VERBOSE)
 serialised_date_re = re.compile(r'''
     (\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d?(\.\d+)?)

roundup/hyperdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: hyperdb.py,v 1.117 2006-02-07 04:14:01 richard Exp $
+# $Id: hyperdb.py,v 1.118 2006-03-03 02:02:50 richard Exp $
 
 """Hyperdatabase implementation, especially field types.
 """
@@ -83,9 +83,9 @@ def from_raw(self, value, db, **kw):
             raise HyperdbValueError, 'property %s: %r is an invalid '\
                 'date (%s)'%(kw['propname'], value, message)
         return value
-    def range_from_raw (self, value, db):
+    def range_from_raw(self, value, db):
         """return Range value from given raw value with offset correction"""
-        return date.Range(value, date.Date, offset=self.offset (db))
+        return date.Range(value, date.Date, offset=self.offset(db))
 
 class Interval:
     """An object designating an Interval property."""

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.67 2006-02-09 23:53:11 richard Exp $
+# $Id: db_test_base.py,v 1.68 2006-03-03 02:02:50 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -996,6 +996,7 @@ def testFilteringRange(self):
         # may fail :)
         ae(filt(None, {'deadline': 'from 2003-02-16'}), ['1', '3', '4'])
         ae(filt(None, {'deadline': '2003-02-16;'}), ['1', '3', '4'])
+        ae(filt(None, {'deadline': '2003-02-16;'}), ['1', '3', '4'])
         # year and month granularity
         ae(filt(None, {'deadline': '2002'}), [])
         ae(filt(None, {'deadline': '2003'}), ['1', '2', '3'])
@@ -1010,6 +1011,17 @@ def testFilteringRange(self):
         ae(filt(None, {'foo': 'from 5:50'}), ['2'])
         ae(filt(None, {'foo': 'to 0:05'}), [])
 
+        # further
+        for issue in (
+                { 'deadline': date.Date('. -2d')},
+                { 'deadline': date.Date('. -1d')},
+                { 'deadline': date.Date('. -8d')},
+                ):
+            self.db.issue.create(**issue)
+        ae(filt(None, {'deadline': '-2d;'}), ['5', '6'])
+        ae(filt(None, {'deadline': '-1d;'}), ['6'])
+        ae(filt(None, {'deadline': '-1w;'}), ['5', '6'])
+
     def testFilteringIntervalSort(self):
         # 1: '1:10'
         # 2: '1d'

test/test_dates.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: test_dates.py,v 1.37 2006-01-13 00:22:17 richard Exp $
+# $Id: test_dates.py,v 1.38 2006-03-03 02:02:50 richard Exp $
 from __future__ import nested_scopes
 
 import unittest, time
@@ -84,6 +84,12 @@ def testOffset(self):
         date = Date("8:47:11", -5)
         ae(str(date), '%s-%02d-%02d.13:47:11'%(y, m, d))
 
+        # just make sure we parse these, m'kay?
+        date = Date('-1d')
+        date = Date('-1w')
+        date = Date('-1m')
+        date = Date('-1y')
+
     def testOffsetRandom(self):
         ae = self.assertEqual
         # XXX unsure of the usefulness of these, they're pretty random