icalendar 0.96.4 → 0.97

data/lib/icalendar/component/alarm.rb

@@ -36,6 +36,9 @@ module Icalendar
     def initialize()
       super("VALARM")
       
+      # Almost everyone just wants to display so I make it the 
+      # default so it works for most people right away...
+      action "DISPLAY"
     end
   end
 end

data/lib/icalendar/component/event.rb

@@ -19,7 +19,7 @@ module Icalendar
     ## Single instance properties
 
     # Access classification (PUBLIC, PRIVATE, CONFIDENTIAL...)
-    ical_property :ip_class 
+    ical_property :ip_class, :klass 
 
     # Date & time of creation
     ical_property :created
@@ -31,7 +31,7 @@ module Icalendar
     ical_property :dtstart, :start
 
     # Latitude & longitude for specified activity
-    ical_property :geo
+    ical_property :geo, :geo_location
  
     # Date & time this item was last modified
     ical_property :last_modified
@@ -57,7 +57,7 @@ module Icalendar
     ical_property :transp, :transparency
 
     # Defines a persistent, globally unique id for this item
-    ical_property :uid, :user_id
+    ical_property :uid, :unique_id
 
     # Defines a URL associated with this item
     ical_property :url
@@ -102,6 +102,11 @@ module Icalendar
     
     def initialize()
       super("VEVENT")
+
+      # Now doing some basic initialization
+      sequence 0
+      timestamp DateTime.now
+      uid new_uid
     end
 
     def alarm(&block)
@@ -113,5 +118,6 @@ module Icalendar
       a
     end
 
+
   end
 end

data/lib/icalendar/component/freebusy.rb

@@ -29,6 +29,9 @@ module Icalendar
 
     def initialize()
       super("VFREEBUSY")
+
+      timestamp DateTime.now
+      uid new_uid
     end
   end
 end

data/lib/icalendar/component/journal.rb

@@ -50,6 +50,10 @@ module Icalendar
 
     def initialize()
       super("VJOURNAL")
+
+      sequence 0
+      timestamp DateTime.now
+      uid new_uid
     end
 
   end

data/lib/icalendar/component/todo.rb

@@ -54,6 +54,10 @@ module Icalendar
     
     def initialize()
       super("VTODO")
+
+      sequence 0
+      timestamp DateTime.now
+      uid new_uid
     end
 
   end

data/lib/icalendar/conversions.rb

@@ -20,7 +20,7 @@ require 'uri/generic'
 
 class String
   def to_ical
-    "#{self.dump[1...-1]}"
+    "#{self}"
   end
 end
 
@@ -36,6 +36,8 @@ class Float
   end
 end
 
+# From the spec: "Values in a list of values MUST be separated by a COMMA
+# character (US-ASCII decimal 44)."
 class Array
   def to_ical
     map{|elem| elem.to_ical}.join ','
@@ -107,6 +109,8 @@ end
 
 class Time
   def to_ical(utc = false)
+    s = ""
+
     # Double digit hour
     s << "0" unless self.hour > 9 
     s << self.hour.to_s
@@ -123,5 +127,7 @@ class Time
     if utc
       s << "Z"
     end
+
+    s
   end
 end

data/lib/icalendar/parser.rb

@@ -9,27 +9,20 @@
 
 require 'date'
 require 'uri'
+require 'stringio'
 
 module Icalendar
-  class Parser < Icalendar::Base
-    # 1*(ALPHA / DIGIT / "=")
-    NAME    = '[-a-z0-9]+'
-
-    # <"> <Any character except CTLs, DQUOTE> <">
-    QSTR    = '"[^"]*"'
+  def Icalendar.parse(src, single = false)
+    cals = Icalendar::Parser.new(src).parse
 
-    # *<Any character except CTLs, DQUOTE, ";", ":", ",">
-    PTEXT   = '[^";:,]*'
-
-    # param-value = ptext / quoted-string
-    PVALUE  = "#{PTEXT}|#{QSTR}"
-
-    # Contentline
-    LINE = "(#{NAME})([^:]*)\:(.*)"
-
-    # param = name "=" param-value *("," param-value)
-    PARAM = ";(#{NAME})(=?)((?:#{PVALUE})(?:,#{PVALUE})*)"
+    if single
+      cals.first
+    else
+      cals
+    end
+  end
 
+  class Parser < Icalendar::Base
     # date = date-fullyear ["-"] date-month ["-"] date-mday
     # date-fullyear = 4 DIGIT
     # date-month = 2 DIGIT
@@ -46,92 +39,59 @@ module Icalendar
     TIME = '(\d\d):?(\d\d):?(\d\d)(\.\d+)?(Z|[-+]\d\d:?\d\d)?'
 
     def initialize(src)
-      @@logger.debug("New Calendar Parser")
-
       # Setup the parser method hash table
       setup_parsers()
 
-      # Define the next line method different depending on whether
-      # this is a string or an IO object so we can be efficient about
-      # parsing large files...
+      if src.respond_to?(:gets)
+        @file = src
+      elsif (not src.nil?) and src.respond_to?(:to_s)
+        @file = StringIO.new(src.to_s, 'r')
+      else
+        raise ArgumentError, "CalendarParser.new cannot be called with a #{src.class} type!"
+      end
 
-      # Just do the unfolding work in one shot if its a whole string
-      if src.respond_to?(:split)
-        unfolded = []
+      @prev_line = @file.gets
+      @prev_line.chomp! unless @prev_line.nil?
 
-        # Split into an array of lines, then unfold those into a new array
-        src.split(/\r?\n/).each do |line|
+      @@logger.debug("New Calendar Parser: #{@file.inspect}")
+    end
 
-          # 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]
-          elsif( line =~ /^$/ )
-          else
-            unfolded << line
-          end
-        end
+    # Define next line for an IO object.
+    # Works for strings now with StringIO
+    def next_line
+      line = @prev_line
 
-        @lines = unfolded
-        @index = 0
+      if line.nil? 
+        return nil 
+      end
 
-        # Now that we are unfolded we can just iterate through the array.
-        # Dynamically define next line for a string.
-        def next_line
-          if @index == @lines.size
-            return nil
-          else
-            line = @lines[@index]
-            @index += 1
-            return line
-          end
-        end
+      # Loop through until we get to a non-continuation line...
+      loop do
+        nextLine = @file.gets
+        @@logger.debug "new_line: #{nextLine}"
 
-        # If its a file we need to read and unfold on the go to save from reading
-        # large amounts of data into memory.
-      elsif src.respond_to?(:gets)
-        @file = src
-        @prev_line = src.gets
-        if !@prev_line.nil?
-          @prev_line.chomp!
+        if !nextLine.nil?
+          nextLine.chomp!
         end
 
-        # Dynamically define next line for an IO object
-        def next_line
-          line = @prev_line
-
-          if line.nil? 
-            return nil 
-          end
-
-          # Loop through until we get to a non-continuation line...
-          loop do
-            nextLine = @file.gets
-            if !nextLine.nil?
-              nextLine.chomp!
-            end
-
-            # If it's a continuation line, add it to the last.
-            # If it's an empty line, drop it from the input.
-            if( nextLine =~ /^[ \t]/ )
-              line << nextLine[1, nextLine.size]
-            elsif( nextLine =~ /^$/ )
-            else
-              @prev_line = nextLine
-              break
-            end
-          end
-          line
+        # If it's a continuation line, add it to the last.
+        # If it's an empty line, drop it from the input.
+        if( nextLine =~ /^[ \t]/ )
+          line << nextLine[1, nextLine.size]
+        elsif( nextLine =~ /^$/ )
+        else
+          @prev_line = nextLine
+          break
         end
-      else
-        raise ArgumentError, "CalendarParser.new cannot be called with a #{src.class} type!"
       end
+      line
     end
 
     # Parse the calendar into an object representation
     def parse
       calendars = []
 
+      @@logger.debug "parsing..."
       # Outer loop for Calendar objects
       while (line = next_line)
         fields = parse_line(line)
@@ -139,6 +99,7 @@ module Icalendar
         # Just iterate through until we find the beginning of a calendar object
         if fields[:name] == "BEGIN" and fields[:value] == "VCALENDAR"
           cal = parse_component
+          @@logger.debug "Added parsed calendar..."
           calendars << cal
         end
       end
@@ -153,6 +114,8 @@ module Icalendar
     # and then one or more calendar components: VEVENT, VTODO, VJOURNAL, 
     # VFREEBUSY, VTIMEZONE
     def parse_component(component = Calendar.new)
+      @@logger.debug "parsing new component..."
+
       while (line = next_line)
         fields = parse_line(line)
 
@@ -208,7 +171,7 @@ module Icalendar
           if component.multi_property?(name)
             adder = "add_" + name
             if component.respond_to?(adder)
-              component.send(adder.to_sym, value, params)
+              component.send(adder, value, params)
             else
               raise(UnknownPropertyMethod, "Unknown property type: #{adder}")
             end
@@ -225,6 +188,24 @@ module Icalendar
       component
     end
 
+    # 1*(ALPHA / DIGIT / "=")
+    NAME    = '[-a-z0-9]+'
+
+    # <"> <Any character except CTLs, DQUOTE> <">
+    QSTR    = '"[^"]*"'
+
+    # Contentline
+    LINE = "(#{NAME})(.*(?:#{QSTR})|(?:[^:]*))\:(.*)"
+   
+    # *<Any character except CTLs, DQUOTE, ";", ":", ",">
+    PTEXT   = '[^";:,]*'
+
+    # param-value = ptext / quoted-string
+    PVALUE  = "#{QSTR}|#{PTEXT}"
+
+    # param = name "=" param-value *("," param-value)
+    PARAM = ";(#{NAME})(=?)((?:#{PVALUE})(?:,#{PVALUE})*)"
+
     def parse_line(line)
       unless line =~ %r{#{LINE}}i # Case insensitive match for a valid line
         raise "Invalid line in calendar string!"
@@ -274,7 +255,7 @@ module Icalendar
         end
       end
 
-      {:name => name, :params => params, :value => value}
+      {:name => name, :value => value, :params => params}
     end
 
     ## Following is a collection of parsing functions for various 
@@ -388,10 +369,7 @@ module Icalendar
         return value
       end
 
-      val = []
-      val[0] = strloc[0].to_f
-      val[1] = strloc[1].to_f
-      val
+      Geo.new(strloc[0].to_f, strloc[1].to_f)
     end
 
   end

data/test/calendar_test.rb

@@ -6,11 +6,12 @@ require 'icalendar'
 require 'date'
 
 class TestCalendar < Test::Unit::TestCase
+  include Icalendar
    # Generate a calendar using the raw api, and then spit it out
    # as a string.  Parse the string and make sure everything matches up.
    def test_raw_generation    
       # Create a fresh calendar
-      cal = Icalendar::Calendar.new
+      cal = Calendar.new
 
       cal.calscale = "GREGORIAN"
       cal.version = "3.2"
@@ -20,7 +21,7 @@ class TestCalendar < Test::Unit::TestCase
       # that everything was set, generated and parsed correctly.
       calString = cal.to_ical
 
-      cals = Icalendar::Parser.new(calString).parse
+      cals = Parser.new(calString).parse
 
       cal2 = cals.first
       assert_equal("GREGORIAN", cal2.calscale)
@@ -29,19 +30,42 @@ class TestCalendar < Test::Unit::TestCase
    end
 
    def test_block_creation
-      cal = Icalendar::Calendar.new
+      cal = Calendar.new
       cal.event do
-         dtend "19970903T190000Z"
-         summary "This is my summary"
+         self.dtend = "19970903T190000Z"
+         self.summary = "This is my summary"
       end
 
       event = cal.event
-      event.dtend = "19970903T190000Z"
-      event.summary = "This is my summary"
+      event.dtend "19970903T190000Z", {:TZID => "Europe/Copenhagen"}
+      event.summary "This is my summary"
 
-#      breakpoint
       ev = cal.events.each do |ev|
          assert_equal("19970903T190000Z", ev.dtend)
+         assert_equal("This is my summary", ev.summary)
       end
    end
+
+   def test_find
+     cal = Calendar.new
+
+     # add some events so we actually have to search
+     10.times do 
+       cal.event
+       cal.todo 
+       cal.journal
+       cal.freebusy 
+     end
+     event = cal.events[5]
+     assert_equal(event, cal.find_event(event.uid))
+
+     todo = cal.todos[5]
+     assert_equal(todo, cal.find_todo(todo.uid))
+
+     journal = cal.journals[5]
+     assert_equal(journal, cal.find_journal(journal.uid))
+     
+     freebusy = cal.freebusys[5]
+     assert_equal(freebusy, cal.find_freebusy(freebusy.uid))
+   end
 end

data/test/component/event_test.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'test/unit'
 require 'icalendar'
@@ -16,7 +16,7 @@ CATEGORIES:BUSINESS,HUMAN RESOURCES
 END:VEVENT
 EOS
 
-class TestVevent < Test::Unit::TestCase
+class TestEvent < Test::Unit::TestCase
 
   # Create a calendar with an event for each test.
   def setup
@@ -32,16 +32,13 @@ class TestVevent < Test::Unit::TestCase
   def test_single_properties
     @event.ip_class = "PRIVATE"
     
-    @cal.add_component(@event)
+    @cal.add_event(@event)
     
     cals = Icalendar::Parser.new(@cal.to_ical).parse
     cal2 = cals.first
     event2 = cal2.events.first
     
-    assert_equal(event2.ip_class, "PRIVATE")
+    assert_equal("PRIVATE", event2.ip_class)
   end
   
-#  def test_restricted_properties
-#  end
-  
 end