icalendar 1.0.2 → 1.1.0

data/README

@@ -75,6 +75,131 @@ Now for some examples:
   # network port, database etc.
   cal_string = cal.to_ical
   puts cal_string
+
+## ALARMS
+
+## Within an event, you can create e-mail notification alarms like this...
+
+  cal.event.do
+    # ...other event properties
+    alarm do
+      action        "EMAIL"
+      description   "This is an event reminder" # email body (required)
+      summary       "Alarm notification"        # email subject (required)
+      attendees     %w(mailto:me@my-domain.com mailto:me-too@my-domain.com) # one or more email recipients (required)
+      add_attendee  "mailto:me-three@my-domain.com"
+      remove_attendee "mailto:me@my-domain.com"
+      trigger       "-PT15M" # 15 minutes before
+      add_attach    "ftp://host.com/novo-procs/felizano.exe", {"FMTTYPE" => "application/binary"} # email attachments (optional)
+    end
+    
+    alarm do
+      action        "DISPLAY" # This line isn't necessary, it's the default
+      summary       "Alarm notification"
+      trigger       "-P1DT0H0M0S" # 1 day before
+    end
+
+    alarm do
+      action        "AUDIO"
+      trigger       "-PT15M"
+      add_attach    "Basso", {"VALUE" => ["URI"]}  # only one attach allowed (optional)
+    end
+  end
+
+  # Output
+
+  # BEGIN:VALARM
+  # ACTION:EMAIL
+  # ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-procs/felizano.exe
+  # TRIGGER:-PT15M
+  # SUMMARY:Alarm notification
+  # DESCRIPTION:This is an event reminder
+  # ATTENDEE:mailto:me-too@my-domain.com
+  # ATTENDEE:mailto:me-three@my-domain.com
+  # END:VALARM
+  #
+  # BEGIN:VALARM
+  # ACTION:DISPLAY
+  # TRIGGER:-P1DT0H0M0S
+  # SUMMARY:Alarm notification
+  # END:VALARM
+  # 
+  # BEGIN:VALARM
+  # ACTION:AUDIO
+  # ATTACH;VALUE=URI:Basso
+  # TRIGGER:-PT15M
+  # END:VALARM
+
+## Timezones
+  
+  # Create a timezone definition (previous convention)
+  cal = Calendar.new
+  timezone = Icalendar::Timezone.new
+  daylight = Icalendar::Daylight.new
+  standard = Icalendar::Standard.new
+
+  timezone.timezone_id =            "America/Chicago"
+
+  daylight.timezone_offset_from =   "-0600"
+  daylight.timezone_offset_to =     "-0500"
+  daylight.timezone_name =          "CDT"
+  daylight.dtstart =                "19700308TO20000"
+  daylight.recurrence_rules =       ["FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"]
+
+  standard.timezone_offset_from =   "-0500"
+  standard.timezone_offset_to =     "-0600"
+  standard.timezone_name =          "CST"
+  standard.dtstart =                "19701101T020000"
+  standard.recurrence_rules =       ["YEARLY;BYMONTH=11;BYDAY=1SU"]
+
+  timezone.add(daylight)
+  timezone.add(standard)
+  cal.add(timezone)
+
+  # Now, you can make timezones like this
+  cal = Calendar.new
+  cal.timezone do
+    timezone_id             "America/Chicago"
+
+    daylight do
+      timezone_offset_from  "-0600"
+      timezone_offset_to    "-0500"
+      timezone_name         "CDT"
+      dtstart               "19700308TO20000"
+      add_recurrence_rule   "FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"
+    end
+
+    standard do
+      timezone_offset_from  "-0500"
+      timezone_offset_to    "-0600"
+      timezone_name         "CST"
+      dtstart               "19701101T020000"
+      add_recurrence_rule   "YEARLY;BYMONTH=11;BYDAY=1SU"
+    end
+  end
+  
+  # Both conventions output
+  
+  # BEGIN:VTIMEZONE
+  # TZID:America/Chicago
+  # BEGIN:DAYLIGHT
+  # TZOFFSETFROM:-0600
+  # TZOFFSETTO:-0500
+  # TZNAME:CDT
+  # DTSTART:19700308T020000
+  # RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+  # END:DAYLIGHT
+  # BEGIN:STANDARD
+  # TZOFFSETFROM:-0500
+  # TZOFFSETTO:-0600
+  # TZNAME:CST
+  # DTSTART:19701101T020000
+  # RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+  # END:STANDARD
+  # END:VTIMEZONE
+
+== Unicode
+Add `$KCODE = 'u'` to make icalender work correctly with Utf8 texts
   
 == Parsing iCalendars:
   

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 require 'rake/clean'
 require 'rake/contrib/sshpublisher'
 
