rubyredrick-ri_cal 0.0.11 → 0.5.0

data/lib/ri_cal/component/event.rb

@@ -23,7 +23,38 @@ module RiCal
       def self.entity_name #:nodoc:
         "VEVENT"
       end
+      
+      # Return a date_time representing the time at which the event starts
+      def start_time
+        dtstart_property ? dtstart.to_datetime : nil
+      end
+      
+      # Return a date_time representing the time at which the event starts
+      def finish_property
+        if dtend_property
+          dtend_property
+        elsif duration_property
+          (dtstart_property + duration_property)
+        else
+          dtstart_property
+        end
+      end
 
+      # Return a date_time representing the time at which the event starts
+      def finish_time
+        prop = finish_property
+        prop ? prop.to_finish_time : nil
+      end
+      
+      def zulu_occurrence_range_start_time
+        dtstart_property ? dtstart_property.to_zulu_occurrence_range_start_time : nil
+       end
+      
+      def zulu_occurrence_range_finish_time
+        prop = finish_property
+        prop ? prop.to_zulu_occurrence_range_finish_time : nil
+      end
+      
     end
   end
 end

data/lib/ri_cal/component/journal.rb

@@ -16,6 +16,15 @@ module RiCal
       def self.entity_name #:nodoc:
         "VJOURNAL"
       end
+      
+      # Return a date_time representing the time at which the event starts
+      def start_time
+        dtstart.to_datetime
+      end
+      
+      # Journals take up no calendar time, so the finish time is always the same as the start_time
+      alias_method :finish_time, :start_time
+      
     end
   end
 end

data/lib/ri_cal/component/todo.rb

@@ -21,6 +21,23 @@ module RiCal
       def subcomponent_class #:nodoc:
         {:alarm => Alarm }
       end
+      
+      # Return a date_time representing the time at which the todo should start
+      def start_time
+        dtstart_property ? dtstart.to_datetime : nil
+      end
+      
+      # Return a date_time representing the time at which the todo is due
+      def finish_time
+        if due
+          due_property.to_finish_time
+        elsif duration_property && dtstart_property
+          (dtstart_property + duration_property).to_finish_time
+        else
+          nil
+        end
+      end
+      
     end
   end
 end

data/lib/ri_cal/occurrence_enumerator.rb

@@ -163,7 +163,26 @@ module RiCal
     def bounded?
       EnumerationInstance.new(self).bounded?
     end
+    
+    # Return a array whose first element is a UTC DateTime representing the start of the first
+    # occurrence, and whose second element is a UTC DateTime representing the end of the last
+    # occurrence.
+    # If the receiver is not bounded then the second element will be nil.
     #
+    # The purpose of this method is to provide values which may be used as database attributes so
+    # that a query can find all occurence enumerating components which may have occurrences within
+    # a range of times.
+    def zulu_occurrence_range
+      if bounded?
+        all = occurrences
+        first, last = all.first, all.last
+      else
+        first = occurrences(:count => 1).first
+        last = nil
+      end
+      [first.zulu_occurrence_range_start_time, last ? last.zulu_occurrence_range_finish_time : nil]
+    end
+    
     def set_occurrence_properties!(occurrence) # :nodoc:
       occurrence_end = occurrence.dtend
       occurrence_start = occurrence.dtstart

data/lib/ri_cal/properties/event.rb

@@ -54,7 +54,7 @@ module RiCal
       # set the CREATED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def created_property=(property_value)
-        @created_property = property_value.for_parent(self)
+        @created_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the CREATED property
@@ -120,7 +120,7 @@ module RiCal
       # set the DTSTART property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtstart_property=(property_value)
-        @dtstart_property = property_value.for_parent(self)
+        @dtstart_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTART property
@@ -186,7 +186,7 @@ module RiCal
       # set the LAST-MODIFIED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def last_modified_property=(property_value)
-        @last_modified_property = property_value.for_parent(self)
+        @last_modified_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the LAST-MODIFIED property
@@ -318,7 +318,7 @@ module RiCal
       # set the DTSTAMP property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def dtstamp_property=(property_value)
-        @dtstamp_property = property_value.for_parent(self)
+        @dtstamp_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTAMP property
@@ -549,7 +549,7 @@ module RiCal
       # set the RECURRENCE-ID property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def recurrence_id_property=(property_value)
