issue_25 raise DateMathException when invalid timestamp is passed

Author: nickmaccarthy

.gitignore

@@ -1,10 +1,6 @@
 *.pyc
-env
-venv
-arrow_test.py
-dm_pretty.py
-ranges.py
-tztest.py
+env*
+venv*
 
 # general things to ignore
 build/

VERSION.txt

@@ -1 +1 @@
-1.5.2
+1.5.3

datemath/__init__.py

@@ -1,9 +1,9 @@
-from .helpers import parse
+from .helpers import parse, DateMathException
 
 def dm(expr, **kwargs):
     ''' does our datemath and returns an arrow object '''
     return parse(expr, **kwargs)
 
 def datemath(expr, **kwargs):
     ''' does our datemath and returns a datetime object '''
-    return parse(expr, **kwargs).datetime
+    return parse(expr, **kwargs)

datemath/helpers.py

@@ -136,6 +136,7 @@ def parse(expression, now=None, tz='UTC', type=None, roundDown=True):
             math = expression
             time = now
         else:
+            if debug: print('parse() - Found and expression that will hit the catchall')
             math = ''
             time = parseTime(expression, tz)
 
@@ -174,6 +175,9 @@ def parseTime(timestamp, timezone='UTC'):
             ts = ts.replace(tzinfo=timezone)
 
         return ts
+    else:
+        if debug: print('parseTime() - Doesnt look like we have a valid timestamp, raise an exception.  timestamp={}'.format(timestamp))
+        raise DateMathException('Valid length timestamp not provide, you gave me a timestamp of "{}", but I need something that has a len() >= 4'.format(timestamp))
 
 def roundDate(now, unit, tz='UTC', roundDown=True):
     '''

requirements-3.txt

@@ -9,7 +9,7 @@ docutils==0.15.2
 idna==2.7
 linecache2==1.0.0
 packaging==16.8
-pkginfo==1.4.1
+pkginfo==1.4.2
 Pygments==2.4.2
 pyparsing==2.2.0
 python-dateutil==2.6.0

tests.py

@@ -13,6 +13,7 @@
 iso8601 = 'YYYY-MM-DDTHH:mm:ssZZ'
 class TestDM(unittest.TestCase):
 
+
     def testParse(self):
 
         # Baisc dates
@@ -154,7 +155,11 @@ def testParse(self):
         self.assertRaises(DateMathException, dm, '+1ä')
         self.assertRaises(DateMathException, dm, '+1ü')
         self.assertRaises(DateMathException, dm, '+1ß')
-
+        self.assertRaises(DateMathException, dm, '2')
+        self.assertRaises(DateMathException, datemath, '2')
+        self.assertRaises(DateMathException, dm, '123')
+        self.assertRaises(DateMathException, datemath, '123')
+        
         try:
             dm('+1,')
         except DateMathException as e: