chronic 0.4.0 → 0.4.1

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 0.4.1
+
+* Fix MiniDate ranges for parsing seasons (Thomas Walpole)
+
 # 0.4.0 / 2011-06-04
 
 * Ensure context is being passed through grabbers. Now "Sunday at 2:18pm"

data/Manifest.txt

@@ -40,6 +40,7 @@ test/helper.rb
 test/test_Chronic.rb
 test/test_DaylightSavings.rb
 test/test_Handler.rb
+test/test_MiniDate.rb
 test/test_Numerizer.rb
 test/test_RepeaterDayName.rb
 test/test_RepeaterFortnight.rb

data/chronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'chronic'
-  s.version           = '0.4.0'
+  s.version           = '0.4.1'
   s.rubyforge_project = 'chronic'
 
   s.summary     = "Natural language date/time parsing."
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     test/test_Chronic.rb
     test/test_DaylightSavings.rb
     test/test_Handler.rb
+    test/test_MiniDate.rb
     test/test_Numerizer.rb
     test/test_RepeaterDayName.rb
     test/test_RepeaterFortnight.rb

data/lib/chronic/handlers.rb

@@ -325,7 +325,7 @@ module Chronic
       #   raise(ChronicPain, "Invalid repeater: #{repeater.class}")
       # end
 
-      span = self.parse("this second", :guess => false, :now => @now)
+      span = Span.new(@now, @now + 1)
 
       self.handle_srp(tokens, span, options)
     end
@@ -399,7 +399,7 @@ module Chronic
       end
 
       puts "--#{outer_span}" if Chronic.debug
-      anchor = find_within(repeaters, outer_span, pointer)
+      find_within(repeaters, outer_span, pointer)
     end
 
     def get_repeaters(tokens) #:nodoc:

data/lib/chronic/mini_date.rb

@@ -3,18 +3,19 @@ module Chronic
     attr_accessor :month, :day
 
     def initialize(month, day)
+      raise(InvalidArgumentException, "1..12 are valid months") unless (1..12).include?(month)
       @month = month
       @day = day
     end
 
     def is_between?(md_start, md_end)
+      return false if (@month==md_start.month && @month==md_end.month && (@day < md_start.day || @day > md_end.day))
       return true if (@month == md_start.month and @day >= md_start.day) ||
                      (@month == md_end.month and @day <= md_end.day)
-
-      i = md_start.month + 1
+      i = (md_start.month % 12) + 1
       until i == md_end.month
         return true if @month == i
-        i = (i+1) % 12
+        i = (i % 12) + 1
       end
 
       return false

data/lib/chronic/ordinal.rb

@@ -1,8 +1,6 @@
 module Chronic
-
   class Ordinal < Tag #:nodoc:
     def self.scan(tokens, options)
-      # for each token
       tokens.each_index do |i|
         if t = scan_for_ordinals(tokens[i]) then tokens[i].tag(t) end
         if t = scan_for_days(tokens[i]) then tokens[i].tag(t) end

data/lib/chronic/pointer.rb

@@ -1,8 +1,6 @@
 module Chronic
-
   class Pointer < Tag #:nodoc:
     def self.scan(tokens, options)
-      # for each token
       tokens.each_index do |i|
         if t = scan_for_all(tokens[i]) then tokens[i].tag(t) end
       end
@@ -21,5 +19,4 @@ module Chronic
       'pointer-' << @type.to_s
     end
   end
-
 end

data/lib/chronic/repeater.rb

@@ -1,7 +1,6 @@
 module Chronic
   class Repeater < Tag #:nodoc:
     def self.scan(tokens, options)
-      # for each token
       tokens.each_index do |i|
         if t = scan_for_season_names(tokens[i]) then tokens[i].tag(t); next end
         if t = scan_for_month_names(tokens[i]) then tokens[i].tag(t); next end
@@ -69,10 +68,7 @@ module Chronic
     end
 
     def self.scan_for_times(token)
-      if token.word =~ /^\d{1,2}(:?\d{2})?([\.:]?\d{2})?$/
-        return Chronic::RepeaterTime.new(token.word)
-      end
-      return nil
+      scan_for token, RepeaterTime, /^\d{1,2}(:?\d{2})?([\.:]?\d{2})?$/
     end
 
     def self.scan_for_units(token)
@@ -109,14 +105,11 @@ module Chronic
 
     # returns the next occurance of this repeatable.
     def next(pointer)
-      !@now.nil? || raise("Start point must be set before calling #next")
-      [:future, :none, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
-      #raise("Repeatable#next must be overridden in subclasses")
+      raise("Start point must be set before calling #next") unless @now
     end
 
     def this(pointer)
-      !@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")
+      raise("Start point must be set before calling #this") unless @now
     end
 
     def to_s

data/lib/chronic/repeaters/repeater_year.rb

@@ -56,7 +56,7 @@ module Chronic
     end
 
     def width
-      (365 * 24 * 60 * 60)
+      YEAR_SECONDS
     end
 
     def to_s

data/lib/chronic/scalar.rb

@@ -1,10 +1,8 @@
 module Chronic
-
   class Scalar < Tag #:nodoc:
     DAY_PORTIONS = %w( am pm morning afternoon evening night )
 
     def self.scan(tokens, options)
-      # for each token
       tokens.each_index do |i|
         if t = scan_for_scalars(tokens[i], tokens[i + 1]) then tokens[i].tag(t) end
         if t = scan_for_days(tokens[i], tokens[i + 1]) then tokens[i].tag(t) end
@@ -80,5 +78,4 @@ module Chronic
       super << '-year-' << @type.to_s
     end
   end
-
-end
+end

data/lib/chronic/separator.rb

@@ -1,5 +1,4 @@
 module Chronic
-
   class Separator < Tag #:nodoc:
     def self.scan(tokens, options)
       tokens.each_index do |i|
@@ -69,5 +68,4 @@ module Chronic
       super << '-on'
     end
   end
-
-end
+end

data/lib/chronic/tag.rb

@@ -16,8 +16,13 @@ module Chronic
       private
 
       def scan_for(token, klass, items={})
-        items.each do |item, symbol|
-          return klass.new(symbol) if item =~ token.word
+        case items
+        when Regexp
+          return klass.new(token.word) if items =~ token.word
+        when Hash
+          items.each do |item, symbol|
+            return klass.new(symbol) if item =~ token.word
+          end
         end
         nil
       end

data/lib/chronic.rb

@@ -8,7 +8,7 @@
 #=============================================================================
 
 module Chronic
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   class << self
     attr_accessor :debug

data/test/test_MiniDate.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+class TestMiniDate < Test::Unit::TestCase
+  def test_valid_month
+    assert_raise(Chronic::InvalidArgumentException){ Chronic::MiniDate.new(0,12) }
+    assert_raise(Chronic::InvalidArgumentException){ Chronic::MiniDate.new(13,1) }
+  end
+  
+  def test_is_between
+    m=Chronic::MiniDate.new(3,2)
+    assert m.is_between?(Chronic::MiniDate.new(2,4), Chronic::MiniDate.new(4,7))
+    assert !m.is_between?(Chronic::MiniDate.new(1,5), Chronic::MiniDate.new(2,7))    
+    
+    #There was a hang if date tested is in december and outside the testing range
+    m=Chronic::MiniDate.new(12,24)
+    assert !m.is_between?(Chronic::MiniDate.new(10,1), Chronic::MiniDate.new(12,21))
+  end
+  
+  def test_is_between_short_range
+    m=Chronic::MiniDate.new(5,10)
+    assert m.is_between?(Chronic::MiniDate.new(5,3), Chronic::MiniDate.new(5,12))
+    assert !m.is_between?(Chronic::MiniDate.new(5,11), Chronic::MiniDate.new(5,15))
+  end
+  
+  def test_is_between_wrapping_range
+    m=Chronic::MiniDate.new(1,1)
+    assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(2,2))
+    m=Chronic::MiniDate.new(12,12)
+    assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(1,5))
+  end
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: chronic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-06-05 00:00:00 Z
 dependencies: []
 
 description: Chronic is a natural language date/time parser written in pure Ruby.
@@ -69,6 +69,7 @@ files:
 - test/test_Chronic.rb
 - test/test_DaylightSavings.rb
 - test/test_Handler.rb
+- test/test_MiniDate.rb
 - test/test_Numerizer.rb
 - test/test_RepeaterDayName.rb
 - test/test_RepeaterFortnight.rb
@@ -116,6 +117,7 @@ test_files:
 - test/test_Chronic.rb
 - test/test_DaylightSavings.rb
 - test/test_Handler.rb
+- test/test_MiniDate.rb
 - test/test_Numerizer.rb
 - test/test_RepeaterDayName.rb
 - test/test_RepeaterFortnight.rb