From 65a5162550f58047974793cdc8067a970b2435c0 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Aug 1999 05:45:20 +0000
Subject: 1.4.0

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/parsedate.rb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'lib/parsedate.rb')

diff --git a/lib/parsedate.rb b/lib/parsedate.rb
index 68550c6505..6afec0ff06 100644
--- a/lib/parsedate.rb
+++ b/lib/parsedate.rb
@@ -8,8 +8,8 @@ module ParseDate
     'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3,
     'thu' => 4, 'fri' => 5, 'sat' => 6 }
   DAYPAT = DAYS.keys.join('|')
-  
-  def parsedate(date) 
+
+  def parsedate(date, guess=false) 
     # part of ISO 8601
     # yyyy-mm-dd | yyyy-mm | yyyy
     # date hh:mm:ss | date Thh:mm:ss
@@ -46,7 +46,7 @@ module ParseDate
       if $3
 	year = $3.to_i
       end
-    elsif date.sub!(/(#{MONTHPAT})\S*\s+(\d+)\S*\s*,?(?:\s+(\d+))?/i, ' ')
+    elsif date.sub!(/(#{MONTHPAT})\S*\s+(\d+)\S*,?(?:\s+(\d+))?/i, ' ')
       mon = MONTHS[$1.downcase]
       mday = $2.to_i
       if $3
@@ -58,6 +58,23 @@ module ParseDate
       if $3
 	year = $3.to_i
       end
+    elsif date.sub!(/(\d+)-(#{MONTHPAT})-(\d+)/i, ' ')
+      mday = $1.to_i
+      mon = MONTHS[$2.downcase]
+      year = $3.to_i
+    end
+    if guess
+      if year < 100
+	if year >= 69
+	  year += 1900
+	else
+	  year += 2000
+	end
+      end
+    elsif date.sub!(/(\d+)-(#{MONTHPAT})-(\d+)/i, ' ')
+      mday = $1.to_i
+      mon = MONTHS[$2.downcase]
+      year = $3.to_i
     end
     return year, mon, mday, hour, min, sec, zone, wday
   end
-- 
cgit v1.2.3