ri_cal 0.8.5 → 0.8.6

data/lib/ri_cal/properties/todo.rb

@@ -74,7 +74,7 @@ module RiCal
 
 
       # return the the CREATED property
-      # which will be an instances of RiCal::PropertyValueDateTime
+      # which will be an instances of RiCal::PropertyValueZuluDateTime
       # 
       # [purpose (from RFC 2445)]
       # This property specifies the date and time that the calendar information was created by teh calendar user agent in the calendar store.
@@ -85,24 +85,24 @@ module RiCal
       end
 
       # set the CREATED property
-      # property value should be an instance of RiCal::PropertyValueDateTime
+      # property value should be an instance of RiCal::PropertyValueZuluDateTime
       def created_property=(property_value)
-        @created_property = property_value ? property_value.for_parent(self) : nil
+        @created_property = property_value
       end
 
       # set the value of the CREATED property
       def created=(ruby_value)
-        self.created_property= RiCal::PropertyValue::DateTime.convert(self, ruby_value)
+        self.created_property= RiCal::PropertyValue::ZuluDateTime.convert(self, ruby_value)
       end
 
       # return the value of the CREATED property
-      # which will be an instance of DateTime
+      # which will be an instance of ZuluDateTime
       def created
         created_property ? created_property.ruby_value : nil
       end
 
       def created_property_from_string(line) # :nodoc:
-        @created_property = RiCal::PropertyValue::DateTime.new(self, line)
+        @created_property = RiCal::PropertyValue::ZuluDateTime.new(self, line)
       end
 
 
@@ -140,7 +140,7 @@ module RiCal
 
 
       # return the the DTSTAMP property
-      # which will be an instances of RiCal::PropertyValueDateTime
+      # which will be an instances of RiCal::PropertyValueZuluDateTime
       # 
       # [purpose (from RFC 2445)]
       # This property indicates the date/time that the instance of the iCalendar object was created.
@@ -151,24 +151,24 @@ module RiCal
       end
 
       # set the DTSTAMP property
-      # property value should be an instance of RiCal::PropertyValueDateTime
+      # property value should be an instance of RiCal::PropertyValueZuluDateTime
       def dtstamp_property=(property_value)
-        @dtstamp_property = property_value ? property_value.for_parent(self) : nil
+        @dtstamp_property = property_value
       end
 
       # set the value of the DTSTAMP property
       def dtstamp=(ruby_value)
-        self.dtstamp_property= RiCal::PropertyValue::DateTime.convert(self, ruby_value)
+        self.dtstamp_property= RiCal::PropertyValue::ZuluDateTime.convert(self, ruby_value)
       end
 
       # return the value of the DTSTAMP property
-      # which will be an instance of DateTime
+      # which will be an instance of ZuluDateTime
       def dtstamp
         dtstamp_property ? dtstamp_property.ruby_value : nil
       end
 
       def dtstamp_property_from_string(line) # :nodoc:
-        @dtstamp_property = RiCal::PropertyValue::DateTime.new(self, line)
+        @dtstamp_property = RiCal::PropertyValue::ZuluDateTime.new(self, line)
       end
 
 
@@ -239,7 +239,7 @@ module RiCal
 
 
       # return the the LAST-MODIFIED property
-      # which will be an instances of RiCal::PropertyValueDateTime
+      # which will be an instances of RiCal::PropertyValueZuluDateTime
       # 
       # [purpose (from RFC 2445)]
       # This property specifies the date and time that the information associated with the calendar component was last revised in teh calendar store.
@@ -250,24 +250,24 @@ module RiCal
       end
 
       # set the LAST-MODIFIED property
-      # property value should be an instance of RiCal::PropertyValueDateTime
+      # property value should be an instance of RiCal::PropertyValueZuluDateTime
       def last_modified_property=(property_value)
-        @last_modified_property = property_value ? property_value.for_parent(self) : nil
+        @last_modified_property = property_value
       end
 
       # set the value of the LAST-MODIFIED property
       def last_modified=(ruby_value)
-        self.last_modified_property= RiCal::PropertyValue::DateTime.convert(self, ruby_value)
+        self.last_modified_property= RiCal::PropertyValue::ZuluDateTime.convert(self, ruby_value)
       end
 
       # return the value of the LAST-MODIFIED property
-      # which will be an instance of DateTime
+      # which will be an instance of ZuluDateTime
       def last_modified
         last_modified_property ? last_modified_property.ruby_value : nil
       end
 
       def last_modified_property_from_string(line) # :nodoc:
-        @last_modified_property = RiCal::PropertyValue::DateTime.new(self, line)
+        @last_modified_property = RiCal::PropertyValue::ZuluDateTime.new(self, line)
       end
 
 
@@ -1423,74 +1423,74 @@ module RiCal
       end
 
       def export_properties_to(export_stream) #:nodoc:
-        export_prop_to(export_stream, "REQUEST-STATUS", @request_status_property)
+        export_prop_to(export_stream, "RDATE", @rdate_property)
+        export_prop_to(export_stream, "CONTACT", @contact_property)
+        export_prop_to(export_stream, "COMPLETED", @completed_property)
         export_prop_to(export_stream, "EXDATE", @exdate_property)
-        export_prop_to(export_stream, "DTSTAMP", @dtstamp_property)
         export_prop_to(export_stream, "CREATED", @created_property)
-        export_prop_to(export_stream, "CONTACT", @contact_property)
-        export_prop_to(export_stream, "CATEGORIES", @categories_property)
+        export_prop_to(export_stream, "DURATION", @duration_property)
         export_prop_to(export_stream, "STATUS", @status_property)
-        export_prop_to(export_stream, "LAST-MODIFIED", @last_modified_property)
         export_prop_to(export_stream, "DTSTART", @dtstart_property)
-        export_prop_to(export_stream, "COMPLETED", @completed_property)
         export_prop_to(export_stream, "RECURRENCE-ID", @recurrence_id_property)
+        export_prop_to(export_stream, "DTSTAMP", @dtstamp_property)
         export_prop_to(export_stream, "RESOURCES", @resources_property)
-        export_prop_to(export_stream, "ATTENDEE", @attendee_property)
-        export_prop_to(export_stream, "DURATION", @duration_property)
+        export_prop_to(export_stream, "CATEGORIES", @categories_property)
         export_prop_to(export_stream, "DUE", @due_property)
-        export_prop_to(export_stream, "UID", @uid_property)
-        export_prop_to(export_stream, "URL", @url_property)
+        export_prop_to(export_stream, "LAST-MODIFIED", @last_modified_property)
         export_prop_to(export_stream, "PRIORITY", @priority_property)
         export_prop_to(export_stream, "PERCENT-COMPLETE", @percent_complete_property)
-        export_prop_to(export_stream, "ORGANIZER", @organizer_property)
-        export_prop_to(export_stream, "RRULE", @rrule_property)
+        export_prop_to(export_stream, "GEO", @geo_property)
+        export_prop_to(export_stream, "ATTENDEE", @attendee_property)
+        export_prop_to(export_stream, "UID", @uid_property)
         export_prop_to(export_stream, "DESCRIPTION", @description_property)
-        export_prop_to(export_stream, "CLASS", @class_property)
+        export_prop_to(export_stream, "URL", @url_property)
         export_prop_to(export_stream, "SUMMARY", @summary_property)
-        export_prop_to(export_stream, "GEO", @geo_property)
+        export_prop_to(export_stream, "ORGANIZER", @organizer_property)
+        export_prop_to(export_stream, "RRULE", @rrule_property)
         export_prop_to(export_stream, "ATTACH", @attach_property)
-        export_prop_to(export_stream, "SEQUENCE", @sequence_property)
-        export_prop_to(export_stream, "RDATE", @rdate_property)
+        export_prop_to(export_stream, "CLASS", @class_property)
         export_prop_to(export_stream, "RELATED-TO", @related_to_property)
+        export_prop_to(export_stream, "REQUEST-STATUS", @request_status_property)
         export_prop_to(export_stream, "EXRULE", @exrule_property)
         export_prop_to(export_stream, "LOCATION", @location_property)
         export_prop_to(export_stream, "COMMENT", @comment_property)
+        export_prop_to(export_stream, "SEQUENCE", @sequence_property)
       end
 
       def ==(o) #:nodoc:
         if o.class == self.class
-        (request_status_property == o.request_status_property) &&
+        (rdate_property == o.rdate_property) &&
+        (contact_property == o.contact_property) &&
+        (completed_property == o.completed_property) &&
         (exdate_property == o.exdate_property) &&
-        (dtstamp_property == o.dtstamp_property) &&
         (created_property == o.created_property) &&
-        (contact_property == o.contact_property) &&
-        (categories_property == o.categories_property) &&
+        (duration_property == o.duration_property) &&
         (status_property == o.status_property) &&
-        (last_modified_property == o.last_modified_property) &&
         (dtstart_property == o.dtstart_property) &&
-        (completed_property == o.completed_property) &&
         (recurrence_id_property == o.recurrence_id_property) &&
+        (dtstamp_property == o.dtstamp_property) &&
         (resources_property == o.resources_property) &&
