Support strings containing "from now"

Author: j-sv

rules/en/deadline.go

@@ -16,9 +16,10 @@ func Deadline(s rules.Strategy) rules.Rule {
 
 	return &rules.F{
 		RegExp: regexp.MustCompile(
-			"(?i)(?:\\W|^)(within|in)\\s*" +
+			"(?i)(?:\\W|^)(within|in)?\\s*" +
 				"(" + INTEGER_WORDS_PATTERN + "|[0-9]+|an?(?:\\s*few)?|half(?:\\s*an?)?)\\s*" +
 				"(seconds?|min(?:ute)?s?|hours?|days?|weeks?|months?|years?)\\s*" +
+				"(from\\s+now)?" +
 				"(?:\\W|$)"),
 		Applier: func(m *rules.Match, c *rules.Context, o *rules.Options, ref time.Time) (bool, error) {
 

rules/en/deadline_test.go

@@ -24,6 +24,7 @@ func TestDeadline(t *testing.T) {
 		{"within a few months", 0, "within a few months", 91 * 24 * time.Hour},
 		{"within one year", 0, "within one year", 366 * 24 * time.Hour},
 		{"in a week", 0, "in a week", 7 * 24 * time.Hour},
+		{"7 days from now", 0, "7 days from now", 7 * 24 * time.Hour},
 	}
 
 	w := when.New(nil)