rubyredrick-ri_cal 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,10 @@
+=== 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
+       Components with no recurrence rules or rdate properties failed on enumeration, they now
+       will enumerate a single occurrence
+  
 === 0.0.7
  * Fixed a bug relating to properly recognizing ActiveRecord::TimeWithZone
  * DATETIME propertyvalues will now return an instance of TimeWithZone instead of DateTime when

data/Manifest.txt

@@ -121,7 +121,7 @@ spec/ri_cal/required_timezones_spec.rb
 spec/ri_cal_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-tasks/ri_cal.rake
-tasks/spec.rake
 tasks/gem_loader/load_active_support.rb
 tasks/gem_loader/load_tzinfo_gem.rb
+tasks/ri_cal.rake
+tasks/spec.rake

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

@@ -17,12 +17,12 @@ module RiCal
           self.tzid = time_zone_identifier
           self
         end
-        
+
         # Predicate indicating whether or not the instance represents a floating time
         def has_floating_timezone?
           tzid == :floating
         end
-        
+
       end
     end
   end
@@ -36,10 +36,12 @@ module RiCal
     def has_floating_timezone?
       false
     end
-    
-    def to_ri_cal_date_or_date_time_value(timezone_finder=nil)
+
+    def to_ri_cal_date_time_value(timezone_finder=nil)
       ::RiCal::PropertyValue::DateTime.new(timezone_finder, :params => {"TZID" => tzid}, :value => strftime("%Y%m%dT%H%M%S"))
     end
+    alias_method :to_ri_cal_date_or_date_time_value, :to_ri_cal_date_time_value
+    alias_method :to_ri_cal_occurrence_list_value, :to_ri_cal_date_time_value
   end
 end
 

data/lib/ri_cal/occurrence_enumerator.rb

@@ -20,6 +20,14 @@ module RiCal
       def self.next_occurrence
         nil
       end
+      
+      def self.bounded?
+        true
+      end
+      
+      def self.empty?
+        true
+      end
     end
     
     # OccurrenceMerger takes multiple recurrence rules and enumerates the combination in sequence. 
@@ -39,9 +47,14 @@ module RiCal
       def initialize(component, rules)
         self.enumerators = rules.map {|rrule| rrule.enumerator(component)}
         @bounded = enumerators.all? {|enumerator| enumerator.bounded?}
+        @empty = enumerators.all? {|enumerator| enumerator.empty?}
         self.nexts = @enumerators.map {|enumerator| enumerator.next_occurrence}
       end
       
+      def empty?
+        @empty
+      end
+      
       # return the earliest of each of the enumerators next occurrences
       def next_occurrence        
         result = nexts.compact.sort.first
@@ -93,18 +106,22 @@ module RiCal
       # yield each occurrence to a block
       # some components may be open-ended, e.g. have no COUNT or DTEND 
       def each
-        occurrence = @rrules.next_occurrence
-        yielded = 0
-        @next_exclusion = @exrules.next_occurrence
-        while (occurrence)
-          if (@cutoff && occurrence[:start].to_datetime >= @cutoff) || (@count && yielded >= @count)
-            occurrence = nil
-          else
-            unless exclude?(occurrence)
-              yielded += 1
-              yield @component.recurrence(occurrence)
+        if @rrules.empty?
+          yield @component
+        else
+          occurrence = @rrules.next_occurrence
+          yielded = 0
+          @next_exclusion = @exrules.next_occurrence
+          while (occurrence)
+            if (@cutoff && occurrence[:start].to_datetime >= @cutoff) || (@count && yielded >= @count)
+              occurrence = nil
+            else
+              unless exclude?(occurrence)
+                yielded += 1
+                yield @component.recurrence(occurrence)
+              end
+              occurrence = @rrules.next_occurrence
             end
-            occurrence = @rrules.next_occurrence
           end
         end
       end

data/lib/ri_cal/property_value/date.rb

@@ -76,7 +76,7 @@ module RiCal
 
       # Return an instance of RiCal::PropertyValue::DateTime representing the start of this date
       def to_ri_cal_date_time_value
