texp 0.0.3 → 0.0.7

data/test/texp/month_test.rb

@@ -12,9 +12,9 @@ class MonthTest < Test::Unit::TestCase
 
   def test_initial_conditions
     te = TExp::Month.new(2)
-    assert te.include?(@date)
-    assert te.include?(@date + 1)
-    assert ! te.include?(@date + 30)
+    assert te.includes?(@date)
+    assert te.includes?(@date + 1)
+    assert ! te.includes?(@date + 30)
   end
 end
 

data/test/texp/operators_test.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'texp'
+
+class OperatorsTest < Test::Unit::TestCase
+  def setup
+    @monday    = Date.parse("Mar 3, 2008")
+    @tuesday   = Date.parse("Mar 4, 2008")
+    @wednesday = Date.parse("Mar 5, 2008")
+    @thursday  = Date.parse("Mar 6, 2008")
+    @friday    = Date.parse("Mar 7, 2008")
+  end
+
+  def test_union
+    te = TExp.parse("2w") + TExp.parse("3w")
+
+    assert ! te.includes?(@monday)
+    assert   te.includes?(@tuesday)
+    assert   te.includes?(@wednesday)
+    assert ! te.includes?(@thursday)
+    assert ! te.includes?(@friday)
+  end
+
+  def test_intersection
+    te = TExp.parse("2w") * TExp.parse("1k")
+
+    assert   te.includes?(@tuesday)
+    assert ! te.includes?(@wednesday)
+    assert ! te.includes?(@tuesday+7)
+  end
+
+  def test_difference
+    te = TExp.parse("3w1,1s") - TExp.parse("3w")
+
+    assert ! te.includes?(@monday)
+    assert   te.includes?(@tuesday)
+    assert ! te.includes?(@wednesday)
+    assert   te.includes?(@thursday)
+    assert ! te.includes?(@friday)
+  end
+
+  def test_negate
+    te = -TExp.parse("3w")
+
+    assert   te.includes?(@monday)
+    assert   te.includes?(@tuesday)
+    assert ! te.includes?(@wednesday)
+    assert   te.includes?(@thursday)
+    assert   te.includes?(@friday)
+  end
+end

data/test/texp/parse_test.rb

@@ -97,14 +97,14 @@ class ParseTest < Test::Unit::TestCase
 
   def test_parse_interval
     te = TExp.parse("2008-02-14,2i")
-    assert te.include?(@date)
-    assert ! te.include?(@date+1)
-    assert te.include?(@date+2)
+    assert te.includes?(@date)
+    assert ! te.includes?(@date+1)
+    assert te.includes?(@date+2)
   end
 
   def test_parse_day_of_month
     te = TExp.parse("14d")
-    te.include?(@date)
+    te.includes?(@date)
   end
 
   def test_parse_list
@@ -114,85 +114,85 @@ class ParseTest < Test::Unit::TestCase
 
   def test_parse_day_of_month_with_multiple_args
     te = TExp.parse("[13,14]d")
-    assert te.include?(@date)
-    assert te.include?(@date-1)
-    assert ! te.include?(@date+2)
+    assert te.includes?(@date)
+    assert te.includes?(@date-1)
+    assert ! te.includes?(@date+2)
   end
 
   def test_parse_day_of_week_with_single_arg
     te = TExp.parse("4w")
-    assert te.include?(@date)
-    assert ! te.include?(@date+2)
+    assert te.includes?(@date)
+    assert ! te.includes?(@date+2)
   end
 
   def test_parse_day_of_week_with_multiple_args
     te = TExp.parse("[3,4]w")
-    assert te.include?(@date)
-    assert te.include?(@date-1)
-    assert ! te.include?(@date+2)
+    assert te.includes?(@date)
+    assert te.includes?(@date-1)
+    assert ! te.includes?(@date+2)
   end
 
   def test_parse_month_with_single_arg
     te = TExp.parse("2m")
-    assert te.include?(@date)
-    assert ! te.include?(@date + 30)
+    assert te.includes?(@date)
+    assert ! te.includes?(@date + 30)
   end
 
   def test_parse_month_with_multiple_args
     te = TExp.parse("[2,3]m")
-    assert te.include?(@date)
-    assert te.include?(@date + 30)
-    assert ! te.include?(@date + 60)
+    assert te.includes?(@date)
+    assert te.includes?(@date + 30)
+    assert ! te.includes?(@date + 60)
   end
 
   def test_parse_year_with_single_arg
     te = TExp.parse("2008y")
-    assert te.include?(@date)
-    assert ! te.include?(@date + 365)
+    assert te.includes?(@date)
+    assert ! te.includes?(@date + 365)
   end
 
   def test_parse_year_with_multiple_args
     te = TExp.parse("[2007,2008]y")
-    assert te.include?(@date)
-    assert te.include?(@date - 365)
-    assert ! te.include?(@date + 365)
+    assert te.includes?(@date)
+    assert te.includes?(@date - 365)
+    assert ! te.includes?(@date + 365)
   end
 
   def test_parse_window
     te = TExp.parse("3w2,1s")
-    assert ! te.include?(Date.parse("Mar 2, 2008"))
-    assert   te.include?(Date.parse("Mar 3, 2008"))
-    assert   te.include?(Date.parse("Mar 4, 2008"))
-    assert   te.include?(Date.parse("Mar 5, 2008"))
-    assert   te.include?(Date.parse("Mar 6, 2008"))
-    assert ! te.include?(Date.parse("Mar 7, 2008"))
+    assert ! te.includes?(Date.parse("Mar 2, 2008"))
+    assert   te.includes?(Date.parse("Mar 3, 2008"))
+    assert   te.includes?(Date.parse("Mar 4, 2008"))
+    assert   te.includes?(Date.parse("Mar 5, 2008"))
+    assert   te.includes?(Date.parse("Mar 6, 2008"))
+    assert ! te.includes?(Date.parse("Mar 7, 2008"))
   end
 
   def test_parse_not
     te = TExp.parse("14dn")
-    assert ! te.include?(@date)
-    assert te.include?(@date + 1)
+    assert ! te.includes?(@date)
+    assert te.includes?(@date + 1)
   end
 
   def test_parse_and
-    TExp.parse("14d").include?(@date)
-    TExp.parse("2m").include?(@date)
+    TExp.parse("14d").includes?(@date)
+    TExp.parse("2m").includes?(@date)
     te = TExp.parse("[14d 2m] a")
-    assert te.include?(@date)
-    assert ! te.include?(@date + 1)
-    assert ! te.include?(@date + 365)
+    assert te.includes?(@date)
+    assert ! te.includes?(@date + 1)
+    assert ! te.includes?(@date + 365)
   end
 
   def test_parse_or
     te = TExp.parse("[14d 15d] o")
-    assert te.include?(@date)
-    assert te.include?(@date + 1)
-    assert ! te.include?(@date + 2)
+    assert te.includes?(@date)
+    assert te.includes?(@date + 1)
+    assert ! te.includes?(@date + 2)
   end
 
   def test_parse_every_day
     te = TExp.parse('e')
-    assert te.include?(Date.today)
+    assert te.includes?(Date.today)
   end
 end
 

data/test/texp/time_ext_test.rb

@@ -0,0 +1,8 @@
+require 'test/texp_tests'
+require 'texp'
+
+class TimeExtTest < Test::Unit::TestCase
+  def test_time_to_date
+    assert_equal Date.today, Time.now.to_date
+  end
+end

data/test/texp/week_test.rb

@@ -8,33 +8,33 @@ class WeekTest < Test::Unit::TestCase
 
   def test_week_include_with_one_week
     te = TExp::Week.new([1])
-    assert te.include?(Date.parse("Feb 1, 2008"))
-    assert te.include?(Date.parse("Feb 2, 2008"))
-    assert te.include?(Date.parse("Feb 3, 2008"))
-    assert te.include?(Date.parse("Feb 5, 2008"))
-    assert te.include?(Date.parse("Feb 6, 2008"))
-    assert te.include?(Date.parse("Feb 7, 2008"))
-    assert ! te.include?(Date.parse("Feb 8, 2008"))
+    assert te.includes?(Date.parse("Feb 1, 2008"))
+    assert te.includes?(Date.parse("Feb 2, 2008"))
+    assert te.includes?(Date.parse("Feb 3, 2008"))
+    assert te.includes?(Date.parse("Feb 5, 2008"))
+    assert te.includes?(Date.parse("Feb 6, 2008"))
+    assert te.includes?(Date.parse("Feb 7, 2008"))
+    assert ! te.includes?(Date.parse("Feb 8, 2008"))
   end
 
   def test_week_include_with_several_weeks
     te = TExp::Week.new([2,4])
-    assert ! te.include?(Date.parse("Feb 1, 2008"))
-    assert ! te.include?(Date.parse("Feb 7, 2008"))
-    assert   te.include?(Date.parse("Feb 8, 2008"))
-    assert   te.include?(Date.parse("Feb 14, 2008"))
-    assert ! te.include?(Date.parse("Feb 15, 2008"))
-    assert ! te.include?(Date.parse("Feb 21, 2008"))
-    assert   te.include?(Date.parse("Feb 22, 2008"))
-    assert   te.include?(Date.parse("Feb 28, 2008"))
+    assert ! te.includes?(Date.parse("Feb 1, 2008"))
+    assert ! te.includes?(Date.parse("Feb 7, 2008"))
+    assert   te.includes?(Date.parse("Feb 8, 2008"))
+    assert   te.includes?(Date.parse("Feb 14, 2008"))
+    assert ! te.includes?(Date.parse("Feb 15, 2008"))
+    assert ! te.includes?(Date.parse("Feb 21, 2008"))
+    assert   te.includes?(Date.parse("Feb 22, 2008"))
+    assert   te.includes?(Date.parse("Feb 28, 2008"))
   end
 
   def test_week_with_last_week_of_month
     te = TExp::Week.new([-1])
-    assert !  te.include?(Date.parse("Feb 1, 2008"))
-    assert !  te.include?(Date.parse("Feb 22, 2008"))
-    assert   te.include?(Date.parse("Feb 23, 2008"))
-    assert   te.include?(Date.parse("Feb 29, 2008"))
+    assert !  te.includes?(Date.parse("Feb 1, 2008"))
+    assert !  te.includes?(Date.parse("Feb 22, 2008"))
+    assert   te.includes?(Date.parse("Feb 23, 2008"))
+    assert   te.includes?(Date.parse("Feb 29, 2008"))
   end
 
   # Test some private methods

data/test/texp/window_test.rb

@@ -9,23 +9,52 @@ class WindowTest < Test::Unit::TestCase
   def test_window
     wed = TExp.parse("3w")
     te = TExp::Window.new(wed, 2, 1)
-    assert ! te.include?(Date.parse("Mar 2, 2008"))
-    assert   te.include?(Date.parse("Mar 3, 2008"))
-    assert   te.include?(Date.parse("Mar 4, 2008"))
-    assert   te.include?(Date.parse("Mar 5, 2008"))
-    assert   te.include?(Date.parse("Mar 6, 2008"))
-    assert ! te.include?(Date.parse("Mar 7, 2008"))
+    assert ! te.includes?(Date.parse("Mar 2, 2008"))
+    assert   te.includes?(Date.parse("Mar 3, 2008"))
+    assert   te.includes?(Date.parse("Mar 4, 2008"))
+    assert   te.includes?(Date.parse("Mar 5, 2008"))
+    assert   te.includes?(Date.parse("Mar 6, 2008"))
+    assert ! te.includes?(Date.parse("Mar 7, 2008"))
   end
 
   def test_narrow_window
     wed = TExp.parse("3w")
     te = TExp::Window.new(wed, 0, 0)
-    assert ! te.include?(Date.parse("Mar 2, 2008"))
-    assert ! te.include?(Date.parse("Mar 3, 2008"))
-    assert ! te.include?(Date.parse("Mar 4, 2008"))
-    assert   te.include?(Date.parse("Mar 5, 2008"))
-    assert ! te.include?(Date.parse("Mar 6, 2008"))
-    assert ! te.include?(Date.parse("Mar 7, 2008"))
+    assert ! te.includes?(Date.parse("Mar 2, 2008"))
+    assert ! te.includes?(Date.parse("Mar 3, 2008"))
+    assert ! te.includes?(Date.parse("Mar 4, 2008"))
+    assert   te.includes?(Date.parse("Mar 5, 2008"))
+    assert ! te.includes?(Date.parse("Mar 6, 2008"))
+    assert ! te.includes?(Date.parse("Mar 7, 2008"))
+  end
+
+  def test_window_reporting
+    mar5 = Date.parse("Mar 5, 2008")
+    wed = TExp.parse("3w")
+    te = TExp::Window.new(wed, 2, 1)
+
+    assert_equal mar5-2, te.first_day_of_window(mar5)
+    assert_equal mar5+1, te.last_day_of_window(mar5)
+  end
+
+  def test_window_reporting_when_outside_window
+    mar5 = Date.parse("Mar 8, 2008")
+    wed = TExp.parse("3w")
+    te = TExp::Window.new(wed, 2, 1)
+
+    assert_nil te.first_day_of_window(mar5)
+    assert_nil te.last_day_of_window(mar5)
+  end
+
+  def test_windows_on_non_window_temporal_expressions
+    mar5 = Date.parse("Mar 5, 2008")
+    te = TExp.parse("3w")
+
+    assert_equal mar5, te.first_day_of_window(mar5)
+    assert_equal mar5, te.last_day_of_window(mar5)
+
+    assert_nil te.first_day_of_window(mar5+1)
+    assert_nil te.last_day_of_window(mar5+1)
   end
 
 end

data/test/texp/year_test.rb

@@ -12,17 +12,17 @@ class YearTest < Test::Unit::TestCase
 
   def test_single_arg
     te = TExp::Year.new(2008)
-    assert te.include?(@date)
-    assert te.include?(@date + 30)
-    assert ! te.include?(@date + 365)
+    assert te.includes?(@date)
+    assert te.includes?(@date + 30)
+    assert ! te.includes?(@date + 365)
   end
 
   def test_single_arg
     te = TExp::Year.new([2007,2008])
-    assert te.include?(@date - 365)
-    assert te.include?(@date)
-    assert te.include?(@date + 30)
-    assert ! te.include?(@date + 365)
+    assert te.includes?(@date - 365)
+    assert te.includes?(@date)
+    assert te.includes?(@date + 30)
+    assert ! te.includes?(@date + 365)
   end
 end
 

data/test/texp_tests.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'texp'
+
+# Convenience method for parsing dates.
+def d(date_string)
+  Date.parse(date_string)
+end
+
+module TExpAssertions
+  def assert_includes(te, *dates)
+    dates.each do |date|
+      date = Date.parse(date) if date.kind_of?(String)
+      assert te.includes?(date), "#{te} should include #{date}"
+    end
+  end
+
+  def assert_not_includes(te, *dates)
+    dates.each do |date|
+      date = Date.parse(date) if date.kind_of?(String)
+      assert ! te.includes?(date), "#{te} should not include #{date}"
+    end
+  end
+end
+
+class Test::Unit::TestCase
+  include TExpAssertions
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texp
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-06 00:00:00 -05:00
+date: 2008-03-10 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,32 +29,40 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
+- TAGS
 - lib/texp.rb
 - lib/texp/base.rb
-- lib/texp/core.rb
+- lib/texp/builder.rb
 - lib/texp/day_interval.rb
 - lib/texp/day_of_month.rb
 - lib/texp/day_of_week.rb
+- lib/texp/dsl.rb
+- lib/texp/errors.rb
 - lib/texp/every_day.rb
 - lib/texp/ext.rb
-- lib/texp/hash_builder.rb
 - lib/texp/logic.rb
 - lib/texp/month.rb
+- lib/texp/operators.rb
 - lib/texp/parse.rb
+- lib/texp/time_ext.rb
+- lib/texp/version.rb
 - lib/texp/week.rb
 - lib/texp/window.rb
 - lib/texp/year.rb
+- test/texp_tests.rb
+- test/texp/base_test.rb
 - test/texp/day_interval_test.rb
 - test/texp/day_of_month_test.rb
 - test/texp/day_of_week_test.rb
+- test/texp/dsl_test.rb
 - test/texp/every_day_test.rb
 - test/texp/ext_test.rb
-- test/texp/hash_test.rb
 - test/texp/inspect_test.rb
 - test/texp/logic_test.rb
-- test/texp/logic_text_test.rb
 - test/texp/month_test.rb
+- test/texp/operators_test.rb
 - test/texp/parse_test.rb
+- test/texp/time_ext_test.rb
 - test/texp/week_test.rb
 - test/texp/window_test.rb
 - test/texp/year_test.rb