Look for dates anywhere in the string, to mimic normal [Time/Date].pa…

…rse behavior, allowing for weekdays and dates after times

lib/american_date.rb

@@ -4,7 +4,7 @@
   # Modify parsing methods to handle american date format correctly.
   class << Date
     # American date format detected by the library.
-    AMERICAN_DATE_RE = %r_\A\s*(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})_.freeze
+    AMERICAN_DATE_RE = %r_\b(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})\b_.freeze
 
     # Alias for stdlib Date._parse
     alias _parse_without_american_date _parse

spec/american_date_spec.rb

@@ -26,6 +26,10 @@
   specify "should ignore preceding whitespace" do
     Date.parse('  01/02/2003').should == Date.new(2003, 1, 2)
   end
+
+  specify "should ignore preceding weekday" do
+    Date.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+  end
 end
 
 describe "DateTime.parse" do
@@ -54,9 +58,17 @@
     DateTime.parse('  01/02/2003').should == DateTime.new(2003, 1, 2)
   end
 
+  specify "should ignore preceding weekday" do
+    DateTime.parse('Day 01/02/2003').should == Date.new(2003, 1, 2)
+  end
+
   specify "should work with times" do
     DateTime.parse('01/02/2003 10:20:30').should == DateTime.new(2003, 1, 2, 10, 20, 30)
   end
+
+  specify "should work with times and weekdays" do
+    DateTime.parse('Day 01/02/2003 10:20:30').should == DateTime.new(2003, 1, 2, 10, 20, 30)
+  end
 end
 
 describe "Time.parse" do
@@ -84,9 +96,25 @@
     Time.parse('  01/02/2003').should == Time.local(2003, 1, 2)
   end
 
+  specify "should ignore preceding weekdays" do
+    Time.parse('Day 01/02/2003').should == Time.local(2003, 1, 2)
+  end
+
   specify "should work with times" do
     Time.parse('01/02/2003 10:20:30').should == Time.local(2003, 1, 2, 10, 20, 30)
   end
+
+  specify "should work with times and weekdays" do
+    Time.parse('Day 01/02/2003 10:20:30').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work with time first and date second" do
+    Time.parse('10:20:30 01/02/2003').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
+
+  specify "should work with time first and date second and weekday in the middle" do
+    Time.parse('10:20:30 Thu 01/02/2003').should == Time.local(2003, 1, 2, 10, 20, 30)
+  end
 end
 
 describe "Date._parse" do