chronic 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,7 @@
+= 0.1.6 2006-01-15
+
+* added 'weekend' support (eventualbuddha)
+
 = 0.1.5 2006-12-20
 
 * fixed 'aug 20' returning next year if current month is august

data/Rakefile

@@ -10,6 +10,8 @@ Hoe.new('chronic', Chronic::VERSION) do |p|
   p.description = p.paragraphs_of('README.txt', 2).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.need_tar = false
+  p.extra_deps = []
 end
 
 # vim: syntax=Ruby

data/lib/chronic.rb

@@ -34,7 +34,7 @@ require 'chronic/ordinal'
 require 'chronic/separator'
 
 module Chronic
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
   
   def self.debug; false; end
 end

data/lib/chronic/repeater.rb

@@ -72,7 +72,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
                /^months?$/ => :month,
                /^fortnights?$/ => :fortnight,
                /^weeks?$/ => :week,
-               /^weekends?$/ => :weekends,
+               /^weekends?$/ => :weekend,
                /^days?$/ => :day,
                /^hours?$/ => :hour,
                /^minutes?$/ => :minute,
@@ -104,7 +104,7 @@ class Chronic::Repeater < Chronic::Tag #:nodoc:
   end
   
   def this(pointer)
-    !@now.nil? || raise("Start point must be set before calling #next")
+    !@now.nil? || raise("Start point must be set before calling #this")
     [:future, :past, :none].include?(pointer) || raise("First argument 'pointer' must be one of :past, :future, :none")
   end
   

data/lib/chronic/repeaters/repeater_weekend.rb

@@ -1,6 +1,55 @@
 class Chronic::RepeaterWeekend < Chronic::Repeater #:nodoc:
   WEEKEND_SECONDS = 172_800 # (2 * 24 * 60 * 60)
   
+  def next(pointer)
+    super
+    
+    if !@current_week_start
+      case pointer
+      when :future
+        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+        saturday_repeater.start = @now
+        next_saturday_span = saturday_repeater.next(:future)
+        @current_week_start = next_saturday_span.begin
+      when :past
+        saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+        saturday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
+        last_saturday_span = saturday_repeater.next(:past)
+        @current_week_start = last_saturday_span.begin
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_week_start += direction * Chronic::RepeaterWeek::WEEK_SECONDS
+    end
+    
+    Chronic::Span.new(@current_week_start, @current_week_start + WEEKEND_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future, :none
+      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+      saturday_repeater.start = @now
+      this_saturday_span = saturday_repeater.this(:future)
+      Chronic::Span.new(this_saturday_span.begin, this_saturday_span.begin + WEEKEND_SECONDS)
+    when :past
+      saturday_repeater = Chronic::RepeaterDayName.new(:saturday)
+      saturday_repeater.start = @now
+      last_saturday_span = saturday_repeater.this(:past)
+      Chronic::Span.new(last_saturday_span.begin, last_saturday_span.begin + WEEKEND_SECONDS)
+    end
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = span.begin
+    start = weekend.next(pointer).begin + (amount - 1) * direction * Chronic::RepeaterWeek::WEEK_SECONDS
+    Chronic::Span.new(start, start + (span.end - span.begin))
+  end
+  
   def width
     WEEKEND_SECONDS
   end

data/test/test_RepeaterWeekend.rb

@@ -0,0 +1,75 @@
+require 'chronic'
+require 'test/unit'
+
+class TestRepeaterWeekend < Test::Unit::TestCase
+  
+  def setup
+    # Wed Aug 16 14:00:00 2006
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+  
+  def test_next_future
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+    
+    next_weekend = weekend.next(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+  
+  def test_next_past
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+    
+    next_weekend = weekend.next(:past)
+    assert_equal Time.local(2006, 8, 12), next_weekend.begin
+    assert_equal Time.local(2006, 8, 14), next_weekend.end
+  end
+  
+  def test_this_future
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+    
+    next_weekend = weekend.this(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+  
+  def test_this_past
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+    
+    next_weekend = weekend.this(:past)
+    assert_equal Time.local(2006, 8, 12), next_weekend.begin
+    assert_equal Time.local(2006, 8, 14), next_weekend.end
+  end
+  
+  def test_this_none
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+    
+    next_weekend = weekend.this(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+  
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+    
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 3, :future)
+    
+    assert_equal Time.local(2006, 9, 2), offset_span.begin
+    assert_equal Time.local(2006, 9, 2, 0, 0, 1), offset_span.end
+    
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 1, :past)
+    
+    assert_equal Time.local(2006, 8, 12), offset_span.begin
+    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
+    
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 0, :future)
+    
+    assert_equal Time.local(2006, 8, 12), offset_span.begin
+    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
+  end
+  
+end

data/test/test_parsing.rb

@@ -254,6 +254,17 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("this week", :now => @time_2006_08_16_14_00_00, :context => :past)
     assert_equal Time.local(2006, 8, 14, 19), time
     
+    # weekend
+    
+    time = Chronic.parse("this weekend", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 20), time
+    
+    time = Chronic.parse("this weekend", :now => @time_2006_08_16_14_00_00, :context => :past)
+    assert_equal Time.local(2006, 8, 13), time
+    
+    time = Chronic.parse("last weekend", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 13), time
+    
     # day
     
     time = Chronic.parse("this day", :now => @time_2006_08_16_14_00_00)
@@ -386,6 +397,9 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("3 weeks ago", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 7, 26, 14, 30, 30), time
     
+    time = Chronic.parse("2 weekends ago", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 5), time
+    
     time = Chronic.parse("3 days ago", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 13, 14), time
     
@@ -418,6 +432,12 @@ class TestParsing < Test::Unit::TestCase
     time = Chronic.parse("1 week from now", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 23, 14, 0, 0), time
     
+    time = Chronic.parse("1 weekend from now", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 19), time
+    
+    time = Chronic.parse("2 weekends from now", :now => @time_2006_08_16_14_00_00)
+    assert_equal Time.local(2006, 8, 26), time
+    
     time = Chronic.parse("1 day hence", :now => @time_2006_08_16_14_00_00)
     assert_equal Time.local(2006, 8, 17, 14), time
     
@@ -492,6 +512,10 @@ class TestParsing < Test::Unit::TestCase
     span = Chronic.parse("november", :now => @time_2006_08_16_14_00_00, :guess => false)
     assert_equal Time.local(2006, 11), span.begin
     assert_equal Time.local(2006, 12), span.end
+    
+    span = Chronic.parse("weekend" , :now => @time_2006_08_16_14_00_00, :guess => false)
+    assert_equal Time.local(2006, 8, 19), span.begin
+    assert_equal Time.local(2006, 8, 21), span.end
   end
   
   def test_argument_validation

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: chronic
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2006-12-21 00:00:00 -08:00
+  version: 0.1.6
+date: 2007-01-15 00:00:00 -08:00
 summary: A natural language date parser
 require_paths: 
 - lib
@@ -82,6 +82,7 @@ test_files:
 - test/test_RepeaterMonthName.rb
 - test/test_RepeaterTime.rb
 - test/test_RepeaterWeek.rb
+- test/test_RepeaterWeekend.rb
 - test/test_RepeaterYear.rb
 - test/test_Span.rb
 - test/test_Token.rb
@@ -95,13 +96,5 @@ extensions: []
 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.6
-    version: 
+dependencies: []
+