-        PropertyValue::DateTime.new(:value => @date_time_value)
+        PropertyValue::DateTime.new(timezone_finder, :value => @date_time_value)
       end
 
       # Return this date property
@@ -113,6 +113,27 @@ module RiCal
         # Do nothing since dates don't have a timezone
       end
 
+      # Return the difference between the receiver and other
+      #
+      # The parameter other should be either a RiCal::PropertyValue::Duration or a RiCal::PropertyValue::DateTime
+      #
+      # If other is a Duration, the result will be a DateTime, if it is a DateTime the result will be a Duration
+      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
+
+      # Return the sum of the receiver and duration
+      #
+      # The parameter other duration should be  a RiCal::PropertyValue::Duration
+      #
+      # The result will be an RiCal::PropertyValue::DateTime
+      def +(duration)
+        duration.add_to_date_time_value(to_ri_cal_date_time_value)
+      end
 
       # Delegate unknown messages to the wrappered Date instance.
       # TODO: Is this really necessary?

data/lib/ri_cal/property_value/duration.rb

@@ -28,7 +28,8 @@ module RiCal
           hour_part = value_part('H', hour_diff)
           min_part = value_part('M', min_diff)
           sec_part = value_part('S', sec_diff)
-          new(parent, :value => "#{sign}P#{day_part}T#{day_part}#{hour_part}#{min_part}#{sec_part}")        
+          t_part = (hour_diff.abs + min_diff.abs + sec_diff.abs) == 0 ? "" : "T"
+          new(parent, :value => "#{sign}P#{day_part}#{t_part}#{hour_part}#{min_part}#{sec_part}")        
         end
       end
 

data/lib/ri_cal/property_value/occurrence_list.rb

@@ -16,6 +16,10 @@ module RiCal
           self.default_duration = component.default_duration
           @index = 0
         end
+        
+        def empty?
+          occurrence_list.empty?
+        end
 
         def next_occurrence
           if @index < occurrence_list.length

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

@@ -19,16 +19,19 @@ module RiCal
           @next_occurrence_count = 0
           @incrementer = YearlyIncrementer.from_rrule(recurrence_rule, start_time)
         end
-        
+
         def self.for(recurrence_rule, component, setpos_list) # :nodoc:
           if !setpos_list || setpos_list.all? {|setpos| setpos > 1}
             self.new(recurrence_rule, component, setpos_list)
           else
             NegativeSetposEnumerator.new(recurrence_rule, component, setpos_list)
           end
-        end        
-        
-        
+        end
+
+         def empty?
+          false
+        end
+
         def bounded?
           @bounded
         end
@@ -54,7 +57,7 @@ module RiCal
         def result_passes_filters?(result)
           if @setpos_list
             result_passes_setpos_filter?(result)
-          else 
+          else
             result >= start_time
           end
         end
@@ -65,7 +68,7 @@ module RiCal
             result = next_time
             self.next_time = @incrementer.next_time(result)
             if result_passes_filters?(result)
-              @count += 1              
+              @count += 1
               return recurrence_rule.exhausted?(@count, result) ? nil : result_hash(result)
             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.7'
+  VERSION = '0.0.8'
   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.7"
+  s.version = "0.0.8"
 
   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-18}
+  s.date = %q{2009-05-19}
   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/ri_cal.rake", "tasks/spec.rake", "tasks/gem_loader/load_active_support.rb", "tasks/gem_loader/load_tzinfo_gem.rb"]
