vpim 0.16 → 0.17

data/lib/vpim/rfc2425.rb

@@ -1,7 +1,5 @@
 =begin
-  $Id: rfc2425.rb,v 1.10 2005/01/01 17:17:01 sam Exp $
-
-  Copyright (C) 2005 Sam Roberts
+  Copyright (C) 2006 Sam Roberts
 
   This library is free software; you can redistribute it and/or modify it
   under the same terms as the ruby language itself, see the file COPYING for
@@ -62,19 +60,18 @@ module Vpim
   # Split on \r\n or \n to get the lines, unfold continued lines (they
   # start with ' ' or \t), and return the array of unfolded lines.
   #
-  # This also implements the (invalid) encoding convention of allowing empty
-  # lines to be inserted for readability - it does this by dropping
-  # zero-length lines.
+  # This also supports the (invalid) encoding convention of allowing empty
+  # lines to be inserted for readability - it does this by dropping zero-length
+  # lines.
   def Vpim.unfold(card) #:nodoc:
       unfolded = []
 
-      card.split(/\r?\n/).each do
-        |line|
-
+      card.each do |line|
+        line.chomp!
         # If it's a continuation line, add it to the last.
         # If it's an empty line, drop it from the input.
         if( line =~ /^[ \t]/ )
-            unfolded << unfolded.pop + line[1, line.size-1]
+          unfolded[-1] << line[1, line.size-1]
         elsif( line =~ /^$/ )
         else
           unfolded << line
@@ -88,10 +85,10 @@ module Vpim
   def Vpim.decode_list(value, sep = ',') # :nodoc:
     list = []
     
-    value.each(sep) {
-      |item|
-      list << yield(item) unless item =~ %r{^\s*#{sep}?$}
-    }
+    value.each(sep) do |item|
+      item.chomp!(sep)
+      list << yield(item)
+    end
     list
   end
 
@@ -160,17 +157,32 @@ module Vpim
 
   # Convert a RFC 2425 date-list into an array of dates.
   def Vpim.decode_date_list(v) # :nodoc:
-    dates = Vpim.decode_list(v) { |date| Vpim.decode_date(date) }
+    Vpim.decode_list(v) do |date|
+      date.strip!
+      if date.length > 0
+        Vpim.decode_date(date)
+      end
+    end.compact
   end
 
   # Convert a RFC 2425 time-list into an array of times.
   def Vpim.decode_time_list(v) # :nodoc:
-    times = Vpim.decode_list(v) { |time| Vpim.decode_time(time) }
+    Vpim.decode_list(v) do |time|
+      time.strip!
+      if time.length > 0
+        Vpim.decode_time(time)
+      end
+    end.compact
   end
 
   # Convert a RFC 2425 date-time-list into an array of date-times.
   def Vpim.decode_date_time_list(v) # :nodoc:
-    datetimes = Vpim.decode_list(v) { |datetime| Vpim.decode_date_time(datetime) }
+    Vpim.decode_list(v) do |datetime|
+      datetime.strip!
+      if datetime.length > 0
+        Vpim.decode_date_time(datetime)
+      end
+    end.compact
   end
 
   # Convert RFC 2425 text into a String.
@@ -179,6 +191,7 @@ module Vpim
   # \N -> NL
   # \, -> ,
   def Vpim.decode_text(v) # :nodoc:
+    # FIXME - this will fail for "\\,"!
     v.gsub(/\\[nN]/, "\n").gsub(/\\,/, ",").gsub(/\\\\/) { |m| "\\" }
   end
 

data/lib/vpim/rfc2425.rb~

@@ -0,0 +1,246 @@
+=begin
+  $Id: rfc2425.rb,v 1.10 2005/01/01 17:17:01 sam Exp $
+
+  Copyright (C) 2005 Sam Roberts
+
+  This library is free software; you can redistribute it and/or modify it
+  under the same terms as the ruby language itself, see the file COPYING for
+  details.
+=end
+
+require 'vpim/vpim'
+
+module Vpim
+  # Contains regular expression strings for the EBNF of RFC 2425.
+  module Bnf #:nodoc:
+
+    # 1*(ALPHA / DIGIT / "-")
+    # Note: I think I can add A-Z here, and get rid of the "i" matches elsewhere.
+    # Note: added '_' to allowed because its produced by Notes - X-LOTUS-CHILD_UID
+    NAME    = '[-a-z0-9_]+'
+
+    # <"> <Any character except CTLs, DQUOTE> <">
+    QSTR    = '"([^"]*)"'
+     
+    # *<Any character except CTLs, DQUOTE, ";", ":", ",">
+    PTEXT   = '([^";:,]+)'
+      
+    # param-value = ptext / quoted-string
+    PVALUE  = "(?:#{QSTR}|#{PTEXT})"
+    
+    # param = name "=" param-value *("," param-value)
+    # Note: v2.1 allows a type or encoding param-value to appear without the type=
+    # or the encoding=. This is hideous, but we try and support it, if there
+    # is no "=", then $2 will be "", and we will treat it as a v2.1 param.
+    PARAM = ";(#{NAME})(=?)((?:#{PVALUE})?(?:,#{PVALUE})*)"
+
+    # V3.0: contentline  =   [group "."]  name *(";" param) ":" value
+    # V2.1: contentline  = *( group "." ) name *(";" param) ":" value
+    #
+    # We accept the V2.1 syntax for backwards compatibility.
+    #LINE = "((?:#{NAME}\\.)*)?(#{NAME})([^:]*)\:(.*)"
+    LINE = "^((?:#{NAME}\\.)*)?(#{NAME})((?:#{PARAM})*):(.*)$"
+
+    # date = date-fullyear ["-"] date-month ["-"] date-mday
+    # date-fullyear = 4 DIGIT
+    # date-month = 2 DIGIT
+    # date-mday = 2 DIGIT
+    DATE = '(\d\d\d\d)-?(\d\d)-?(\d\d)'
+
+    # time = time-hour [":"] time-minute [":"] time-second [time-secfrac] [time-zone]
+    # time-hour = 2 DIGIT
+    # time-minute = 2 DIGIT
+    # time-second = 2 DIGIT
+    # time-secfrac = "," 1*DIGIT
+    # time-zone = "Z" / time-numzone
+    # time-numzome = sign time-hour [":"] time-minute
+    TIME = '(\d\d):?(\d\d):?(\d\d)(\.\d+)?(Z|[-+]\d\d:?\d\d)?'
+  end
+end
+
+module Vpim
+  # Split on \r\n or \n to get the lines, unfold continued lines (they
+  # start with ' ' or \t), and return the array of unfolded lines.
+  #
+  # This also supports the (invalid) encoding convention of allowing empty
+  # lines to be inserted for readability - it does this by dropping zero-length
+  # lines.
+  def Vpim.unfold(card) #:nodoc:
+      unfolded = []
+
+      card.each do |line|
+        line.chomp!
+        # If it's a continuation line, add it to the last.
+        # If it's an empty line, drop it from the input.
+        if( line =~ /^[ \t]/ )
+          unfolded[-1] << line[1, line.size-1]
+        elsif( line =~ /^$/ )
+        else
+          unfolded << line
+        end
+      end
+
+      unfolded
+  end
+
+  # Convert a +sep+-seperated list of values into an array of values.
+  def Vpim.decode_list(value, sep = ',') # :nodoc:
+    list = []
+    
+    value.each(sep) {
+      |item|
+      list << yield(item) unless item =~ %r{^\s*#{sep}?$}
+    }
+    list
+  end
+
+  # Convert a RFC 2425 date into an array of [year, month, day].
+  def Vpim.decode_date(v) # :nodoc:
+    unless v =~ %r{\s*#{Bnf::DATE}\s*}
+      raise Vpim::InvalidEncodingError, "date not valid (#{v})"
+    end
+    [$1.to_i, $2.to_i, $3.to_i]
+  end
+
+  # Note in the following the RFC2425 allows yyyy-mm-ddThh:mm:ss, but RFC2445
+  # does not. I choose to encode to the subset that is valid for both.
+
+  # Encode a Date object as "yyyymmdd".
+  def Vpim.encode_date(d) # :nodoc:
+     "%0.4d%0.2d%0.2d" % [ d.year, d.mon, d.day ]
+  end
+
+  # Encode a Date object as "yyyymmdd".
+  def Vpim.encode_time(d) # :nodoc:
+     "%0.4d%0.2d%0.2d" % [ d.year, d.mon, d.day ]
+  end
+
+  # Encode a Time or DateTime object as "yyyymmddThhmmss"
+  def Vpim.encode_date_time(d) # :nodoc:
+     "%0.4d%0.2d%0.2dT%0.2d%0.2d%0.2d" % [ d.year, d.mon, d.day, d.hour, d.min, d.sec ]
+  end
+
+  # Convert a RFC 2425 time into an array of [hour,min,sec,secfrac,timezone]
+  def Vpim.decode_time(v) # :nodoc:
+    unless match = %r{\s*#{Bnf::TIME}\s*}.match(v)
+      raise Vpim::InvalidEncodingError, "time not valid (#{v})"
+    end
+    hour, min, sec, secfrac, tz = match.to_a[1..5]
+
+    [hour.to_i, min.to_i, sec.to_i, secfrac ? secfrac.to_f : 0, tz]
+  end
+
+  # Convert a RFC 2425 date-time into an array of [hour,min,sec,secfrac,timezone]
+  def Vpim.decode_date_time(v) # :nodoc:
+    unless match = %r{\s*#{Bnf::DATE}T#{Bnf::TIME}\s*}.match(v)
+      raise Vpim::InvalidEncodingError, "date-time '#{v}' not valid"
+    end
+    year, month, day, hour, min, sec, secfrac, tz = match.to_a[1..8]
+
+    [
+      # date
+      year.to_i, month.to_i, day.to_i,
+      # time
+      hour.to_i, min.to_i, sec.to_i, secfrac ? secfrac.to_f : 0, tz
+    ]
+  end
+
+  # Vpim.decode_boolean
+  #
+  # float
+  #
+  # float_list
+  #
+  # integer
+  #
+  # integer_list
+  #
+  # text_list
+
+  # Convert a RFC 2425 date-list into an array of dates.
+  def Vpim.decode_date_list(v) # :nodoc:
+    dates = Vpim.decode_list(v) { |date| Vpim.decode_date(date) }
+  end
+
+  # Convert a RFC 2425 time-list into an array of times.
+  def Vpim.decode_time_list(v) # :nodoc:
+    times = Vpim.decode_list(v) { |time| Vpim.decode_time(time) }
+  end
+
+  # Convert a RFC 2425 date-time-list into an array of date-times.
+  def Vpim.decode_date_time_list(v) # :nodoc:
+    datetimes = Vpim.decode_list(v) { |datetime| Vpim.decode_date_time(datetime) }
+  end
+
+  # Convert RFC 2425 text into a String.
+  # \\ -> \
+  # \n -> NL
+  # \N -> NL
+  # \, -> ,
+  def Vpim.decode_text(v) # :nodoc:
+    v.gsub(/\\[nN]/, "\n").gsub(/\\,/, ",").gsub(/\\\\/) { |m| "\\" }
+  end
+
+
+  # Unfold the lines in +card+, then return an array of one Field object per
+  # line.
+  def Vpim.decode(card) #:nodoc:
+      content = Vpim.unfold(card).collect { |line| DirectoryInfo::Field.decode(line) }
+  end
+
+
+  # Expand an array of fields into its syntactic entities. Each entity is a sequence
+  # of fields where the sequences is delimited by a BEGIN/END field. Since
+  # BEGIN/END delimited entities can be nested, we build a tree. Each entry in
+  # the array is either a Field or an array of entries (where each entry is
+  # either a Field, or an array of entries...).
+  def Vpim.expand(src) #:nodoc:
+    # output array to expand the src to
+    dst = []
+    # stack used to track our nesting level, as we see begin/end we start a
+    # new/finish the current entity, and push/pop that entity from the stack
+    current = [ dst ]
+
+    for f in src
+      if f.name? 'begin'
+        e = [ f ]
+
+        current.last.push(e)
+        current.push(e)
+
+      elsif f.name? 'end'
+        current.last.push(f)
+
+        unless current.last.first.value? current.last.last.value
+          raise "BEGIN/END mismatch (#{current.last.first.value} != #{current.last.last.value})"
+        end
+
+        current.pop
+
+      else
+        current.last.push(f)
+      end
+    end
+
+    dst
+  end
+
+  # Split an array into an array of all the fields at the outer level, and
+  # an array of all the inner arrays of fields. Return the array [outer,
+  # inner].
+  def Vpim.outer_inner(fields) #:nodoc:
+    # seperate into the outer-level fields, and the arrays of component
+    # fields
+    outer = []
+    inner = []
+    fields.each do |line|
+      case line
+      when Array; inner << line
+      else;       outer << line
+      end
+    end
+    return outer, inner
+  end
+
+end
+

data/lib/vpim/rrule.rb

@@ -1,7 +1,5 @@
 =begin
-  $Id: rrule.rb,v 1.18 2005/01/23 22:19:48 sam Exp $
-
-  Copyright (C) 2005 Sam Roberts
+  Copyright (C) 2006 Sam Roberts
 
   This library is free software; you can redistribute it and/or modify it
   under the same terms as the ruby language itself, see the file COPYING for
@@ -86,7 +84,7 @@ module Vpim
 
            case key
            when 'FREQ'
-             @freq = value.upcase
+             @freq = value
 
            when 'UNTIL'
              if @count

data/lib/vpim/rrule.rb~

@@ -0,0 +1,482 @@
+=begin
+  $Id: rrule.rb,v 1.18 2005/01/23 22:19:48 sam Exp $
+
+  Copyright (C) 2005 Sam Roberts
+
+  This library is free software; you can redistribute it and/or modify it
+  under the same terms as the ruby language itself, see the file COPYING for
+  details.
+=end
+
+require 'vpim/rfc2425'
+require 'vpim/date'
+require 'vpim/time'
+require 'vpim/vpim'
+
+=begin
+require 'pp'
+
+$debug = ENV['DEBUG']
+
+def debug(*objs)
+  if $debug
+    pp(*objs)
+    print '  (', caller(1)[0], ')', "\n"
+  end
+end
+=end
+
+module Vpim
+
+  # Implements the iCalendar recurence rule syntax. See etc/rrule.txt for the
+  # syntax description and examples from RFC 2445. The description is pretty
+  # hard to understand, but the examples are more helpful.
+  #
+  # The implementation is pretty complete, but still lacks support for:
+  #
+  # TODO - BYWEEKLY, BYWEEKNO, WKST: rules that recur by the week, or are
+  # limited to particular weeks, not hard, but not trivial, I'll do it for the
+  # next release
+  #
+  # TODO - BYHOUR, BYMINUTE, BYSECOND: trivial to do, but I don't have an
+  # immediate need for them, I'll do it for the next release
+  #
+  # TODO - BYSETPOS: limiting to only certain recurrences in a set (what does
+  # -1, last occurence, mean for an infinitely occuring rule?)
+  #
+  # TODO - new API? -> Rrule#infinite?
+  #
+  # == Examples
+  #
+  # - link:rrule.txt: utility for printing recurrence rules
+  class Rrule
+    include Enumerable
+
+    # The recurrence rule, +rrule+, specifies how to generate a set of times
+    # from a start time, +dtstart+ (which must the first of the set of
+    # recurring times). If +rrule+ is nil, the set contains only +dtstart+.
+    def initialize(dtstart, rrule = nil)
+      # dtstart must be in local time, they say, but I think that really
+      # means must be in a particular timezone
+
+      # Note: DTSTART is always in the recurrence set
+       @dtstart = dtstart
+       @rrule = rrule
+
+       # Freq is mandatory, but must occur only once.
+       @freq = nil
+   
+       # Both Until and Count must not occur, neither is OK.
+       @until = nil
+       @count = nil
+   
+       # Interval is optional, but defaults to 1.
+       @interval = 1
+
+       # WKST defines what day a week begins on, the default is monday.
+       @wkst = 'MO'
+   
+       # Recurrence can modified by these.
+       @by = {}
+  
+       if @rrule
+         @rrule.scan(/([^;=]+)=([^;=]+)/) do |key,value|
+           key.upcase!
+           value.upcase!
+
+           case key
+           when 'FREQ'
+             @freq = value.upcase
+
+           when 'UNTIL'
+             if @count
+               raise "found UNTIL, but COUNT already specified"
+             end
+             @until = Rrule.time_from_rfc2425(value)
+
+           when 'COUNT'
+             if @until
+               raise "found COUNT, but UNTIL already specified"
+             end
+             @count = value.to_i
+
+           when 'INTERVAL'
+             @interval = value.to_i
+             if @interval < 1
+               raise "interval must be a positive integer"
+             end
+
+           when 'WKST'
+             # TODO - check value is MO-SU
+             @wkst = value
+
+           else
+             @by[key] = value
+           end
+         end
+
+         if !@freq
+           # TODO - this shouldn't be an arg error, but a FormatError, its not the
+           # caller's fault!
+           raise ArgumentError, "recurrence rule lacks a frequency"
+         end
+       end
+    end
+
+    # Return an Enumerable, it's #each() will yield over all occurences up to
+    # (and not including) time +dountil+.
+    def each_until(dountil)
+      Vpim::Enumerator.new(self, dountil)
+    end
+
+    # Yields for each +ytime+ in the recurring set of events.
+    #
+    # Warning: the set may be infinite! If you need an upper bound on the
+    # number of occurences, you need to implement a count, or pass a time,
+    # +dountil+, which will not be iterated past (i.e. all times yielded will be
+    # less than +dountil+).
+    #
+    # Also, iteration will not currently continue past the limit of a Time
+    # object, which is some time in 2037 with the 32-bit time_t's common on
+    # most systems.
+    def each(dountil = nil) #:yield: ytime
+      t = @dtstart.clone
+      count = 1
+
+      # Time.to_a => [ sec, min, hour, day, month, year, wday, yday, isdst, zone ]
+
+      # Every event occurs at least once, at its start time, but only if the start
+      # time is earlier than 'dountil'...
+      if !@rrule
+        if !dountil || t < dountil
+          yield t
+        end
+        return self
+      end
+
+      loop do
+        # Build the set of times to yield within this interval (and after
+        # DTSTART)
+
+        days  = DaySet.new(t)
+        hour  = nil
+        min   = nil
+        sec   = nil
+
+        # Need to make a Dates class, and make month an instance of it, and add
+        # the "intersect" operator.
+
+        case @freq
+          #when 'YEARLY' then
+          # Don't need to keep track of year, all occurences are within t's
+          # year.
+          when 'MONTHLY'  then  days.month = t.month #month = { t.month => nil }
+  #       when 'WEEKLY'   then  days.mday = t.month, t.mday
+          # TODO - WEEKLY
+          when 'DAILY'    then  days.mday = t.month, t.mday #month = { t.month => [ t.mday ] }
+          when 'HOURLY'   then  hour  = [t.hour]
+          when 'MINUTELY' then  min   = [t.min]
+          when 'SECONDLY' then  sec   = [t.sec]
+        end
+
+        # Process the BY* modifiers in RFC defined order:
+        #  BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY,
+        #  BYHOUR, BYMINUTE, BYSECOND and BYSETPOS
+        
+        if @by['BYMONTH']
+          bymon = @by['BYMONTH'].split(',')
+          bymon = bymon.collect { |m| m.to_i }
+  #        debug bymon
+
+          # In yearly, at  this point, month will always be nil. At other
+          # frequencies, it will not.
+          days.intersect_bymon(bymon)
+
+  #        debug days
+        end
+
+        # TODO - BYWEEKNO
+
+        if @by['BYYEARDAY']
+          byyday = @by['BYYEARDAY'].scan(/,?([+-]?[1-9]\d*)/)
+  #        debug byyday
+          dates = byyearday(t.year, byyday)
+          days.intersect_dates(dates)
+        end
+
+        if @by['BYMONTHDAY']
+          bymday = @by['BYMONTHDAY'].scan(/,?([+-]?[1-9]\d*)/)
+  #        debug bymday
+          # Generate all days matching this for all months. For yearly, this
+          # is what we want, for anything of monthly or higher frequency, it
+          # is too many days, but that's OK, since  the month will already
+          # be specified and intersection will eliminate the out-of-range
+          # dates.
+          dates = bymonthday(t.year, bymday)
+  #        debug dates
+          days.intersect_dates(dates)
+  #        debug days
+        end
+
+        if @by['BYDAY']
+          byday = @by['BYDAY'].scan(/,?([+-]?[1-9]?\d*)?(SU|MO|TU|WE|TH|FR|SA)/i)
+  #        debug byday
+
+          # BYDAY means different things in different frequencies. The +n+
+          # is only meaningful when freq is yearly or monthly.
+
+          case @freq
+            when 'YEARLY'
+              dates = byday_in_yearly(t.year, byday)
+            when 'MONTHLY'
+              dates = byday_in_monthly(t.year, t.month, byday)
+            when 'WEEKLY'
+              # dates = byday_in_weekly(t.year, wkstart, t.month, t.day, byday)
+            when 'DAILY', 'HOURLY', 'MINUTELY', 'SECONDLY'
+              # Reuse the byday_in_monthly. Current day is already specified,
+              # so this will just eliminate the current day if its not allowed
+              # in BYDAY.
+              dates = byday_in_monthly(t.year, t.month, byday)
+          end
+
+  #        debug dates
+          days.intersect_dates(dates)
+  #        debug days
+        end
+
+        # TODO - BYHOUR, BYMINUTE, BYSECOND
+        
+        # TODO - BYSETPOS
+
+        # Yield the time, if we haven't gone over COUNT, or past UNTIL, or past
+        # the end of representable time.
+
+        hour   = [@dtstart.hour]   if !hour 
+        min    = [@dtstart.min]    if !min  
+        sec    = [@dtstart.sec]    if !sec 
+
+  #      debug days
+
+        days.each do |m,d|
+            hour.each do |h|
+              min.each do |n|
+                sec.each do |s|
+                  if(@count && (count > @count))
+                    return self
+                  end
+                  y = Time.local(t.year, m, d, h, n, s, 0)
+
+                  next if y.hour != h
+
+                  # The generated set can sometimes generate results earlier
+                  # than the DTSTART, skip them.
+                  next if y < @dtstart
+
+                  # We are done if current time is past @until.
+                  if @until && (y > @until)
+                    return self
+                  end
+                  # We are also done if current time is past the
+                  # caller-requested until.
+                  if dountil && (y >= dountil)
+                    return self
+                  end
+                  yield y
+                  count += 1
+                end
+              end
+            end
+        end
+
+
+        # Add @interval to @freq component
+
+        # Note - when we got past representable time, the error is:
+        #   time out of range (ArgumentError)
+        # Finish when we see this.
+        begin
+          case @freq
+            when 'YEARLY' then
+              t = t.plus_year(@interval)
+
+            when 'MONTHLY' then
+              t = t.plus_month(@interval)
+
+            when 'WEEKLY' then
+              t = t.plus_day(@interval * 7)
+
+            when 'DAILY' then
+              t = t.plus_day(@interval)
+
+            when 'HOURLY' then
+              t += @interval * 60 * 60
+
+            when 'MINUTELY' then
+              t += @interval * 60
+
+            when 'SECONDLY' then
+              t += @interval
+
+            when nil
+              return self
+          end
+        rescue ArgumentError
+          return self if $!.message =~ /^time out of range$/
+
+          raise ArgumentError, "#{$!.message} while adding interval to #{t.inspect}"
+        end
+
+        return self if dountil && (t > dountil)
+      end
+    end
+
+    class DaySet #:nodoc:
+
+      def initialize(ref)
+        @ref = ref # Need to know because leap years have an extra day, and to get
+                     # our defaults.
+        @month = nil
+        @week = nil
+      end
+
+      def month=(mon)
+        @month = { mon => nil }
+      end
+
+      def week=(week)
+        @week = week
+      end
+
+      def mday=(pair)
+        @month = { pair[0] => [ pair[1] ] }
+      end
+
+      def intersect_bymon(bymon) #:nodoc:
+        if !@month
+          @month = {}
+          bymon.each do |m|
+            @month[m] = nil
+          end
+        else
+          @month.delete_if { |m, days| ! bymon.include? m }
+        end
+      end
+
+      def intersect_dates(dates) #:nodoc:
+        if dates
+          # If no months are in the dayset, add all the ones in dates
+          if !@month
+            @month = {}
+
+            dates.each do |d|
+              @month[d.mon] = nil
+            end
+          end
+
+          # In each month,
+          #   if there are days,
+          #     eliminate those not in dates
+          #   otherwise
+          #     add all those in dates
+          @month.each do |mon, days|
+            days_in_mon = dates.find_all { |d| d.mon == mon }
+            days_in_mon = days_in_mon.collect { |d| d.day }
+
+            if days
+              days_in_mon = days_in_mon & days
+            end
+            @month[mon] = days_in_mon
+          end
+        end
+      end
+
+      def each
+        @month  = { @ref.month => [ @ref.mday ] } if !@month
+        @month.each_key do |m|
+          @month[m] = [@ref.day] if !@month[m]
+          # FIXME - if @ref.day is 31, and the month doesn't have 32 days, we'll
+          # generate invalid dates here, check for that, and eliminate them
+        end
+
+        @month.keys.sort.each do |m|
+          @month[m].sort.each do |d|
+            yield m, d
+          end
+        end
+      end
+    end
+
+    def self.time_from_rfc2425(str) #:nodoc:
+      # With ruby1.8 we can use DateTime to do this quick-n-easy:
+      #  dt = DateTime.parse(str)
+      #  Time.local(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec, 0)
+
+      # The time can be a DATE or a DATE-TIME, the latter always has a 'T' in it.
+
+      if str =~ /T/
+        d = Vpim.decode_date_time(str)
+        # We get [ year, month, day, hour, min, sec, usec, tz ]
+        if(d.pop == "Z")
+          t = Time.gm(*d)
+        else
+          t = Time.local(*d)
+        end
+      else
+        d = Vpim.decode_date(str)
+        # We get [ year, month, day ]
+        # FIXME - I have to choose gm or local, though neither makes much
+        # sense. This is a bit of a hack - what we should really do is return
+        # an instance of Date, and Time should allow itself to be compared to
+        # Date... This hack will give odd results when comparing times, because
+        # it will create a Time on the right date but whos time is 00:00:00.
+        t = Time.local(*d)
+      end
+      if t.month != d[1] || t.day != d[2] || (d[3] && t.hour != d[3])
+        raise Vpim::InvalidEncodingError, "Error - datetime does not exist"
+      end
+      t
+    end
+
+    def bymonthday(year, bymday) #:nodoc:
+      dates = []
+
+      bymday.each do |mday|
+        dates |= DateGen.bymonthday(year, nil, mday[0].to_i)
+      end
+      dates.sort!
+      dates
+    end
+
+    def byyearday(year, byyday) #:nodoc:
+      dates = []
+
+      byyday.each do |yday|
+        dates << Date.new2(year, yday[0].to_i)
+      end
+      dates.sort!
+      dates
+    end
+
+    def byday_in_yearly(year, byday) #:nodoc:
+      byday_in_monthly(year, nil, byday)
+    end
+
+    def byday_in_monthly(year, mon, byday) #:nodoc:
+      dates = []
+
+      byday.each do |rule|
+        if rule[0].empty?
+          n = nil
+        else
+          n = rule[0].to_i
+        end
+        dates |= DateGen.bywday(year, mon, Date.str2wday(rule[1]), n)
+      end
+      dates.sort!
+      dates
+    end
+
+  end
+
+end
+