texp 0.0.7 → 0.1.1

data/test/texp/inspect_test.rb

@@ -1,19 +1,14 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'date'
-require 'texp'
-require 'flexmock/test_unit'
+require 'test_helper'
 
 ######################################################################
-class InspectTest < Test::Unit::TestCase
+class InspectTest < Minitest::Test
   def test_inspect
     assert_inspect "e", "every day"
 
-    assert_inspect "0w", "the day of the week is Sunday"
-    assert_inspect "[0,1]w", "the day of the week is Sunday or Monday"
+    assert_inspect "0w", "on Sunday"
+    assert_inspect "[0,1]w", "on Sunday and Monday"
     assert_inspect "[0,1,4,2,3,6,5]w",
-      "the day of the week is Sunday, Monday, Tuesday, Wednesday, Thursday, Friday or Saturday"
+      "on Sunday, Monday, Tuesday, Wednesday, Thursday, Friday and Saturday"
 
     assert_inspect "1d", "the day of the month is the 1st"
     assert_inspect "2d", "the day of the month is the 2nd"
@@ -33,8 +28,8 @@ class InspectTest < Test::Unit::TestCase
     assert_inspect "20d", "the day of the month is the 20th"
     assert_inspect "[1,10,15]d", "the day of the month is the 1st, 10th or 15th"
 
-    assert_inspect "2008-02-15,3i", "every 3rd day starting on February 15, 2008"
-    assert_inspect "2008-02-15,1i", "every day starting on February 15, 2008"
+    assert_inspect "2008-02-15,3i", "every 3 days"
+    assert_inspect "2008-02-15,1i", "every day"
 
     assert_inspect "1k", "it is the 1st week of the month"
     assert_inspect "[1,3]k", "it is the 1st or 3rd week of the month"
@@ -56,7 +51,7 @@ class InspectTest < Test::Unit::TestCase
       "it is not the case that the day of the month is the 1st or the month is January"
 
     assert_inspect "3w2,1s",
-      "the day of the week is Wednesday, or up to 2 days prior, or up to 1 day after"
+      "on Wednesday, or up to 2 days prior, or up to 1 day after"
   end
 
   def assert_inspect(texp, string)

data/test/texp/logic_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'test/unit'
-require 'date'
-require 'texp'
-
-class LogicTest < Test::Unit::TestCase
+class LogicTest < Minitest::Test
 
   DATE = Date.parse("Feb 14, 2008")
   LEFT = TExp::DayInterval.new(DATE, 2)
@@ -48,4 +44,3 @@ class LogicTest < Test::Unit::TestCase
   end
 
 end
-

data/test/texp/month_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'test/unit'
-require 'date'
-require 'texp'
-
-class MonthTest < Test::Unit::TestCase
+class MonthTest < Minitest::Test
 
   def setup
     @date = Date.parse("Feb 14, 2008")
@@ -17,4 +13,3 @@ class MonthTest < Test::Unit::TestCase
     assert ! te.includes?(@date + 30)
   end
 end
-

data/test/texp/operators_test.rb

@@ -1,9 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'test/unit'
-require 'texp'
-
-class OperatorsTest < Test::Unit::TestCase
+class OperatorsTest < Minitest::Test
   def setup
     @monday    = Date.parse("Mar 3, 2008")
     @tuesday   = Date.parse("Mar 4, 2008")

data/test/texp/parse_test.rb

@@ -1,16 +1,20 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'date'
-require 'texp'
-require 'flexmock/test_unit'
+require 'test_helper'
 
 ######################################################################
-class TExpParseLexicalTest < Test::Unit::TestCase
+class TExpParseLexicalTest < Minitest::Test
+  XTEXP = class << TExp; self; end
+
   def setup
+    @compile_method = TExp.method(:compile)
     @tokens = []
