runt 0.6.0 → 0.7.0

data/test/sugartest.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'runt'
+require 'runt/sugar'
+
+class SugarTest < Test::Unit::TestCase
+  include Runt
+
+  def test_build__should_return_nil_when_an_unknown_name_is_given
+    assert self.build('duh').nil?
+  end
+
+  def test_method_missing_should_be_called_for_invalid_name
+    begin
+      self.some_tuesday
+    rescue NoMethodError
+      # YAY!
+    end
+  end
+
+  def test_const_should_return_runt_constant
+    assert_equal Runt::Monday, Runt.const('monday'), \
+      "Expected #{Runt::Monday} but was #{Runt.const('monday')}"
+  end
+  
+  def test_method_missing_should_define_dimonth
+      make_ordinals.each do |ordinal|
+        make_days.each do |day|
+	  name = ordinal + '_' + day
+	  result = self.send(name)
+	  expected = DIMonth.new(Runt.const(ordinal), Runt.const(day))
+	  assert_expression expected, result
+	end
+      end
+  end
+  
+  def test_method_missing_should_define_diweek
+    assert_expression(DIWeek.new(Monday), self.monday)
+    assert_expression(DIWeek.new(Tuesday), self.tuesday)
+    assert_expression(DIWeek.new(Wednesday), self.wednesday)
+    assert_expression(DIWeek.new(Thursday), self.thursday)
+    assert_expression(DIWeek.new(Friday), self.friday)
+    assert_expression(DIWeek.new(Saturday), self.saturday)
+    assert_expression(DIWeek.new(Sunday), self.sunday)
+  end
+
+  def test_parse_time
+    assert_equal [13,2], parse_time('1','02','pm')
+    assert_equal [1,2], parse_time('1','02','am')
+  end
+
+  def test_method_missing_should_define_re_day
+    assert_expression(REDay.new(8,45,14,00), daily_8_45am_to_2_00pm)
+  end
+
+  def test_method_missing_should_define_re_week
+    make_days.each do |st_day|
+      make_days.each do |end_day|
+	if Runt.const(st_day) <= Runt.const(end_day) then
+	  assert_expression REWeek.new(Runt.const(st_day), \
+	      Runt.const(end_day)), self.send('weekly_' + st_day + '_to_' + end_day)
+	end
+      end
+    end
+  end
+
+  def test_method_missing_should_define_re_month
+    assert_expression(REMonth.new(3,14), monthly_3rd_to_14th)
+  end
+  def test_method_missing_should_define_re_year
+    # Imperfect but "good enough" for now
+    make_months.each do |st_month|
+      make_months.each do |end_month|
+	st_mon_number = Runt.const(st_month)
+	end_mon_number = Runt.const(end_month)
+	next if st_mon_number > end_mon_number
+	st_day = rand(27) + 1
+	end_day = rand(27) + 1
+        if st_mon_number == end_mon_number && st_day > end_day then
+	  st_day, end_day = end_day, st_day
+	end	  
+	#puts "Checking #{st_month} #{st_day} - #{end_month} #{end_day}"
+	assert_expression REYear.new(st_mon_number, st_day, end_mon_number, end_day), \
+	  self.send('yearly_' + st_month + '_' + st_day.to_s + '_to_' + end_month + '_' + end_day.to_s)
+      end
+    end
+  end
+
+  private 
+  def assert_expression(expected, actual)
+    assert_equal expected.to_s, actual.to_s, \
+      "Expected #{expected.to_s} but was #{actual.to_s}"
+  end
+  def make_ordinals
+    Runt::WEEK_OF_MONTH_ORDINALS.delete('()').split('|')
+  end
+  def make_days
+    Runt::DAYS.delete('()').split('|')
+  end
+  def make_months
+    Runt::MONTHS.delete('()').split('|')
+  end
+end

data/test/temporalexpressiontest.rb

@@ -1,76 +1,76 @@
-#!/usr/bin/env ruby
-
-require 'baseexpressiontest'
-
-# Unit tests for TExpr classes
-# Author:: Matthew Lipper
-
-class TExprTest < BaseExpressionTest
-
-  include TExpr
-
-  def test_include
-    assert !self.include?(true), "Default include? method should always return false"
-  end
-
-  def test_to_s
-    assert_equal self.to_s, 'TExpr', "Default to_s method should always return 'TExpr'"
-  end
-
-  def test_or_from_union
-    union = Union.new
-    same_union = union.or(@stub1)
-    assert_same union, same_union, "Expected same Union instance that received the or method"
-    assert_same @stub1, union.expressions.first, "Union instance should have added the stub expression"
-  end
-
-  def test_or_from_nonunion
-    result = @stub1.or(@stub2) {|e| e}
-    assert_equal Runt::Union, result.class, "Expected an Union instance. Instead got #{result.class}"
-    assert_same @stub1, result.expressions.first, "Result should be new Union instance containing both stub expressions"
-    assert_same @stub2, result.expressions.last, "Result should be new Union instance containing both stub expressions"
-  end
-
-  def test_and_from_intersect
-    intersect = Intersect.new
-    result = intersect.and(@stub1)
-    assert_same intersect, result, "Expected same Intersect instance that received the and method"
-    assert_same @stub1, intersect.expressions.first, "Intersect instance should have added the stub expression"
-  end
-
-  def test_or_from_nonintersect
-    result = @stub1.and(@stub2) {|e| e}
-    assert_equal Runt::Intersect, result.class, "Expected an Intersect instance. Instead got #{result.class}"
-    assert_same @stub1, result.expressions.first, "Result should be new Intersect instance containing both stub expressions"
-    assert_same @stub2, result.expressions.last, "Result should be new Intersect instance containing both stub expressions"
-  end
-
-  def test_minus
-    result = @stub1.minus(@stub2) {|e| e}
-    assert_equal Runt::Diff, result.class, "Expected an Diff instance. Instead got #{result.class}"
-    assert_same @stub1, result.expr1, "Expected first stub instance used to create Diff expression"
-    assert_same @stub2, result.expr2, "Expected second stub instance used to create Diff expression"
-  end
-
-  def test_dates_no_limit
-    # Normally, your range is made up of Date-like Objects
-    range = 1..3
-    assert @stub1.dates(range).empty?, "Expected empty Array of Objects returned from stub expression"
-    @stub1.match = true
-    result = @stub1.dates(range)
-    assert_equal 1, result[0], "Expected Array of Objects given by range to be returned from stub expression"
-    assert_equal 2, result[1], "Expected Array of Objects given by range to be returned from stub expression"
-    assert_equal 3, result[2], "Expected Array of Objects given by range to be returned from stub expression"
-  end
-
-  def test_dates_with_limit
-    range = 1..3
-    assert @stub1.dates(range).empty?, "Expected empty Array of Objects returned from stub expression"
-    @stub1.match = true
-    result = @stub1.dates(range,2)
-    assert_equal 2, result.size, "Expected Array of only 2 Objects. Got #{result.size}"
-    assert_equal 1, result[0], "Expected Array of Objects given by range to be returned from stub expression"
-    assert_equal 2, result[1], "Expected Array of Objects given by range to be returned from stub expression"
-  end
-
-end
+#!/usr/bin/env ruby
+
+require 'baseexpressiontest'
+
+# Unit tests for TExpr classes
+# Author:: Matthew Lipper
+
+class TExprTest < BaseExpressionTest
+
+  include TExpr
+
+  def test_include
+    assert !self.include?(true), "Default include? method should always return false"
+  end
+
+  def test_to_s
+    assert_equal self.to_s, 'TExpr', "Default to_s method should always return 'TExpr'"
+  end
+
+  def test_or_from_union
+    union = Union.new
+    same_union = union.or(@stub1)
+    assert_same union, same_union, "Expected same Union instance that received the or method"
+    assert_same @stub1, union.expressions.first, "Union instance should have added the stub expression"
+  end
+
+  def test_or_from_nonunion
+    result = @stub1.or(@stub2) {|e| e}
+    assert_equal Runt::Union, result.class, "Expected an Union instance. Instead got #{result.class}"
+    assert_same @stub1, result.expressions.first, "Result should be new Union instance containing both stub expressions"
+    assert_same @stub2, result.expressions.last, "Result should be new Union instance containing both stub expressions"
+  end
+
+  def test_and_from_intersect
+    intersect = Intersect.new
+    result = intersect.and(@stub1)
+    assert_same intersect, result, "Expected same Intersect instance that received the and method"
+    assert_same @stub1, intersect.expressions.first, "Intersect instance should have added the stub expression"
+  end
+
+  def test_or_from_nonintersect
+    result = @stub1.and(@stub2) {|e| e}
+    assert_equal Runt::Intersect, result.class, "Expected an Intersect instance. Instead got #{result.class}"
+    assert_same @stub1, result.expressions.first, "Result should be new Intersect instance containing both stub expressions"
+    assert_same @stub2, result.expressions.last, "Result should be new Intersect instance containing both stub expressions"
+  end
+
+  def test_minus
+    result = @stub1.minus(@stub2) {|e| e}
+    assert_equal Runt::Diff, result.class, "Expected an Diff instance. Instead got #{result.class}"
+    assert_same @stub1, result.expr1, "Expected first stub instance used to create Diff expression"
+    assert_same @stub2, result.expr2, "Expected second stub instance used to create Diff expression"
+  end
+
+  def test_dates_no_limit
+    # Normally, your range is made up of Date-like Objects
+    range = 1..3
+    assert @stub1.dates(range).empty?, "Expected empty Array of Objects returned from stub expression"
+    @stub1.match = true
+    result = @stub1.dates(range)
+    assert_equal 1, result[0], "Expected Array of Objects given by range to be returned from stub expression"
+    assert_equal 2, result[1], "Expected Array of Objects given by range to be returned from stub expression"
+    assert_equal 3, result[2], "Expected Array of Objects given by range to be returned from stub expression"
+  end
+
+  def test_dates_with_limit
+    range = 1..3
+    assert @stub1.dates(range).empty?, "Expected empty Array of Objects returned from stub expression"
+    @stub1.match = true
+    result = @stub1.dates(range,2)
+    assert_equal 2, result.size, "Expected Array of only 2 Objects. Got #{result.size}"
+    assert_equal 1, result[0], "Expected Array of Objects given by range to be returned from stub expression"
+    assert_equal 2, result[1], "Expected Array of Objects given by range to be returned from stub expression"
+  end
+
+end

metadata

@@ -1,131 +1,148 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: runt
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-12-31 00:00:00 -05:00
-summary: Ruby Temporal Expressions.
-require_paths: 
-- lib
-email: mlipper@gmail.com
-homepage: http://runt.rubyforge.org
-rubyforge_project: runt
-description: Runt is a Ruby version of temporal patterns by Martin Fowler. Runt provides an API for scheduling recurring events using set-like semantics.
-autorequire: runt
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.7.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Matthew Lipper
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-30 00:00:00 +00:00
+default_executable: 
+dependencies: []
+
+description: Runt is a Ruby version of temporal patterns by Martin Fowler. Runt provides an API for scheduling recurring events using set-like semantics.
+email: mlipper@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
+- TODO
+- LICENSE.txt
+- doc/tutorial_te.rdoc
+- doc/tutorial_schedule.rdoc
+- doc/tutorial_sugar.rdoc
 files: 
 - setup.rb
-- CHANGES
-- doc
-- examples
-- lib
 - LICENSE.txt
 - Rakefile
-- README
-- site
-- test
 - TODO
-- lib/runt/daterange.rb
-- lib/runt/dprecision.rb
+- CHANGES
+- README
 - lib/runt/pdate.rb
-- lib/runt/schedule.rb
+- lib/runt/dprecision.rb
 - lib/runt/temporalexpression.rb
+- lib/runt/daterange.rb
+- lib/runt/schedule.rb
+- lib/runt/sugar.rb
+- lib/runt/expressionbuilder.rb
 - lib/runt.rb
-- test/baseexpressiontest.rb
-- test/collectiontest.rb
+- test/reweektest.rb
+- test/icalendartest.rb
+- test/everytetest.rb
 - test/combinedexpressionstest.rb
+- test/wimonthtest.rb
+- test/reyeartest.rb
+- test/runttest.rb
+- test/uniontest.rb
+- test/yeartetest.rb
 - test/daterangetest.rb
-- test/dayintervaltetest.rb
-- test/difftest.rb
-- test/dimonthtest.rb
-- test/diweektest.rb
+- test/baseexpressiontest.rb
+- test/spectest.rb
+- test/collectiontest.rb
+- test/scheduletest.rb
+- test/pdatetest.rb
 - test/dprecisiontest.rb
-- test/everytetest.rb
-- test/icalendartest.rb
 - test/intersecttest.rb
-- test/pdatetest.rb
+- test/dimonthtest.rb
+- test/temporalexpressiontest.rb
 - test/redaytest.rb
+- test/diweektest.rb
+- test/difftest.rb
+- test/dayintervaltetest.rb
 - test/remonthtest.rb
-- test/reweektest.rb
-- test/reyeartest.rb
 - test/rspectest.rb
-- test/runttest.rb
-- test/scheduletest.rb
-- test/spectest.rb
-- test/temporalexpressiontest.rb
-- test/uniontest.rb
-- test/wimonthtest.rb
-- test/yeartetest.rb
-- examples/reminder.rb
+- test/aftertetest.rb
+- test/sugartest.rb
+- test/beforetetest.rb
+- test/expressionbuildertest.rb
 - examples/schedule_tutorial.rb
 - examples/schedule_tutorialtest.rb
-- doc/tutorial_schedule.rdoc
+- examples/reminder.rb
+- examples/payment_report.rb
+- examples/payment_reporttest.rb
 - doc/tutorial_te.rdoc
+- doc/tutorial_schedule.rdoc
+- doc/tutorial_sugar.rdoc
 - site/blue-robot3.css
-- site/dcl-small.gif
-- site/index.html
 - site/logohover.png
+- site/index.html
 - site/runt-logo.gif
 - site/runt-logo.psd
+- site/dcl-small.gif
+has_rdoc: true
+homepage: http://runt.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README
+- --title
+- Runt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: 
+- none
+rubyforge_project: runt
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: Ruby Temporal Expressions.
 test_files: 
-- examples/schedule_tutorialtest.rb
-- test/baseexpressiontest.rb
-- test/collectiontest.rb
+- test/reweektest.rb
+- test/icalendartest.rb
+- test/everytetest.rb
 - test/combinedexpressionstest.rb
+- test/wimonthtest.rb
+- test/reyeartest.rb
+- test/runttest.rb
+- test/uniontest.rb
+- test/yeartetest.rb
 - test/daterangetest.rb
-- test/dayintervaltetest.rb
-- test/difftest.rb
-- test/dimonthtest.rb
-- test/diweektest.rb
+- test/baseexpressiontest.rb
+- test/spectest.rb
+- test/collectiontest.rb
+- test/scheduletest.rb
+- test/pdatetest.rb
 - test/dprecisiontest.rb
-- test/everytetest.rb
-- test/icalendartest.rb
 - test/intersecttest.rb
-- test/pdatetest.rb
+- test/dimonthtest.rb
+- test/temporalexpressiontest.rb
 - test/redaytest.rb
+- test/diweektest.rb
+- test/difftest.rb
+- test/dayintervaltetest.rb
 - test/remonthtest.rb
-- test/reweektest.rb
-- test/reyeartest.rb
 - test/rspectest.rb
-- test/runttest.rb
-- test/scheduletest.rb
-- test/spectest.rb
-- test/temporalexpressiontest.rb
-- test/uniontest.rb
-- test/wimonthtest.rb
-- test/yeartetest.rb
-rdoc_options: 
-- --main
-- README
-- --title
-- Runt
-extra_rdoc_files: 
-- README
-- CHANGES
-- TODO
-- LICENSE.txt
-- doc/tutorial_schedule.rdoc
-- doc/tutorial_te.rdoc
-executables: []
-
-extensions: []
-
-requirements: 
-- none
-dependencies: []
-
+- test/aftertetest.rb
+- test/sugartest.rb
+- test/beforetetest.rb
+- test/expressionbuildertest.rb
+- examples/schedule_tutorialtest.rb
+- examples/payment_reporttest.rb