icalendar 0.96 → 0.96.1

data/lib/icalendar/base.rb

@@ -15,7 +15,11 @@ module Icalendar #:nodoc:
   end
 
   # Exception used when the library encounters a bogus calendar component.
-  class InvalidComponentClass < IcalendarError
+  class UnknownComponentClass < IcalendarError
+  end
+
+  # Exception used when the library encounters a bogus property type.
+  class UnknownPropertyMethod< IcalendarError
   end
 
   # Exception used when the library encounters a bogus property value.
@@ -26,6 +30,6 @@ module Icalendar #:nodoc:
   # the library so that the logging system can be configured in one place.
   class Base
     @@logger = Logger.new(STDERR)
-    @@logger.level = Logger::WARN
+    @@logger.level = Logger::FATAL
   end
 end

data/lib/icalendar/calendar.rb

@@ -14,7 +14,7 @@ module Icalendar
     ical_property :calscale, :calendar_scale
     ical_property :prodid, :product_id
     ical_property :version
-    ical_property :method
+    ical_property :ip_method
 
     def initialize()
       super("VCALENDAR")

data/lib/icalendar/component.rb

@@ -6,8 +6,6 @@
   details.
 =end
 
-require 'breakpoint'
-
 module Icalendar
   # The body of the iCalendar object consists of a sequence of calendar
   # properties and one or more calendar components. The calendar
@@ -17,6 +15,9 @@ module Icalendar
   # specify an Event, a Todo, a Journal entry, Timezone information, or
   # Freebusy time information, or an Alarm.
   class Component < Icalendar::Base
+
+    meta_include HashAttrs
+
     attr_reader :name
     attr_accessor :properties, :property_params
 
@@ -42,56 +43,75 @@ module Icalendar
       @components[key] << component
     end
 
+    alias add add_component
+
     def to_ical
-      print_string do |s|
+      print_component do |s|
         @components.each_value do |comps|
           comps.each { |component| s << component.to_ical }
         end
       end
     end
 
-    def print_string
+    # Print this icalendar component
+    def print_component
       s = ""
 
       # Begin a new component
       s << "BEGIN:#{@name.upcase}\r\n"
 
-      # Then print the properties, possible parameters and potentially
-      # multiple parameter values for each parameter.
+      # Then the properties
+      print_properties(s)
+
+      # Any custom body of the derived component
+      yield(s)
+
+      # End of this component
+      s << "END:#{@name.upcase}\r\n"
+    end
+
+    # Print this components properties
+    def print_properties(s)
       @properties.each do |key,value| 
+        # Take out underscore for property names that conflicted
+        # with built-in words.
+        if key =~ /ip_.*/
+          key = key[3..-1]
+        end
+
         # Property name
         s << "#{key.upcase}"
 
         # Possible parameters
-        if @property_params.has_key?(key) 
-          params = @property_params[key]
-          params.each do |key,val|
-            s << ";#{key}"
-            val = [ val ] unless val.respond_to?(:to_ary)
-
-            # Possible parameter values
-            unless val.empty?
-              s << "="
-              sep = "" # First entry comes after = sign, but then we need commas
-              val.each do |pval| 
-                if pval.respond_to? :to_ical 
-                  s << sep << pval.to_ical
-                  sep = ","
-                end
-              end
-            end
-          end
-        end
+        print_parameter(s, key, value)
 
         # Property value
         s << ":#{value.to_ical}\r\n" 
       end
+    end
 
-      # Any custom body of the derived component
-      yield(s)
+    # Print the parameters for a specific property
+    def print_parameter(s, key, value)
+      if @property_params.has_key?(key) 
+        params = @property_params[key]
+        params.each do |key,val|
+          s << ";#{key}"
+          val = [ val ] unless val.respond_to?(:to_ary)
+
+          # Possible parameter values
+          unless val.empty?
+            s << "="
+            sep = "" # First entry comes after = sign, but then we need commas
+            val.each do |pval| 
+              if pval.respond_to? :to_ical 
+                s << sep << pval.to_ical
+                sep = ","
+              end
+            end
+          end
 
-      # End of this component
-      s << "END:#{@name.upcase}\r\n"
+        end
+      end
     end
 
     # TODO: Look into the x-property, x-param stuff...
@@ -100,46 +120,19 @@ module Icalendar
     end
 
     def multi_property?(name)
-      @@multi_properties.has_key?(name)
-    end
-
-    private
-
-    def Component.hash_reader(hash, syms)
-      syms.each do |id|
-        class_eval <<-"stop"
-    def #{id.to_s.downcase}
-      return @#{hash.to_s}[:#{id.to_s.downcase}]
-    end
-        stop
-        puts "Creating method: #{id.to_s.downcase}"
-      end
-    end
-
-    def Component.hash_writer(hash, syms)
-      syms.each do |id|
-        class_eval <<-"stop"
-    def #{id.to_s.downcase}=(val)
-      return @#{hash.to_s}[:#{id.to_s.downcase}] = val
-    end
-        stop
-      end
-    end
-
-    def Component.hash_attr(hash, syms)
-      hash_reader(hash, syms)
-      hash_writer(hash, syms)
+      @@multi_properties.has_key?(name.upcase)
     end
 
     # Make it protected so we can monitor usage...
     protected
 
     def Component.ical_component(*syms)
-      hash_attr :components, syms
+      hash_accessor :components, syms
     end
-    
+
     # Define a set of methods supporting a new property
     def Component.ical_property(property, alias_name = nil, prop_name = nil)
+
       property = "#{property}".strip.downcase
       getter = "#{property}"
       setter = "#{property}="
@@ -157,17 +150,17 @@ module Icalendar
 
       unless instance_methods.include? getter
         code = <<-code
-            def #{getter}(*a)
-              if a.empty?
+            def #{getter}(val = nil, params = {})
+              if val.nil?
                 @properties["#{property}"]
               else
-                self.#{getter} = a.first
+                # Set the value just like normal
+                self.#{setter}(val)
               end 
             end
         code
 
         class_eval code, "component.rb", 155
-
         alias_method("#{alias_name}", "#{getter}") unless alias_name.nil?
       end
 
@@ -175,7 +168,7 @@ module Icalendar
         code = <<-code
             def #{setter}(val)
               unless val.respond_to?(:to_ical)
-                raise(NotImplementedError, "Property value does not support to_ical method!")
+                raise(NotImplementedError, "Value of type (" + val.class.to_s + ") does not support to_ical method!")
               end
 
               @properties["#{property}"] = val
@@ -249,7 +242,6 @@ module Icalendar
 
                 @properties["#{property}"] = a.to_ary
 
-
               else
                 raise ArgumentError, "#{getter} is a multi-property that must be an array! Use the #{adder} method to add single entries."
               end
@@ -273,20 +265,21 @@ module Icalendar
       # Add another item to this properties array
       unless instance_methods.include? adder
         code = <<-code
-            def #{adder}(a)
-              unless a.respond_to?(:to_ical)
+            def #{adder}(val, params = {})
+              unless val.respond_to?(:to_ical)
                 raise(NotImplementedError, "Property value object does not support to_ical method!")
               end
 
               if @properties.has_key?("#{property}")
-                @properties["#{property}"] << a
+                @properties["#{property}"] << val
               else
-                @properties["#{property}"] = [a]
+                @properties["#{property}"] = [val]
               end
             end
         code
 
         class_eval code, "component.rb", 228
+        alias_method("add_#{property.downcase}", "#{adder}") 
       end
 
       # Remove an item from this properties array
@@ -300,8 +293,42 @@ module Icalendar
         code
 
         class_eval code, "component.rb", 241
+        alias_method("remove_#{property.downcase}", "#{remover}")
       end
 
     end
-  end
+
+    def method_missing(method_name, *args)
+      method_name = method_name.to_s.downcase
+
+      unless method_name =~ /x_.*/
+        raise NoMethodError
+      end
+
+      val = args.first
+
+      unless val.respond_to?(:to_ical)
+        raise(NotImplementedError, "Value of type (" + val.class.to_s + ") does not support to_ical method!")
+      end
+
+      if method_name =~ /(.*)(=)/ # Its a setter
+        @properties[$1] = val
+        @@logger.debug("Setting #{$1} => #{val}")
+      else # Or its a getter
+        @@logger.debug("Getting #{method_name} => #{@properties[method_name]}")
+        return @properties[method_name]
+      end
+    end
+
+    public
+
+    def respond_to?(method_name)
+      unless method_name.to_s.downcase =~ /x-.*/
+        super
+      end
+
+      true
+    end
+
+  end # class Component
 end

data/lib/icalendar/component/alarm.rb

@@ -23,13 +23,15 @@ module Icalendar
     # Single and only occurring once
     ical_property :attach, :attachment
     
+    ical_property :created
+    ical_property :last_modified
+    ical_property :timestamp
+    ical_property :sequence
+
     def initialize()
       super("VALARM")
       
     end
 
-    def to_ical
-      print_string {}
-    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 :klass, nil, :class 
+    ical_property :ip_class 
 
     # Date & time of creation
     ical_property :created

data/lib/icalendar/component/freebusy.rb

@@ -6,30 +6,30 @@
   details.
 =end
 module Icalendar
-    # A Freebusy calendar component is a grouping of
-    # component properties that represents either a request for, a reply to
-    # a request for free or busy time information or a published set of
-    # busy time information.
-    class Freebusy < Component
-      
-          # Single properties
+  # A Freebusy calendar component is a grouping of
+  # component properties that represents either a request for, a reply to
+  # a request for free or busy time information or a published set of
+  # busy time information.
+  class Freebusy < Component
+
+    # Single properties
     ical_property :contact
     ical_property :dtstart, :start
     ical_property :dtend, :end
-    ical_property :dtstamp, :timestamp
-    ical_property :duration
-    ical_property :organizer
-    ical_property :uid, :user_id
-    ical_property :url
-    
-    # Multi-properties
-    ical_multi_property :attendee, :attendee, :attendees
-    ical_multi_property :comment, :comment, :comments
-    ical_multi_property :freebusy, :freebusy, :freebusys
-    ical_multi_property :rstatus, :request_status, :request_statuses
-   
-      def initialize()
-        super("VFREEBUSY")
-      end
-    end
+  ical_property :dtstamp, :timestamp
+  ical_property :duration
+  ical_property :organizer
+  ical_property :uid, :user_id
+  ical_property :url
+
+  # Multi-properties
+  ical_multi_property :attendee, :attendee, :attendees
+  ical_multi_property :comment, :comment, :comments
+  ical_multi_property :freebusy, :freebusy, :freebusys
+  ical_multi_property :rstatus, :request_status, :request_statuses
+
+  def initialize()
+    super("VFREEBUSY")
+  end
   end
+end

data/lib/icalendar/component/journal.rb

@@ -20,7 +20,7 @@ module Icalendar
   class Journal < Component
 
     # Single properties
-    ical_property :klass, nil, :class
+    ical_property :ip_class
     ical_property :created
     ical_property :description
     ical_property :dtstart, :start
@@ -52,10 +52,6 @@ module Icalendar
       super("VJOURNAL")
     end
 
-    def to_ical
-      print_string { }
-    end
-
   end
 end
 

data/lib/icalendar/component/timezone.rb

@@ -26,6 +26,13 @@ module Icalendar
     ical_property :dtstart, :start
     ical_property :tzoffsetto, :timezone_offset_to
     ical_property :tzoffsetfrom, :timezone_offset_from
+    ical_property :tzid, :timezone_id
+    ical_property :tzname, :timezone_name
+    
+    ical_property :created
+    ical_property :last_modified
+    ical_property :timestamp
+    ical_property :sequence
 
     # Multi-properties
     ical_multi_property :comment, :comment, :comments

data/lib/icalendar/component/todo.rb

@@ -15,7 +15,7 @@ module Icalendar
     ical_component :alarms
 
     # Single properties
-    ical_property :klass, nil, :class
+    ical_property :ip_class
     ical_property :completed
     ical_property :created
     ical_property :description
@@ -54,12 +54,7 @@ module Icalendar
     
     def initialize()
       super("VTODO")
-      
-      @alarms = alarms
     end
 
-    def to_ical
-      print_string { |s| @alarms.each { |alarm| alarm.to_s } }
-    end      
   end
 end