-        @recurrence_id_property = property_value.for_parent(self)
+        @recurrence_id_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the RECURRENCE-ID property
@@ -582,7 +582,7 @@ module RiCal
       # set the DTEND property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtend_property=(property_value)
-        @dtend_property = property_value.for_parent(self)
+        @dtend_property = property_value ? property_value.for_parent(self) : nil
         @duration_property = nil
       end
 
@@ -1039,8 +1039,8 @@ module RiCal
 
       # set the value of the RDATE property to a single value
       # one instance of OccurrenceList may be passed to this method
-      def rdate=(ruby_value)
-        @rdate_property = [RiCal::PropertyValue::OccurrenceList.convert(self, ruby_value)]
+      def rdate=(*ruby_value)
+        @rdate_property = [RiCal::PropertyValue::OccurrenceList.convert(self, *ruby_value)]
       end
 
       # add one or more values to the RDATE property

data/lib/ri_cal/properties/freebusy.rb

@@ -54,7 +54,7 @@ module RiCal
       # set the DTSTART property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtstart_property=(property_value)
-        @dtstart_property = property_value.for_parent(self)
+        @dtstart_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTART property
@@ -87,7 +87,7 @@ module RiCal
       # set the DTEND property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtend_property=(property_value)
-        @dtend_property = property_value.for_parent(self)
+        @dtend_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTEND property
@@ -153,7 +153,7 @@ module RiCal
       # set the DTSTAMP property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def dtstamp_property=(property_value)
-        @dtstamp_property = property_value.for_parent(self)
+        @dtstamp_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTAMP property

data/lib/ri_cal/properties/journal.rb

@@ -54,7 +54,7 @@ module RiCal
       # set the CREATED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def created_property=(property_value)
-        @created_property = property_value.for_parent(self)
+        @created_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the CREATED property
@@ -120,7 +120,7 @@ module RiCal
       # set the DTSTART property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtstart_property=(property_value)
-        @dtstart_property = property_value.for_parent(self)
+        @dtstart_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTART property
@@ -153,7 +153,7 @@ module RiCal
       # set the DTSTAMP property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def dtstamp_property=(property_value)
-        @dtstamp_property = property_value.for_parent(self)
+        @dtstamp_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTAMP property
@@ -186,7 +186,7 @@ module RiCal
       # set the LAST-MODIFIED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def last_modified_property=(property_value)
-        @last_modified_property = property_value.for_parent(self)
+        @last_modified_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the LAST-MODIFIED property
@@ -252,7 +252,7 @@ module RiCal
       # set the RECURRENCE-ID property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def recurrence_id_property=(property_value)
-        @recurrence_id_property = property_value.for_parent(self)
+        @recurrence_id_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the RECURRENCE-ID property

data/lib/ri_cal/properties/timezone.rb

@@ -54,7 +54,7 @@ module RiCal
       # set the LAST-MODIFIED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def last_modified_property=(property_value)
-        @last_modified_property = property_value.for_parent(self)
+        @last_modified_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the LAST-MODIFIED property

data/lib/ri_cal/properties/timezone_period.rb

@@ -21,7 +21,7 @@ module RiCal
       # set the DTSTART property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtstart_property=(property_value)
-        @dtstart_property = property_value.for_parent(self)
+        @dtstart_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTART property

data/lib/ri_cal/properties/todo.rb

@@ -1,6 +1,7 @@
 module RiCal
   module Properties #:nodoc:
-    #- ©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
     #
     # Properties::Todo provides property accessing methods for the Todo class
     # This source file is generated by the  rical:gen_propmodules rake tasks, DO NOT EDIT
@@ -53,7 +54,7 @@ module RiCal
       # set the COMPLETED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def completed_property=(property_value)
-        @completed_property = property_value.for_parent(self)
+        @completed_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the COMPLETED property
@@ -86,7 +87,7 @@ module RiCal
       # set the CREATED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def created_property=(property_value)
-        @created_property = property_value.for_parent(self)
+        @created_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the CREATED property
@@ -152,7 +153,7 @@ module RiCal
       # set the DTSTAMP property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def dtstamp_property=(property_value)
-        @dtstamp_property = property_value.for_parent(self)
+        @dtstamp_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTAMP property
@@ -185,7 +186,7 @@ module RiCal
       # set the DTSTART property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def dtstart_property=(property_value)
