rubyredrick-ri_cal 0.0.2 → 0.0.3

data/lib/ri_cal/property_value/date_time.rb

@@ -1,8 +1,7 @@
 require 'date'
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::CalAddress represents an icalendar CalAddress property value
     # which is defined in RFC 2445 section 4.3.5 pp 35-37
@@ -28,13 +27,17 @@ module RiCal
           PropertyValue::Date.new(parent, line)
         end
       end
+      
+      def self.valid_string?(string) #:nodoc:
+        string =~ /^\d{8}T\d{6}Z?$/
+      end
 
       def self.default_tzid # :nodoc:
         @default_tzid ||= "UTC"
       end
 
       def self.params_for_tzid(tzid) #:nodoc:
-        if tzid == FloatingTimezone
+        if tzid == :floating
           {}
         else
           {'TZID' => tzid}
@@ -44,12 +47,12 @@ module RiCal
       # Set the default tzid to be used when instantiating an instance from a ruby object
       # see RiCal::PropertyValue::DateTime.from_time
       #
-      # The parameter tzid is a string value to be used for the default tzid, a value of 'none' will cause
+      # The parameter tzid is a string value to be used for the default tzid, a value of :floating will cause
       # values with NO timezone to be produced, which will be interpreted by iCalendar as floating times
       # i.e. they are interpreted in the timezone of each client. Floating times are typically used
       # to represent events which are 'repeated' in the various time zones, like the first hour of the year.
       def self.default_tzid=(tzid)
-        @default_tzid = value
+        @default_tzid = tzid
       end
 
       def self.default_tzid_hash # :nodoc:
@@ -59,7 +62,7 @@ module RiCal
           {'TZID' => default_tzid}
         end
       end
-
+      
       def inspect # :nodoc:
         "#{@date_time_value}:#{tzid}"
       end
@@ -86,79 +89,40 @@ module RiCal
         when nil
           @date_time_value = nil
         when String
-          self.tzid = 'UTC' if val =~/Z/
           @date_time_value = ::DateTime.parse(val)
+          if val =~/Z/
+            self.tzid = 'UTC'
+          else
+            @tzid ||= :floating
+          end
         when ::DateTime
           @date_time_value = val
         when ::Date, ::Time
           @date_time_value = ::DateTime.parse(val.to_s)
         end
       end
-
+      
       # Extract the time and timezone identifier from an object used to set the value of a DATETIME property.
       #
-      # If the object is an array it is expected to have a time or datetime as its first element, and a time zone
-      # identifier string as the second element
+      # If the object is a string it should be of the form [TZID=identifier:]
       #
       # Otherwise determine if the object acts like an activesupport enhanced time, and extract its timezone
       # idenfifier if it has one.
       #
-      def self.time_and_tzid(object)
-        if ::Array === object
-          object, identifier = object[0], object[1]
-        else
-          activesupport_time = object.acts_like_time? rescue nil
-          time_zone = activesupport_time && object.time_zone rescue nil
-          identifier = time_zone && (time_zone.respond_to?(:tzinfo) ? time_zone.tzinfo  : time_zone).identifier
-        end
-        [object, identifier]
-      end
-
-      # A hack to detect whether an array passed to convert is a
-      def self.single_time_or_date?(ruby_object)
-        if (::Array === ruby_object) 
-          if (ruby_object.length == 2) && (::String === ruby_object[1])
-            case ruby_object[0]
-            when ::Date, ::DateTime, ::Time, PropertyValue::Date, PropertyValue::DateTime
-              ruby_object
-            else
-              nil
-            end
-          end
+      def self.time_and_parameters(object)
+        parameters = {}
+        if ::String === object
+          object, parameters = self.time_and_parameters_from_string(object)
         else
-          ruby_object
+          identifier = object.tzid rescue nil
+          parameters["TZID"] = identifier if identifier
         end
+        [object, parameters]
       end
 
 
       def self.convert(timezone_finder, ruby_object) # :nodoc:
-        convert_with_tzid_or_nil(timezone_finder, ruby_object) || ruby_object.to_ri_cal_date_or_date_time_value.for_parent(timezone_finder)
-      end
-
-      # Create an instance of RiCal::PropertyValue::DateTime representing a Ruby Time or DateTime
-      # If the ruby object has been extended by ActiveSupport to have a time_zone method, then
-      # the timezone will be used as the TZID parameter.
-      #
-      # Otherwise the class level default tzid will be used.
-      # == See
-      # * RiCal::PropertyValue::DateTime.default_tzid
-      # * RiCal::PropertyValue::DateTime#object_time_zone
-      def self.from_time(time_or_date_time)
-        convert_with_tzid_or_nil(nil, time_or_date_time) ||
-        new(nil, :value => time_or_date_time.strftime("%Y%m%dT%H%M%S"), :params => default_tzid_hash)
-      end
-
-      def self.convert_with_tzid_or_nil(timezone_finder, ruby_object) # :nodoc:
-        time, identifier = *self.time_and_tzid(ruby_object)
-        if identifier
-          new(
-          timezone_finder,
-          :params => params_for_tzid(identifier),
-          :value => time.strftime("%Y%m%d%H%M%S")
-          )
-        else
-          nil
-        end
+          ruby_object.to_ri_cal_date_or_date_time_value(timezone_finder)
       end
 
       def self.from_string(string) # :nodoc:
@@ -192,10 +156,22 @@ module RiCal
 
       def params=(value) #:nodoc:
         @params = value.dup
-        if params_timezone = params['TZID']
-          @tzid = params_timezone
+        if params_timezone = @params['TZID']
+          self.tzid =  @params['TZID']
         end
       end
+      
+      # Return a Hash representing this properties parameters
+      def params
+        result = @params.dup
+        case tzid
+        when :floating, nil, "UTC"
+          result.delete('TZID')
+        else
+          result['TZID'] = tzid
+        end
+        result
+      end
 
       # Compare the receiver with another object which must respond to the to_datetime message
       # The comparison is done using the Ruby DateTime representations of the two objects
@@ -208,11 +184,11 @@ module RiCal
         [other.year, other.month] == [year, month]
       end
 
-      def nth_wday_in_month(n, which_wday)
+      def nth_wday_in_month(n, which_wday) #:nodoc:
         @date_time_value.nth_wday_in_month(n, which_wday, self)
       end
 
-      def nth_wday_in_year(n, which_wday)
+      def nth_wday_in_year(n, which_wday) #:nodoc:
         @date_time_value.nth_wday_in_year(n, which_wday, self)
       end
 
@@ -228,12 +204,6 @@ module RiCal
         @date_time_value.days_in_month
       end
 
-      def in_same_month_as?(other)
-        [other.year, other.month] == [year, month]
-      end
-
-
-
       # Determine if the receiver and another object are equivalent RiCal::PropertyValue::DateTime instances
       def ==(other)
         if self.class === other
@@ -295,26 +265,26 @@ module RiCal
         @date_time_value.iso_year_and_week_one_start(wkst)
       end
 
-      def iso_weeks_in_year(wkst)
-        @date_time_value.iso_weeks_in_year(wkst)
+      def iso_weeks_in_year(wkst) #:nodoc:
+        @date_time_value.iso_weeks_in_year(wkst) #:nodoc:
       end
 
       # Return the "Natural' property value for the receover, in this case the receiver itself."
-      def to_ri_cal_date_or_date_time_value
-        self
+      def to_ri_cal_date_or_date_time_value(timezone_finder = nil) #:nodoc:
+        self.for_parent(timezone_finder)
       end
 
       # Return the Ruby DateTime representation of the receiver
-      def to_datetime
+      def to_datetime #:nodoc:
         @date_time_value
       end
 
       # Returns a ruby DateTime object representing the receiver.
        def ruby_value
-        to_datetime
+         ::DateTime.civil(year, month, day, hour, min, sec, rational_tz_offset).set_tzid(@tzid)
       end
 
-      alias_method :to_ri_cal_ruby_value, :ruby_value
+      alias_method :to_ri_cal_ruby_value, :to_datetime
 
       def add_date_times_to(required_timezones) #:nodoc:
         required_timezones.add_datetime(self, tzid) if has_local_timezone?

data/lib/ri_cal/property_value/duration.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::CalAddress represents an icalendar Duration property value
     # which is defined in 
@@ -14,7 +13,7 @@ module RiCal
 
       def self.from_datetimes(parent, start, finish, sign='+') # :nodoc:
         if start > finish
-          from_datetimes(finish, start, '-')
+          from_datetimes(self, finish, start, '-')
         else
           diff = finish - start
           days_diff = diff.to_i
@@ -60,6 +59,10 @@ module RiCal
           end
         end
       end
+      
+      def self.valid_string?(string) #:nodoc:
+        string =~  /^[+-]?P((\d+)[DHMSW])+$/
+      end
 
       def days # :nodoc:
         @days * @sign

data/lib/ri_cal/property_value/geo.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::CalAddress represents an icalendar Duration property value
     # which is defined in 

data/lib/ri_cal/property_value/integer.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     class Integer < PropertyValue # :nodoc:
 

data/lib/ri_cal/property_value/occurrence_list.rb

@@ -1,10 +1,11 @@
 module RiCal
   class PropertyValue
     # OccurrenceList is used to represent the value of an RDATE or EXDATE property.
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     class OccurrenceList < Array
+      attr_accessor :tzid #:nodoc:
+
       class Enumerator # :nodoc:
 
         attr_accessor :default_duration, :occurrence_list
@@ -26,35 +27,87 @@ module RiCal
           end
         end
       end
+
+      def initialize(timezone_finder, options={}) # :nodoc:
+        super
+        validate_elements
+      end
+
+      def self.convert(timezone_finder, *ruby_objects) # :nodoc:
+        # ruby_objects = [ruby_objects] unless Array === ruby_objects
+        source_elements = ruby_objects.inject([]) { |se, element|
+          if String === element
+            element.split(",").each {|str| se << str}
+          else
+            se << element
+          end
+          se
+          }        
+        new(timezone_finder, :source_elements => source_elements )
+      end
+
+      def values_to_elements(values) # :nodoc:
+        values.map {|val| val.to_ri_cal_occurrence_list_value(self)}
+      end
       
+      def tzid_from_source_elements # :nodoc:
+        if @source_elements && String === (first_source = @source_elements.first)
+          probe = first_source.to_ri_cal_occurrence_list_value rescue nil
+          unless probe
+            return @source_elements.shift
+          end
+        end
+        nil
+      end
+      
+      def tzid_conflict(element_tzid) # :nodoc:
+        element_tzid && tzid != element_tzid
+      end
       
-      def self.convert(timezone_finder, ruby_object) # :nodoc:
-        if PropertyValue::DateTime.single_time_or_date?(ruby_object)
-          values = [ruby_object]
+      def validate_elements # :nodoc:
+        if @source_elements
+          self.tzid = tzid_from_source_elements
+          @elements = values_to_elements(@source_elements)
+          @value = @elements.map {|prop| prop.value}
         else
-          values = ruby_object
+          @elements = values_to_elements(@value)
+        end
+        # if the tzid wasn't set by the parameters
+        self.tzid ||= @elements.map {|element| element.tzid}.find {|id| id}
+        @elements.each do |element|
+          raise InvalidPropertyValue.new("Mixed timezones are not allowed in an occurrence list") if tzid_conflict(element.tzid)
+          element.tzid = tzid
         end
-        super(timezone_finder, values)
       end
 
-      def value=(val) #:nodoc:
-        super
-        case params[:value]
-        when 'DATE-TIME', nil
-          @elements = @value.map {|val| PropertyValue::DateTime.convert(self, val)}.sort
-          @value = @elements.map {|element| element.value}
-        when 'DATE'
-          @elements = @value.map {|val| PropertyValue::Date.new(self, val)}.sort
-          @value = @elements.map {|element| element.value}
-        when 'PERIOD'
+      def has_local_timezone? # :nodoc:
+        tzid && tzid != 'UTC'
+      end
+
+      def visible_params # :nodoc:
+        result = params.dup
+        if has_local_timezone?
+          result['TZID'] = tzid
+        else
+          result.delete('TZID')
         end
+        result
+      end
+
+      def value # :nodoc:
+        @elements.map {|element| element.value}.join(",")
+      end
+
+      # Return an array of the occurrences within the list
+      def ruby_value
+        @elements.map {|prop| prop.ruby_value}
       end
     end
-    
-    attr_writer :elements
-    private :elements=
-    
-    def for_parent(parent)
+
+    attr_accessor :elements, :source_elements #:nodoc:
+    private :elements, :elements=, :source_elements=, :source_elements
+
+    def for_parent(parent) #:nodoc:
       if timezone_finder.nil?
         @timezone_finder = parent
         self
@@ -64,12 +117,12 @@ module RiCal
         OccurrenceList.new(parent, :value => value)
       end
     end
-    
+
     # Return an enumerator which can produce the elements of the occurrence list
-    def enumerator(component)
+    def enumerator(component) # :nodoc:
       OccurrenceList::Enumerator.new(@elements, component)
     end
-    
+
     def add_date_times_to(required_timezones) #:nodoc:
       if @elements
         @elements.each do | occurrence |
@@ -77,6 +130,6 @@ module RiCal
         end
       end
     end
-    
+
   end
 end

data/lib/ri_cal/property_value/period.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::CalAddress represents an icalendar Period property value
     # which is defined in 
@@ -29,7 +28,28 @@ module RiCal
         end
       end
       
-      def for_parent(parent)
+      
+      def self.valid_string?(string) # :nodoc:
+        return false unless string.include?("/")
+        starter, terminator = *string.split("/")
+        return false unless PropertyValue::DateTime.valid_string?(starter)
+        if /P/ =~ terminator
+          return false unless PropertyValue::Duration.valid_string?(terminator)
+        else
+          return false unless PropertyValue::DateTime.valid_string?(terminator)
+        end
+        true
+      end
+      
+      # Nop to allow occurrence list to try to set it
+      def tzid=(val)#:nodoc:
+      end
+      
+      def tzid #:nodoc:
+        nil
+      end
+      
+      def for_parent(parent) #:nodoc:
         if timezone_finder.nil
           @timezone_finder = parent
           self

data/lib/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       module EnumerationSupportMethods # :nodoc:
 

data/lib/ri_cal/property_value/recurrence_rule/enumerator.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class Enumerator # :nodoc:
         # base_time gets changed everytime the time is updated by the recurrence rule's frequency

data/lib/ri_cal/property_value/recurrence_rule/initialization_methods.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       module InitializationMethods # :nodoc:
         

data/lib/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class NegativeSetposEnumerator < Enumerator # :nodoc:
 

data/lib/ri_cal/property_value/recurrence_rule/numbered_span.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class NumberedSpan # :nodoc:
         attr_reader :source

data/lib/ri_cal/property_value/recurrence_rule/occurence_incrementer.rb

@@ -35,8 +35,7 @@ module RiCal
           date_time.change(:month => 1, :day => 1)
         end
       end
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class OccurrenceIncrementer # :nodoc:
 

data/lib/ri_cal/property_value/recurrence_rule/recurring_day.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       # Instances of RecurringDay are used to represent values in BYDAY recurrence rule parts
       #

data/lib/ri_cal/property_value/recurrence_rule/recurring_month_day.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       # Instances of RecurringMonthDay represent BYMONTHDAY parts in recurrence rules
       class RecurringMonthDay < NumberedSpan # :nodoc:

data/lib/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class RecurringNumberedWeek < NumberedSpan # :nodoc:
         def last

data/lib/ri_cal/property_value/recurrence_rule/recurring_year_day.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       class RecurringYearDay < NumberedSpan # :nodoc:
 

data/lib/ri_cal/property_value/recurrence_rule/validations.rb

@@ -1,8 +1,7 @@
 module RiCal
   class PropertyValue
     class RecurrenceRule < PropertyValue
-      #- ©2009 Rick DeNatale
-      #- All rights reserved. Refer to the file README.txt for the license
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       module Validations #:nodoc:
         # Validate that the parameters of the reciever conform to RFC 2445

data/lib/ri_cal/property_value/recurrence_rule.rb

@@ -4,8 +4,7 @@ end
 
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::RecurrenceRule represents an icalendar Recurrence Rule property value
     # which is defined in 
@@ -99,7 +98,7 @@ module RiCal
       #
       def until=(until_value)
         reset_errors
-        @until = until_value && until_value.to_ri_cal_date_or_date_time_value
+        @until = until_value && until_value.to_ri_cal_date_or_date_time_value(timezone_finder)
         @count = nil unless @count.nil? || @by_list_hash
       end
 
@@ -119,7 +118,7 @@ module RiCal
         @interval = interval_value
       end
       
-      def value
+      def value #:nodoc:
         @value || to_ical
       end      
 

data/lib/ri_cal/property_value/text.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::Text represents an icalendar Text property value
     # which is defined in 

data/lib/ri_cal/property_value/uri.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     # RiCal::PropertyValue::Uri represents an icalendar Uri property value
     # which is defined in 

data/lib/ri_cal/property_value/utc_offset.rb

@@ -1,7 +1,6 @@
 module RiCal
   class PropertyValue
-    #- ©2009 Rick DeNatale
-    #- All rights reserved. Refer to the file README.txt for the license
+    #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
     #
     class UtcOffset < PropertyValue # :nodoc:
       attr_accessor :sign, :hours, :minutes, :seconds