texp 0.0.7 → 0.1.1

data/lib/texp.rb

@@ -4,15 +4,18 @@ require 'texp/version'
 require 'texp/errors'
 require 'texp/base'
 require 'texp/parse'
+require 'texp/logic'
+require 'texp/operators'
 require 'texp/day_of_week'
 require 'texp/day_of_month'
 require 'texp/week'
 require 'texp/month'
 require 'texp/year'
 require 'texp/day_interval'
+require 'texp/week_interval'
+require 'texp/day_of_week_interval'
+require 'texp/month_interval'
 require 'texp/every_day'
 require 'texp/window'
-require 'texp/logic'
 require 'texp/dsl'
-require 'texp/operators'
 require 'texp/ext'

data/lib/texp/base.rb

@@ -1,4 +1,10 @@
 module TExp
+  
+  class TExpError < StandardError
+  end
+  
+  class TExpIncludeError < TExpError
+  end
 
   ####################################################################
   # Abstract Base class for all Texp Temporal Expressions.
@@ -13,6 +19,10 @@ module TExp
       codes.join("")
     end
 
+    def include?(*args)
+      raise TExpIncludeError, "Use includes? rather than include?"
+    end
+
     # Create a new temporal expression with a new anchor date.
     def reanchor(date)
       self

data/lib/texp/day_interval.rb

@@ -2,8 +2,16 @@ module TExp
   class DayInterval < Base
     register_parse_callback('i')
 
-    attr_reader :base_date
+    attr_reader :base_date, :interval
 
+    def day_multiplier
+      1
+    end
+    
+    def interval_unit
+      "day"
+    end
+    
     def initialize(base_date, interval)
       @base_date = base_date.kind_of?(Date) ? base_date : nil
       @interval = interval
@@ -14,7 +22,7 @@ module TExp
       if @base_date.nil? || date < @base_date
         false
       else
-        ((date.mjd - base_mjd) % @interval) == 0
+        ((date.mjd - base_mjd) % (@interval * day_multiplier)) == 0
       end
     end
 
@@ -26,9 +34,11 @@ module TExp
     # Human readable version of the temporal expression.
     def inspect
       if @interval == 1
-        "every day starting on #{humanize_date(@base_date)}"
+        "every #{interval_unit}"
+      elsif @interval == 2
+        "every other #{interval_unit}"
       else
-        "every #{ordinal(@interval)} day starting on #{humanize_date(@base_date)}"
+        "every #{@interval} #{pluralize(interval_unit)}"
       end
     end
 
@@ -44,6 +54,10 @@ module TExp
 
     private
 
+    def pluralize(word)
+      "#{word}s"
+    end
+
     def base_mjd
       @base_date.mjd
     end
@@ -52,7 +66,7 @@ module TExp
       def parse_callback(stack)
         interval = stack.pop
         date = stack.pop
-        stack.push TExp::DayInterval.new(date, interval)
+        stack.push self.new(date, interval)
       end
     end
   end

data/lib/texp/day_of_week.rb

@@ -1,5 +1,7 @@
 module TExp
   class DayOfWeek < Base
+    attr_reader :days
+    
     register_parse_callback('w')
 
     def initialize(days)
@@ -13,8 +15,8 @@ module TExp
 
     # Human readable version of the temporal expression.
     def inspect
-      "the day of the week is " +
-        humanize_list(@days) { |d| Date::DAYNAMES[d] }
+      "on " +
+        humanize_list(@days, "and") { |d| Date::DAYNAMES[d] }
     end
 
     # Encode the temporal expression into +codes+.

data/lib/texp/day_of_week_interval.rb

@@ -0,0 +1,38 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+module TExp
+  class DayOfWeekInterval < And
+    register_parse_callback('q')
+    def initialize(*args)
+      if args.size == 3
+        day, week_interval, start_date = args[0..2]
+        @day_texp = DayOfWeek.new(day)
+        @week_interval_texp = WeekInterval.new(
+          find_day_of_week_on_or_after(start_date, day),
+          week_interval
+        )
+        super(@day_texp, @week_interval_texp)
+      else
+        @day_texp, @week_interval_texp = args[0], args[1]
+        super(@day_texp, @week_interval_texp)
+      end
+    end
+
+    def find_day_of_week_on_or_after(date, day_of_week)
+      raise ArgumentError, "#{day_of_week} is not a valid day of week" unless
+      (0..6).to_a.include? day_of_week
+      while date.wday != day_of_week
+        date = date + 1
+      end
+      date
+    end
+
+    def reanchor(date)
+      super(find_day_of_week_on_or_after(date, @day_texp.days[0]))
+    end
+
+    def inspect
+      "#{@week_interval_texp.inspect} #{@day_texp.inspect}"
+    end
+  end
+end

data/lib/texp/dsl.rb

@@ -164,7 +164,7 @@ module TExp
     # Evaluate a temporal expression in the TExp environment.
     # Redirect missing method calls to the containing environment.
     def evaluate_expression_in_environment(&block) # :nodoc:
-      env = EvalEnvironment.new(block)
+      env = EvalEnvironment.new(block.binding)
       env.instance_eval(&block)
     end
 

data/lib/texp/month_interval.rb

@@ -0,0 +1,29 @@
+module TExp
+  class MonthInterval < DayInterval
+    register_parse_callback('c')
+
+    def day_multiplier
+      28
+    end
+    
+    def interval_unit
+      "month"
+    end
+    
+    def inspect
+      case interval
+      when 1
+        "once per month"
+      when 0.5
+        base = "twice per month"
+      when 0.25
+        base = "4 times per month"
+      else
+        base = super
+      end
+      base + " (#{interval * day_multiplier} days)"
+    end
+    
+
+  end
+end

data/lib/texp/parse.rb

@@ -26,7 +26,7 @@ module TExp
     def register_parse_callback(token, callback)
       PARSE_CALLBACKS[token] = callback
     end
-  
+
     # Return the temporal expression encoded by string.
     def parse(string)
       @stack = []
@@ -37,6 +37,10 @@ module TExp
       @stack.pop
     end
 
+    def parse_callbacks
+      PARSE_CALLBACKS
+    end
+
     private
 
     # Compile the token into the current definition.
@@ -51,7 +55,7 @@ module TExp
         when /^[-+]?\d+$/
           @stack.push tok.to_i
         else
-          fail ParseError, "Unrecoginized TExp Token '#{tok}'"
+          fail ParseError, "Unrecognized TExp Token '#{tok}'"
         end
       end
     end
@@ -67,18 +71,18 @@ module TExp
       @callback.call(stack)
     end
   end
-  
+
   # List parsing handlers
-  
+
   # Mark the end of the list.
   MARK = :mark                  # :nodoc:
-  
+
   # Push a mark on the stack to start a list.
   register_parse_callback('[',
     ParseCallback.new do |stack|
       stack.push MARK
     end)
-  
+
   # Pop the stack and build a list until you find a mark.
   register_parse_callback(']',
     ParseCallback.new do |stack|

data/lib/texp/version.rb

@@ -1,3 +1,3 @@
 module TExp
-  VERSION = '0.0.7'
+  VERSION = '0.1.1'
 end

data/lib/texp/week_interval.rb

@@ -0,0 +1,13 @@
+module TExp
+  class WeekInterval < DayInterval
+    register_parse_callback('b')
+
+    def day_multiplier
+      7
+    end
+    
+    def interval_unit
+      "week"
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'minitest/autorun'
+require 'texp_tests'
+require 'date'
+require 'texp'

data/test/texp/base_test.rb

@@ -1,7 +1,6 @@
-require 'test/unit'
-require 'texp'
+require 'test_helper'
 
-class BaseEachTest < Test::Unit::TestCase
+class BaseEachTest < Minitest::Test
   def test_each_on_base
     te = basic_texp
     assert_equal [te], te.collect { |t| t }
@@ -17,6 +16,12 @@ class BaseEachTest < Test::Unit::TestCase
     assert_equal [@basic, @multi], te.collect { |t| t }
   end
 
+  def test_complains_about_include
+    assert_raises TExp::TExpIncludeError do
+      basic_texp.include? Date.parse("Feb 1, 2009")
+    end
+  end
+
   private
 
   def basic_texp
@@ -33,7 +38,7 @@ class BaseEachTest < Test::Unit::TestCase
 
 end
 
-class BaseAnchorTest < Test::Unit::TestCase
+class BaseAnchorTest < Minitest::Test
   def test_setting_anchor_date
     start_date = Date.parse("Feb 10, 2008")
     te = TExp::DayInterval.new(start_date, 3)

data/test/texp/day_interval_test.rb

@@ -1,8 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'test/texp_tests'
-
-class DayIntervalTest < Test::Unit::TestCase
+class DayIntervalTest < Minitest::Test
 
   def test_day_interval
     te = TExp::DayInterval.new(Date.parse("Feb 10, 2008"), 3)
@@ -31,4 +29,3 @@ class DayIntervalTest < Test::Unit::TestCase
     assert_not_includes te, date-3, date-2, date-1
   end
 end
-

data/test/texp/day_of_month_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'date'
-require 'test/unit'
-require 'texp'
-
-class DayOfMonthTest < Test::Unit::TestCase
+class DayOfMonthTest < Minitest::Test
 
   def test_day_of_month_with_single_arg
     te = TExp::DayOfMonth.new(14)
@@ -24,4 +20,3 @@ class DayOfMonthTest < Test::Unit::TestCase
     assert te.includes?(Date.parse("Feb 16, 2008"))
   end
 end
-

data/test/texp/day_of_week_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'date'
-require 'test/unit'
-require 'texp'
-
-class DayOfWeekTest < Test::Unit::TestCase
+class DayOfWeekTest < Minitest::Test
 
   def test_day_of_week_include_with_one_day
     te = TExp::DayOfWeek.new([1])
@@ -28,4 +24,3 @@ class DayOfWeekTest < Test::Unit::TestCase
     assert ! te.includes?(Date.parse("Feb 16, 2008"))
   end
 end
-

data/test/texp/dsl_test.rb

@@ -1,7 +1,6 @@
-require 'test/texp_tests'
-require 'texp'
+require 'test_helper'
 
-class BuilderTest < Test::Unit::TestCase
+class BuilderTest < Minitest::Test
   def test_day_builder
     date = d("Mar 12, 2008")
     te = TExp.day(12)
@@ -152,19 +151,19 @@ class BuilderTest < Test::Unit::TestCase
   end
 
   def test_on_builder_with_invalid_arguments
-    assert_raise(ArgumentError) do TExp.on(1) end
-    assert_raise(ArgumentError) do TExp.on(1,2,3,4) end
-    assert_raise(ArgumentError) do TExp.on(nil, nil) end
-    assert_raise(ArgumentError) do TExp.on(0, 1) end
-    assert_raise(ArgumentError) do TExp.on(1, 0) end
-    assert_raise(ArgumentError) do TExp.on(32, 1) end
-    assert_raise(ArgumentError) do TExp.on(1, 13) end
-    assert_raise(ArgumentError) do TExp.on(0, 1, 2008) end
-    assert_raise(ArgumentError) do TExp.on(1, 0, 2008) end
-    assert_raise(ArgumentError) do TExp.on(32, 1, 2008) end
-    assert_raise(ArgumentError) do TExp.on(1, 13, 2008) end
-    assert_raise(ArgumentError) do TExp.on(1, 'nox') end
-    assert_raise(ArgumentError) do TExp.on(1, 'nox', 2008) end
+    assert_raises(ArgumentError) do TExp.on(1) end
+    assert_raises(ArgumentError) do TExp.on(1,2,3,4) end
+    assert_raises(ArgumentError) do TExp.on(nil, nil) end
+    assert_raises(ArgumentError) do TExp.on(0, 1) end
+    assert_raises(ArgumentError) do TExp.on(1, 0) end
+    assert_raises(ArgumentError) do TExp.on(32, 1) end
+    assert_raises(ArgumentError) do TExp.on(1, 13) end
+    assert_raises(ArgumentError) do TExp.on(0, 1, 2008) end
+    assert_raises(ArgumentError) do TExp.on(1, 0, 2008) end
+    assert_raises(ArgumentError) do TExp.on(32, 1, 2008) end
+    assert_raises(ArgumentError) do TExp.on(1, 13, 2008) end
+    assert_raises(ArgumentError) do TExp.on(1, 'nox') end
+    assert_raises(ArgumentError) do TExp.on(1, 'nox', 2008) end
   end
 
   def test_dow_builder
@@ -259,7 +258,7 @@ class BuilderTest < Test::Unit::TestCase
   end
 
   def test_window_builder_with_bad_units
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       te = TExp.on(Date.today).window(1, nil)
     end
   end

data/test/texp/every_day_test.rb

@@ -1,15 +1,8 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'date'
-
-require 'texp'
-
-class EveryDayTest < Test::Unit::TestCase
+require 'test_helper'
 
+class EveryDayTest < Minitest::Test
   def test_every_day
     te = TExp::EveryDay.new
     assert te.includes?(Date.parse("Feb 15, 2008"))
   end
 end
-

data/test/texp/ext_test.rb

@@ -1,8 +1,4 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'date'
-require 'texp'
+require 'test_helper'
 
 module TExp
 
@@ -64,7 +60,7 @@ module TExp
   end # module Extensions
 end # module TExp
 
-class ExtensionsTest < Test::Unit::TestCase
+class ExtensionsTest < Minitest::Test
   def test_never
     te = TExp::Extensions::MyExt::Never.new
     assert ! te.includes?(Date.today)
@@ -79,4 +75,3 @@ class ExtensionsTest < Test::Unit::TestCase
     assert_equal "<MyExt::never>", TExp.parse("<MyExt::never>").to_s
   end
 end
-