-        @dtstart_property = property_value.for_parent(self)
+        @dtstart_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the DTSTART property
@@ -251,7 +252,7 @@ module RiCal
       # set the LAST-MODIFIED property
       # property value should be an instance of RiCal::PropertyValueDateTime
       def last_modified_property=(property_value)
-        @last_modified_property = property_value.for_parent(self)
+        @last_modified_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the LAST-MODIFIED property
@@ -416,7 +417,7 @@ module RiCal
       # set the RECURRENCE-ID property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def recurrence_id_property=(property_value)
-        @recurrence_id_property = property_value.for_parent(self)
+        @recurrence_id_property = property_value ? property_value.for_parent(self) : nil
       end
 
       # set the value of the RECURRENCE-ID property
@@ -614,7 +615,7 @@ module RiCal
       # set the DUE property
       # property value should be an instance of either RiCal::PropertyValue::DateTime or RiCal::PropertyValue::Date
       def due_property=(property_value)
-        @due_property = property_value.for_parent(self)
+        @due_property = property_value ? property_value.for_parent(self) : nil
         @duration_property = nil
       end
 

data/lib/ri_cal/property_value/date.rb

@@ -151,6 +151,18 @@ module RiCal
         true
       end
       
+      def to_zulu_occurrence_range_start_time
+        to_ri_cal_date_time_value.to_zulu_occurrence_range_start_time
+      end
+      
+      def to_zulu_occurrence_range_finish_time
+        to_ri_cal_date_time_value.end_of_day.to_zulu_occurrence_range_finish_time
+      end
+      
+      def to_finish_time
+        to_ri_cal_date_time_value.end_of_day.to_datetime
+      end
+      
       def for_occurrence(occurrence)
         if occurrence.start_of_day?
           occurrence.to_ri_cal_date_value(timezone_finder)

data/lib/ri_cal/property_value/date_time/timezone_support.rb

@@ -67,7 +67,7 @@ module RiCal
 
         # Predicate indicating whether or not the instance represents a floating time
         def floating?
-          tzid == :floating
+          tzid.nil?
         end
         
         def has_valid_tzinfo_tzid? #:nodoc:

data/lib/ri_cal/property_value/date_time.rb

@@ -290,7 +290,35 @@ module RiCal
       end
 
       alias_method :to_ri_cal_ruby_value, :to_datetime
-
+      alias_method :to_finish_time, :to_datetime
+      
+      def to_zulu_time
+        utc.to_datetime
+      end
+      
+      # If a time is floating, then the utc of it's start time may actually be as early 
+      # as 12 hours earlier if the occurrence is being viewed in a time zone just west
+      # of the International Date Line
+      def to_zulu_occurrence_range_start_time
+        if floating?
+          utc.advance(:hours => -12).to_datetime
+        else
+          to_zulu_time
+        end
+      end
+      
+      
+      # If a time is floating, then the utc of it's start time may actually be as early 
+      # as 12 hours later if the occurrence is being viewed in a time zone just east
+      # of the International Date Line
+      def to_zulu_occurrence_range_finish_time
+        if floating?
+          utc.advance(:hours => 12).to_datetime
+        else
+          to_zulu_time
+        end
+      end
+      
       def add_date_times_to(required_timezones) #:nodoc:
         required_timezones.add_datetime(self, tzid) if has_local_timezone?
       end

data/lib/ri_cal.rb

@@ -11,7 +11,7 @@ module RiCal
   autoload :OccurrenceEnumerator, "#{my_dir}/ri_cal/occurrence_enumerator.rb"
   
   # :stopdoc:
-  VERSION = '0.0.11'
+  VERSION = '0.5.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 

