chronic 0.1.1 → 0.1.2

data/lib/chronic.rb

@@ -7,8 +7,6 @@
 #
 #=============================================================================
 
-require 'date'
-
 require 'chronic/chronic'
 require 'chronic/handlers'
 

data/lib/chronic/repeaters/repeater_day.rb

@@ -4,10 +4,14 @@ class Chronic::RepeaterDay < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    @current_day ||= Date.parse(@now.to_s)
-    @current_day += pointer == :future ? 1 : -1
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    if !@current_day_start
+      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+    end
+    
+    direction = pointer == :future ? 1 : -1
+    @current_day_start += direction * DAY_SECONDS
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
   
   def this(pointer = :future)

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -4,18 +4,22 @@ class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
   def next(pointer)
     super
     
-    if !@current_day
-      @current_day = Date.parse(@now.to_s)
-      @current_day += pointer == :future ? 1 : -1
+    direction = pointer == :future ? 1 : -1
+    
+    if !@current_day_start
+      @current_day_start = Time.local(@now.year, @now.month, @now.day)
+      @current_day_start += direction * DAY_SECONDS
+
       day_num = symbol_to_number(@type)
-      while @current_day.wday != day_num
-        @current_day += pointer == :future ? 1 : -1
+      
+      while @current_day_start.wday != day_num
+        @current_day_start += direction * DAY_SECONDS
       end
     else
-      @current_day += pointer == :future ? 7 : -7
+      @current_day_start += direction * 7 * DAY_SECONDS
     end
-    span_begin = Time.parse(@current_day.to_s)
-    Chronic::Span.new(span_begin, span_begin + width)
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
   end
   
   def this(pointer = :future)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: chronic
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-09-09 00:00:00 -07:00
+  version: 0.1.2
+date: 2006-09-16 00:00:00 -07:00
 summary: A natural language date parser
 require_paths: 
 - lib