-    flexmock(TExp).should_receive(:compile).with(any).
-      and_return { |tok| @tokens << tok }
+    tk = @tokens
+    XTEXP.send(:define_method, :compile) { |tok|
+      tk << tok
+    }
+  end
+
+  def teardown
+    XTEXP.send(:define_method, :compile, @compile_method)
   end
 
   def test_letters
@@ -49,7 +53,7 @@ class TExpParseLexicalTest < Test::Unit::TestCase
     '[', '[', '2008', 'y', '2', 'm', '14', 'd', ']', 'a', '12', 'm',
     '[', '1', '15', ']', 'd', '2008-02-14', '3', 'i', ']', 'o'
   ]
-  
+
   def test_mixed
     assert_lex "[[2008y2m14d]a12m[1,15]d2008-02-14,3i]o", *EXPECTED
   end
@@ -68,25 +72,25 @@ end
 
 
 ######################################################################
-class ParseTest < Test::Unit::TestCase
+class ParseTest < Minitest::Test
   def setup
     @date = Date.parse("Feb 14, 2008")
   end
 
   def test_bad_parse_string
-    assert_raise TExp::ParseError do
+    assert_raises TExp::ParseError do
       TExp.parse("(1,2)d")
     end
   end
 
   def test_unbalanced_list
-    assert_raise TExp::ParseError do
+    assert_raises TExp::ParseError do
       TExp.parse("[1")
     end
   end
 
   def test_unbalanced_list2
-    assert_raise TExp::ParseError do
+    assert_raises TExp::ParseError do
       TExp.parse("1]")
     end
   end
@@ -197,7 +201,7 @@ class ParseTest < Test::Unit::TestCase
 end
 
 ######################################################################
-class ParseReverseTest < Test::Unit::TestCase
+class ParseReverseTest < Minitest::Test
   def setup
     @date = Date.parse("Feb 14, 2008")
   end
@@ -230,4 +234,3 @@ class ParseReverseTest < Test::Unit::TestCase
     assert_equal string, te.to_s
   end
 end
-

data/test/texp/time_ext_test.rb

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

data/test/texp/week_interval_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class WeekIntervalTest < Minitest::Test
+
+  def test_week_interval
+    te = TExp::WeekInterval.new(Date.parse("Feb 10, 2008"), 1)
+    assert ! te.includes?(Date.parse("Feb 9, 2008"))
+    assert te.includes?(Date.parse("Feb 10, 2008"))
+    assert ! te.includes?(Date.parse("Feb 11, 2008"))
+    assert ! te.includes?(Date.parse("Feb 12, 2008"))
+    assert ! te.includes?(Date.parse("Feb 16, 2008"))
+    assert te.includes?(Date.parse("Feb 17, 2008"))
+    assert ! te.includes?(Date.parse("Feb 18, 2008"))
+    assert ! te.includes?(Date.parse("Feb 23, 2008"))
+    assert te.includes?(Date.parse("Feb 24, 2008"))
+    assert ! te.includes?(Date.parse("Feb 25, 2008"))
+  end
+
+  def test_day_interval_without_start_date
+    te = TExp::DayInterval.new(0, 3)
+    assert ! te.includes?(Date.parse("Feb 10, 2008"))
+    assert_equal "0,3i", te.to_s
+    assert_equal "0,3i", TExp.parse("0,3i").to_s
+  end
+
+  def test_day_interval_excludes_dates_before_start
+    date = d("Mar 1, 2008")
+    te = TExp::DayInterval.new(date, 3)
+
+    assert_not_includes te, date-3, date-2, date-1
+  end
+end

data/test/texp/week_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'date'
-require 'test/unit'
-require 'texp'
-
-class WeekTest < Test::Unit::TestCase
+class WeekTest < Minitest::Test
 
   def test_week_include_with_one_week
     te = TExp::Week.new([1])
@@ -55,4 +51,3 @@ class WeekTest < Test::Unit::TestCase
     assert_equal 31, te.send(:last_day_of_month, Date.parse("Dec 1, 2007"))
   end
 end
-

data/test/texp/window_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'date'
-require 'test/unit'
-require 'texp'
-
-class WindowTest < Test::Unit::TestCase
+class WindowTest < Minitest::Test
 
   def test_window
     wed = TExp.parse("3w")
@@ -58,4 +54,3 @@ class WindowTest < Test::Unit::TestCase
   end
 
 end
-

data/test/texp/year_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby
+require 'test_helper'
 
-require 'test/unit'
-require 'date'
-require 'texp'
-
-class YearTest < Test::Unit::TestCase
+class YearTest < Minitest::Test
 
   def setup
     @date = Date.parse("Feb 14, 2008")
@@ -17,7 +13,7 @@ class YearTest < Test::Unit::TestCase
     assert ! te.includes?(@date + 365)
   end
 
-  def test_single_arg
+  def test_two_args
     te = TExp::Year.new([2007,2008])
     assert te.includes?(@date - 365)
     assert te.includes?(@date)
@@ -25,4 +21,3 @@ class YearTest < Test::Unit::TestCase
     assert ! te.includes?(@date + 365)
   end
 end
-

data/test/texp_tests.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'texp'
 
 # Convenience method for parsing dates.
@@ -22,6 +22,6 @@ module TExpAssertions
   end
 end
 
-class Test::Unit::TestCase
+class Minitest::Test
   include TExpAssertions
 end

metadata

@@ -1,55 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: texp
-version: !ruby/object:Gem::Version 
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-03-10 00:00:00 -04:00
-default_executable: 
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies: []
-
-description: TExp is a temporal expression library for Ruby with a modular,  extensible expression serialization language.
+description: |2
+        TExp is a temporal expression library for Ruby with a modular,
+        extensible expression serialization language.
 email: jim.weirich@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
+extra_rdoc_files:
+- README.rdoc
 - MIT-LICENSE
 - ChangeLog
-files: 
+files:
 - ChangeLog
+- Gemfile
+- Gemfile.lock
 - INFO
 - MIT-LICENSE
+- README.rdoc
 - Rakefile
-- README
 - TAGS
 - lib/texp.rb
 - lib/texp/base.rb
-- lib/texp/builder.rb
 - lib/texp/day_interval.rb
 - lib/texp/day_of_month.rb
 - lib/texp/day_of_week.rb
+- lib/texp/day_of_week_interval.rb
 - lib/texp/dsl.rb
 - lib/texp/errors.rb
 - lib/texp/every_day.rb
 - lib/texp/ext.rb
 - lib/texp/logic.rb
 - lib/texp/month.rb
+- lib/texp/month_interval.rb
 - lib/texp/operators.rb
 - lib/texp/parse.rb
 - lib/texp/time_ext.rb
 - lib/texp/version.rb
 - lib/texp/week.rb
+- lib/texp/week_interval.rb
 - lib/texp/window.rb
 - lib/texp/year.rb
-- test/texp_tests.rb
+- test/test_helper.rb
 - test/texp/base_test.rb
 - test/texp/day_interval_test.rb
 - test/texp/day_of_month_test.rb
@@ -63,40 +64,39 @@ files:
 - test/texp/operators_test.rb
 - test/texp/parse_test.rb
 - test/texp/time_ext_test.rb
+- test/texp/week_interval_test.rb
 - test/texp/week_test.rb
 - test/texp/window_test.rb
 - test/texp/year_test.rb
+- test/texp_tests.rb
 - doc/jamis.rb
-has_rdoc: true
 homepage: http://texp.rubyforge.org
+licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
-- README
+- README.rdoc
 - --title
 - TExp - Temporal Expressions
-require_paths: 
+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: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: texp
-rubygems_version: 1.0.1
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Temporal Expressions for Ruby.
 test_files: []
-

data/lib/texp/builder.rb

@@ -1,254 +0,0 @@
-module TExp
-
-  # Builder methods are available as methods on TExp
-  # (e.g. +TExp.day()+).  Alternatively, you can include the
-  # +TExp::Builder+ module into whatever namespace to get direct
-  # access to these methods.
-  module Builder
-
-    # Return a temporal expression that matches any date that falls on
-    # a day of the month given in the argument list.
-    # Examples:
-    #
-    #    day(1)       # Match any date that falls on the 1st of any month
-    #    day(1, 15)   # Match any date that falls on the 1st or 15th of any month
-    #
-    def day(*days_of_month)
-      TExp::DayOfMonth.new(days_of_month)
-    end
-
-    # Return a temporal expression that matches any date in the
-    # specified week of the month.  Days 1 through 7 are considered
-    # the first week of the month; days 8 through 14 are the second
-    # week; and so on.
-    #
-    # The week is specified by a numeric argument.  Negative arguments
-    # are calculated from the end of the month (e.g. -1 would request
-    # the _last_ 7 days of the month).  The symbols <tt>:first</tt>,
-    # <tt>:second</tt>, <tt>:third</tt>, <tt>:fourth</tt>,
-    # <tt>:fifth</tt>, and <tt>:last</tt> are also recognized.
-    #
-    # Examples:
-    #
-    #   week(1)       # Match any date in the first 7 days of any month.
-    #   week(1, 2)    # Match any date in the first or second 7 days of any month.
-    #   week(:first)  # Match any date in the first 7 days of any month.
-    #   week(:last)   # Match any date in the last 7 days of any month.
-    #
-    def week(*weeks)
-      TExp::Week.new(weeks)
-    end
-
-    # Return a temporal expression that matches any date in the list
-    # of given months.
-    #
-    # <b>Examples:</b>
-    #
-    #   month(2)              # Match any date in February
-    #   month(2, 8)           # Match any date in February or August
-    #   month("February")     # Match any date in February
-    #   month("Sep", "Apr", "Jun", "Nov")
-    #                         # Match any date in any month with 30 days.
-    #
-    def month(*month)
-      TExp::Month.new(month)
-    end
-
-    # Return a temporal expression that matches the given list of
-    # years.
-    #
-    # <b>Examples:</b>
-    #
-    #   year(2008)              # Match any date in 2008
-    #   year(2000, 2004, 2008)  # Match any date in any of the three years
-    def year(*years)
-      TExp::Year.new(years)
-    end
-
-    # :call-seq:
-    #   on(day, month)
-    #   on(day, month_string)
-    #   on(day, month, year)
-    #   on(day, month_string, year)
-    #   on(date)
-    #   on(date_string)
-    #   on(time)
-    #   on(object_with_to_date)
-    #   on(object_with_to_s)
-    #
-    # Return a temporal expression that matches a particular date of
-    # the year.  The temporal expression will be pinned to a
-    # particular year if a year is given (either explicity as a
-    # parameter or implicitly via a +Date+ object).  If no year is
-    # given, then the temporal expression will match that date in any
-    # year.
-    #
-    # If only a single argument is given, then the argument may be a
-    # string (which is parsed), a Date, a Time, or an object that
-    # responds to +to_date+.  If the single argument is none of the
-    # above, then it is converted to a string (via +to_s+) and given
-    # to <tt>Date.parse()</tt>.
-    #
-    # Invalid arguments will cause +on+ to throw an ArgumentError
-    # exception.
-    #
-    # <b>Examples:</b>
-    #
-    # The following examples all match Feb 14 of any year.
-    #
-    #   on(14, 2)
-    #   on(14, "February")
-    #   on(14, "Feb")
-    #   on(14, :feb)
-    #
-    # The following examples all match Feb 14 of the year 2008.
-    #
-    #   on(14, 2, 2008)
-    #   on(14, "February", 2008)
-    #   on(14, "Feb", 2008)
-    #   on(14, :feb, 2008)
-    #   on("Feb 14, 2008")
-    #   on(Date.new(2008, 2, 14))
-    #
-    def on(*args)
-      if args.size == 1
-        arg = args.first
-        case arg
-        when String
-          date = Date.parse(arg)
-        when Date
-          date = arg
-        else
-          if arg.respond_to?(:to_date)
-            date = arg.to_date
-          else
-            date = try_parsing(arg.to_s)
-          end
-        end
-        on(date.day, date.month, date.year)
-      elsif args.size == 2
-        day, month = dm_args(args)
-        TExp::And.new(
-          TExp::DayOfMonth.new(day),
-          TExp::Month.new(month))
-      elsif args.size == 3
-        day, month, year = dmy_args(args)
-        TExp::And.new(
-          TExp::DayOfMonth.new(day),
-          TExp::Month.new(normalize_month(month)),
-          TExp::Year.new(year))
-      else
-        fail DateArgumentError
-      end
-    rescue DateArgumentError
-      fail ArgumentError, "Invalid arguents for on(): #{args.inspect}"
-    end
-    
-    # Return a temporal expression matching the given days of the
-    # week.
-    #
-    # <b>Examples:</b>
-    #
-    #   dow(2)                 # Match any date on a Tuesday
-    #   dow("Tuesday")         # Match any date on a Tuesday
-    #   dow(:mon, :wed, :fr)   # Match any date on a Monday, Wednesday or Friday
-    #
-    def dow(*dow)
-      TExp::DayOfWeek.new(normalize_dows(dow))
-    end
-
-    # Return a temporal expression that matches 
-    def every(n, unit, start_date=Date.today)
-      value = apply_units(unit, n)
-      TExp::DayInterval.new(start_date, value)
-    end
-
-    def normalize_units(args)   # :nodoc:
-      result = []
-      while ! args.empty?
-        arg = args.shift
-        case arg
-        when Numeric
-          result.push(arg)
-        when Symbol
-          result.push(apply_units(arg, result.pop))
-        else
-          fail ArgumentError, "Unabled to recognize #{arg}"
-        end
-      end
-      result
-    end
-    
-    private
-    
-    MONTHNAMES = Date::MONTHNAMES.collect { |mn| mn ? mn[0,3].downcase : nil }
-    DAYNAMES = Date::DAYNAMES.collect { |dn| dn[0,2].downcase }
-    
-    UNIT_MULTIPLIERS = {
-      :day => 1,      :days => 1,
-      :week => 7,     :weeks => 7,
-      :month => 30,   :months => 30,
-      :year => 365,   :years => 365,
-    }
-
-    def apply_units(unit, value)
-      UNIT_MULTIPLIERS[unit] * value
-    end
-
-    def try_parsing(string)
-      Date.parse(string)
-    rescue ArgumentError
-      fail DateArgumentError
-    end
-
-    def dm_args(args)
-      day, month = args
-      month = normalize_month(month)
-      check_valid_day_month(day, month)
-      [day, month]
-    end
-    
-    def dmy_args(args)
-      day, month, year = args
-      month = normalize_month(month)
-      check_valid_day_month(day, month)
-      [day, month, year]
-    end
-    
-    def check_valid_day_month(day, month)
-      unless day.kind_of?(Integer) &&
-          month.kind_of?(Integer) &&
-          month >= 1 &&
-          month <= 12 &&
-          day >= 1 &&
-          day <= 31
-        fail DateArgumentError
-      end
-    end
-    
-    def normalize_month(month_thing)
-      case month_thing
-      when Integer
-        month_thing
-      else
-        MONTHNAMES.index(month_thing.to_s[0,3].downcase)
-      end
-    end
-
-    def normalize_dows(dow_list)
-      dow_list.collect { |dow| normalize_dow(dow) }
-    end
-
-    def normalize_dow(dow_thing)
-      case dow_thing
-      when Integer
-        dow_thing
-      else
-        DAYNAMES.index(dow_thing.to_s[0,2].downcase)
-      end
-    end
-
-  end
-
-  extend Builder
-end