+  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.has_rdoc = true
   s.homepage = %q{http://rical.rubyforge.org/}
   s.rdoc_options = ["--main", "README.txt"]

data/spec/ri_cal/component/event_spec.rb

@@ -1,4 +1,5 @@
 #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
+
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe RiCal::Component::Event do
@@ -312,6 +313,32 @@ 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
+          Time.zone = "America/New_York"
+          @exception_date_time = Time.zone.local(2009, 5, 19, 11, 13)
+           cal = RiCal.Calendar do |cal|
+            cal.event do |event|
+              event.add_exdate @exception_date_time
+            end
+          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
+      end
 
       context "An event in a non-tzinfo source calendar" do
               before(:each) do

data/spec/ri_cal/occurrence_enumerator_spec.rb

@@ -2,6 +2,10 @@
 
 require File.join(File.dirname(__FILE__), %w[.. spec_helper.rb])
 
+def mock_enumerator(name, next_occurrence)
+  mock(name, :next_occurrence => next_occurrence, :bounded? => true, :empty? => false)
+end
+
 # Note that this is more of a functional spec
 describe RiCal::OccurrenceEnumerator do
   
@@ -130,8 +134,8 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
     describe "with multiple rrules" do
       before(:each) do
         @component = mock("component", :dtstart => :dtstart_value)
-        @enum1 = mock("rrule_enumerator1", :next_occurrence => :occ1, :bounded? => true)
-        @enum2 = mock("rrule_enumerator2", :next_occurrence => :occ2, :bounded? => true)
+        @enum1 = mock_enumerator("rrule_enumerator1", :occ1)
+        @enum2 = mock_enumerator("rrule_enumerator2", :occ2)
         @rrule1 = mock("rrule", :enumerator => @enum1)
         @rrule2 = mock("rrule", :enumerator => @enum2)
       end
@@ -158,8 +162,8 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
 
     describe "with unique nexts" do
       before(:each) do
-        @enum1 = mock("rrule_enumerator1", :next_occurrence => 3, :bounded? => true)
-        @enum2 = mock("rrule_enumerator2", :next_occurrence => 2, :bounded? => true)
+        @enum1 = mock_enumerator("rrule_enumerator1",3)
+        @enum2 = mock_enumerator("rrule_enumerator2", 2)
         @rrule1 = mock("rrule", :enumerator => @enum1)
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
@@ -188,8 +192,8 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
     
     describe "with duplicated nexts" do
       before(:each) do
-        @enum1 = mock("rrule_enumerator1", :next_occurrence => 2, :bounded? => true)
-        @enum2 = mock("rrule_enumerator2", :next_occurrence => 2, :bounded? => true)
+        @enum1 = mock_enumerator("rrule_enumerator1", 2)
+        @enum2 = mock_enumerator("rrule_enumerator2", 2)
         @rrule1 = mock("rrule", :enumerator => @enum1)
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
@@ -216,8 +220,8 @@ describe RiCal::OccurrenceEnumerator::OccurrenceMerger do
     
     describe "with all enumerators at end" do
       before(:each) do
-        @enum1 = mock("rrule_enumerator1", :next_occurrence => nil, :bounded? => true)
-        @enum2 = mock("rrule_enumerator2", :next_occurrence => nil, :bounded? => true)
+        @enum1 = mock_enumerator("rrule_enumerator1", nil)
+        @enum2 = mock_enumerator("rrule_enumerator2", nil)
         @rrule1 = mock("rrule", :enumerator => @enum1)
         @rrule2 = mock("rrule", :enumerator => @enum2)
         @it = @merger.new(0, [@rrule1, @rrule2])
@@ -284,7 +288,49 @@ ENDCAL
         lambda {@event.occurrences}.should_not raise_error
       end
     end
-  
+
+    context "Lighthouse bug #3" do
+      before(:each) do
+        cals = RiCal.parse_string <<ENDCAL
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Europe/Paris
+X-LIC-LOCATION:Europe/Paris
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20070606T141629Z
+LAST-MODIFIED:20070606T154611Z
+DTSTAMP:20070607T120859Z
+UID:5d1ae55f-3910-4de9-8b65-d652768fb2f2
+SUMMARY:Lundi de Pâques
+DTSTART;VALUE=DATE;TZID=/mozilla.org/20070129_1/Europe/Paris:20070409
+DTEND;VALUE=DATE;TZID=/mozilla.org/20070129_1/Europe/Paris:20070410
+CATEGORIES:Jours fériés
+END:VEVENT
+END:VCALENDAR
+ENDCAL
+      @event = cals.first.events.first
+    end
+    
+    it "should be able to enumerate occurrences" do
+      @event.occurrences.should == [@event]
+    end
+  end
+
 end
-  
-  

data/spec/ri_cal/property_value/date_spec.rb

@@ -3,19 +3,51 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe RiCal::PropertyValue::Date do
-  describe ".advance" do
+  context ".advance" do
     it "should advance by one week if passed :days => 7" do
       dt1 = RiCal::PropertyValue::Date.new(nil, :value => "20050131")
       dt2 = RiCal::PropertyValue::Date.new(nil, :value => "20050207")
       dt1.advance(:days => 7).should == dt2
     end
-    
-    describe ".==" do
+
+    context ".==" do
       it "should return true for two instances representing the same date" do
         dt1 = RiCal::PropertyValue::Date.new(nil, :value => DateTime.parse("20050131T010000"))
         dt2 = RiCal::PropertyValue::Date.new(nil, :value => DateTime.parse("20050131T010001"))
-        dt1.should == dt2        
+        dt1.should == dt2
       end
     end
   end
+
+  context ".-" do
+
+    it "should return a Duration property when the argument is also a Date property" do
+      dt1 = RiCal::PropertyValue::Date.new(nil, :value => DateTime.parse("20090519"))
+      dt2 = RiCal::PropertyValue::Date.new(nil, :value => DateTime.parse("20090518"))
+      (dt1 - dt2).should == RiCal::PropertyValue::Duration.new(nil, :value => "+P1D")
+    end
+
+    it "should return a Duration property when the argument is a DateTime property" do
+      dt1 = RiCal::PropertyValue::Date.new(nil, :value => DateTime.parse("20090519"))
+      dt2 = RiCal::PropertyValue::DateTime.new(nil, :value => DateTime.parse("20090518T120000"))
+      (dt1 - dt2).should == RiCal::PropertyValue::Duration.new(nil, :value => "+PT12H")
+    end
+
+    it "should return a DateTime property when the argument is a Duration Property" do
+      dt1 = RiCal::PropertyValue::Date.new(nil, :value => "19980119")
+      duration = RiCal::PropertyValue::Duration.new(nil, :value => "+PT2H")
+      @it = dt1 - duration
+      @it.should == RiCal::PropertyValue::DateTime.new(nil, :value => "19980118T220000")
+    end
+  end
+
+  context ".+" do
+
+    it "should return a DateTime property when the argument is a Duration Property" do
+      dt1 = RiCal::PropertyValue::Date.new(nil, :value => "19980119")
+      duration = RiCal::PropertyValue::Duration.new(nil, :value => "+PT2H")
+      @it = dt1 + duration
+      @it.should == RiCal::PropertyValue::DateTime.new(nil, :value => "19980119T020000")
+    end
+  end
 end

data/spec/ri_cal/property_value/duration_spec.rb

@@ -4,8 +4,8 @@ require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 require 'date'
 
 describe RiCal::PropertyValue::Duration do
-  
-  describe "with various values" do
+
+  context "with various values" do
     def value_expectations(dv, values = {})
       values = {:weeks => 0, :days => 0, :hours => 0, :minutes => 0, :seconds => 0}.merge(values)
       dv.weeks.should == values[:weeks]
@@ -14,77 +14,113 @@ describe RiCal::PropertyValue::Duration do
       dv.minutes.should == values[:minutes]
       dv.seconds.should == values[:seconds]
     end
-    
+
     it ".+P7W should have represent 7 weeks" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "+P7W"), :weeks => 7)
     end