-        (attendee_property == o.attendee_property) &&
-        (duration_property == o.duration_property) &&
+        (categories_property == o.categories_property) &&
         (due_property == o.due_property) &&
-        (uid_property == o.uid_property) &&
-        (url_property == o.url_property) &&
+        (last_modified_property == o.last_modified_property) &&
         (priority_property == o.priority_property) &&
         (percent_complete_property == o.percent_complete_property) &&
-        (organizer_property == o.organizer_property) &&
-        (rrule_property == o.rrule_property) &&
+        (geo_property == o.geo_property) &&
+        (attendee_property == o.attendee_property) &&
+        (uid_property == o.uid_property) &&
         (description_property == o.description_property) &&
-        (class_property == o.class_property) &&
+        (url_property == o.url_property) &&
         (summary_property == o.summary_property) &&
-        (geo_property == o.geo_property) &&
+        (organizer_property == o.organizer_property) &&
+        (rrule_property == o.rrule_property) &&
         (attach_property == o.attach_property) &&
-        (sequence_property == o.sequence_property) &&
-        (rdate_property == o.rdate_property) &&
+        (class_property == o.class_property) &&
         (related_to_property == o.related_to_property) &&
+        (request_status_property == o.request_status_property) &&
         (exrule_property == o.exrule_property) &&
         (location_property == o.location_property) &&
-        (comment_property == o.comment_property)
+        (comment_property == o.comment_property) &&
+        (sequence_property == o.sequence_property)
         else
            super
         end
@@ -1498,45 +1498,42 @@ module RiCal
 
       def initialize_copy(o) #:nodoc:
         super
-        request_status_property = request_status_property && request_status_property.dup
+        rdate_property = rdate_property && rdate_property.dup
+        contact_property = contact_property && contact_property.dup
+        completed_property = completed_property && completed_property.dup
         exdate_property = exdate_property && exdate_property.dup
-        dtstamp_property = dtstamp_property && dtstamp_property.dup
         created_property = created_property && created_property.dup
-        contact_property = contact_property && contact_property.dup
-        categories_property = categories_property && categories_property.dup
+        duration_property = duration_property && duration_property.dup
         status_property = status_property && status_property.dup
-        last_modified_property = last_modified_property && last_modified_property.dup
         dtstart_property = dtstart_property && dtstart_property.dup
-        completed_property = completed_property && completed_property.dup
         recurrence_id_property = recurrence_id_property && recurrence_id_property.dup
+        dtstamp_property = dtstamp_property && dtstamp_property.dup
         resources_property = resources_property && resources_property.dup
-        attendee_property = attendee_property && attendee_property.dup
-        duration_property = duration_property && duration_property.dup
+        categories_property = categories_property && categories_property.dup
         due_property = due_property && due_property.dup
-        uid_property = uid_property && uid_property.dup
-        url_property = url_property && url_property.dup
+        last_modified_property = last_modified_property && last_modified_property.dup
         priority_property = priority_property && priority_property.dup
         percent_complete_property = percent_complete_property && percent_complete_property.dup
-        organizer_property = organizer_property && organizer_property.dup
-        rrule_property = rrule_property && rrule_property.dup
+        geo_property = geo_property && geo_property.dup
+        attendee_property = attendee_property && attendee_property.dup
+        uid_property = uid_property && uid_property.dup
         description_property = description_property && description_property.dup
-        class_property = class_property && class_property.dup
+        url_property = url_property && url_property.dup
         summary_property = summary_property && summary_property.dup
-        geo_property = geo_property && geo_property.dup
+        organizer_property = organizer_property && organizer_property.dup
+        rrule_property = rrule_property && rrule_property.dup
         attach_property = attach_property && attach_property.dup
-        sequence_property = sequence_property && sequence_property.dup
-        rdate_property = rdate_property && rdate_property.dup
+        class_property = class_property && class_property.dup
         related_to_property = related_to_property && related_to_property.dup
+        request_status_property = request_status_property && request_status_property.dup
         exrule_property = exrule_property && exrule_property.dup
         location_property = location_property && location_property.dup
         comment_property = comment_property && comment_property.dup
+        sequence_property = sequence_property && sequence_property.dup
       end
 
       def add_date_times_to(required_timezones) #:nodoc:
-        add_property_date_times_to(required_timezones, created_property)
-        add_property_date_times_to(required_timezones, dtstamp_property)
         add_property_date_times_to(required_timezones, dtstart_property)
-        add_property_date_times_to(required_timezones, last_modified_property)
         add_property_date_times_to(required_timezones, recurrence_id_property)
         add_property_date_times_to(required_timezones, due_property)
         add_property_date_times_to(required_timezones, exdate_property)
@@ -1545,7 +1542,7 @@ module RiCal
 
       module ClassMethods #:nodoc:
         def property_parser #:nodoc:
-          {"RDATE"=>:rdate_property_from_string, "RELATED-TO"=>:related_to_property_from_string, "DTSTART"=>:dtstart_property_from_string, "DTSTAMP"=>:dtstamp_property_from_string, "LOCATION"=>:location_property_from_string, "EXRULE"=>:exrule_property_from_string, "CONTACT"=>:contact_property_from_string, "URL"=>:url_property_from_string, "LAST-MODIFIED"=>:last_modified_property_from_string, "COMPLETED"=>:completed_property_from_string, "RESOURCES"=>:resources_property_from_string, "EXDATE"=>:exdate_property_from_string, "ATTACH"=>:attach_property_from_string, "UID"=>:uid_property_from_string, "SEQUENCE"=>:sequence_property_from_string, "PERCENT-COMPLETE"=>:percent_complete_property_from_string, "CATEGORIES"=>:categories_property_from_string, "SUMMARY"=>:summary_property_from_string, "RECURRENCE-ID"=>:recurrence_id_property_from_string, "GEO"=>:geo_property_from_string, "CLASS"=>:class_property_from_string, "RRULE"=>:rrule_property_from_string, "STATUS"=>:status_property_from_string, "ATTENDEE"=>:attendee_property_from_string, "PRIORITY"=>:priority_property_from_string, "ORGANIZER"=>:organizer_property_from_string, "CREATED"=>:created_property_from_string, "REQUEST-STATUS"=>:request_status_property_from_string, "COMMENT"=>:comment_property_from_string, "DURATION"=>:duration_property_from_string, "DUE"=>:due_property_from_string, "DESCRIPTION"=>:description_property_from_string}
+          {"RDATE"=>:rdate_property_from_string, "COMMENT"=>:comment_property_from_string, "LOCATION"=>:location_property_from_string, "CONTACT"=>:contact_property_from_string, "URL"=>:url_property_from_string, "RECURRENCE-ID"=>:recurrence_id_property_from_string, "LAST-MODIFIED"=>:last_modified_property_from_string, "COMPLETED"=>:completed_property_from_string, "CLASS"=>:class_property_from_string, "EXDATE"=>:exdate_property_from_string, "UID"=>:uid_property_from_string, "SEQUENCE"=>:sequence_property_from_string, "PERCENT-COMPLETE"=>:percent_complete_property_from_string, "EXRULE"=>:exrule_property_from_string, "ATTENDEE"=>:attendee_property_from_string, "ORGANIZER"=>:organizer_property_from_string, "GEO"=>:geo_property_from_string, "RRULE"=>:rrule_property_from_string, "RESOURCES"=>:resources_property_from_string, "ATTACH"=>:attach_property_from_string, "CATEGORIES"=>:categories_property_from_string, "SUMMARY"=>:summary_property_from_string, "PRIORITY"=>:priority_property_from_string, "DESCRIPTION"=>:description_property_from_string, "RELATED-TO"=>:related_to_property_from_string, "REQUEST-STATUS"=>:request_status_property_from_string, "DURATION"=>:duration_property_from_string, "DUE"=>:due_property_from_string, "STATUS"=>:status_property_from_string, "DTSTART"=>:dtstart_property_from_string, "DTSTAMP"=>:dtstamp_property_from_string, "CREATED"=>:created_property_from_string}
         end
       end
 

data/lib/ri_cal/property_value.rb

@@ -17,6 +17,7 @@ module RiCal
     autoload :Text, "ri_cal/property_value/text.rb"
     autoload :Uri, "ri_cal/property_value/uri.rb"
     autoload :UtcOffset, "ri_cal/property_value/utc_offset.rb"
+    autoload :ZuluDateTime, "ri_cal/property_value/zulu_date_time.rb"
 
     attr_writer :params, :value #:nodoc:
     attr_reader :timezone_finder #:nodoc:

data/lib/ri_cal/property_value/date.rb

@@ -20,6 +20,10 @@ module RiCal
           nil
         end
       end
+      
+      def to_ri_cal_zulu_date_time
+        self.to_ri_cal_date_time_value.to_ri_cal_zulu_date_time
+      end
 
       # Set the value of the property to val
       #

data/lib/ri_cal/property_value/date_time.rb

@@ -71,6 +71,14 @@ module RiCal
           nil
         end
       end
+      
+      def to_ri_cal_zulu_date_time
+        ZuluDateTime.new(nil, :value => self.utc.fast_date_tme)
+      end
+      
+      def fast_date_tme # :nodoc:
+        @date_time_value
+      end
 
       # Set the value of the property to val
       #

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

