rubyredrick-ri_cal 0.0.8 → 0.0.9

data/History.txt

@@ -1,7 +1,14 @@
+=== 0.0.9
+  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/4
+    Missing comparison methods in PropertyValue::Date
+  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/6
+    Type of dtstart and dtend (DATE or DATETIME) now preserved on enumeration
 === 0.0.8
-  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941-ri_cal/tickets/1-occurrence-lists-not-picking-up-timewithzone-identifier#ticket-1-2
-  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/2-date-property-subtraction-bug
-  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/3-fwd-ri_cal-question
+  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941-ri_cal/tickets/1
+    EXDATE and RDATE now pick up the timezone from DateTime, Time, and TimeWithZone values
+  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/2
+    Missing arithmetic methods in PropertyValue::Date
+  * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/3
        Components with no recurrence rules or rdate properties failed on enumeration, they now
        will enumerate a single occurrence
   

data/Manifest.txt

@@ -36,6 +36,7 @@ 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

data/lib/ri_cal/core_extensions/date/conversions.rb

@@ -22,6 +22,39 @@ module RiCal
         def to_ri_cal_property_value(timezone_finder = nil)
           to_ri_cal_date_value(timezone_finder)
         end
+        
+        unless defined? ActiveSupport
+          # A method to keep Time, Date and DateTime instances interchangeable on conversions.
+          # In this case, it simply returns +self+.
+          def to_date
+            self
+          end if RUBY_VERSION < '1.9'
+
+          # Converts a Date instance to a Time, where the time is set to the beginning of the day.
+          # The timezone can be either :local or :utc (default :local).
+          #
+          # ==== Examples
+          #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
+          #
+          #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
+          #   date.to_time(:local)           # => Sat Nov 10 00:00:00 0800 2007
+          #
+          #   date.to_time(:utc)             # => Sat Nov 10 00:00:00 UTC 2007
+          def to_time(form = :local)
+            ::Time.send("#{form}_time", year, month, day)
+          end
+
+          # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
+          # and UTC offset is set to 0.
+          #
+          # ==== Examples
+          #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
+          #
+          #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
+          def to_datetime
+            ::DateTime.civil(year, month, day, 0, 0, 0, 0)
+          end if RUBY_VERSION < '1.9'
+        end
       end
     end
   end

data/lib/ri_cal/core_extensions/date_time/conversions.rb

@@ -0,0 +1,50 @@
+require 'date'
+module RiCal
+  module CoreExtensions #:nodoc:
+    module DateTime #:nodoc:
+      #- ©2009 Rick DeNatale
+      #- All rights reserved. Refer to the file README.txt for the license
+      #
+      module Conversions #:nodoc:
+        # Return an RiCal::PropertyValue::DateTime representing the receiver
+        def to_ri_cal_date_time_value(timezone_finder = nil) #:nodoc:
+          RiCal::PropertyValue::DateTime.new(
+               timezone_finder, 
+               :value => strftime("%Y%m%dT%H%M%S"), 
+               :params => {"TZID" => self.tzid || :default})
+        end
+
+        alias_method :to_ri_cal_date_or_date_time_value, :to_ri_cal_date_time_value #:nodoc:
+        alias_method :to_ri_cal_occurrence_list_value, :to_ri_cal_date_time_value #:nodoc:
+
+        # Return the natural ri_cal_property for this object
+        def to_ri_cal_property_value(timezone_finder = nil) #:nodoc:
+          to_ri_cal_date_time_value(timezone_finder)
+        end
+        
+        # Return a copy of this object which will be interpreted as a floating time.
+        def with_floating_timezone
+          dup.set_tzid(:floating)
+        end
+        
+        unless defined? ActiveSupport
+          # Converts self to a Ruby Date object; time portion is discarded
+          def to_date
+            ::Date.new(year, month, day)
+          end
+
+          # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
+          # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time
+          def to_time
+            self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec) : self
+          end
+
+          # To be able to keep Times, Dates and DateTimes interchangeable on conversions
+          def to_datetime
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ri_cal/core_extensions/date_time.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/time/conversions.rb"
+require "#{File.dirname(__FILE__)}/date_time/conversions.rb"
 require "#{File.dirname(__FILE__)}/time/tzid_access.rb"
 require "#{File.dirname(__FILE__)}/time/week_day_predicates.rb"
 require "#{File.dirname(__FILE__)}/time/calculations.rb"
@@ -11,5 +11,5 @@ class DateTime #:nodoc:
   include RiCal::CoreExtensions::Time::WeekDayPredicates
   include RiCal::CoreExtensions::Time::Calculations
   include RiCal::CoreExtensions::Time::TzidAccess
-  include RiCal::CoreExtensions::Time::Conversions
+  include RiCal::CoreExtensions::DateTime::Conversions
 end

data/lib/ri_cal/core_extensions/time/conversions.rb

@@ -25,6 +25,36 @@ module RiCal
         def with_floating_timezone
           dup.set_tzid(:floating)
         end
+        
+        unless defined? ActiveSupport
+          # Converts a Time object to a Date, dropping hour, minute, and second precision.
+          #
+          #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
+          #   my_time.to_date     # => Mon, 12 Nov 2007
+          #
+          #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+          #   your_time.to_date                                 # => Tue, 13 Jan 2009
+          def to_date
+            ::Date.new(year, month, day)
+          end
+
+          # A method to keep Time, Date and DateTime instances interchangeable on conversions.
+          # In this case, it simply returns +self+.
+          def to_time
+            self
+          end
+
+          # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
+          #
+          #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
+          #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
+          #
+          #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+          #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
+          def to_datetime
+            ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
+          end
+        end
       end
     end
   end

data/lib/ri_cal/occurrence_enumerator.rb

@@ -94,7 +94,7 @@ 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] == occurrence[:start]
+        exclusion && occurrence[:start] == exclusion[:start]
       end
       
       # Also exclude occurrences before the :starting date_time
@@ -172,15 +172,11 @@ module RiCal
       @rdate_property = nil
       @exdate_property = nil
       @recurrence_id_property = occurrence_start
-      @dtstart_property = occurrence_start
-      if occurrence_end
-        @dtend_property = occurrence_end
-      else
-        if dtend
-          my_duration = @dtend_property - @dtstart_property
-          @dtend_property = occurrence_start + my_duration
-        end
+      if @dtend_property && !occurrence_end
+        occurrence_end = occurrence_start + (@dtend_property - @dtstart_property)
       end
+      @dtstart_property = dtstart_property.for_occurrence(occurrence_start)
+      @dtend_property = dtend_property.for_occurrence(occurrence_end) if @dtend_property
       self      
     end
     

data/lib/ri_cal/property_value/date.rb

@@ -148,5 +148,17 @@ module RiCal
           :end => date_time.advance(:hours => 24, :seconds => -1)}
         end
       end
+      
+      def start_of_day?
+        true
+      end
+      
+      def for_occurrence(occurrence)
+        if occurrence.start_of_day?
+          occurrence.to_ri_cal_date_value(timezone_finder)
+        else
+          occurrence.for_parent(timezone_finder)
+        end
+      end
     end
   end

data/lib/ri_cal/property_value/date_time.rb

@@ -253,8 +253,8 @@ module RiCal
 
 
       # Return an RiCal::PropertyValue::DateTime representing the receiver.
-      def to_ri_cal_date_time_value
-        self
+      def to_ri_cal_date_time_value(timezone=nil)
+        for_parent(timezone)
       end
 
       def iso_year_and_week_one_start(wkst) #:nodoc:
@@ -269,6 +269,11 @@ module RiCal
       def to_ri_cal_date_or_date_time_value(timezone_finder = nil) #:nodoc:
         self.for_parent(timezone_finder)
       end
+      
+      # Return a Date property for this DateTime
+      def to_ri_cal_date_value(timezone_finder=nil)
+        PropertyValue::Date.new(timezone_finder, :value => @date_time_value.strftime("%Y%m%d"))
+      end
 
       # Return the Ruby DateTime representation of the receiver
       def to_datetime #:nodoc:
@@ -289,6 +294,14 @@ module RiCal
       def add_date_times_to(required_timezones) #:nodoc:
         required_timezones.add_datetime(self, tzid) if has_local_timezone?
       end
+      
+      def start_of_day?
+        [hour, min, sec] == [0,0,0]
+      end
+      
+      def for_occurrence(occurrence)
+        occurrence.to_ri_cal_date_time_value(timezone_finder)
+      end
     end
   end
 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.8'
+  VERSION = '0.0.9'
   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.8"
+  s.version = "0.0.9"
 
   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-19}
+  s.date = %q{2009-05-21}
   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/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/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

@@ -309,6 +309,14 @@ 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" 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"
+      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$))
+    end
   end
 
   if RiCal::TimeWithZone

data/spec/ri_cal/occurrence_enumerator_spec.rb

@@ -8,7 +8,7 @@ end
 
 # Note that this is more of a functional spec
 describe RiCal::OccurrenceEnumerator do
-  
+
   Fr13Unbounded_Zulu = <<-TEXT
 BEGIN:VEVENT
 DTSTART:19970902T090000Z
@@ -45,24 +45,24 @@ TEXT
       before(:each) do
         @it = RiCal.parse_string(Fr13Unbounded_Zulu).first
       end
-      
+
       it "should raise an ArgumentError with no options to limit result" do
         lambda {@it.occurrences}.should raise_error(ArgumentError)
       end
-      
+
       it "should have the right five occurrences when :count => 5 option is used" do
         result = @it.occurrences(:count => 5)
         result.should == Fr13UnboundedZuluExpectedFive
       end
-      
+
     end
   end
-  
+
   describe ".occurrences" do
     before(:each) do
       @it = RiCal.parse_string(Fr13Unbounded_Zulu).first
     end
-    
+
     describe "with :starting specified" do
       it "should exclude dates before :starting" do
         result = @it.occurrences(:starting => Fr13UnboundedZuluExpectedFive[1].dtstart,
@@ -70,7 +70,7 @@ TEXT
         result.map{|o|o.dtstart}.should == Fr13UnboundedZuluExpectedFive[1..-2].map{|e| e.dtstart}
       end
     end
-    
+
     describe "with :before specified" do
       it "should exclude dates after :before" do
         result = @it.occurrences(:before => Fr13UnboundedZuluExpectedFive[3].dtstart,
@@ -79,7 +79,7 @@ TEXT
       end
     end
   end
-    
+
 
   describe ".each" do
     describe " for Every Friday the 13th, forever" do
@@ -105,7 +105,7 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
   before(:each) do
     @merger = RiCal::OccurrenceEnumerator::OccurrenceMerger
   end
-  
+
   describe ".for" do
     it "should return an EmptyEnumerator if the rules parameter is nil" do
       @merger.for(nil, nil).should == RiCal::OccurrenceEnumerator::EmptyRulesEnumerator
@@ -114,23 +114,23 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
     it "should return an EmptyEnumerator if the rules parameter is empty" do
       @merger.for(nil, []).should == RiCal::OccurrenceEnumerator::EmptyRulesEnumerator
     end
-    
+
     describe "with a single rrule" do
       before(:each) do
         @component = mock("component", :dtstart => :dtstart_value)
         @rrule = mock("rrule", :enumerator => :rrule_enumerator)
       end
-      
+
       it "should return the enumerator the rrule" do
         @merger.for(@component, [@rrule]).should == :rrule_enumerator
       end
-      
+
       it "should pass the component to the enumerator instantiation" do
         @rrule.should_receive(:enumerator).with(@component)
         @merger.for(@component, [@rrule])
       end
     end
-    
+
     describe "with multiple rrules" do
       before(:each) do
         @component = mock("component", :dtstart => :dtstart_value)
@@ -139,25 +139,25 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
         @rrule1 = mock("rrule", :enumerator => @enum1)
         @rrule2 = mock("rrule", :enumerator => @enum2)
       end
-      
+
       it "should return an instance of RiCal::OccurrenceEnumerator::OccurrenceMerger" do
         @merger.for(@component, [@rrule1, @rrule2]).should be_kind_of(RiCal::OccurrenceEnumerator::OccurrenceMerger)
       end
-      
+
       it "should pass the component to the enumerator instantiation" do
         @rrule1.should_receive(:enumerator).with(@component).and_return(@enum1)
         @rrule2.should_receive(:enumerator).with(@component).and_return(@enum2)
         @merger.for(@component, [@rrule1, @rrule2])
       end
-      
+
       it "should preload the next occurrences" do
         @enum1.should_receive(:next_occurrence).and_return(:occ1)
         @enum2.should_receive(:next_occurrence).and_return(:occ2)
-        @merger.for(@component, [@rrule1, @rrule2])        
+        @merger.for(@component, [@rrule1, @rrule2])
       end
     end
   end
-  
+
   describe "#next_occurence" do
 
     describe "with unique nexts" do
@@ -168,28 +168,28 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
       end
-      
+
       it "should return the earliest occurrence" do
         @it.next_occurrence.should == 2
       end
-      
+
       it "should advance the enumerator which returned the result" do
         @enum2.should_receive(:next_occurrence).and_return(4)
         @it.next_occurrence
       end
-      
+
       it "should not advance the other enumerator" do
         @enum1.should_not_receive(:next_occurrence)
         @it.next_occurrence
       end
-      
+
       it "should properly update the next array" do
         @enum2.stub!(:next_occurrence).and_return(4)
         @it.next_occurrence
         @it.nexts.should == [3, 4]
       end
     end
-    
+
     describe "with duplicated nexts" do
       before(:each) do
         @enum1 = mock_enumerator("rrule_enumerator1", 2)
@@ -198,26 +198,26 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
       end
-      
+
       it "should return the earliest occurrence" do
         @it.next_occurrence.should == 2
       end
-      
+
       it "should advance both enumerators" do
         @enum1.should_receive(:next_occurrence).and_return(5)
         @enum2.should_receive(:next_occurrence).and_return(4)
         @it.next_occurrence
       end
-      
+
       it "should properly update the next array" do
         @enum1.stub!(:next_occurrence).and_return(5)
         @enum2.stub!(:next_occurrence).and_return(4)
         @it.next_occurrence
         @it.nexts.should == [5, 4]
       end
-      
+
     end
-    
+
     describe "with all enumerators at end" do
       before(:each) do
         @enum1 = mock_enumerator("rrule_enumerator1", nil)
@@ -226,11 +226,11 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
       end
-      
+
       it "should return nil" do
         @it.next_occurrence.should == nil
       end
-      
+
       it "should not advance the enumerators which returned the result" do
         @enum1.should_not_receive(:next_occurrence)
         @enum2.should_not_receive(:next_occurrence)
@@ -238,10 +238,42 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
       end
     end
   end
+
+  context "Ticket #4 from paulsm" do
+    it "should produce 4 occurrences" do
+      cal = RiCal.parse_string <<ENDCAL
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+X-WR-CALNAME:Australian32Holidays
+X-WR-CALDESC:Australian Public Holidays. Compiled from http://www.indust
+ rialrelations.nsw.gov.au/holidays/default.html and the links for the oth
+ er states at the bottom of that page
+X-WR-RELCALID:AC1E4CE8-6690-49F6-A144-2F8891DFFD8D
+VERSION:2.0
+X-WR-TIMEZONE:Australia/Sydney
+BEGIN:VEVENT
+SEQUENCE:8
+TRANSP:OPAQUE
+UID:5B5579F3-2137-11D7-B491-00039301B0C2
+DTSTART;VALUE=DATE:20020520
+DTSTAMP:20060602T045619Z
+SUMMARY:Adelaide Cup Carnival and Volunteers Day (SA)
+EXDATE;VALUE=DATE:20060515
+CREATED:20080916T000924Z
+DTEND;VALUE=DATE:20020521
+RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20070520;BYMONTH=5;BYDAY=3MO
+END:VEVENT
+END:VCALENDAR
+ENDCAL
+      cal.first.events.first.occurrences.length.should == 4
+    end
+  end
   
-    context "Bug report from paulsm" do
-        before(:each) do
-          cals = RiCal.parse_string <<ENDCAL
+  context "Ticket #2 from paulsm" do
+    before(:each) do
+      cals = RiCal.parse_string <<ENDCAL
 BEGIN:VCALENDAR
 X-WR-TIMEZONE:America/New_York
 PRODID:-//Apple Inc.//iCal 3.0//EN
@@ -327,10 +359,67 @@ END:VCALENDAR
 ENDCAL
       @event = cals.first.events.first
     end
-    
+
     it "should be able to enumerate occurrences" do
       @event.occurrences.should == [@event]
     end
   end
+  
+  context "An event with a DATE dtstart, Ticket #6" do
+    before(:each) do
+      cal = RiCal.parse_string <<ENDCAL
+BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20090520T092032Z
+LAST-MODIFIED:20090520T092052Z
+DTSTAMP:20090520T092032Z
+UID:d41c124a-65c3-400e-bd04-1d2ee7b98352
+SUMMARY:event2
+RRULE:FREQ=MONTHLY;INTERVAL=1
+DTSTART;VALUE=DATE:20090603
+DTEND;VALUE=DATE:20090604
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+ENDCAL
+      @occurrences = cal.first.events.first.occurrences(
+      :after => Date.parse('01/01/1990'), 
+      :before => Date.parse("01/01/2010")
+      )
+    end
 
-end
+    it "should produce the right dtstart values" do
+      @occurrences.map {|o| o.dtstart}.should == [
+        Date.parse("2009-06-03"),
+        Date.parse("2009-07-03"),
+        Date.parse("2009-08-03"),
+        Date.parse("2009-09-03"),
+        Date.parse("2009-10-03"),
+        Date.parse("2009-11-03"),
+        Date.parse("2009-12-03")
+      ]
+    end
+
+    it "should produce events whose dtstarts are all dates" do
+      @occurrences.all? {|o| o.dtstart.class == ::Date}.should be_true      
+    end
+
+    it "should produce the right dtend values" do
+      @occurrences.map {|o| o.dtend}.should == [
+        Date.parse("2009-06-04"),
+        Date.parse("2009-07-04"),
+        Date.parse("2009-08-04"),
+        Date.parse("2009-09-04"),
+        Date.parse("2009-10-04"),
+        Date.parse("2009-11-04"),
+        Date.parse("2009-12-04")
+      ]
+    end
+
+    it "should produce events whose dtstends are all dates" do
+      @occurrences.all? {|o| o.dtend.class == ::Date}.should be_true      
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - 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