runt 0.2.0 → 0.3.0

data/CHANGES

@@ -1,5 +1,28 @@
 = Runt Changelog
 
+== Version 0.3.0
+
+* TExpr (finally!) becomes a Module instead of a superclass 
+
+* Added overlap? method for all temporal expressions and DateRange
+
+* Added REMonth expression which matches a range of dates each month
+ 
+* Contributed by Emmett Shear: TExpr#dates method which returns an array of dates occurring within the supplied DateRange
+
+* Rakefile fixes:
+  - test path allow gem to be installed with -t switch
+  - usage of gzip which will break on Win32
+
+* Removed and then subsequently restored SpecTE
+
+* General clean-up, including:
+  - renamed several methods on PDate
+  - renamed 'dateprecisiontest.rb' to 'dprecisiontest.rb'
+
+* Fixed Object.id deprecation warning
+
+
 == Version 0.2.0
 
 * Fixed Schedule class

data/README

@@ -8,6 +8,10 @@
 
 = INSTALL
 
+* gem install runt
+
+  <b>or</b>
+
 * Unpack the Runt distribution.
 
    $ tar -xzvf runt-<version>.tar.gz
@@ -32,7 +36,7 @@
 
 * require 'runt'
 
-* See http://runt.rubyforge.org/doc/index.html
+* See Runt website[http://runt.rubyforge.org].
 
 * See $UNPACK_DIR/runt/test/*.rb for example usage.
 
@@ -66,7 +70,9 @@ The ruby-nyc user's group for their suggestions and feedback.
 
 BlueRobot[http://www.bluerobot.com/web/layouts/] for the CSS used to prettify the Runt website.
 
-The number 12, and the letters E and J.
+Emmett Shear for contributed TExpr#dates code and several thought-provoking feature requests.
+
+The number 12, and the letters E, J, and B.
 
 ---
 
@@ -85,4 +91,4 @@ implied warranties, including, without limitation, the implied
 warranties of merchantibility and fitness for a particular
 purpose.
 
-link://../dcl-small.gif
+link://../dcl-small.gif

data/Rakefile

@@ -10,15 +10,17 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
-#require 'rake/packagetask'
-
 require 'rake/contrib/sshpublisher'
 require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 
+#####################################################################
+# Constants
+#####################################################################
+
 # Build Settings
-PKG_VERSION = "0.2.0"
-#  'gem_install_bin.rb',
+PKG_VERSION = "0.3.0"
+
 # Files to be included in Runt distribution
 PKG_FILES = FileList[
   'setup.rb',
@@ -29,10 +31,19 @@ PKG_FILES = FileList[
   'site/**/*'
 ].exclude("*.ses")
 
+if(RUBY_PLATFORM =~ /win32/i)
+  PKG_EXEC_TAR = false
+else
+  PKG_EXEC_TAR = true 
+end
+  
 # build directory
 TARGET_DIR = "target"
 
+#####################################################################
 # Targets
+#####################################################################
+
 task :default => [:test]
 task :clobber => [:clobber_build_dir]
 
@@ -55,14 +66,7 @@ end
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = 'test/alltests.rb'
-  t.verbose = true
-end
-
-Rake::PackageTask.new("runt", PKG_VERSION) do |p|
-  p.package_dir="#{TARGET_DIR}/#{p.package_dir}"
-  p.need_tar = true
-  p.need_zip = true
-  p.package_files.include(PKG_FILES)
+  t.verbose = false	
 end
 
 desc "Copy html files for the Runt website to the build directory."
@@ -79,7 +83,7 @@ task :publish => [:rdoc,:copy_site,:clobber_package] do |t|
 end
 
 desc "Publish the Documentation to the build dir."
-task :test_publish => [:rerdoc,:copy_site,:clobber_package] do |t|
+task :test_publish => [:rdoc,:copy_site,:clobber_package] do |t|
   puts "YAY! We've tested publish! YAY!"
 end
 
@@ -100,8 +104,7 @@ else
     s.email = 'matt@digitalclash.com'
     s.homepage = 'http://runt.rubyforge.org'
     s.has_rdoc = true
-#    s.rdoc_files = rd.rdoc_files
-#    s.rdoc_options = rd.option_list
+    s.test_files = Dir['test/*test.rb']
     s.rubyforge_project = 'runt'
     s.description = <<EOF
 Runt is a Ruby version of temporal patterns by
@@ -112,6 +115,6 @@ EOF
   
   Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_zip = true
-    pkg.need_tar = true
+    pkg.need_tar = PKG_EXEC_TAR
   end
 end

data/TODO

@@ -4,16 +4,17 @@ Send suggestions, questions, threats, etc. for this list to Matt[mailto:matt@dig
 
 === To Do
 
-* Fix REWeek so that ordinal day values where the end day < start day does not fail
+* Schedule tutorial
 
-* Make Schedule a Module instead of a class
+* Example usage with Rails
 
-* Schedule tutorial
+* Persistence strategy:
+  - Marshall
+  - database...create storable grammar, expression stack?  
 
-* Better RDoc's which include usage examples
+* Fix REWeek so that ordinal day values where the end day < start day does not fail
 
-* Properly implement/test Range functionality in DateRange
+* Make Schedule a Module instead of a class
 
 * Address performance issues due to implementation (in particular, PDate#<=>)
 
-* Use RDoc properly so Runt website and README don't cause DRY violations

data/doc/tutorial_schedule.rdoc

@@ -48,4 +48,4 @@ We created a temporal expression to match this time period, like so:
 
 * Fowler's recurring event pattern[http://martinfowler.com/apsupp/recurring.pdf]
 
-* Other temporal patterns[http://martinfowler.com/ap2/timeNarrative.html]
+* Other temporal patterns[http://martinfowler.com/ap2/timeNarrative.html]

data/doc/tutorial_te.rdoc

@@ -181,10 +181,10 @@ easy to write your own.
 
 Fowler's paper[http://martinfowler.com/apsupp/recurring.pdf] also goes
 on to describe another element of this pattern: the <tt>Schedule</tt>.
-See the schedule tutorial[http://runt.rubyforge.org/doc/files/doc/schedule_te.html] for details.
+See the schedule tutorial[http://runt.rubyforge.org/doc/files/doc/tutorial_schedule_rdoc.html] for details.
 
 <em>See Also:</em>
 
 * Fowler's recurring event pattern[http://martinfowler.com/apsupp/recurring.pdf]
 
-* Other temporal patterns[http://martinfowler.com/ap2/timeNarrative.html]
+* Other temporal patterns[http://martinfowler.com/ap2/timeNarrative.html]

data/lib/runt.rb

@@ -84,10 +84,27 @@ module Runt
       @negate.call(arg)
     end
   end
+  LastProc = ApplyLast.new
 
   public
-  Last = ApplyLast.new
-  Last_of = Last[First]
-  Second_to_last = Last[Second]
+  Last = LastProc[First]
+  Last_of = LastProc[First]
+  Second_to_last = LastProc[Second]
 
-end
+end
+
+#
+# Add precision +Runt::DPrecision+ to standard library classes Date and DateTime 
+# (which is a subclass of Date). 
+#
+class Date
+
+  include Runt::DPrecision
+
+  attr_accessor :date_precision
+
+  def date_precision
+    return @date_precision unless @date_precision.nil? 
+    return Runt::DPrecision::DEFAULT 
+  end 	  
+end

data/lib/runt/daterange.rb

@@ -31,9 +31,9 @@ module Runt
     end
 
     def overlap?(obj)
-      return true if( include?(obj.min) || include?(obj.max) )
-			return true if( obj.kind_of?(Range) && obj.include?(self) )
-			false
+      return true if( member?(obj) || include?(obj.min) || include?(obj.max) )
+      return true if( obj.kind_of?(Range) && obj.include?(self) )
+      false
     end
 
     def empty?
@@ -71,4 +71,4 @@ module Runt
     EMPTY = DateRange.new(PDate.day(2004,2,2),PDate.day(2004,2,1))
 
   end
-end
+end

data/lib/runt/pdate.rb

@@ -123,5 +123,4 @@ module Runt
     end
 
   end
-
 end

data/lib/runt/temporalexpression.rb

@@ -2,19 +2,13 @@
 
 require 'date'
 require 'runt/dprecision'
+require 'runt/pdate'
 
 #
 # Author:: Matthew Lipper
 
 module Runt
 
-# FKA = 'Formally Known As'
-
-
-# FKA: TemporalExpression
-#
-# Base class for all TExpr classes that has proved itself usefull enough to
-# avoid O's Razor, but that may wind up as a module.
 #
 # 'TExpr' is short for 'TemporalExpression' and are inspired by the recurring event
 # <tt>pattern</tt>[http://martinfowler.com/apsupp/recurring.pdf]
@@ -22,11 +16,12 @@ module Runt
 # specifying recurring events using set expressions.
 #
 # See also [tutorial_te.rdoc]
-class TExpr
+module TExpr
 
   # Returns true or false depending on whether this TExpr includes the supplied
   # date expression.
   def include?(date_expr); false end
+  
   def to_s; "TExpr" end
 
   def or (arg)
@@ -65,44 +60,25 @@ class TExpr
     self.minus(expr){|adjusted| adjusted }
   end
 
-  protected
-  def week_in_month(day_in_month)
-    ((day_in_month - 1) / 7) + 1
-  end
-
-  def days_left_in_month(date)
-    return max_day_of_month(date) - date.day
-  end
-
-  def max_day_of_month(date)
-    result = 1
-    date.step( Date.new(date.year,date.mon+1,1), 1 ){ |d| result=d.day unless d.day < result }
-    result
-  end
-
-  def week_matches?(index,date)
-    if(index > 0)
-      return week_from_start_matches?(index,date)
-    else
-      return week_from_end_matches?(index,date)
+  # Contributed by Emmett Shear:
+  # Returns an Array of Date-like objects which occur within the supplied
+  # DateRange.
+  def dates(date_range)
+    result = []
+    date_range.each do |date|
+      result << date if self.include? date
     end
-  end
-
-  def week_from_start_matches?(index,date)
-    week_in_month(date.day)==index
-  end
-
-  def week_from_end_matches?(index,date)
-    n = days_left_in_month(date) + 1
-    week_in_month(n)==index.abs
+    result
   end
 
 end
 
 # Base class for TExpr classes that can be composed of other
 # TExpr objects imlpemented using the <tt>Composite(GoF)</tt> pattern.
-class Collection < TExpr
-
+class Collection 
+  
+  include TExpr
+  
   attr_reader :expressions
   protected :expressions
 
@@ -115,6 +91,16 @@ class Collection < TExpr
     self
   end
 
+  # Will return true if the supplied object overlaps with the range used to
+  # create this instance
+  def overlap?(date_expr)
+    @expressions.each do | interval |
+      return true if date_expr.overlap?(interval)      
+    end
+    false    
+  end
+
+
   def to_s; "Collection:" + @expressions.to_s end
 end
 
@@ -137,7 +123,6 @@ end
 class Intersect < Collection
 
   def include?(aDate)
-    #Handle @expressions.size==0
     result = false
     @expressions.each do |expr|
       return false unless (result = expr.include?(aDate))
@@ -149,8 +134,10 @@ class Intersect < Collection
 end
 
 # TExpr that will be true only if the first of
-# it's two contained expressions is true and the second is false.
-class Diff < TExpr
+# its two contained expressions is true and the second is false.
+class Diff 
+
+  include TExpr
 
   def initialize(expr1, expr2)
     @expr1 = expr1
@@ -166,8 +153,10 @@ class Diff < TExpr
 end
 
 # TExpr that provides for inclusion of an arbitrary date.
-class Spec < TExpr
-
+class Spec
+  
+  include TExpr
+  
   def initialize(date_expr)
     @date_expr = date_expr
   end
@@ -187,10 +176,11 @@ end
 # facilitating inclusion of an arbitrary range in a temporal expression.
 #
 #  See also: Range
-class RSpec < TExpr
+class RSpec 
+
+  include TExpr
 
   def initialize(date_expr)
-    raise TypeError, 'expected range' unless date_expr.kind_of?(Range)
     @date_expr = date_expr
   end
 
@@ -199,10 +189,62 @@ class RSpec < TExpr
   def include?(date_expr)
     return @date_expr.include?(date_expr)
   end
+  
+  # Will return true if the supplied object overlaps with the range used to
+  # create this instance
+  def overlap?(date_expr)
+    @date_expr.each do | interval |
+      return true if date_expr.include?(interval)      
+    end
+    false    
+  end
 
   def to_s; "RSpec" end
 end
 
+#######################################################################
+# Utility methods common to some expressions
+
+module TExprUtils
+  def week_in_month(day_in_month)
+    ((day_in_month - 1) / 7) + 1
+  end
+
+  def days_left_in_month(date)
+    return max_day_of_month(date) - date.day
+  end
+
+  def max_day_of_month(date)
+    result = 1
+    next_month = nil
+    if(date.mon==12)
+      next_month = Date.new(date.year+1,1,1)
+    else
+      next_month = Date.new(date.year,date.mon+1,1)
+    end
+    date.step(next_month,1){ |d| result=d.day unless d.day < result }
+    result
+  end
+
+  def week_matches?(index,date)
+    if(index > 0)
+      return week_from_start_matches?(index,date)
+    else
+      return week_from_end_matches?(index,date)
+    end
+  end
+
+  def week_from_start_matches?(index,date)
+    week_in_month(date.day)==index
+  end
+
+  def week_from_end_matches?(index,date)
+    n = days_left_in_month(date) + 1
+    week_in_month(n)==index.abs
+  end
+
+end
+
 # TExpr that provides support for building a temporal
 # expression using the form:
 #
@@ -228,7 +270,10 @@ end
 #     DIMonth.new(Last,Saturday)
 #
 #  See also: Date, Runt
-class DIMonth < TExpr
+class DIMonth 
+
+  include TExpr
+  include TExprUtils
 
   def initialize(week_of_month_index,day_index)
     @day_index = day_index
@@ -243,17 +288,6 @@ class DIMonth < TExpr
     "DIMonth"
   end
 
-  def print(date)
-    puts "DIMonth: #{date}"
-    puts "include? == #{include?(date)}"
-    puts "day_matches? == #{day_matches?(date)}"
-    puts "week_matches? == #{week_matches?(date)}"
-    puts "week_from_start_matches? == #{week_from_start_matches?(date)}"
-    puts "week_from_end_matches? == #{week_from_end_matches?(date)}"
-    puts "days_left_in_month == #{days_left_in_month(date)}"
-    puts "max_day_of_month == #{max_day_of_month(date)}"
-  end
-
   private
   def day_matches?(date)
     @day_index == date.wday
@@ -275,7 +309,9 @@ end
 #     DIWeek.new(Sunday)
 #
 #  See also: Date, Runt
-class DIWeek < TExpr
+class DIWeek 
+
+  include TExpr
 
   VALID_RANGE = 0..6
 
@@ -298,20 +334,21 @@ end
 # If start and end day are equal, the entire week will match true.
 #
 #  See also: Date
-class REWeek < TExpr
+class REWeek 
+
+  include TExpr
 
   VALID_RANGE = 0..6
 
-	# Creates a REWeek using the supplied start
+  # Creates a REWeek using the supplied start
   # day(range = 0..6, where 0=>Sunday) and an optional end
   # day. If an end day is not supplied, the maximum value
   # (6 => Saturday) is assumed.
   #
   # If the start day is greater than the end day, an
-	# ArgumentError will be raised
-	def initialize(start_day,end_day=6)
-		super()
-		validate(start_day,end_day)
+  # ArgumentError will be raised
+  def initialize(start_day,end_day=6)
+    validate(start_day,end_day)
     @start_day = start_day
     @end_day = end_day
   end
@@ -325,7 +362,7 @@ class REWeek < TExpr
     "REWeek"
   end
 
-	private
+  private
   def validate(start_day,end_day)
     unless start_day<=end_day
       raise ArgumentError, 'end day of week must be greater than start day'
@@ -336,10 +373,11 @@ class REWeek < TExpr
   end
 end
 
-class REYear < TExpr
+class REYear 
 
+  include TExpr
+  
   def initialize(start_month, start_day=0, end_month=start_month, end_day=0)
-    super()
     @start_month = start_month
     @start_day = start_day
     @end_month = end_month
@@ -356,14 +394,6 @@ class REYear < TExpr
     "REYear"
   end
 
-  def print(date)
-    puts "DIMonth: #{date}"
-    puts "include? == #{include?(date)}"
-    puts "months_include? == #{months_include?(date)}"
-    puts "end_month_include? == #{end_month_include?(date)}"
-    puts "start_month_include? == #{start_month_include?(date)}"
-  end
-
   private
   def months_include?(date)
     (date.mon > @start_month) && (date.mon < @end_month)
@@ -385,7 +415,9 @@ end
 # is assumed to be on the following day.
 #
 #  See also: Date
-class REDay < TExpr
+class REDay 
+
+  include TExpr
 
   CURRENT=28
   NEXT=29
@@ -406,8 +438,9 @@ class REDay < TExpr
   end
 
   def include?(date)
-    raise TypeError, 'expected date' unless date.kind_of?(Date)
-
+    # If precision is day or greater, then the result is always true
+    return true if date.date_precision <= DPrecision::DAY
+    
     if(@spans_midnight&&date.hour<12) then
       #Assume next day
       return @range.include?(get_next(date.hour,date.min))
@@ -421,17 +454,11 @@ class REDay < TExpr
     "REDay"
   end
 
-  def print(date)
-    puts "DIMonth: #{date}"
-    puts "include? == #{include?(date)}"
-  end
-
   private
   def spans_midnight?(start_hour, end_hour)
     return end_hour <= start_hour
   end
 
-  private
   def get_current(hour,minute)
       PDate.min(ANY_DATE.year,ANY_DATE.month,CURRENT,hour,minute)
   end
@@ -447,7 +474,10 @@ end
 #     WIMonth.new(1)
 #
 #  See also: Date
-class WIMonth < TExpr
+class WIMonth 
+
+  include TExpr
+  include TExprUtils
 
   VALID_RANGE = -2..5
 
@@ -464,4 +494,31 @@ class WIMonth < TExpr
 
 end
 
+# TExpr that matches a range of dates within a month. For example:
+# 
+#     REMonth.(12,28)
+#
+# matches from the 12th thru the 28th of any month. If end_day==0
+# or is not given, start_day will define the range with that single day.
+# 
+#  See also: Date
+class REMonth
+
+  include TExpr
+
+  def initialize(start_day, end_day=0)
+    end_day=start_day if end_day==0
+    @range = start_day..end_day
+  end
+
+  def include?(date)
+    @range.include? date.mday
+  end
+
+  def to_s
+    "REMonth"
+  end
+
+end
+
 end

data/site/index.html

@@ -49,6 +49,7 @@
     ideas off-line.
     </li>
     <li><a href="http://www.bluerobot.com/web/layouts/">Blue Robot</a> for the CSS</li>
+    <li>Emmett Shear for contributed <a href="http://runt.rubyforge.org/doc/classes/Runt/TExpr.html">TExpr#dates</a> code and several thought-provoking feature requests.</li>
   </ul>
   </p>
 </div>
@@ -89,4 +90,4 @@
 <!-- BlueRobot was here. -->
 
 </body>
-</html>
+</html>

data/test/alltests.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:<<'../lib'
-
 # All Runt unit tests
 #
 # Author:: Matthew Lipper

data/test/daterangetest.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:<<'../lib'
-
 require 'test/unit'
 require 'runt'
 require 'date'
@@ -57,6 +55,13 @@ class DateRangeTest < Test::Unit::TestCase
     assert(o_range.overlap?(range))
     assert(o_range.overlap?(DateRange.new(r_start,o_end)))
     assert(o_range.overlap?(DateRange.new(o_start,r_end)))
+        
+    # September 18th - 19th, 2005, 8am - 10am 
+    expr1=DateRange.new(PDate.day(2005,9,18),PDate.day(2005,9,19)) 
+    # September 19th - 20th, 2005, 9am - 11am 
+    expr2=DateRange.new(PDate.day(2005,9,19),PDate.day(2005,9,20))
+
+    assert(expr1.overlap?(expr2))
   end
 
   def test_empty

data/test/dprecisiontest.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:<<'../lib'
-
 require 'test/unit'
 require 'runt'
 require 'date'
@@ -9,6 +7,7 @@ require 'date'
 # Unit tests for DPrecision class
 #
 # Author:: Matthew Lipper
+
 class DPrecisionTest < Test::Unit::TestCase
 
   include Runt
@@ -23,13 +22,13 @@ class DPrecisionTest < Test::Unit::TestCase
   end
 
   def test_pseudo_singleton_instance
-    assert(DPrecision::YEAR.id==DPrecision::YEAR.id, "Object Id's not equal.")
-    assert(DPrecision::MONTH.id==DPrecision::MONTH.id, "Object Id's not equal.")
-    assert(DPrecision::DAY.id==DPrecision::DAY.id, "Object Id's not equal.")
-    assert(DPrecision::HOUR.id==DPrecision::HOUR.id, "Object Id's not equal.")
-    assert(DPrecision::MIN.id==DPrecision::MIN.id, "Object Id's not equal.")
-    assert(DPrecision::SEC.id==DPrecision::SEC.id, "Object Id's not equal.")
-    assert(DPrecision::MILLI.id==DPrecision::MILLI.id, "Object Id's not equal.")
+    assert(DPrecision::YEAR.object_id==DPrecision::YEAR.object_id, "Object Id's not equal.")
+    assert(DPrecision::MONTH.object_id==DPrecision::MONTH.object_id, "Object Id's not equal.")
+    assert(DPrecision::DAY.object_id==DPrecision::DAY.object_id, "Object Id's not equal.")
+    assert(DPrecision::HOUR.object_id==DPrecision::HOUR.object_id, "Object Id's not equal.")
+    assert(DPrecision::MIN.object_id==DPrecision::MIN.object_id, "Object Id's not equal.")
+    assert(DPrecision::SEC.object_id==DPrecision::SEC.object_id, "Object Id's not equal.")
+    assert(DPrecision::MILLI.object_id==DPrecision::MILLI.object_id, "Object Id's not equal.")
   end
 
   def test_to_precision

data/test/pdatetest.rb

@@ -1,6 +1,4 @@
-  #!/usr/bin/env ruby
-
-$:<<'../lib'
+#!/usr/bin/env ruby
 
 require 'test/unit'
 require 'date'

data/test/scheduletest.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:<<'../lib'
-
 require 'test/unit'
 require 'runt'
 require 'date'
@@ -52,5 +50,39 @@ class ScheduleTest < Test::Unit::TestCase
     assert_equal(expected,dates)
   end
 
+  def test_using_a_schedule
+        
+    # September 18th - 19th, 2005, 8am - 10am 
+    expr1=RSpec.new(DateRange.new(PDate.day(2005,9,18),PDate.day(2005,9,19))) & REDay.new(8,0,10,0)
+    assert(expr1.include?(PDate.min(2005,9,18,8,15)))
+    # September 19th - 20th, 2005, 9am - 11am 
+    expr2=RSpec.new(DateRange.new(PDate.day(2005,9,19),PDate.day(2005,9,20))) & REDay.new(9,0,11,0) 
+    # Quick sanuty check
+    assert(expr1.overlap?(expr2))
+    # Setup a schedule w/first expression
+    sched = Schedule.new
+    sched.add(Event.new("Snafubar Opening"),expr1)
+    resource = Resource.new(sched)
+    # Add a another overlapping event 
+    resource.add_event(Event.new("Yodeling Lesson"),expr2)
+    # Create a new resource using the same schedule
+    resource2 = Resource.new(sched)
+    # Add a another overlapping event and pass a block which should complain
+    #resource.add_event(Event.new("Yodeling Lesson"),expr2) \
+    #{|e,s| raise "Resource not available at requested time(s)." \
+    #  if (@schedule.overlap?(s))} 
+  end
 end
 
+class Resource
+  def initialize(schedule)
+    @schedule=schedule
+  end
+  def add_event(event,expr)
+    if(block_given?) 
+      yield(event,expr) 
+    else
+      @schedule.add(event,expr) 
+    end
+  end
+end

data/test/temporalexpressiontest.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:<<'../lib'
-
 require 'test/unit'
 require 'runt'
 require 'date'
@@ -10,11 +8,13 @@ $DEBUG=false
 
 # Unit tests for TExpr classes
 # Author:: Matthew Lipper
+
 class TExprTest < Test::Unit::TestCase
 
   include Runt
   include DPrecision
 
+
   def test_collection_te
     #base class that should always return false
     expr = Collection.new
@@ -166,19 +166,28 @@ class TExprTest < Test::Unit::TestCase
     #12:01 am (January 28th, 2004 - ignored)
     assert(!expr2.include?(PDate.min(2004,1,28,0,01)))
   end
-  def test_range_each_week_te
 
-    assert_raises(ArgumentError){ expr = REWeek.new(10,4) }
+  def test_range_each_day_te_again
+    dr = DateRange.new(PDate.day(2005,9,19),PDate.day(2005,9,20))
+    red = REDay.new(8,0,10,0)
+    result = false
+    dr.each do |interval|
+      result = red.include?(interval)
+      break if result
+    end      
+    assert(result)
+  end
 
+  def test_range_each_week_te
+    assert_raises(ArgumentError){ expr = REWeek.new(10,4) }
     expr1 = REWeek.new(Mon,Fri) & REDay.new(8,00,8,30)
     assert(!expr1.include?(PDate.new(2004,5,1,8,06)))
-
-
     #Sunday through Thursday
     expr2 = REWeek.new(0,4)
     assert(expr2.include?(PDate.min(2004,2,19,23,59,59)))
     assert(!expr2.include?(PDate.min(2004,2,20,0,0,0)))
   end
+
   def test_combined_te
     #This is a hack.....
     #In the U.S., Memorial Day begins the last Monday of May
@@ -279,4 +288,115 @@ class TExprTest < Test::Unit::TestCase
     assert(!ticket.include?(DateTime.new(2004,3,11,1,15)))
  end
 
+ def test_re_month_te
+   # October 22nd, 2005
+   dt1 = Date.civil(2005,10,22)
+   # The 20th through the 29th of any month
+   expr1 = REMonth.new(20,29)
+   assert(expr1.include?(dt1))
+   assert(!expr1.include?(PDate.new(2010,12,12)))
+   # August 17th, 1975
+   dt2 = Date.civil(1975,8,17)
+   # The 17th of any month
+   expr2 = REMonth.new(17)
+   assert(expr2.include?(dt2))
+   assert(!expr2.include?(dt1))
+  end
+  
+  ###
+  # Dates functionality & tests contributed by Emmett Shear
+  ###
+  def test_day_in_month_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 12, 31)
+    month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] 
+    expr = DIMonth.new(First, Tuesday)
+    dates = expr.dates(date_range)
+    assert dates.size == 12
+    dates.each do |d|
+      assert d.wday == 2 # tuesday
+      assert d.day < 8 # in the first week
+    end
+    expr2 = DIMonth.new(Last, Friday)
+    dates2 = expr2.dates(date_range)
+    assert dates2.size == 12
+    dates2.each do |d|
+      assert d.wday == 5 # friday
+      assert d.day > month_days[d.month-1] - 8 # last week
+    end
+  end
+
+  def test_day_in_week_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 1, 31)
+    expr = DIWeek.new(Sunday)
+    dates = expr.dates(date_range)
+    assert( dates.size == 5 )
+    assert( dates.include?( Date.civil(2005, 1, 16) ) )
+    assert( dates.include?( Date.civil(2005, 1, 30) ) )
+  end
+
+  def test_union_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 12, 31)
+    month_days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] 
+    expr = DIMonth.new(Last, Friday) | DIMonth.new(1, Tuesday)
+    dates = expr.dates(date_range)
+    assert dates.size == 24
+    dates.each do |d|
+      unless (d.wday == 2 and d.day < 8) or \
+	(d.wday == 5 and d.day > month_days[d.month-1] - 8)
+        assert false, d.to_s 
+      end
+    end
+  end
+
+  def test_intersection_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 12, 31)
+    expr = DIWeek.new(Sunday) & DIMonth.new(Second, Sunday)
+    dates = expr.dates(date_range)
+    assert( dates.size == 12 )
+    other_dates = DIMonth.new(Second, Sunday).dates(date_range)
+    dates.each { |d| assert( other_dates.include?(d) ) }
+  end
+
+  def test_range_each_week_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 1, 31)
+    expr = REWeek.new(3, 5)
+    dates = expr.dates(date_range)
+    assert dates.size == 12
+  end
+
+  def test_range_each_year_dates
+    date_range = Date.civil(2004, 5, 1)..Date.civil(2006, 5, 4)
+    expr = REYear.new(4, 28, 5, 6)
+    dates = expr.dates(date_range)
+    assert dates.size == 22, dates.size
+  end
+
+  def test_week_in_month_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 2, 28)
+    expr = WIMonth.new(2)
+    dates = expr.dates(date_range)
+    assert dates.size == 14, dates.size
+    assert dates.first.mday == 8
+    assert dates.last.mday == 14
+    expr_2 = WIMonth.new(Last)
+    dates_2 = expr_2.dates(date_range)
+    assert dates_2.size == 14, dates_2.size
+    assert dates_2.first.mday == 25
+    assert dates_2.last.mday == 28
+  end
+
+  def test_range_each_month_dates
+    date_range = Date.civil(2005, 1, 7)..Date.civil(2005, 1, 15)
+    expr = REMonth.new(5, 9)
+    dates = expr.dates(date_range)
+    assert dates.size == 3, dates.size
+    assert false if dates.include? Date.civil(2005, 1, 6)
+  end
+  
+  def test_diff_dates
+    date_range = Date.civil(2005, 1, 1)..Date.civil(2005, 1, 31)
+    expr = REYear.new(1, 1, 1, 31) - REMonth.new(7, 15)
+    dates = expr.dates(date_range)
+    assert dates.size == 22, dates.size
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.11
 specification_version: 1
 name: runt
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2004-11-29
+  version: 0.3.0
+date: 2005-10-22 00:00:00 -04:00
 summary: Ruby Temporal Expressions.
 require_paths: 
   - lib
-author: Matthew Lipper
 email: matt@digitalclash.com
 homepage: http://runt.rubyforge.org
 rubyforge_project: runt
@@ -25,6 +24,10 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+authors: 
+  - Matthew Lipper
 files: 
   - setup.rb
   - CHANGES
@@ -52,7 +55,12 @@ files:
   - site/logohover.png
   - site/runt-logo.gif
   - site/runt-logo.psd
-test_files: []
+test_files: 
+  - test/daterangetest.rb
+  - test/dprecisiontest.rb
+  - test/pdatetest.rb
+  - test/scheduletest.rb
+  - test/temporalexpressiontest.rb
 rdoc_options: []
 extra_rdoc_files: []
 executables: []