-    
+
     it ".P15DT5H0M20S should have represent 15 days, 5 hours and 20 seconds" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "P15DT5H0M20S"), :days => 15, :hours => 5, :seconds => 20)
     end
-    
+
     it ".+P2D should have represent 2 days" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "+P2D"), :days => 2)
     end
-    
+
     it ".+PT3H should have represent 3 hours" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "+PT3H"), :hours => 3)
     end
-    
+
     it ".+PT15M should have represent 15 minutes" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "+PT15M"), :minutes => 15)
     end
-    
+
     it ".+PT45S should have represent 45 seconds" do
       value_expectations(RiCal::PropertyValue::Duration.new(nil, :value => "+PT45S"), :seconds => 45)
     end
   end
-  
-  describe ".from_datetimes" do
-    
-    describe "starting at 11:00 pm, and ending at 1:01:02 am the next day" do
+
+  context ".==" do
+    it "should return true for two durations of one day" do
+      RiCal::PropertyValue.new(nil, :value => "+P1D").should == RiCal::PropertyValue.new(nil, :value => "+P1D")
+    end
+  end
+
+  context ".from_datetimes" do
+
+    context "starting at 11:00 pm, and ending at 1:01:02 am the next day" do
       before(:each) do
-        @it = RiCal::PropertyValue::Duration.from_datetimes(nil, 
-                      DateTime.parse("Sep 1, 2008 23:00"), 
-                      DateTime.parse("Sep 2, 2008 1:01:02")
-                  ) 
+        @it = RiCal::PropertyValue::Duration.from_datetimes(nil,
+        DateTime.parse("Sep 1, 2008 23:00"),
+        DateTime.parse("Sep 2, 2008 1:01:02")
+        )
       end
 
       it "should produce a duration" do
         @it.class.should == RiCal::PropertyValue::Duration
       end
-      
+
       it "should have a value of '+P2H1M2S'" do
         @it.value.should == '+PT2H1M2S'
       end
-      
+
       it "should contain zero days" do
         @it.days.should == 0
       end
-      
+
       it "should contain two hours" do
         @it.hours.should == 2
       end
-      
+
       it "should contain one minute" do
         @it.minutes.should == 1
       end
-      
+
       it "should contain one minute" do
         @it.minutes.should == 1
       end
     end
-  end
-  
-  describe ".from_datetimes" do
+
+    context "starting at 00:00, and ending at 00:00 the next day" do
+      before(:each) do
+        @it = RiCal::PropertyValue::Duration.from_datetimes(nil,
+        DateTime.parse("Sep 1, 2008 00:00"),
+        DateTime.parse("Sep 2, 2008 00:00")
+        )
+      end
+
+      it "should produce a duration" do
+        @it.class.should == RiCal::PropertyValue::Duration
+      end
+
+      it "should have a value of '+P1D'" do
+        @it.value.should == '+P1D'
+      end
+
+      it "should contain zero days" do
+        @it.days.should == 1
+      end
+
+      it "should contain zero hours" do
+        @it.hours.should == 0
+      end
+
+      it "should contain zero minutes" do
+        @it.minutes.should == 0
+      end
+
+      it "should contain zero minutes" do
+        @it.minutes.should == 0
+      end
+    end
+
     it "should work when start > finish" do
       lambda {
-        RiCal::PropertyValue::Duration.from_datetimes(nil, 
-                      DateTime.parse("Sep 2, 2008 1:01:02"),
-                      DateTime.parse("Sep 1, 2008 23:00")
-                  )
-      }.should_not raise_error(ArgumentError)
+        RiCal::PropertyValue::Duration.from_datetimes(nil,
+        DateTime.parse("Sep 2, 2008 1:01:02"),
+        DateTime.parse("Sep 1, 2008 23:00")
+        )
+        }.should_not raise_error(ArgumentError)
+      end
     end
-  end
-  
-end
+  end

data/tasks/spec.rake

@@ -18,6 +18,7 @@ desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
   t.spec_files = FileList['spec/**/*_spec.rb']
+  t.ruby_opts << "-rubygems"
 end
 
 namespace :spec do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,10 +171,10 @@ files:
 - spec/ri_cal_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ri_cal.rake
-- tasks/spec.rake
 - tasks/gem_loader/load_active_support.rb
 - tasks/gem_loader/load_tzinfo_gem.rb
+- tasks/ri_cal.rake
+- tasks/spec.rake
 has_rdoc: true
 homepage: http://rical.rubyforge.org/
 post_install_message: