rubyredrick-ri_cal 0.0.10 → 0.0.11

data/Manifest.txt

@@ -50,6 +50,7 @@ lib/ri_cal/floating_timezone.rb
 lib/ri_cal/invalid_property_value.rb
 lib/ri_cal/invalid_timezone_identifer.rb
 lib/ri_cal/occurrence_enumerator.rb
+lib/ri_cal/occurrence_period.rb
 lib/ri_cal/parser.rb
 lib/ri_cal/properties/alarm.rb
 lib/ri_cal/properties/calendar.rb

data/lib/ri_cal/occurrence_enumerator.rb

@@ -56,7 +56,7 @@ module RiCal
       end
       
       # return the earliest of each of the enumerators next occurrences
-      def next_occurrence        
+      def next_occurrence
         result = nexts.compact.sort.first
         if result
           nexts.each_with_index { |datetimevalue, i| @nexts[i] = @enumerators[i].next_occurrence if result == datetimevalue }
@@ -85,7 +85,7 @@ module RiCal
       # return the next exclusion which starts at the same time or after the start time of the occurrence
       # return nil if this exhausts the exclusion rules
       def exclusion_for(occurrence)
-        while (@next_exclusion && @next_exclusion[:start] < occurrence[:start])
+        while (@next_exclusion && @next_exclusion.dtstart < occurrence.dtstart)
           @next_exclusion = @exrules.next_occurrence
         end
         @next_exclusion
@@ -94,13 +94,13 @@ module RiCal
       # TODO: Need to research this, I beleive that this should also take the end time into account,
       #       but I need to research
       def exclusion_match?(occurrence, exclusion)
-        exclusion && occurrence[:start] == exclusion[:start]
+        exclusion && (occurrence.dtstart == exclusion.dtstart)
       end
       
       # Also exclude occurrences before the :starting date_time
       def exclude?(occurrence)
         exclusion_match?(occurrence, exclusion_for(occurrence)) ||
-          (@start && occurrence[:start].to_datetime < @start)
+          (@start && occurrence.dtstart.to_datetime < @start)
       end
       
       # yield each occurrence to a block
@@ -113,7 +113,7 @@ module RiCal
           yielded = 0
           @next_exclusion = @exrules.next_occurrence
           while (occurrence)
-            if (@cutoff && occurrence[:start].to_datetime >= @cutoff) || (@count && yielded >= @count)
+            if (@cutoff && occurrence.dtstart.to_datetime >= @cutoff) || (@count && yielded >= @count)
               occurrence = nil
             else
               unless exclude?(occurrence)
@@ -165,8 +165,8 @@ module RiCal
     end
     #
     def set_occurrence_properties!(occurrence) # :nodoc:
-      occurrence_end = occurrence[:end]
-      occurrence_start = occurrence[:start]
+      occurrence_end = occurrence.dtend
+      occurrence_start = occurrence.dtstart
       @rrule_property = nil
       @exrule_property = nil
       @rdate_property = nil

data/lib/ri_cal/occurrence_period.rb

@@ -0,0 +1,17 @@
+module RiCal
+  class OccurrencePeriod
+    attr_reader :dtstart, :dtend
+    def initialize(dtstart, dtend)
+      @dtstart = dtstart
+      @dtend = dtend
+    end
+    
+    def to_s
+      "op:#{dtstart}-#{dtend}"
+    end
+    
+    def <=>(other)
+      [dtstart, dtend] <=> [other.dtstart, other.dtend]
+    end
+  end
+end

data/lib/ri_cal/property_value/date.rb

@@ -121,7 +121,7 @@ module RiCal
       def -(other)
         other.subtract_from_date_time_value(to_ri_cal_date_time_value)
       end
-      
+
       def subtract_from_date_time_value(date_time)
         to_ri_cal_date_time_value.subtract_from_date_time_value(date_time)
       end
@@ -142,11 +142,9 @@ module RiCal
       end
 
       # TODO: consider if this should be a period rather than a hash
-      def occurrence_hash(default_duration) #:nodoc:
+      def occurrence_period(default_duration) #:nodoc:
         date_time = self.to_ri_cal_date_time_value
-        {:start => date_time,
-          :end => date_time.advance(:hours => 24, :seconds => -1)}
-        end
+        RiCal::OccurrencePeriod.new(date_time, date_time.advance(:hours => 24, :seconds => -1))
       end
       
       def start_of_day?
@@ -161,4 +159,5 @@ module RiCal
         end
       end
     end
-  end
+  end
+end

data/lib/ri_cal/property_value/date_time.rb

@@ -210,8 +210,8 @@ module RiCal
       end
 
       # TODO: consider if this should be a period rather than a hash
-      def occurrence_hash(default_duration) # :nodoc:
-        {:start => self, :end => (default_duration ? self + default_duration : nil)}
+      def occurrence_period(default_duration) # :nodoc:
+        RiCal::OccurrencePeriod.new(self, (default_duration ? self + default_duration : nil))
       end
 
       # Return the year (including the century)

data/lib/ri_cal/property_value/occurrence_list.rb

@@ -27,7 +27,7 @@ module RiCal
 
         def next_occurrence
           if @index < occurrence_list.length
-            result = occurrence_list[@index].occurrence_hash(default_duration)
+            result = occurrence_list[@index].occurrence_period(default_duration)
             @index += 1
             result
           else
@@ -79,6 +79,7 @@ module RiCal
           @value = @elements.map {|prop| prop.value}
         else
           @elements = values_to_elements(@value)
+          self.tzid = params['TZID']
         end
         # if the tzid wasn't set by the parameters
         self.tzid ||= @elements.map {|element| element.tzid}.find {|id| id}

data/lib/ri_cal/property_value/period.rb

@@ -69,9 +69,8 @@ module RiCal
         self
       end
 
-      # TODO: consider if this should be a period rather than a hash
-      def occurrence_hash(default_duration) #:nodoc:
-        {:start => self, :end => (default_duration ? self + default_duration : nil)}
+      def occurrence_period(default_duration) #:nodoc:
+        RiCal::OccurrencePeriod.new(self, (default_duration ? self + default_duration : nil))
       end
 
       def add_date_times_to(required_timezones) #:nodoc:

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

@@ -36,8 +36,8 @@ module RiCal
           @bounded
         end
 
-        def result_hash(date_time_value)
-          {:start => date_time_value, :end => nil}
+        def result_occurrence_period(date_time_value)
+          RiCal::OccurrencePeriod.new(date_time_value, nil)
         end
 
         def result_passes_setpos_filter?(result)
@@ -69,7 +69,7 @@ module RiCal
             self.next_time = @incrementer.next_time(result)
             if result_passes_filters?(result)
               @count += 1
-              return recurrence_rule.exhausted?(@count, result) ? nil : result_hash(result)
+              return recurrence_rule.exhausted?(@count, result) ? nil : result_occurrence_period(result)
             end
           end
         end

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

@@ -16,7 +16,7 @@ module RiCal
             result = advance
             if result >= start_time
               @count += 1
-              return recurrence_rule.exhausted?(@count, result) ? nil : result_hash(result)
+              return recurrence_rule.exhausted?(@count, result) ? nil : result_occurrence_period(result)
             end
           end
         end

data/lib/ri_cal/property_value/text.rb

@@ -26,9 +26,9 @@ module RiCal
       end
       
       def self.convert(parent, string) #:nodoc:
-        ical_str = string.gsub(/\n|,|;/) {|match|
-          if match == "\n"
-            '\n'
+        ical_str = string.gsub(/\n\r?|\r\n?|,|;|\\/) {|match|
+          if ["\n", "\r", "\n\r", "\r\n"].include?(match)
+            '\\n'
           else
             "\\#{match}"
           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.10'
+  VERSION = '0.0.11'
   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.10"
+  s.version = "0.0.11"
 
   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-21}
+  s.date = %q{2009-05-23}
   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.
@@ -22,7 +22,7 @@ A Google group for discussion of this library has been set up http://groups.goog
   s.email = ["rick.denatale@gmail.com"]
   s.executables = ["ri_cal"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "copyrights.txt", "docs/draft-ietf-calsify-2446bis-08.txt", "docs/draft-ietf-calsify-rfc2445bis-09.txt", "docs/incrementers.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/ri_cal", "component_attributes/alarm.yml", "component_attributes/calendar.yml", "component_attributes/component_property_defs.yml", "component_attributes/event.yml", "component_attributes/freebusy.yml", "component_attributes/journal.yml", "component_attributes/timezone.yml", "component_attributes/timezone_period.yml", "component_attributes/todo.yml", "copyrights.txt", "docs/draft-ietf-calsify-2446bis-08.txt", "docs/draft-ietf-calsify-rfc2445bis-09.txt", "docs/incrementers.txt", "docs/rfc2445.pdf", "lib/ri_cal.rb", "lib/ri_cal/component.rb", "lib/ri_cal/component/alarm.rb", "lib/ri_cal/component/calendar.rb", "lib/ri_cal/component/event.rb", "lib/ri_cal/component/freebusy.rb", "lib/ri_cal/component/journal.rb", "lib/ri_cal/component/t_z_info_timezone.rb", "lib/ri_cal/component/timezone.rb", "lib/ri_cal/component/timezone/daylight_period.rb", "lib/ri_cal/component/timezone/standard_period.rb", "lib/ri_cal/component/timezone/timezone_period.rb", "lib/ri_cal/component/todo.rb", "lib/ri_cal/core_extensions.rb", "lib/ri_cal/core_extensions/array.rb", "lib/ri_cal/core_extensions/array/conversions.rb", "lib/ri_cal/core_extensions/date.rb", "lib/ri_cal/core_extensions/date/conversions.rb", "lib/ri_cal/core_extensions/date_time.rb", "lib/ri_cal/core_extensions/date_time/conversions.rb", "lib/ri_cal/core_extensions/object.rb", "lib/ri_cal/core_extensions/object/conversions.rb", "lib/ri_cal/core_extensions/string.rb", "lib/ri_cal/core_extensions/string/conversions.rb", "lib/ri_cal/core_extensions/time.rb", "lib/ri_cal/core_extensions/time/calculations.rb", "lib/ri_cal/core_extensions/time/conversions.rb", "lib/ri_cal/core_extensions/time/tzid_access.rb", "lib/ri_cal/core_extensions/time/week_day_predicates.rb", "lib/ri_cal/floating_timezone.rb", "lib/ri_cal/invalid_property_value.rb", "lib/ri_cal/invalid_timezone_identifer.rb", "lib/ri_cal/occurrence_enumerator.rb", "lib/ri_cal/parser.rb", "lib/ri_cal/properties/alarm.rb", "lib/ri_cal/properties/calendar.rb", "lib/ri_cal/properties/event.rb", "lib/ri_cal/properties/freebusy.rb", "lib/ri_cal/properties/journal.rb", "lib/ri_cal/properties/timezone.rb", "lib/ri_cal/properties/timezone_period.rb", "lib/ri_cal/properties/todo.rb", "lib/ri_cal/property_value.rb", "lib/ri_cal/property_value/array.rb", "lib/ri_cal/property_value/cal_address.rb", "lib/ri_cal/property_value/date.rb", "lib/ri_cal/property_value/date_time.rb", "lib/ri_cal/property_value/date_time/additive_methods.rb", "lib/ri_cal/property_value/date_time/time_machine.rb", "lib/ri_cal/property_value/date_time/timezone_support.rb", "lib/ri_cal/property_value/duration.rb", "lib/ri_cal/property_value/geo.rb", "lib/ri_cal/property_value/integer.rb", "lib/ri_cal/property_value/occurrence_list.rb", "lib/ri_cal/property_value/period.rb", "lib/ri_cal/property_value/recurrence_rule.rb", "lib/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb", "lib/ri_cal/property_value/recurrence_rule/enumerator.rb", "lib/ri_cal/property_value/recurrence_rule/initialization_methods.rb", "lib/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb", "lib/ri_cal/property_value/recurrence_rule/numbered_span.rb", "lib/ri_cal/property_value/recurrence_rule/occurence_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_day.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_month_day.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_year_day.rb", "lib/ri_cal/property_value/recurrence_rule/validations.rb", "lib/ri_cal/property_value/text.rb", "lib/ri_cal/property_value/uri.rb", "lib/ri_cal/property_value/utc_offset.rb", "lib/ri_cal/required_timezones.rb", "ri_cal.gemspec", "sample_ical_files/from_ical_dot_app/test1.ics", "script/console", "script/destroy", "script/generate", "script/txt2html", "spec/ri_cal/component/alarm_spec.rb", "spec/ri_cal/component/calendar_spec.rb", "spec/ri_cal/component/event_spec.rb", "spec/ri_cal/component/freebusy_spec.rb", "spec/ri_cal/component/journal_spec.rb", "spec/ri_cal/component/t_z_info_timezone_spec.rb", "spec/ri_cal/component/timezone_spec.rb", "spec/ri_cal/component/todo_spec.rb", "spec/ri_cal/component_spec.rb", "spec/ri_cal/core_extensions/string/conversions_spec.rb", "spec/ri_cal/core_extensions/time/calculations_spec.rb", "spec/ri_cal/core_extensions/time/week_day_predicates_spec.rb", "spec/ri_cal/occurrence_enumerator_spec.rb", "spec/ri_cal/parser_spec.rb", "spec/ri_cal/property_value/date_spec.rb", "spec/ri_cal/property_value/date_time_spec.rb", "spec/ri_cal/property_value/duration_spec.rb", "spec/ri_cal/property_value/occurrence_list_spec.rb", "spec/ri_cal/property_value/period_spec.rb", "spec/ri_cal/property_value/recurrence_rule/recurring_year_day_spec.rb", "spec/ri_cal/property_value/recurrence_rule_spec.rb", "spec/ri_cal/property_value/text_spec.rb", "spec/ri_cal/property_value/utc_offset_spec.rb", "spec/ri_cal/property_value_spec.rb", "spec/ri_cal/required_timezones_spec.rb", "spec/ri_cal_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/gem_loader/load_active_support.rb", "tasks/gem_loader/load_tzinfo_gem.rb", "tasks/ri_cal.rake", "tasks/spec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/ri_cal", "component_attributes/alarm.yml", "component_attributes/calendar.yml", "component_attributes/component_property_defs.yml", "component_attributes/event.yml", "component_attributes/freebusy.yml", "component_attributes/journal.yml", "component_attributes/timezone.yml", "component_attributes/timezone_period.yml", "component_attributes/todo.yml", "copyrights.txt", "docs/draft-ietf-calsify-2446bis-08.txt", "docs/draft-ietf-calsify-rfc2445bis-09.txt", "docs/incrementers.txt", "docs/rfc2445.pdf", "lib/ri_cal.rb", "lib/ri_cal/component.rb", "lib/ri_cal/component/alarm.rb", "lib/ri_cal/component/calendar.rb", "lib/ri_cal/component/event.rb", "lib/ri_cal/component/freebusy.rb", "lib/ri_cal/component/journal.rb", "lib/ri_cal/component/t_z_info_timezone.rb", "lib/ri_cal/component/timezone.rb", "lib/ri_cal/component/timezone/daylight_period.rb", "lib/ri_cal/component/timezone/standard_period.rb", "lib/ri_cal/component/timezone/timezone_period.rb", "lib/ri_cal/component/todo.rb", "lib/ri_cal/core_extensions.rb", "lib/ri_cal/core_extensions/array.rb", "lib/ri_cal/core_extensions/array/conversions.rb", "lib/ri_cal/core_extensions/date.rb", "lib/ri_cal/core_extensions/date/conversions.rb", "lib/ri_cal/core_extensions/date_time.rb", "lib/ri_cal/core_extensions/date_time/conversions.rb", "lib/ri_cal/core_extensions/object.rb", "lib/ri_cal/core_extensions/object/conversions.rb", "lib/ri_cal/core_extensions/string.rb", "lib/ri_cal/core_extensions/string/conversions.rb", "lib/ri_cal/core_extensions/time.rb", "lib/ri_cal/core_extensions/time/calculations.rb", "lib/ri_cal/core_extensions/time/conversions.rb", "lib/ri_cal/core_extensions/time/tzid_access.rb", "lib/ri_cal/core_extensions/time/week_day_predicates.rb", "lib/ri_cal/floating_timezone.rb", "lib/ri_cal/invalid_property_value.rb", "lib/ri_cal/invalid_timezone_identifer.rb", "lib/ri_cal/occurrence_enumerator.rb", "lib/ri_cal/occurrence_period.rb", "lib/ri_cal/parser.rb", "lib/ri_cal/properties/alarm.rb", "lib/ri_cal/properties/calendar.rb", "lib/ri_cal/properties/event.rb", "lib/ri_cal/properties/freebusy.rb", "lib/ri_cal/properties/journal.rb", "lib/ri_cal/properties/timezone.rb", "lib/ri_cal/properties/timezone_period.rb", "lib/ri_cal/properties/todo.rb", "lib/ri_cal/property_value.rb", "lib/ri_cal/property_value/array.rb", "lib/ri_cal/property_value/cal_address.rb", "lib/ri_cal/property_value/date.rb", "lib/ri_cal/property_value/date_time.rb", "lib/ri_cal/property_value/date_time/additive_methods.rb", "lib/ri_cal/property_value/date_time/time_machine.rb", "lib/ri_cal/property_value/date_time/timezone_support.rb", "lib/ri_cal/property_value/duration.rb", "lib/ri_cal/property_value/geo.rb", "lib/ri_cal/property_value/integer.rb", "lib/ri_cal/property_value/occurrence_list.rb", "lib/ri_cal/property_value/period.rb", "lib/ri_cal/property_value/recurrence_rule.rb", "lib/ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb", "lib/ri_cal/property_value/recurrence_rule/enumerator.rb", "lib/ri_cal/property_value/recurrence_rule/initialization_methods.rb", "lib/ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb", "lib/ri_cal/property_value/recurrence_rule/numbered_span.rb", "lib/ri_cal/property_value/recurrence_rule/occurence_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_day.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_month_day.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb", "lib/ri_cal/property_value/recurrence_rule/recurring_year_day.rb", "lib/ri_cal/property_value/recurrence_rule/validations.rb", "lib/ri_cal/property_value/text.rb", "lib/ri_cal/property_value/uri.rb", "lib/ri_cal/property_value/utc_offset.rb", "lib/ri_cal/required_timezones.rb", "ri_cal.gemspec", "sample_ical_files/from_ical_dot_app/test1.ics", "script/console", "script/destroy", "script/generate", "script/txt2html", "spec/ri_cal/component/alarm_spec.rb", "spec/ri_cal/component/calendar_spec.rb", "spec/ri_cal/component/event_spec.rb", "spec/ri_cal/component/freebusy_spec.rb", "spec/ri_cal/component/journal_spec.rb", "spec/ri_cal/component/t_z_info_timezone_spec.rb", "spec/ri_cal/component/timezone_spec.rb", "spec/ri_cal/component/todo_spec.rb", "spec/ri_cal/component_spec.rb", "spec/ri_cal/core_extensions/string/conversions_spec.rb", "spec/ri_cal/core_extensions/time/calculations_spec.rb", "spec/ri_cal/core_extensions/time/week_day_predicates_spec.rb", "spec/ri_cal/occurrence_enumerator_spec.rb", "spec/ri_cal/parser_spec.rb", "spec/ri_cal/property_value/date_spec.rb", "spec/ri_cal/property_value/date_time_spec.rb", "spec/ri_cal/property_value/duration_spec.rb", "spec/ri_cal/property_value/occurrence_list_spec.rb", "spec/ri_cal/property_value/period_spec.rb", "spec/ri_cal/property_value/recurrence_rule/recurring_year_day_spec.rb", "spec/ri_cal/property_value/recurrence_rule_spec.rb", "spec/ri_cal/property_value/text_spec.rb", "spec/ri_cal/property_value/utc_offset_spec.rb", "spec/ri_cal/property_value_spec.rb", "spec/ri_cal/required_timezones_spec.rb", "spec/ri_cal_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/gem_loader/load_active_support.rb", "tasks/gem_loader/load_tzinfo_gem.rb", "tasks/ri_cal.rake", "tasks/spec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://rical.rubyforge.org/}
   s.rdoc_options = ["--main", "README.txt"]

data/spec/ri_cal/component/event_spec.rb

@@ -310,12 +310,12 @@ describe RiCal::Component::Event do
       unfold(@it.export).should match(/^DTSTART;VALUE=DATE:20090422$/)
     end
     
-    it "should properly fold on export" 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\nhttp://www.shopcrossroadsplaza.c...\n"
+    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
       export_string.should match(%r(^DESCRIPTION:Weather report looks nice\\, 80 degrees and partly cloudy\\, so$))
       export_string.should match(%r(^  following Michael's suggestion\\, let's meet at the food court at Crossr$))
-      export_string.should match(%r(^ oads:\\n\\nhttp://www.shopcrossroadsplaza\.c\.\.\.\\n$))
+      export_string.should match(%r(^ oads:\\nhttp://www\.shopcrossroadsplaza.c\.\.\.\\n$))
     end
   end
 

data/spec/ri_cal/occurrence_enumerator_spec.rb

@@ -451,5 +451,61 @@ ENDCAL
       @event.should be_bounded
     end
   end
+  
+  context "EXDATES with timezones bug" do
+    before(:each) do
+      cals = RiCal.parse_string rectify_ical <<-ENDCAL
+      BEGIN:VCALENDAR
+      METHOD:PUBLISH
+      PRODID:-//Apple Inc.//iCal 3.0//EN
+      CALSCALE:GREGORIAN
+      X-WR-CALNAME:Utah Cycling
+      X-WR-RELCALID:BF579011-36BF-49C6-8C7D-E96F03DE8055
+      VERSION:2.0
+      X-WR-TIMEZONE:US/Mountain
+      BEGIN:VTIMEZONE
+      TZID:US/Mountain
+      BEGIN:DAYLIGHT
+      TZOFFSETFROM:-0700
+      TZOFFSETTO:-0600
+      DTSTART:20070311T020000
+      RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+      TZNAME:MDT
+      END:DAYLIGHT
+      BEGIN:STANDARD
+      TZOFFSETFROM:-0600
+      TZOFFSETTO:-0700
+      DTSTART:20071104T020000
+      RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+      TZNAME:MST
+      END:STANDARD
+      END:VTIMEZONE
+      BEGIN:VEVENT
+      SEQUENCE:11
+      TRANSP:OPAQUE
+      UID:15208112-E0FA-4A7C-954C-CFDF19D1B0E7
+      DTSTART;TZID=US/Mountain:20090114T163000
+      DTSTAMP:20090107T024340Z
+      SUMMARY:Wild Rose XC/Skate Training Series
+      EXDATE;TZID=US/Mountain:20090114T163000
+      EXDATE;TZID=US/Mountain:20090128T163000
+      EXDATE;TZID=US/Mountain:20090121T163000
+      EXDATE;TZID=US/Mountain:20090211T163000
+      EXDATE;TZID=US/Mountain:20090204T163000
+      EXDATE;TZID=US/Mountain:20090218T163000
+      CREATED:20090107T024012Z
+      DTEND;TZID=US/Mountain:20090114T180000
+      LOCATION:Mountain Dell Golf Course
+      RRULE:FREQ=WEEKLY;INTERVAL=1;UNTIL=20090219T065959Z
+      END:VEVENT
+      END:VCALENDAR
+      ENDCAL
+      @event = cals.first.events.first
+    end
+    
+    it "should have no occurrences" do
+      @event.occurrences.length.should == 0
+    end
+  end
 
 end

data/spec/ri_cal/property_value/recurrence_rule_spec.rb

@@ -432,7 +432,7 @@ describe RiCal::PropertyValue::RecurrenceRule do
           (0..(iterations-1)).each do |i|
             occurrence = @enum.next_occurrence
             break if occurrence.nil?
-            actuals << occurrence[:start]
+            actuals << occurrence.dtstart
             # This is a little strange, we do this to avoid O(n*2)
             unless actuals.last == @expectations[i]
               actuals.should == @expectations[0,actuals.length]

data/spec/ri_cal/property_value/text_spec.rb

@@ -3,11 +3,23 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe RiCal::PropertyValue::Text do
-  
-  it "should handle escapes according to RFC2445 Sec 4.3.11 p 45" do
-   expected = "this\\ has\, \nescaped\;\n\\x characters"
-   it = RiCal::PropertyValue::Text.new(nil, :value => 'this\\ has\, \nescaped\;\N\x characters')
-   it.ruby_value.should == expected
+
+  context ".ruby_value" do
+
+    it "should handle escapes according to RFC2445 Sec 4.3.11 p 45" do
+      expected = "this\\ has\, \nescaped\;\n\\x characters"
+      it = RiCal::PropertyValue::Text.new(nil, :value => 'this\\ has\, \nescaped\;\N\x characters')
+      it.ruby_value.should == expected
+    end
+  end
+
+  context ".convert" do
+
+    it "should handle escapes according to RFC2445 Sec 4.3.11 p 45" do
+      expected = ':this has\, \nescaped\;\n characters\ncr\nnlcr\ncrnl'
+      it = RiCal::PropertyValue::Text.convert(nil, "this\ has, \nescaped;\n characters\rcr\n\rnlcr\r\ncrnl")
+      it.to_s.should == expected
+    end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -07:00
+date: 2009-05-23 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - lib/ri_cal/invalid_property_value.rb
 - lib/ri_cal/invalid_timezone_identifer.rb
 - lib/ri_cal/occurrence_enumerator.rb
+- lib/ri_cal/occurrence_period.rb
 - lib/ri_cal/parser.rb
 - lib/ri_cal/properties/alarm.rb
 - lib/ri_cal/properties/calendar.rb