@@ -76,12 +76,13 @@ module RiCal
 
         # Return the next time after previous_occurrence generated by this incrementer
         # But the occurrence is outside the current cycle of any outer incrementer(s) return
-        # nil which will cause the outer incrementer to step to its next cycle.
+        # nil which will cause the outer incrementer to step to its next cycle
         def next_time(previous_occurrence)
+          @previous_occurrence = previous_occurrence
           if current_occurrence
-            sub_occurrence = sub_cycle_incrementer.next_time(previous_occurrence)
+            sub_occurrence = @sub_cycle_incrementer.next_time(previous_occurrence)
           else #first time
-            sub_occurrence = sub_cycle_incrementer.first_sub_occurrence(previous_occurrence, update_cycle_range(previous_occurrence))
+            sub_occurrence = @sub_cycle_incrementer.first_sub_occurrence(previous_occurrence, update_cycle_range(previous_occurrence))
           end
           if sub_occurrence
             candidate = sub_occurrence

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb

@@ -39,6 +39,10 @@ module RiCal
               OccurrenceIncrementer::ByYeardayIncrementer.for_rrule(rrule)
             end
           end
+          
+          def unneeded?(candidate)
+            false
+          end
 
           def daily_incrementer?
             true
@@ -60,7 +64,7 @@ module RiCal
             result
           end
 
-          def candidate_acceptible?(candidate)
+          def candidate_acceptable?(candidate)
             list.any? {|recurring_day| recurring_day.include?(candidate)}
           end
 

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb

@@ -8,7 +8,7 @@ module RiCal
           def self.for_rrule(rrule)
             conditional_incrementer(rrule, :bymonthday, DailyIncrementer)
           end
-
+          
           def scope_of(date_time)
             date_time.month
           end

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb

@@ -9,6 +9,10 @@ module RiCal
           def daily_incrementer?
             true
           end
+          
+          def unneeded?(candidate)
+            list.length == 1 && list.first.fixed_day?
+          end
 
           def occurrences_for(date_time)
             if occurrences && @scoping_value == scope_of(date_time)
@@ -24,7 +28,7 @@ module RiCal
             date_time.end_of_day
           end
 
-          def candidate_acceptible?(candidate)
+          def candidate_acceptable?(candidate)
             list.any? {|by_part| by_part.include?(candidate)}
           end
         end

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb

@@ -20,6 +20,10 @@ module RiCal
           def weeknum_incrementer?
             true
           end
+          
+          def unneeded?(candidate)
+            false
+          end
 
           def first_within_outer_cycle(previous_occurrence, outer_range)
             new_range_start = outer_range.first
@@ -47,7 +51,7 @@ module RiCal
             weeks.map {|wk_num| week_one_occurrence.advance(:days => (wk_num - 1) * 7)}
           end
 
-          def candidate_acceptible?(candidate)
+          def candidate_acceptable?(candidate)
             list.include?(candidate.iso_week_num(wkst))
           end
 

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb

@@ -33,6 +33,14 @@ module RiCal
           def step(occurrence)
             occurrence.advance(advance_what => (interval * multiplier))
           end
+          
+          def sub_cycle_incrementer
+            if @sub_cycle_incrementer.unneeded?(current_occurrence || @previous_occurrence)
+              NullSubCycleIncrementer
+            else
+              super
+            end
+          end
 
           def first_within_outer_cycle(previous_occurrence, outer_cycle_range)
             if outer_range
@@ -46,6 +54,7 @@ module RiCal
 
           # Advance to the next occurrence, if the result is within the current cycles of all outer incrementers
           def next_cycle(previous_occurrence)
+            @sub_cycle_dtstart = previous_occurrence
             if current_occurrence
               candidate = sub_cycle_incrementer.cycle_adjust(step(current_occurrence))
             else

data/lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb

@@ -40,6 +40,16 @@ module RiCal
               nil
             end
           end
+          
+          def unneeded?(candidate)
+            sub_cycle_incrementer.unneeded?(candidate) &&
+            list.length == 1 && 
+            candidate_acceptable?(candidate)
+          end
+          
+          def candidate_acceptable?(candidate)
+            list.any? {|value| candidate.send(varying_time_attribute) == value}
+          end
 
           def first_within_outer_cycle(previous_occurrence, outer_range)
             self.outer_range = outer_range
@@ -47,7 +57,7 @@ module RiCal
             occurrences.each { |occurrence|
               sub = sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(occurrence))
               return sub if sub && sub > previous_occurrence
-              }
+            }
             nil
           end