-PKG_VERSION = "1.0.2"
+PKG_VERSION = "1.1.0"
 
 $VERBOSE = nil
 TEST_CHANGES_SINCE = Time.now - 600 # Recent tests = changed in last 10 minutes
@@ -74,8 +74,8 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "COPYING", "GPL"]
   s.rdoc_options.concat ['--main', 'README']
 
-  s.author = "Jeff Rose" 
-  s.email = "rosejn@gmail.com" 
+  s.author = "Sean Dague" 
+  s.email = "sean@dague.net" 
 end 
 
 Rake::GemPackageTask.new(spec) do |pkg| 

data/lib/icalendar.rb

@@ -34,3 +34,5 @@ require 'icalendar/component/alarm'
 # Calendar parser
 require 'icalendar/parser'
 
+# TZINFO support
+# require 'icalendar/tzinfo'

data/lib/icalendar/calendar.rb

@@ -27,9 +27,18 @@ module Icalendar
 
     def event(&block)
       e = Event.new
+      # Note: I'm not sure this is the best way to pass this down, but it works
+      e.tzid = self.timezones[0].tzid if self.timezones.length > 0
+     
       self.add_component e
 
-      e.instance_eval &block if block
+      if block
+        e.instance_eval &block
+        if e.tzid
+          e.dtstart.ical_params = { "TZID" => e.tzid }
+          e.dtend.ical_params = { "TZID" => e.tzid }
+        end
+      end
 
       e
     end

data/lib/icalendar/component.rb

@@ -145,25 +145,29 @@ module Icalendar
 
            # Property value
            value = ":#{val.to_ical}" 
-           escaped = prelude + value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;")
-           s << escaped.slice!(0, MAX_LINE_LENGTH) << "\r\n " while escaped.size > MAX_LINE_LENGTH
-           s << escaped << "\r\n"
-           s.gsub!(/ *$/, '')
+           add_sliced_text(s,prelude+escape_chars(value))
          else 
            prelude = "#{key.gsub(/_/, '-').upcase}" 
             val.each do |v| 
                params = print_parameters(v)
                value = ":#{v.to_ical}"
-               escaped = prelude + params + value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;")
-               s << escaped.slice!(0, MAX_LINE_LENGTH) << "\r\n " while escaped.size > MAX_LINE_LENGTH
-               s << escaped << "\r\n"
-               s.gsub!(/ *$/, '')
+               add_sliced_text(s,prelude + params + escape_chars(value))
             end
          end
       end
       s
     end
 
+    def escape_chars(value)
+      value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;")
+    end
+
+    def add_sliced_text(add_to,escaped)
+      escaped = escaped.split('') # split is unicdoe-aware when `$KCODE = 'u'`
+      add_to << escaped.slice!(0,MAX_LINE_LENGTH).to_s << "\r\n " while escaped.length != 0 # shift(MAX_LINE_LENGTH) does not work with ruby 1.8.6
+      add_to.gsub!(/ *$/, '')
+    end
+
     # Print the parameters for a specific property
     def print_parameters(val)
       s = ""

data/lib/icalendar/component/alarm.rb

@@ -31,7 +31,7 @@ module Icalendar
 
     # Multi properties
     ical_multiline_property :attendee, :attendee, :attendees
-    ical_multi_property :attach, :attachment, :attachments
+    ical_multiline_property :attach, :attachment, :attachments
 
     def initialize()
       super("VALARM")

data/lib/icalendar/component/event.rb

@@ -27,6 +27,9 @@ module Icalendar
     # Complete description of the calendar component
     ical_property :description
 
+    # Specifies the timezone for the event
+    attr_accessor :tzid
+    
     # Specifies date-time when calendar component begins
     ical_property :dtstart, :start
 
@@ -117,7 +120,10 @@ module Icalendar
 
       a
     end
-
+    
+    def occurrences_starting(time)
+      recurrence_rules.first.occurrences_of_event_starting(self, time)
+    end
 
   end
 end

data/lib/icalendar/component/timezone.rb

@@ -50,19 +50,37 @@ module Icalendar
     # of components.
     def to_ical
       print_component do
-		  s = ""
+      s = ""
         @components.each_value do |comp|
           s << comp.to_ical
         end
-		  s
+      s
       end
     end
-
+    
 
     def initialize(name = "VTIMEZONE")
       super(name)
     end
+    
+    # Allow block syntax for declaration of standard and daylight components of timezone
+    def standard(&block)
+      e = Standard.new
+      self.add_component e
 
+      e.instance_eval &block if block
+
+      e
+    end
+
+    def daylight(&block)
+      e = Daylight.new
+      self.add_component e
+
+      e.instance_eval &block if block
+
+      e
+    end
   end
 
   # A Standard component is a sub-component of the Timezone component which

data/lib/icalendar/conversions.rb

@@ -16,6 +16,12 @@ require 'date'
 #   end
 # end
 
+module Icalendar
+  module TzidSupport
+    attr_accessor :icalendar_tzid
+  end
+end
+
 require 'uri/generic'
 
 class String
@@ -53,7 +59,10 @@ module URI
 end
 
 class DateTime < Date
-  def to_ical(utc = false)
+  attr_accessor :ical_params
+  include Icalendar::TzidSupport
+
+  def to_ical
     s = ""
     
     # 4 digit year
@@ -82,7 +91,7 @@ class DateTime < Date
     s << self.sec.to_s
 
     # UTC time gets a Z suffix
-    if utc
+    if icalendar_tzid == "UTC"
       s << "Z"
     end
 
@@ -91,6 +100,7 @@ class DateTime < Date
 end
 
 class Date
+  attr_accessor :ical_params
   def to_ical(utc = false)
     s = ""
         
@@ -108,6 +118,7 @@ class Date
 end
 
 class Time
+  attr_accessor :ical_params
   def to_ical(utc = false)
     s = ""
 

data/lib/icalendar/parser.rb

@@ -12,6 +12,101 @@ require 'uri'
 require 'stringio'
 
 module Icalendar
+  class RRule
+    
+    class Weekday
+      def initialize(day, position)
+        @day, @position = day, position
+      end
+      
+      def to_s
+        "#{@position}#{@day}"
+      end
+    end
+    
+    def initialize(name, params, value, parser)
+      frequency_match = value.match(/FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY)/)
+      raise Icalendar::InvalidPropertyValue.new("FREQ must be specified for RRULE values") unless frequency_match
+      @frequency = frequency_match[1]
+      @until = parse_date_val("UNTIL", value)
+      @count = parse_int_val("COUNT", value)
+      raise Icalendar::InvalidPropertyValue.new("UNTIL and COUNT must not both be specified for RRULE values") if [@until, @count].compact.length > 1
+      @interval = parse_int_val("INTERVAL", value)
+      @by_list = {:bysecond => parse_int_list("BYSECOND", value)}
+      @by_list[:byminute] = parse_int_list("BYMINUTE",value)
+      @by_list[:byhour] = parse_int_list("BYHOUR", value)
+      @by_list[:byday] = parse_weekday_list("BYDAY", value)
+      @by_list[:bymonthday] = parse_int_list("BYMONTHDAY", value)
+      @by_list[:byyearday] = parse_int_list("BYYEARDAY", value)
+      @by_list[:byweekno] = parse_int_list("BYWEEKNO", value)
+      @by_list[:bymonth] = parse_int_list("BYMONTH", value)
+      @by_list[:bysetpos] = parse_int_list("BYSETPOS", value)
+      @wkst = parse_wkstart(value)
+    end
+    
+    def to_ical
+      result = ["FREQ=#{@frequency}"]
+      result << ";UNTIL=#{@until.to_ical}" if @until
+      result << ";COUNT=#{@count}" if @count
+      result << ";INTERVAL=#{@interval}" if @interval
+      @by_list.each do |key, value|
+        result << ";#{key.to_s.upcase}=#{value}" if value
+      end
+      result << ";WKST=#{@wkst}" if @wkst
+      result.join
+    end
+    
+    def parse_date_val(name, string)
+      match = string.match(/;#{name}=(.*?)(;|$)/)
+      match ? DateTime.parse(match[1]) : nil
+    end
+    
+    def parse_int_val(name, string)
+      match = string.match(/;#{name}=(\d+)(;|$)/)
+      match ? match[1].to_i : nil
+    end
+    
+    def parse_int_list(name, string)
+      match = string.match(/;#{name}=([+-]?.*?)(;|$)/)
+      if match
+        match[1].split(",").map {|int| int.to_i}
+      else
+        nil
+      end
+    end
+    
+    def parse_weekday_list(name, string)
+      match = string.match(/;#{name}=(.*?)(;|$)/)
+      if match
+        match[1].split(",").map {|weekday| 
+          wd_match = weekday.match(/([+-]?\d*)(SU|MO|TU|WE|TH|FR|SA)/)
+          Weekday.new(wd_match[2], wd_match[1])
+          }
+      else
+        nil
+      end
+    end
+    
+    def parse_wkstart(string)
+      match = string.match(/;WKSTART=(SU|MO|TU|WE|TH|FR|SA)(;|$)/)
+      if match
+        %w{SU MO TU WE TH FR SA}.index(match[1])
+      else
+        nil
+      end
+    end
+    
+    # TODO: Incomplete
+    def occurrences_of_event_starting(event, datetime)
+      initial_start = event.dtstart
+      (0...@count).map {|day_offset| 
+              occurrence = event.clone
+              occurrence.dtstart = initial_start + day_offset
+              occurrence.clone
+              }
+    end
+  end
+  
   def Icalendar.parse(src, single = false)
     cals = Icalendar::Parser.new(src).parse
 
@@ -153,6 +248,7 @@ module Icalendar
 
           # Lookup the property name to see if we have a string to
           # object parser for this property type.
+          orig_value = value
           if @parsers.has_key?(name)
             value = @parsers[name].call(name, params, value)
           end
@@ -223,7 +319,7 @@ module Icalendar
         pname = $1
         pvals = $3
 
-        # If their isn't an '=' sign then we need to do some custom
+        # If there isn't an '=' sign then we need to do some custom
         # business.  Defaults to 'type'
         if $2 == ""
           pvals = $1
@@ -298,6 +394,11 @@ module Icalendar
       # GEO
       m = self.method(:parse_geo)
       @parsers["GEO"] = m
+      
+      #RECUR
+      m = self.method(:parse_recur)
+      @parsers["RRULE"] = m
+      @parsers["EXRULE"] = m
 
     end
 
@@ -317,11 +418,25 @@ module Icalendar
     # NOTE: invalid dates & times will be returned as strings...
     def parse_datetime(name, params, value)
       begin
-        DateTime.parse(value)
+        if params["VALUE"] && params["VALUE"].first == "DATE"
+          result = Date.parse(value)
+        else
+          result = DateTime.parse(value)
+          if /Z$/ =~ value
+            timezone = "UTC"
+          else
+            timezone = params["TZID"].first if params["TZID"]
+          end
+          result.icalendar_tzid = timezone
+        end
+        result
       rescue Exception
         value
       end
-
+    end
+    
+    def parse_recur(name, params, value)
+      ::Icalendar::RRule.new(name, params, value, self)
     end
 
     # Durations

data/lib/icalendar/tzinfo.rb

@@ -0,0 +1,121 @@
+=begin
+  Copyright (C) 2008 Sean Dague
+
+  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
+
+# The following adds a bunch of mixins to the tzinfo class, with the
+# intent on making it very easy to load in tzinfo data for generating
+# ical events.  With this you can do the following:
+#
+#   require "icalendar/tzinfo"
+#
+#   estart = DateTime.new(2008, 12, 29, 8, 0, 0)
+#   eend = DateTime.new(2008, 12, 29, 11, 0, 0)
+#   tstring = "America/Chicago"
+#
+#   tz = TZInfo::Timezone.get(tstring)
+#   cal = Calendar.new
+#   # the mixins now generate all the timezone info for the date in question
+#   timezone = tz.ical_timezone(estart)
+#   cal.add(timezone)
+#  
+#   cal.event do
+#       dtstart       estart
+#       dtend        eend
+#       summary     "Meeting with the man."
+#       description "Have a long lunch meeting and decide nothing..."
+#       klass       "PRIVATE"
+#   end
+#
+#   puts cal.to_ical
+#
+# The recurance rule calculations are hacky, and only start at the
+# beginning of the current dst transition.  I doubt this works for non
+# dst areas yet.  However, for a standard dst flipping zone, this
+# seems to work fine (tested in Mozilla Thunderbird + Lightning).
+# Future goal would be making this better.
+
+# require "rubygems"
+# require "tzinfo"
+
+module TZInfo
+    class Timezone
+        def ical_timezone(date)
+            period = period_for_local(date)
+            timezone = Icalendar::Timezone.new
+            timezone.timezone_id = identifier
+            timezone.add(period.daylight)
+            timezone.add(period.standard)
+            return timezone
+        end
+    end
+    
+    class TimezoneTransitionInfo
+        def offset_from
+            a = previous_offset.utc_total_offset
+            sprintf("%2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
+        end
+        
+        def offset_to
+            a = offset.utc_total_offset
+            sprintf("%2.2d%2.2d", (a / 3600).to_i, ((a / 60) % 60).to_i)
+        end
+        
+        def rrule 
+            start = local_start.to_datetime
+            # this is somewhat of a hack, but seems to work ok
+            [sprintf(
+                    "FREQ=YEARLY;BYMONTH=%d;BYDAY=%d%s",
+                    start.month, 
+                    ((start.day - 1)/ 7).to_i + 1,
+                    start.strftime("%a").upcase[0,2]
+                    )]
+        end
+        
+        def dtstart
+            local_start.to_datetime.strftime("%Y%m%dT%H%M%S")
+        end
+
+    end
+    
+    class TimezonePeriod
+        def daylight
+            day = Icalendar::Daylight.new
+            if dst?
+                day.timezone_name = abbreviation.to_s
+                day.timezone_offset_from = start_transition.offset_from
+                day.timezone_offset_to = start_transition.offset_to
+                day.dtstart = start_transition.dtstart
+                day.recurrence_rules = start_transition.rrule
+            else
+                day.timezone_name = abbreviation.to_s.sub("ST","DT")
+                day.timezone_offset_from = end_transition.offset_from
+                day.timezone_offset_to = end_transition.offset_to
+                day.dtstart = end_transition.dtstart
+                day.recurrence_rules = end_transition.rrule
+            end
+            return day
+        end
+        
+        def standard
+            std = Icalendar::Standard.new
+            if dst?
+                std.timezone_name = abbreviation.to_s.sub("DT","ST")
+                std.timezone_offset_from = end_transition.offset_from
+                std.timezone_offset_to = end_transition.offset_to
+                std.dtstart = end_transition.dtstart
+                std.recurrence_rules = end_transition.rrule
+            else
+                std.timezone_name = abbreviation.to_s
+                std.timezone_offset_from = start_transition.offset_from
+                std.timezone_offset_to = start_transition.offset_to
+                std.dtstart = start_transition.dtstart
+                std.recurrence_rules = start_transition.rrule
+            end
+            return std
+        end
+    end
+end

data/test/component/event_test.rb

@@ -3,6 +3,14 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'test/unit'
 require 'icalendar'
 
+unless defined? 1.days
+  class Integer
+    def days
+      self * 60 * 60 * 24
+    end
+  end
+end
+
 # Define a test event
 testEvent = <<EOS
 BEGIN:VEVENT
@@ -40,5 +48,209 @@ class TestEvent < Test::Unit::TestCase
     
     assert_equal("PRIVATE", event2.ip_class)
   end
+end
+
+class TestEventWithSpecifiedTimezone < Test::Unit::TestCase
+  
+  def setup
+    src = <<EOS
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+CALSCALE:GREGORIAN
+VERSION:2.0
+BEGIN:VEVENT
+UID:19970901T130000Z-123401@host.com
+DTSTAMP:19970901T1300Z
+DTSTART;TZID=America/Chicago:19970903T163000
+DTEND;TZID=America/Chicago:19970903T190000
+SUMMARY:Annual Employee Review
+CLASS:PRIVATE
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+END:VEVENT
+END:VCALENDAR
+EOS
+    @calendar = Icalendar.parse(src).first
+    @event = @calendar.events.first
+  end
+  
+  def test_event_is_parsed
+    assert_not_nil(@event)
+  end
+  
+  def test_dtstart_should_understand_icalendar_tzid
+    assert_respond_to(@event.dtstart, :icalendar_tzid)
+  end
+  
+  def test_dtstart_tzid_should_be_correct
+    puts "#{@event.dtstart.icalendar_tzid} #{@event.dtstart}"
+    assert_equal("America/Chicago",@event.dtstart.icalendar_tzid)
+  end
+  
+  def test_dtend_tzid_should_be_correct
+    assert_equal("America/Chicago",@event.dtend.icalendar_tzid)
+  end
+  
+end
+
+class TestEventWithZuluTimezone < Test::Unit::TestCase
+  
+  def setup
+    src = <<EOS
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+CALSCALE:GREGORIAN
+VERSION:2.0
+BEGIN:VEVENT
+UID:19970901T130000Z-123401@host.com
+DTSTAMP:19970901T1300Z
+DTSTART:19970903T163000Z
+DTEND:19970903T190000Z
+SUMMARY:Annual Employee Review
+CLASS:PRIVATE
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+END:VEVENT
+END:VCALENDAR
+EOS
+    @calendar = Icalendar.parse(src).first
+    @event = @calendar.events.first
+  end
+  
+  def test_event_is_parsed
+    assert_not_nil(@event)
+  end
+  
+  def test_dtstart_tzid_should_be_correct
+    puts "#{@event.dtstart.icalendar_tzid} #{@event.dtstart}"
+    assert_equal("UTC",@event.dtstart.icalendar_tzid)
+  end
+  
+  def test_dtend_tzid_should_be_correct
+    assert_equal("UTC",@event.dtend.icalendar_tzid)
+  end
   
 end
+
+class TestEventWithFloatingTimezone < Test::Unit::TestCase
+  
+  def setup
+    src = <<EOS
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+CALSCALE:GREGORIAN
+VERSION:2.0
+BEGIN:VEVENT
+UID:19970901T130000Z-123401@host.com
+DTSTAMP:19970901T1300Z
+DTSTART:19970903T163000
+DTEND:19970903T190000
+SUMMARY:Annual Employee Review
+CLASS:PRIVATE
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+END:VEVENT
+END:VCALENDAR
+EOS
+    @calendar = Icalendar.parse(src).first
+    @event = @calendar.events.first
+  end
+  
+  def test_event_is_parsed
+    assert_not_nil(@event)
+  end
+  
+  def test_dtstart_tzid_should_be_nil
+    puts "#{@event.dtstart.icalendar_tzid.inspect} #{@event.dtstart}"
+    assert_nil(@event.dtstart.icalendar_tzid)
+  end
+  
+  def test_dtend_tzid_should_be_nil
+    assert_nil(@event.dtend.icalendar_tzid)
+  end
+  
+end
+
+class TestAllDayEventWithoutTime < Test::Unit::TestCase
+  
+  def setup
+    src = <<EOS
+BEGIN:VCALENDAR
+VERSION:2.0
+X-WR-CALNAME:New Event
+PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
+X-WR-RELCALID:3A016BE7-8932-4456-8ABD-C8F7EEC5963A
+X-WR-TIMEZONE:Europe/London
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+BEGIN:VEVENT
+DTSTART;VALUE=DATE:20090110
+DTEND;VALUE=DATE:20090111
+SUMMARY:New Event
+UID:3829F33C-F601-49AC-A3A5-C3AC4A6A3483
+SEQUENCE:4
+DTSTAMP:20090109T184719Z
+END:VEVENT
+END:VCALENDAR
+EOS
+    @calendar = Icalendar.parse(src).first
+    @event = @calendar.events.first
+  end
+  
+  def test_event_is_parsed
+    assert_not_nil(@event)
+  end
+  
+  def test_dtstart_set_correctly
+    assert_equal("20090110", @event.dtstart.to_ical)
+  end
+  
+end
+
+class TestRecurringEventWithCount < Test::Unit::TestCase 
+  # DTSTART;TZID=US-Eastern:19970902T090000
+  # RRULE:FREQ=DAILY;COUNT=10
+  # ==> (1997 9:00 AM EDT)September 2-11
+  
+  def setup
+    src = <<EOS
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+CALSCALE:GREGORIAN
+VERSION:2.0
+BEGIN:VEVENT
+UID:19970901T130000Z-123401@host.com
+DTSTAMP:19970901T1300Z
+DTSTART:19970902T090000Z
+DTEND:19970902T100000Z
+RRULE:FREQ=DAILY;COUNT=10
+SUMMARY:Annual Employee Review
+CLASS:PRIVATE
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+END:VEVENT
+END:VCALENDAR
+EOS
+    @calendar = Icalendar.parse(src).first
+    @event = @calendar.events.first
+  end
+  
+  def test_event_is_parsed
+    assert_not_nil(@event)
+  end
+  
+  def test_recurrence_rules_should_return_a_recurrence_rule_array
+    assert_equal 1, @event.recurrence_rules.length
+    assert_kind_of(Icalendar::RRule, @event.recurrence_rules.first)
+  end
+  
+  def test_occurrences_after_with_start_before_start_at_should_return_count_occurrences
+    assert_equal 10, @event.occurrences_starting(Time.utc(1997, 9, 2, 8, 30, 0, 0)).length
+  end
+                  
+#  def test_occurrences_after_with_start_before_start_at_should_return_an_event_with_the_dtstart_as_the_first_event
+#    assert_equal @event.dtstart.to_s, @event.occurrences_starting(Time.utc(1997, 9, 2, 8, 30, 0, 0)).first.dtstart.to_s
+#  end
+#  
+#  def test_occurrences_after_with_start_before_start_at_should_return_events_with_the_correct_dtstart_values
+#    expected = (0..9).map {|delta| (@event.dtstart + delta).to_s}
+#    assert_equal expected, @event.occurrences_starting(Time.utc(1997, 9, 2, 8, 30, 0, 0)).map {|occurence| occurence.dtstart.to_s}
+#  end
+end
+

data/test/component/timezone_test.rb

@@ -0,0 +1,67 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'test/unit'
+require 'icalendar'
+
+class TestTimezone < Test::Unit::TestCase
+
+  # Create a calendar with an event for each test.
+  def setup
+    @cal = Icalendar::Calendar.new
+    # Define a test timezone
+    @testTimezone = %Q(BEGIN:VTIMEZONE\r\nTZID:America/Chicago\r\nBEGIN:STANDARD\r\nTZOFFSETTO:-0600\r\nRRULE:FREQ=YEARLY\\;BYMONTH=11\\;BYDAY=1SU\r\nTZOFFSETFROM:-0500\r\nDTSTART:19701101T020000\r\nTZNAME:CST\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETTO:-0500\r\nRRULE:FREQ=YEARLY\\;BYMONTH=3\\;BYDAY=2SU\r\nTZOFFSETFROM:-0600\r\nDTSTART:19700308TO20000\r\nTZNAME:CDT\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE\r\n)
+  end
+
+  def test_new
+    @tz = Icalendar::Timezone.new
+    assert(@tz)
+  end
+  
+  def test_raw_generation    
+    timezone = Icalendar::Timezone.new
+    daylight = Icalendar::Daylight.new
+    standard = Icalendar::Standard.new
+
+    timezone.timezone_id =            "America/Chicago"
+
+    daylight.timezone_offset_from =   "-0600"
+    daylight.timezone_offset_to =     "-0500"
+    daylight.timezone_name =          "CDT"
+    daylight.dtstart =                "19700308TO20000"
+    daylight.recurrence_rules =       ["FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"]
+
+    standard.timezone_offset_from =   "-0500"
+    standard.timezone_offset_to =     "-0600"
+    standard.timezone_name =          "CST"
+    standard.dtstart =                "19701101T020000"
+    standard.recurrence_rules =       ["FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"]
+
+    timezone.add(standard)
+    timezone.add(daylight)
+    @cal.add(timezone)
+    assert_equal(@testTimezone, @cal.timezones.first.to_ical)
+  end
+
+  def test_block_creation
+    @cal.timezone do
+      timezone_id             "America/Chicago"
+
+      daylight do
+        timezone_offset_from  "-0600"
+        timezone_offset_to    "-0500"
+        timezone_name         "CDT"
+        dtstart               "19700308TO20000"
+        add_recurrence_rule   "FREQ=YEARLY;BYMONTH=3;BYDAY=2SU"
+      end
+
+      standard do
+        timezone_offset_from  "-0500"
+        timezone_offset_to    "-0600"
+        timezone_name         "CST"
+        dtstart               "19701101T020000"
+        add_recurrence_rule   "FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"
+      end
+    end
+    assert_equal(@testTimezone, @cal.timezones.first.to_ical)
+  end  
+end

data/test/conversions_test.rb

@@ -18,7 +18,7 @@ LAST-MODIFIED:19960817T133000
 SEQUENCE:2
 ORGANIZER:mailto:joe@example.com?subject=Ruby
 UID:foobar
-X-TIME-OF-DAY:111736
+X-TIME-OF-DAY:101736
 CATEGORIES:foo\\,bar\\,baz
 GEO:46.01\\;8.57
 DESCRIPTION:desc
@@ -60,7 +60,7 @@ EOS
       timestamp DateTime.parse("2006-07-20T17:40:52+0200")
 
       # Time
-      x_time_of_day Time.at(123456)
+      x_time_of_day Time.at(123456).utc
 
       uid "foobar"
     end

metadata

@@ -1,98 +1,109 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: icalendar
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-11-25 00:00:00 +01:00
-summary: A ruby implementation of the iCalendar specification (RFC-2445).
-require_paths: 
-- lib
-email: rosejn@gmail.com
-homepage: http://icalendar.rubyforge.org/
-rubyforge_project: 
-description: Implements the iCalendar specification (RFC-2445) in Ruby.  This allows for the generation and parsing of .ics files, which are used by a variety of calendaring applications.
-autorequire: icalendar
-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: 1.1.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Jeff Rose
+- Sean Dague
+autorequire: icalendar
+bindir: bin
+cert_chain: []
+
+date: 2009-01-29 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: Implements the iCalendar specification (RFC-2445) in Ruby.  This allows for the generation and parsing of .ics files, which are used by a variety of calendaring applications.
+email: sean@dague.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- COPYING
+- GPL
 files: 
-- test/component
-- test/component/event_test.rb
-- test/component/todo_test.rb
+- test/calendar_test.rb
 - test/parameter_test.rb
 - test/interactive.rb
-- test/coverage
+- test/conversions_test.rb
 - test/component_test.rb
+- test/parser_test.rb
+- test/read_write.rb
 - test/fixtures
-- test/fixtures/simplecal.ics
-- test/fixtures/folding.ics
 - test/fixtures/single_event.ics
+- test/fixtures/folding.ics
+- test/fixtures/simplecal.ics
 - test/fixtures/life.ics
-- test/read_write.rb
-- test/calendar_test.rb
-- test/parser_test.rb
-- test/conversions_test.rb
+- test/component
+- test/component/timezone_test.rb
+- test/component/todo_test.rb
+- test/component/event_test.rb
+- test/coverage
+- test/coverage/STUB
 - lib/icalendar
+- lib/icalendar/parameter.rb
+- lib/icalendar/component.rb
+- lib/icalendar/base.rb
+- lib/icalendar/parser.rb
+- lib/icalendar/tzinfo.rb
+- lib/icalendar/calendar.rb
 - lib/icalendar/component
 - lib/icalendar/component/alarm.rb
+- lib/icalendar/component/todo.rb
 - lib/icalendar/component/event.rb
-- lib/icalendar/component/freebusy.rb
 - lib/icalendar/component/journal.rb
 - lib/icalendar/component/timezone.rb
-- lib/icalendar/component/todo.rb
+- lib/icalendar/component/freebusy.rb
 - lib/icalendar/conversions.rb
-- lib/icalendar/parameter.rb
-- lib/icalendar/component.rb
 - lib/icalendar/helpers.rb
-- lib/icalendar/parser.rb
-- lib/icalendar/calendar.rb
-- lib/icalendar/base.rb
-- lib/hash_attrs.rb
-- lib/icalendar.rb
 - lib/meta.rb
-- docs/api
+- lib/icalendar.rb
+- lib/hash_attrs.rb
 - docs/rfcs
+- docs/rfcs/rfc2446.pdf
+- docs/rfcs/rfc2426.pdf
 - docs/rfcs/itip_notes.txt
+- docs/rfcs/rfc2447.pdf
 - docs/rfcs/rfc2425.pdf
-- docs/rfcs/rfc2426.pdf
 - docs/rfcs/rfc2445.pdf
-- docs/rfcs/rfc2446.pdf
-- docs/rfcs/rfc2447.pdf
 - docs/rfcs/rfc3283.txt
+- docs/api
+- docs/api/STUB
 - examples/single_event.ics
-- examples/create_cal.rb
 - examples/parse_cal.rb
+- examples/create_cal.rb
 - Rakefile
 - README
 - COPYING
 - GPL
-test_files: []
-
+has_rdoc: true
+homepage: http://icalendar.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - --main
 - README
-extra_rdoc_files: 
-- README
-- COPYING
-- GPL
-executables: []
-
-extensions: []
-
+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: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A ruby implementation of the iCalendar specification (RFC-2445).
+test_files: []