data/ri_cal.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ri_cal}
-  s.version = "0.0.11"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["author=Rick DeNatale"]
-  s.date = %q{2009-05-23}
+  s.date = %q{2009-05-26}
   s.default_executable = %q{ri_cal}
   s.description = %q{This is an UNOFFICIAL version.  The public official version will be released on RubyForge.  Github will be used
 for interim versions.  USE THIS VERSION AT YOUR OWN RISK.

data/spec/ri_cal/component/event_spec.rb

@@ -181,6 +181,149 @@ describe RiCal::Component::Event do
     end
   end
 
+  context ".start_time" do
+
+    it "should be nil if there is no dtstart property" do
+      RiCal.Event.start_time.should be_nil
+    end
+
+    it "should be the same as dtstart for a date time" do
+      event = RiCal.Event {|e| e.dtstart = "20090525T151900"}
+      event.start_time.should == DateTime.civil(2009,05,25,15,19,0,0)
+    end
+
+    it "should be the start of the day of dtstart for a date" do
+      event = RiCal.Event {|e| e.dtstart = "20090525"}
+      event.start_time.should == DateTime.civil(2009,05,25,0,0,0,0)
+    end
+  end
+
+  context ".finish_time" do
+    before(:each) do
+      @event = RiCal.Event {|e| e.dtstart = "20090525T151900"}
+    end
+
+    context "with a given dtend" do
+      it "should be the same as dtend for a date time" do
+        @event.dtend = "20090525T161900"
+        @event.finish_time.should == DateTime.civil(2009,05,25,16,19,0,0)
+      end
+
+
+    end
+
+    context "with no dtend" do
+      context "and a duration" do
+        it "should be the dtstart plus the duration" do
+          @event.duration = "+P1H"
+          @event.finish_time.should == DateTime.civil(2009,5,25,16,19,0,0)
+        end
+      end
+
+      context "and no duration" do
+        context "when the dtstart is not set" do
+          before(:each) do
+            @event.dtstart_property = nil
+          end
+
+          it "should be nil" do
+            @event.finish_time.should be_nil
+          end
+        end
+        context "when the dstart is a datetime" do
+          # For cases where a "VEVENT" calendar component
+          # specifies a "DTSTART" property with a DATE-TIME data type but no
+          # "DTEND" property, the event ends on the same calendar date and time
+          # of day specified by the "DTSTART" property. RFC 2445 p 53
+          it "should be the same as start_time" do
+            @event.finish_time.should == @event.start_time
+          end
+        end
+        context "when the dtstart is a date" do
+          # For cases where a "VEVENT" calendar component specifies a "DTSTART" property with a DATE data type
+          # but no "DTEND" property, the events non-inclusive end is the end of the calendar date specified by
+          # the "DTSTART" property. RFC 2445 p 53
+
+          it "should be the end of the same day as start_time" do
+            @event.dtstart = "20090525"
+            @event.finish_time.should == DateTime.civil(2009,5,25,23,59,59,0)
+          end
+        end
+      end
+    end
+
+  end
+
+  context ".zulu_occurrence_range_start_time" do
+
+    it "should be nil if there is no dtstart property" do
+      RiCal.Event.zulu_occurrence_range_start_time.should be_nil
+    end
+
+    it "should be the utc equivalent of dtstart for a date time" do
+      event = RiCal.Event {|e| e.dtstart = "TZID=America/New_York:20090525T151900"}
+      event.zulu_occurrence_range_start_time.should == DateTime.civil(2009,05,25,19,19,0,0)
+    end
+
+    it "should be the utc time of the start of the day of dtstart in the earliest timezone for a date" do
+      event = RiCal.Event {|e| e.dtstart = "20090525"}
+      event.zulu_occurrence_range_start_time.should == DateTime.civil(2009,05,24,12,0,0,0)
+    end
+
+    it "should be the utc time of the dtstart in the earliest timezone if dtstart is a floating datetime" do
+      event = RiCal.Event {|e| e.dtstart = "20090525T151900"}
+      event.zulu_occurrence_range_start_time.should == DateTime.civil(2009,05,25,3,19,0,0)
+    end
+  end
+
+  context ".zulu_occurrence_range_finish_time" do
+    before(:each) do
+      @event = RiCal.Event {|e| e.dtstart = "TZID=America/New_York:20090525T151900"}
+    end
+
+    context "with a given dtend" do
+      it "should be the utc equivalent of dtend if dtend is a date time" do
+        @event.dtend = "TZID=America/New_York:20090525T161900"
+        @event.zulu_occurrence_range_finish_time.should == DateTime.civil(2009,05,25, 20,19,0,0)
+      end
+    end
+
+    context "with no dtend" do
+      context "and a duration" do
+        it "should be the dtstart plus the duration" do
+          @event.duration = "+P1H"
+          @event.zulu_occurrence_range_finish_time.should == DateTime.civil(2009,5,25,20 ,19,0,0)
+        end
+      end
+
+      context "and no duration" do
+        context "when the dtstart is not set" do
+          before(:each) do
+            @event.dtstart_property = nil
+          end
+
+          it "should be nil" do
+            @event.zulu_occurrence_range_finish_time.should be_nil
+          end
+        end
+
+        context "when the dstart is a datetime" do
+
+          it "should be the same as start_time" do
+            @event.zulu_occurrence_range_finish_time.should == @event.zulu_occurrence_range_start_time
+          end
+        end
+        
+        context "when the dtstart is a date" do
+          it "should be the utc of end of the same day as start_time in the westermost time zone" do
+            @event.dtstart = "20090525"
+            @event.zulu_occurrence_range_finish_time.should == DateTime.civil(2009,5,26,11,59,59,0)
+          end
+        end
+      end
+    end
+  end
+
   context "description property" do
     before(:each) do
       @ical_desc = "posted by Joyce per Zan\\nASheville\\, Rayan's Restauratn\\, Biltm\n ore Square"
@@ -309,7 +452,7 @@ describe RiCal::Component::Event do
       @it.dtstart = Date.parse("April 22, 2009")
       unfold(@it.export).should match(/^DTSTART;VALUE=DATE:20090422$/)
     end
-    
+
     it "should properly fold on export when the description contains a carriage return" do
       @it.description = "Weather report looks nice, 80 degrees and partly cloudy, so following Michael's suggestion, let's meet at the food court at Crossroads:\n\rhttp://www.shopcrossroadsplaza.c...\n"
       export_string = @it.export
@@ -321,7 +464,7 @@ describe RiCal::Component::Event do
 
   if RiCal::TimeWithZone
     context "with ActiveSupport loaded" do
-      
+
       context "an event with an timezoned exdate" do
         before(:each) do
           @old_timezone = Time.zone
@@ -334,15 +477,15 @@ describe RiCal::Component::Event do
           end
           @event = cal.events.first
         end
-        
+
         after(:each) do
           Time.zone = @old_timezone
         end
-        
+
         it "should pickup the timezone in the exdate property" do
           @event.exdate.first.first.tzid.should == "America/New_York"
         end
-        
+
         it "should have the timezone in the ical representation of the exdate property" do
           @event.exdate_property.to_s.should match(%r{;TZID=America/New_York[:;]})
         end

data/spec/ri_cal/component/journal_spec.rb

@@ -9,4 +9,29 @@ describe RiCal::Component::Journal do
       RiCal::Component::Journal.entity_name.should == "VJOURNAL"
     end
   end
+  
+  context ".start_time" do
+    it "should be the same as dtstart for a date time" do
+      event = RiCal.Journal {|e| e.dtstart = "20090525T151900"}
+      event.start_time.should == DateTime.civil(2009,05,25,15,19,0,0)
+    end
+    
+    it "should be the start of the day of dtstart for a date" do
+      event = RiCal.Journal {|e| e.dtstart = "20090525"}
+      event.start_time.should == DateTime.civil(2009,05,25,0,0,0,0)
+    end
+  end
+  
+  context ".finish_time" do
+    it "should be the same as dtstart for a date time" do
+      event = RiCal.Journal {|e| e.dtstart = "20090525T151900"}
+      event.finish_time.should == DateTime.civil(2009,05,25,15,19,0,0)
+    end
+    
+    it "should be the start of the day of dtstart for a date" do
+      event = RiCal.Journal {|e| e.dtstart = "20090525"}
+      event.finish_time.should == DateTime.civil(2009,05,25,0,0,0,0)
+    end
+  end
+  
 end

data/spec/ri_cal/component/todo_spec.rb

@@ -3,6 +3,58 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe RiCal::Component::Todo do
+  
+  context ".start_time" do
+    it "should be the same as dtstart for a date time" do
+      todo = RiCal.Todo {|e| e.dtstart = "20090525T151900"}
+      todo.start_time.should == DateTime.civil(2009,05,25,15,19,0,0)
+    end
+    
+    it "should be the start of the day of dtstart for a date" do
+      todo = RiCal.Todo {|e| e.dtstart = "20090525"}
+      todo.start_time.should == DateTime.civil(2009,05,25,0,0,0,0)
+    end
+    
+    it "should be nil if the dtstart property is not set" do
+      RiCal.Todo.start_time.should be_nil
+    end
+  end
+  
+  context ".finish_time" do
+    before(:each) do
+      @todo = RiCal.Todo {|t| t.dtstart = "20090525T151900"}
+    end
+
+    context "with a given due" do
+      it "should be the same as due for a date time" do
+        @todo.due = "20090525T161900"
+        @todo.finish_time.should == DateTime.civil(2009,05,25,16,19,0,0)
+      end
+    end
+
+    context "with no due" do
+      context "and a duration" do
+        before(:each) do
+          @todo.duration = "+P1H"
+        end
+        
+        it "should be the dtstart plus the duration" do
+          @todo.finish_time.should == DateTime.civil(2009,5,25,16,19,0,0)
+        end
+        
+        it "should be nil if the dtstart property is not set" do
+          @todo.dtstart_property = nil
+          @todo.finish_time.should be_nil
+        end
+      end
+
+      context "and no duration" do
+        it "should be nil" do
+          @todo.finish_time.should be_nil
+        end
+      end
+    end
+  end
 
   describe "with both due and duration specified" do
     before(:each) do

data/spec/ri_cal/occurrence_enumerator_spec.rb

@@ -157,6 +157,9 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
       end
     end
   end
+  
+  describe "#zulu_occurrence_range" do
+  end
 
   describe "#next_occurence" do
 
@@ -507,5 +510,64 @@ ENDCAL
       @event.occurrences.length.should == 0
     end
   end
+  
+  
+  describe "#zulu_occurrence_range" do
+    context "For an unbounded recurring event" do
+      before(:each) do
+        @event = RiCal.Event do |e| 
+          e.dtstart = "TZID=America/New_York:20090525T143500"
+          e.dtend = "TZID=America/New_York:20090525T153500"
+          e.add_rrule("FREQ=DAILY")
+        end
+        
+        it "should return an array with the first dtstart and nil" do
+          @event.zulu_occurrence_range.should == [DateTime.civil(2009,5,25,18,35,00, 0), nil]          
+        end
+      end
+    end
+    
+    context "For a bounded recurring event" do
+      before(:each) do
+        @event = RiCal.Event do |e| 
+          e.dtstart = "TZID=America/New_York:20090525T143500"
+          e.dtend = "TZID=America/New_York:20090525T153500"
+          e.add_rrule("FREQ=DAILY;COUNT=3")
+        end
+        
+        it "should return an array with the first dtstart last dtend converted to utc" do
+          @event.zulu_occurrence_range.should == [DateTime.civil(2009,5,25,18,35,00, 0), DateTime.civil(2009,5,27,19,35,00, 0)]          
+        end
+      end
+    end
+    
+    context "For an event with no recurrence rules" do
+      context "with a non-floating dtstart and dtend" do
+        before(:each) do
+          @event = RiCal.Event do |e| 
+            e.dtstart = "TZID=America/New_York:20090525T143500"
+            e.dtend = "TZID=America/New_York:20090525T153500"
+          end
+        end
+        
+        it "should return an array with dtstart and dtend converted to zulu time" do
+          @event.zulu_occurrence_range.should == [DateTime.civil(2009,5,25,18,35,00, 0), DateTime.civil(2009,5,25,19,35,00, 0)]
+        end
+      end
+      context "with a floating dtstart and dtend" do
+        before(:each) do
+          @event = RiCal.Event do |e| 
+            e.dtstart = "20090525T143500"
+            e.dtend = "20090525T153500"
+          end
+        end
+        
+        it "should return an array with dtstart in the first timezone and dtend in the last time zone converted to zulu time" do
+          @event.zulu_occurrence_range.should == [DateTime.civil(2009,5,25,2,35,00, 0), DateTime.civil(2009,5,26,3,35,00, 0)]
+        end
+      end
+    end
+  end
+  
 
 end

data/tasks/ri_cal.rake

@@ -159,7 +159,7 @@ class VEntityUpdater
     end
     @all_props[property] = name.upcase
     @property_map[name.upcase] = :"#{property}_from_string"
-    parent_set = needs_tz_access ? ".for_parent(self)" : ""
+    parent_set = needs_tz_access ? " ? property_value.for_parent(self) : nil" : ""
     if type == 'date_time_or_date'
       line_evaluator = "RiCal::PropertyValue::DateTime.or_date(self, line)"
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.5.0
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency