From 85a0c6b6189cfcb5a5dc6ab5d9edbcb7e96e8e0a Mon Sep 17 00:00:00 2001
From: Aaron Raddon <araddon@gmail.com>
Date: Tue, 20 May 2014 22:53:52 -0700
Subject: [PATCH] couple new date formats

---
 parseany.go      | 55 +++++++++++++++++++++++++++++++++++++++++++++---
 parseany_test.go | 33 +++++++++++++++++++++++------
 2 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/parseany.go b/parseany.go
index 2f82718..b7d73a5 100644
--- a/parseany.go
+++ b/parseany.go
@@ -26,6 +26,7 @@ const (
 	ST_ALPHA
 	ST_ALPHAWS
 	ST_ALPHAWSCOMMA
+	ST_ALPHAWSALPHA
 	ST_ALPHACOMMA
 	//ST_ALPHADIGIT
 )
@@ -174,8 +175,8 @@ iterRunes:
 			switch {
 			case r == ' ':
 				state = ST_ALPHAWS
-				// case r == ',':  TODO
-				// 	state = ST_ALPHACOMMA
+			case r == ',':
+				state = ST_ALPHACOMMA
 				// case unicode.IsDigit(r):
 				// 	state = ST_ALPHADIGIT
 			}
@@ -186,7 +187,28 @@ iterRunes:
 			case r == ',':
 				state = ST_ALPHAWSCOMMA
 			case unicode.IsLetter(r):
-				state = state << 9
+				state = ST_ALPHAWSALPHA
+			}
+		case ST_ALPHACOMMA: // Starts alpha then comma
+			// Mon, 02 Jan 2006 15:04:05 MST
+			// Mon, 02 Jan 2006 15:04:05 -0700
+			switch {
+			case r == '-':
+				//RFC1123Z    = "Mon, 02 Jan 2006 15:04:05 -0700" // RFC1123 with numeric zone
+				// TODO:  this doesn't work???
+				if t, err := time.Parse(time.RFC1123Z, datestr); err == nil {
+					return t, nil
+				} else {
+					u.Errorf("'%s'  err=%v", datestr, err)
+					break iterRunes
+				}
+			case unicode.IsLetter(r):
+				if t, err := time.Parse("Jan 2, 2006 3:04:05 PM", datestr); err == nil {
+					return t, nil
+				} else {
+					u.Errorf("'%s'  err=%v", datestr, err)
+					break iterRunes
+				}
 			}
 		case ST_ALPHAWSCOMMA: // Starts Alpha, whitespace, digit, comma
 			// May 8, 2009 5:57:51 PM
@@ -195,6 +217,32 @@ iterRunes:
 			} else {
 				u.Error(err)
 			}
+		case ST_ALPHAWSALPHA: // Starts Alpha, whitespace, alpha
+			// ANSIC       = "Mon Jan _2 15:04:05 2006"
+			// UnixDate    = "Mon Jan _2 15:04:05 MST 2006"
+			// RubyDate    = "Mon Jan 02 15:04:05 -0700 2006"
+			if len(datestr) == len("Mon Jan _2 15:04:05 2006") {
+				if t, err := time.Parse(time.ANSIC, datestr); err == nil {
+					return t, nil
+				} else {
+					u.Errorf("'%s'  err=%v", datestr, err)
+					break iterRunes
+				}
+			} else if len(datestr) == len("Mon Jan _2 15:04:05 MST 2006") {
+				if t, err := time.Parse(time.UnixDate, datestr); err == nil {
+					return t, nil
+				} else {
+					u.Error(err)
+					break iterRunes
+				}
+			} else if len(datestr) == len("Mon Jan 02 15:04:05 -0700 2006") {
+				if t, err := time.Parse(time.RubyDate, datestr); err == nil {
+					return t, nil
+				} else {
+					u.Error(err)
+					break iterRunes
+				}
+			}
 		default:
 			//u.Infof("no case for: %d", state)
 			break iterRunes
@@ -334,6 +382,7 @@ iterRunes:
 				u.Error(err)
 			}
 		}
+
 	default:
 		u.Infof("no case for: %d : %s", state, datestr)
 	}
diff --git a/parseany_test.go b/parseany_test.go
index b276e44..d2278c1 100644
--- a/parseany_test.go
+++ b/parseany_test.go
@@ -59,6 +59,27 @@ func TestParse(t *testing.T) {
 	//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
 	assert.T(t, "2009-05-08 17:57:51 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
 
+	//   ANSIC       = "Mon Jan _2 15:04:05 2006"
+	ts, err = ParseAny("Mon Jan  2 15:04:05 2006")
+	//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
+	assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
+
+	//   UnixDate    = "Mon Jan _2 15:04:05 MST 2006"
+	ts, err = ParseAny("Mon Jan  2 15:04:05 MST 2006")
+	//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
+	assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
+
+	// RubyDate    = "Mon Jan 02 15:04:05 -0700 2006"
+	ts, err = ParseAny("Mon Jan 02 15:04:05 -0700 2006")
+	//u.Debug(fmt.Sprintf("%v", ts.In(time.UTC)), "  ---- ", ts)
+	// Are we SURE this is right time?
+	assert.T(t, "2006-01-02 22:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
+
+	// Wat?  Go can't parse a date that it supplies a format for?
+	// ts, err = ParseAny("Mon, 02 Jan 2006 15:04:05 -0700")
+	// //u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
+	// assert.T(t, "2006-01-02 15:04:05 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
+
 	ts, err = ParseAny("03/19/2012 10:11:59")
 	assert.Tf(t, err == nil, "%v", err)
 	//u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
@@ -140,9 +161,9 @@ func TestParse(t *testing.T) {
 	assert.T(t, "2014-05-11 08:20:13.787 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
 }
 
-func TestWIP(t *testing.T) {
-	ts, err := ParseAny("2013-04-01 22:43:22")
-	assert.Tf(t, err == nil, "%v", err)
-	u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
-	assert.T(t, "2013-04-01 22:43:22 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
-}
+// func TestWIP(t *testing.T) {
+// 	ts, err := ParseAny("2013-04-01 22:43:22")
+// 	assert.Tf(t, err == nil, "%v", err)
+// 	u.Debug(ts.In(time.UTC).Unix(), ts.In(time.UTC))
+// 	assert.T(t, "2013-04-01 22:43:22 +0000 UTC" == fmt.Sprintf("%v", ts.In(time.UTC)))
+// }