icalendar 0.96 → 0.96.1

data/lib/icalendar/conversions.rb

@@ -16,6 +16,8 @@ require 'date'
 #   end
 # end
 
+require 'uri/generic'
+
 class String
   def to_ical
     "#{self.dump[1...-1]}"
@@ -40,6 +42,14 @@ class Array
   end
 end
 
+module URI
+  class Generic
+    def to_ical
+      "#{self}"
+    end
+  end
+end
+
 class DateTime < Date
   def to_ical(utc = false)
     s = ""

data/lib/icalendar/parser.rb

@@ -1,7 +1,7 @@
 =begin
   Copyright (C) 2005 Jeff Rose
   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.
@@ -14,7 +14,7 @@ module Icalendar
   class Parser < Icalendar::Base
     # 1*(ALPHA / DIGIT / "=")
     NAME    = '[-a-z0-9]+'
-    
+
     # <"> <Any character except CTLs, DQUOTE> <">
     QSTR    = '"[^"]*"'
 
@@ -47,14 +47,14 @@ module Icalendar
 
     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...
-      
+
       # Just do the unfolding work in one shot if its a whole string
       if src.respond_to?(:split)
         unfolded = []
@@ -95,11 +95,11 @@ module Icalendar
         if !@prev_line.nil?
           @prev_line.chomp!
         end
-        
+
         # Dynamically define next line for an IO object
         def next_line
           line = @prev_line
-          
+
           if line.nil? 
             return nil 
           end
@@ -110,7 +110,7 @@ module Icalendar
             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]/ )
@@ -127,27 +127,27 @@ module Icalendar
         raise ArgumentError, "CalendarParser.new cannot be called with a #{src.class} type!"
       end
     end
-    
+
     # Parse the calendar into an object representation
     def parse
       calendars = []
-      
+
       # Outer loop for Calendar objects
       while (line = next_line)
         fields = parse_line(line)
-        
+
         # Just iterate through until we find the beginning of a calendar object
         if fields[:name] == "BEGIN" and fields[:value] == "VCALENDAR"
           cal = parse_component
           calendars << cal
         end
       end
-      
+
       calendars
     end
 
     private
-    
+
     # Parse a single VCALENDAR object
     # -- This should consist of the PRODID, VERSION, option METHOD & CALSCALE,
     # and then one or more calendar components: VEVENT, VTODO, VJOURNAL, 
@@ -156,8 +156,8 @@ module Icalendar
       while (line = next_line)
         fields = parse_line(line)
 
-        name = fields[:name]
-        
+        name = fields[:name].upcase
+
         # Although properties are supposed to come before components, we should
         # be able to handle them in any order...
         if name == "END"
@@ -185,48 +185,45 @@ module Icalendar
             next
           end
         else # If its not a component then it should be a property
-          
-          # Just set the properties so that the parser can still
-          # parse invalid files...
-          @@logger.debug("Setting #{name} => #{fields[:value]}")
-          
+
+          params = fields[:params]
+          value = fields[:value]
+
           # Lookup the property name to see if we have a string to
           # object parser for this property type.
-          if @parsers.has_key?(name.upcase)
-            val = @parsers[name.upcase].call(name, fields[:params], fields[:value])
-          else
-            val = fields[:value]
+          if @parsers.has_key?(name)
+            value = @parsers[name].call(name, params, value)
           end
 
-          if component.multi_property?(name.upcase)
-            val = [val]
+          name = name.downcase
 
-            if fields[:params].empty?
-              params = []
-            else
-              params = fields[:params]
-            end
-            
-            if component.properties.has_key?(name)
-              component.properties[name] += val
-              component.property_params[name] += params
+          # TODO: check to see if there are any more conflicts.
+          if name == 'class' or name == 'method'
+            name = "ip_" + name
+          end
+
+          # Replace dashes with underscores
+          name = name.gsub('-', '_')
+
+          if component.multi_property?(name)
+            adder = "add_" + name
+            if component.respond_to?(adder)
+              component.send(adder.to_sym, value, params)
             else
-              component.properties[name] = val
-              component.property_params[name] = params
+              raise(UnknownPropertyMethod, "Unknown property type: #{adder}")
             end
-
           else
-            component.properties[name] = val            
-
-            unless fields[:params].empty?
-              component.property_params[name] = fields[:params]
+            puts "Looking for: #{name}"
+            if component.respond_to?(name)
+              component.send(name, value, params)
+            else
+              raise(UnknownPropertyMethod, "Unknown property type: #{name}")
             end
           end
         end  
       end
 
       component
-
     end
 
     def parse_line(line)
@@ -237,50 +234,50 @@ module Icalendar
       name = $1.upcase # The case insensitive part is upcased for easier comparison...
       paramslist = $2
       value = $3
-      
+
       # Parse the parameters
       params = {}
       if paramslist.size > 1
         paramslist.scan( %r{#{PARAM}}i ) do
-          
-          # parameter names are case-insensitive, and multi-valued
-          pname = $1
-          pvals = $3
-          
-          # If their isn't an '=' sign then we need to do some custom
-          # business.  Defaults to 'type'
-          if $2 == ""
-            pvals = $1
-            case $1
-            when /quoted-printable/i
-              pname = 'encoding'
-              
-            when /base64/i
-              pname = 'encoding'
-              
-            else
-              pname = 'type'
-            end
-          end
-          
-          # Make entries into the params dictionary where the name
-          # is the key and the value is an array of values.
-          unless params.key? pname
-            params[pname] = []
+
+        # parameter names are case-insensitive, and multi-valued
+        pname = $1
+        pvals = $3
+
+        # If their isn't an '=' sign then we need to do some custom
+        # business.  Defaults to 'type'
+        if $2 == ""
+          pvals = $1
+          case $1
+          when /quoted-printable/i
+            pname = 'encoding'
+
+          when /base64/i
+            pname = 'encoding'
+
+          else
+            pname = 'type'
           end
+        end
 
-          # Save all the values into the array.
-          pvals.scan( %r{(#{PVALUE})} ) do
-            if $1.size > 0
-              params[pname] << $1
-            end
+        # Make entries into the params dictionary where the name
+        # is the key and the value is an array of values.
+        unless params.key? pname
+          params[pname] = []
+        end
+
+        # Save all the values into the array.
+        pvals.scan( %r{(#{PVALUE})} ) do
+          if $1.size > 0
+            params[pname] << $1
           end
         end
+        end
       end
-      
+
       {:name => name, :params => params, :value => value}
     end
-    
+
     ## Following is a collection of parsing functions for various 
     ## icalendar property value data types...  First we setup
     ## a hash with property names pointing to methods...
@@ -313,7 +310,7 @@ module Icalendar
       @parsers["ATTENDEE"] = m
       @parsers["ORGANIZER"] = m
       @parsers["URL"] = m
-      
+
       # This is a URI by default, and if its not a valid URI
       # it will be returned as a string which works for binary data
       # the other possible type.
@@ -324,7 +321,7 @@ module Icalendar
       @parsers["GEO"] = m
 
     end
-    
+
     # Booleans
     # NOTE: It appears that although this is a valid data type
     # there aren't any properties that use it...  Maybe get
@@ -336,7 +333,7 @@ module Icalendar
         true
       end
     end
-    
+
     # Dates, Date-Times & Times
     # NOTE: invalid dates & times will be returned as strings...
     def parse_datetime(name, params, value)
@@ -345,34 +342,34 @@ module Icalendar
       rescue Exception
         value
       end
-      
+
     end
-    
+
     # Durations
     # TODO: Need to figure out the best way to represent durations 
     # so just returning string for now.
     def parse_duration(name, params, value)
       value
     end
-    
+
     # Floats
     # NOTE: returns 0.0 if it can't parse the value
     def parse_float(name, params, value)
       value.to_f
     end
-    
+
     # Integers
     # NOTE: returns 0 if it can't parse the value
     def parse_integer(name, params, value)
       value.to_i
     end
-    
+
     # Periods
     # TODO: Got to figure out how to represent periods also...
     def parse_period(name, params, value)
       value
     end
-    
+
     # Calendar Address's & URI's
     # NOTE: invalid URI's will be returned as strings...
     def parse_uri(name, params, value)
@@ -397,6 +394,6 @@ module Icalendar
       val[1] = strloc[1].to_f
       val
     end
-    
+
   end
 end

data/lib/meta.rb

@@ -0,0 +1,32 @@
+# A set of methods to help create meta-programming gizmos.
+class Object
+  # The metaclass is the singleton behind every object.  
+  def metaclass
+    class << self
+      self
+    end
+  end
+
+  # Evaluates the block in the context of the metaclass
+  def meta_eval &blk
+    metaclass.instance_eval &blk
+  end
+
+  # Acts like an include except it adds the module's methods
+  # to the metaclass so they act like class methods.
+  def meta_include mod
+    meta_eval do
+      include mod
+    end
+  end
+
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+end

data/test/component_test.rb

@@ -6,69 +6,74 @@ require 'icalendar'
 
 class TestComponent < Test::Unit::TestCase
 
-   # Create a calendar with an event for each test.
-   def setup
-      @cal = Icalendar::Calendar.new
-      @event = Icalendar::Event.new
-   end
-
-   def test_ical_property
-      # No alias but it does have a prop_name
-      assert_equal(@event.klass?, false)
-      @event.klass = "PRIVATE"
-      assert_equal(@event.klass?, true)
-      assert_equal(@event.klass, "PRIVATE")
-
-      # Check that both dtstart and its alias start work correctly
-      date = DateTime.new(2005, 02, 05, 23, 24, 25)
-      @event.dtend = date
-      assert_equal(@event.dtend.year, date.year)
-
-      date2 =  DateTime.new(2005, 02, 05, 23, 24, 26)
-      @event.end = date2
-      assert_equal(@event.end.year, date2.year)
-   end
-
-   def test_ical_multi_property
-      # Query
-      assert_equal(@event.comments?, false)
-      @event.comments = []
-      assert_equal(@event.comments?, true)
-
-      # Should return an empty array, rather than nil
-      assert_equal(@event.comments.size, 0)
-
-      # Add and remove
-      @event.add_comment "c1"
-      @event.add_comment "c2"
-      assert_equal(@event.comments.size, 2)
-      assert_equal(@event.comments, ["c1", "c2"])
-      @event.remove_comment "c1"
-      assert_equal(@event.comments, ["c2"])
-
-      # Set & get whole array
-      foo = ["as", "df"]
-      @event.comments = foo
-      assert_equal(@event.comments, foo)
-
-      foo = ["asdf", "qwer"]    
-      @event.comments(foo)
-      assert_equal(@event.comments, foo)
-
-      # Error cases
-      assert_raise(ArgumentError) { @event.comments("asdf") }
-   end
-
-   def test_bad_args
-      # Single property
-      assert_raise(NotImplementedError) do
-         @event.klass = {}
-      end
-
-      # Multi property
-      assert_raise(NotImplementedError) do
-         @event.comments = [{}]
-      end
-   end
+  # Create a calendar with an event for each test.
+  def setup
+    @cal = Icalendar::Calendar.new
+    @event = Icalendar::Event.new
+  end
+
+  def test_add_component
+    @cal.add_component @event
+    assert_equal(@cal.events.size, 1)
+  end
+
+  def test_ical_property
+    # No alias but it does have a prop_name
+    assert_equal(@event.klass?, false)
+    @event.klass = "PRIVATE"
+    assert_equal(@event.klass?, true)
+    assert_equal(@event.klass, "PRIVATE")
+
+    # Check that both dtstart and its alias start work correctly
+    date = DateTime.new(2005, 02, 05, 23, 24, 25)
+    @event.dtend = date
+    assert_equal(@event.dtend.year, date.year)
+
+    date2 =  DateTime.new(2005, 02, 05, 23, 24, 26)
+    @event.end = date2
+    assert_equal(@event.end.year, date2.year)
+  end
+
+  def test_ical_multi_property
+    # Query
+    assert_equal(@event.comments?, false)
+    @event.comments = []
+    assert_equal(@event.comments?, true)
+
+    # Should return an empty array, rather than nil
+    assert_equal(@event.comments.size, 0)
+
+    # Add and remove
+    @event.add_comment "c1"
+    @event.add_comment "c2"
+    assert_equal(@event.comments.size, 2)
+    assert_equal(@event.comments, ["c1", "c2"])
+    @event.remove_comment "c1"
+    assert_equal(@event.comments, ["c2"])
+
+    # Set & get whole array
+    foo = ["as", "df"]
+    @event.comments = foo
+    assert_equal(@event.comments, foo)
+
+    foo = ["asdf", "qwer"]    
+    @event.comments(foo)
+    assert_equal(@event.comments, foo)
+
+    # Error cases
+    assert_raise(ArgumentError) { @event.comments("asdf") }
+  end
+
+  def test_bad_args
+    # Single property
+    assert_raise(NotImplementedError) do
+      @event.klass = {}
+    end
+
+    # Multi property
+    assert_raise(NotImplementedError) do
+      @event.comments = [{}]
+    end
+  end
 
 end