rubyredrick-ri_cal 0.8.2 → 0.8.4

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

@@ -0,0 +1,37 @@
+module RiCal
+  class PropertyValue
+    class RecurrenceRule < PropertyValue
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
+      #
+      class OccurrenceIncrementer # :nodoc:
+        class WeeklyIncrementer < FrequencyIncrementer #:nodoc:
+
+          attr_reader :wkst
+
+          # include WeeklyBydayMethods
+
+          def initialize(rrule, parent)
+            @wkst = rrule.wkst_day
+            super(rrule, parent)
+          end
+
+          def self.for_rrule(rrule)
+            conditional_incrementer(rrule, "WEEKLY", ByDayIncrementer)
+          end
+
+          def multiplier
+            7
+          end
+
+          def advance_what
+            :days
+          end
+
+          def end_of_occurrence(date_time)
+            date_time.end_of_week_with_wkst(wkst)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+module RiCal
+  class PropertyValue
+    class RecurrenceRule < PropertyValue
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
+      #
+      class OccurrenceIncrementer # :nodoc:
+         class YearlyIncrementer < FrequencyIncrementer #:nodoc:
+
+           attr_reader :wkst
+
+           def initialize(rrule, sub_cycle_incrementer)
+             @wkst = rrule.wkst_day
+             super(rrule, sub_cycle_incrementer)
+           end
+
+           def self.from_rrule(rrule, start_time)
+             conditional_incrementer(rrule, "YEARLY", ByMonthIncrementer)
+           end
+
+           def advance_what
+             :years
+           end
+
+           def step(date_time)
+             if contains_weeknum_incrementer?
+               result = date_time
+               multiplier.times do
+                 result = result.at_start_of_next_iso_year(wkst)
+               end
+               result
+             else
+               super(date_time)
+             end
+           end
+
+           def start_of_cycle(date_time)
+             if contains_weeknum_incrementer?
+               date_time.at_start_of_iso_year(wkst)
+             elsif contains_daily_incrementer?
+               date_time.change(:month => 1, :day => 1)
+             else
+               date_time.change(:month => 1)
+             end
+           end
+
+           def end_of_occurrence(date_time)
+             if contains_weeknum_incrementer?
+               date_time.end_of_iso_year(wkst)
+             else
+               date_time.end_of_year
+             end
+           end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module RiCal
+  class PropertyValue
+    class RecurrenceRule < PropertyValue
+      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
+      #
+      module TimeManipulation #:nodoc:
+
+        def advance_day(date_time)
+          date_time.advance(:days => 1)
+        end
+
+        def first_hour_of_day(date_time)
+          date_time.change(:hour => 0)
+        end
+
+        def advance_week(date_time)
+          date_time.advance(:days => 7)
+        end
+
+        def first_day_of_week(wkst_day, date_time)
+          date_time.at_start_of_week_with_wkst(wkst_day)
+        end
+
+        def advance_month(date_time)
+          date_time.advance(:months => 1)
+        end
+
+        def first_day_of_month(date_time)
+          date_time.change(:day => 1)
+        end
+
+        def advance_year(date_time)
+          date_time.advance(:years => 1)
+        end
+
+        def first_day_of_year(date_time)
+          date_time.change(:month => 1, :day => 1)
+        end
+      end
+    end
+  end
+end

data/ri_cal.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ri_cal}
-  s.version = "0.8.2"  #comment to trigger github rebuild
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["author=Rick DeNatale"]
-  s.date = %q{2009-09-04}
+  s.date = %q{2009-09-18}
   s.default_executable = %q{ri_cal}
   s.description = %q{A new Ruby implementation of RFC2445 iCalendar.
 
@@ -19,7 +19,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/non_standard.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/fast_date_time.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", "performance/empty_propval/subject.rb", "performance/paris_eastern/subject.rb", "performance/penultimate_weekday/subject.rb", "performance/psm_big_enum/ical.ics", "performance/psm_big_enum/subject.rb", "performance/utah_cycling/subject.rb", "ri_cal.gemspec", "sample_ical_files/from_ical_dot_app/test1.ics", "script/benchmark_subject", "script/console", "script/destroy", "script/generate", "script/profile_subject", "script/txt2html", "spec/ri_cal/bugreports_spec.rb", "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/fast_date_time_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/non_standard.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/fast_date_time.rb", "lib/ri_cal/floating_timezone.rb", "lib/ri_cal/invalid_property_value.rb", "lib/ri_cal/invalid_timezone_identifier.rb", "lib/ri_cal/occurrence_enumerator.rb", "lib/ri_cal/occurrence_period.rb", "lib/ri_cal/parser.rb", "lib/ri_cal/properties.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/occurrence_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb", "lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_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/time_manipulation.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", "performance/empty_propval/subject.rb", "performance/paris_eastern/subject.rb", "performance/penultimate_weekday/subject.rb", "performance/psm_big_enum/ical.ics", "performance/psm_big_enum/subject.rb", "performance/utah_cycling/subject.rb", "ri_cal.gemspec", "script/benchmark_subject", "script/console", "script/destroy", "script/generate", "script/profile_subject", "script/txt2html", "spec/ri_cal/bugreports_spec.rb", "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/fast_date_time_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.homepage = %q{http://ri-cal.rubyforge.org/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,10 +110,11 @@ files:
 - lib/ri_cal/fast_date_time.rb
 - lib/ri_cal/floating_timezone.rb
 - lib/ri_cal/invalid_property_value.rb
-- lib/ri_cal/invalid_timezone_identifer.rb
+- lib/ri_cal/invalid_timezone_identifier.rb
 - lib/ri_cal/occurrence_enumerator.rb
 - lib/ri_cal/occurrence_period.rb
 - lib/ri_cal/parser.rb
+- lib/ri_cal/properties.rb
 - lib/ri_cal/properties/alarm.rb
 - lib/ri_cal/properties/calendar.rb
 - lib/ri_cal/properties/event.rb
@@ -141,11 +142,31 @@ files:
 - 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/occurrence_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_day_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_hour_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_minute_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_month_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_monthday_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_numbered_day_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_second_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_weekno_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/by_yearday_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/daily_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/frequency_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/hourly_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/list_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/minutely_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/monthly_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/null_sub_cycle_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/secondly_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/weekly_incrementer.rb
+- lib/ri_cal/property_value/recurrence_rule/occurrence_incrementer/yearly_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/time_manipulation.rb
 - lib/ri_cal/property_value/recurrence_rule/validations.rb
 - lib/ri_cal/property_value/text.rb
 - lib/ri_cal/property_value/uri.rb
@@ -158,7 +179,6 @@ files:
 - performance/psm_big_enum/subject.rb
 - performance/utah_cycling/subject.rb
 - ri_cal.gemspec
-- sample_ical_files/from_ical_dot_app/test1.ics
 - script/benchmark_subject
 - script/console
 - script/destroy

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

@@ -1,793 +0,0 @@
-module RiCal
-  class PropertyValue
-    class RecurrenceRule < PropertyValue
-      module TimeManipulation #:nodoc:
-
-        def advance_day(date_time)
-          date_time.advance(:days => 1)
-        end
-
-        def first_hour_of_day(date_time)
-          date_time.change(:hour => 0)
-        end
-
-        def advance_week(date_time)
-          date_time.advance(:days => 7)
-        end
-
-        def first_day_of_week(wkst_day, date_time)
-          date_time.at_start_of_week_with_wkst(wkst_day)
-        end
-
-        def advance_month(date_time)
-          date_time.advance(:months => 1)
-        end
-
-        def first_day_of_month(date_time)
-          date_time.change(:day => 1)
-        end
-
-        def advance_year(date_time)
-          date_time.advance(:years => 1)
-        end
-
-        def first_day_of_year(date_time)
-          date_time.change(:month => 1, :day => 1)
-        end
-      end
-      #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
-      #
-      class OccurrenceIncrementer # :nodoc:
-
-        attr_accessor :sub_cycle_incrementer, :current_occurrence, :outer_range
-        attr_accessor :outer_incrementers
-        attr_accessor :contains_daily_incrementer, :contains_weeknum_incrementer
-        attr_reader :leaf_iterator
-
-        include TimeManipulation
-
-        class NullSubCycleIncrementer #:nodoc:
-          def self.next_time(previous)
-            nil
-          end
-
-          def self.add_outer_incrementer(incrementer)
-          end
-
-          def self.first_within_outer_cycle(previous_occurrence, outer_cycle_range)
-            outer_cycle_range.first
-          end
-
-          def self.first_sub_occurrence(previous_occurrence, outer_cycle_range)
-            nil
-          end
-
-          def self.cycle_adjust(date_time)
-            date_time
-          end
-
-          def self.to_s
-            "NULL-INCR"
-          end
-
-          def inspect
-            to_s
-          end
-        end
-
-        def initialize(rrule, sub_cycle_incrementer)
-          self.sub_cycle_incrementer = sub_cycle_incrementer
-          @outermost = true
-          self.outer_incrementers = []
-          if sub_cycle_incrementer
-            self.contains_daily_incrementer = sub_cycle_incrementer.daily_incrementer? ||
-              sub_cycle_incrementer.contains_daily_incrementer?
-            self.contains_weeknum_incrementer = sub_cycle_incrementer.weeknum_incrementer?||
-              sub_cycle_incrementer.contains_weeknum_incrementer?
-            sub_cycle_incrementer.add_outer_incrementer(self)
-          else
-            self.sub_cycle_incrementer = NullSubCycleIncrementer
-          end
-        end
-
-        def add_outer_incrementer(incrementer)
-          @outermost = false
-          self.outer_incrementers << incrementer
-          sub_cycle_incrementer.add_outer_incrementer(incrementer)
-        end
-
-        def outermost?
-          @outermost
-        end
-
-        def to_s
-          if sub_cycle_incrementer
-            "#{self.short_name}->#{sub_cycle_incrementer}"
-          else
-            self.short_name
-          end
-        end
-
-        def short_name
-          @short_name ||= self.class.name.split("::").last
-        end
-
-        # Return the next time after previous_occurrence generated by this incrementer
-        # But the occurrence is outside the current cycle of any outer incrementer(s) return
-        # nil which will cause the outer incrementer to step to its next cycle.
-        def next_time(previous_occurrence)
-          if current_occurrence
-            sub_occurrence = sub_cycle_incrementer.next_time(previous_occurrence)
-          else #first time
-            sub_occurrence = sub_cycle_incrementer.first_sub_occurrence(previous_occurrence, update_cycle_range(previous_occurrence))
-          end
-          if sub_occurrence
-            candidate = sub_occurrence
-          else
-            candidate = next_cycle(previous_occurrence)
-          end
-          if in_outer_cycle?(candidate)
-            candidate
-          else
-            nil
-          end
-        end
-
-        def update_cycle_range(date_time)
-          self.current_occurrence = date_time
-          (date_time..end_of_occurrence(date_time))
-        end
-
-        def in_outer_cycle?(candidate)
-          candidate && (outer_range.nil? || (outer_range.first <= candidate && outer_range.last >= candidate))
-        end
-
-        def first_sub_occurrence(previous_occurrence, outer_cycle_range)
-          first_within_outer_cycle(previous_occurrence, outer_cycle_range)
-        end
-
-        # Advance to the next cycle, if the result is within the current cycles of all outer incrementers
-        def next_cycle(previous_occurrence)
-          raise "next_cycle is a subclass responsibility"
-        end
-
-        def contains_daily_incrementer?
-          @contains_daily_incrementer
-        end
-
-        def daily_incrementer?
-          false
-        end
-
-        def contains_weeknum_incrementer?
-          @contains_weeknum_incrementer
-        end
-
-        def weeknum_incrementer?
-          false
-        end
-      end
-
-      # A ListIncrementer represents a byxxx part of a recurrence rule
-      # It contains a list of simple values or recurring values
-      # It keeps a collection of occurrences within a given range called a cycle
-      # When the collection of occurrences is exhausted it is refreshed if there is no
-      # outer incrementer, or if a new cycle would start in the current cycle of the outer incrementers.
-      class ListIncrementer < OccurrenceIncrementer #:nodoc:
-        attr_accessor :occurrences, :list, :outer_occurrence, :cycle_start
-
-        def initialize(rrule, list, sub_cycle_incrementer)
-          super(rrule, sub_cycle_incrementer)
-          self.list = list
-        end
-
-        def self.conditional_incrementer(rrule, by_part, sub_cycle_class)
-          sub_cycle_incrementer = sub_cycle_class.for_rrule(rrule)
-          list = rrule.by_rule_list(by_part)
-          if list
-            new(rrule, list, sub_cycle_incrementer)
-          else
-            sub_cycle_incrementer
-          end
-        end
-
-        # Advance to the next occurrence, if the result is within the current cycles of all outer incrementers
-        def next_cycle(previous_occurrence)
-          unless occurrences
-            self.occurrences = occurrences_for(previous_occurrence)
-          end
-          candidate = next_candidate(previous_occurrence)
-          if candidate
-            sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(candidate))
-          else
-            nil
-          end
-        end
-
-        def first_within_outer_cycle(previous_occurrence, outer_range)
-          self.outer_range = outer_range
-          self.occurrences = occurrences_within(outer_range)
-          occurrences.each { |occurrence|
-            sub = sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(occurrence))
-            return sub if sub && sub > previous_occurrence
-            }
-          nil
-        end
-
-        def next_candidate(date_time)
-          candidate = next_in_list(date_time)
-          if outermost?
-            while candidate.nil?
-              get_next_occurrences
-              candidate = next_in_list(date_time)
-            end
-          end
-          candidate
-        end
-
-        def next_in_list(date_time)
-          occurrences.find {|occurrence| occurrence > date_time}
-        end
-
-        def get_next_occurrences
-          adv_cycle = advance_cycle(start_of_cycle(occurrences.first))
-          self.occurrences = occurrences_for(adv_cycle)
-        end
-
-        def cycle_adjust(date_time)
-          sub_cycle_incrementer.cycle_adjust(start_of_cycle(date_time))
-        end
-
-        def occurrences_for(date_time)
-          list.map {|value| date_time.change(varying_time_attribute => value)}
-        end
-
-        def occurrences_within(date_time_range)
-          result = []
-          date_time = date_time_range.first
-          while date_time <= date_time_range.last
-             result << occurrences_for(date_time)
-             date_time = advance_cycle(date_time)
-           end
-           result.flatten
-        end
-      end
-
-      # A FrequenceIncrementer represents the xxxLY and FREQ parts of a recurrence rule
-      # A FrequenceIncrementer has a single occurrence within each cycle.
-      class FrequencyIncrementer < OccurrenceIncrementer #:nodoc:
-        attr_accessor :interval, :outer_occurrence, :skip_increment
-
-        alias_method :cycle_start, :current_occurrence
-
-        def initialize(rrule, sub_cycle_incrementer)
-          super(rrule, sub_cycle_incrementer)
-          self.interval = rrule.interval
-        end
-
-        def self.conditional_incrementer(rrule, freq_str, sub_cycle_class)
-          sub_cycle_incrementer = sub_cycle_class.for_rrule(rrule)
-          if rrule.freq == freq_str
-            new(rrule, sub_cycle_incrementer)
-          else
-            sub_cycle_incrementer
-          end
-        end
-
-        def multiplier
-          1
-        end
-
-        def step(occurrence)
-          occurrence.advance(advance_what => (interval * multiplier))
-        end
-
-        def first_within_outer_cycle(previous_occurrence, outer_cycle_range)
-          if outer_range
-            first_occurrence = outer_cycle_range.first
-          else
-            first_occurrence = step(previous_occurrence)
-          end
-          self.outer_range = outer_cycle_range
-          sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(first_occurrence))
-        end
-
-        # Advance to the next occurrence, if the result is within the current cycles of all outer incrementers
-        def next_cycle(previous_occurrence)
-          if current_occurrence
-            candidate = sub_cycle_incrementer.cycle_adjust(step(current_occurrence))
-          else
-            candidate = step(previous_occurrence)
-          end
-          if outermost?
-            sub_occurrence = sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(candidate))
-            until sub_occurrence
-              candidate = sub_cycle_incrementer.cycle_adjust(step(candidate))
-              sub_occurrence = sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(candidate))
-            end
-            sub_occurrence
-          elsif in_outer_cycle?(candidate)
-            sub_cycle_incrementer.first_within_outer_cycle(previous_occurrence, update_cycle_range(candidate))
-          else
-            nil
-          end
-        end
-      end
-
-      class SecondlyIncrementer < FrequencyIncrementer #:nodoc:
-
-        def self.for_rrule(rrule)
-          if rrule.freq == "SECONDLY"
-            new(rrule, nil)
-          else
-            nil
-          end
-        end
-
-        def advance_what
-          :seconds
-        end
-
-        def end_of_occurrence(date_time)
-          date_time
-        end
-      end
-
-
-      class BySecondIncrementer < ListIncrementer #:nodoc:
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :bysecond, SecondlyIncrementer)
-        end
-
-        def varying_time_attribute
-          :sec
-        end
-
-        def start_of_cycle(date_time)
-          date_time.start_of_minute
-        end
-
-        def advance_cycle(date_time)
-          date_time.advance(:minutes => 1).start_of_minute
-        end
-
-        def end_of_occurrence(date_time)
-          date_time
-        end
-      end
-
-      class MinutelyIncrementer < FrequencyIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, "MINUTELY", BySecondIncrementer)
-        end
-
-        def advance_what
-          :minutes
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_minute
-        end
-      end
-
-      class ByMinuteIncrementer < ListIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :byminute, MinutelyIncrementer)
-        end
-
-        def advance_cycle(date_time)
-          date_time.advance(:hours => 1).start_of_hour
-        end
-
-        def start_of_cycle(date_time)
-          date_time.change(:min => 0)
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_minute
-        end
-
-        def varying_time_attribute
-          :min
-        end
-      end
-
-      class HourlyIncrementer < FrequencyIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, "HOURLY", ByMinuteIncrementer)
-        end
-
-        def advance_what
-          :hours
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_hour
-        end
-      end
-
-      class ByHourIncrementer < ListIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :byhour, HourlyIncrementer)
-        end
-
-        def start_of_cycle(date_time)
-          date_time.change(:hour => 0)
-        end
-
-        def varying_time_attribute
-          :hour
-        end
-
-        def advance_cycle(date_time)
-          first_hour_of_day(advance_day(date_time))
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_hour
-        end
-      end
-
-      class DailyIncrementer < FrequencyIncrementer #:nodoc:
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, "DAILY", ByHourIncrementer)
-        end
-
-        def daily_incrementer?
-          true
-        end
-
-        def advance_what
-          :days
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_day
-        end
-      end
-
-      class ByNumberedDayIncrementer < ListIncrementer #:nodoc:
-
-        def daily_incrementer?
-          true
-        end
-
-        def occurrences_for(date_time)
-          if occurrences && @scoping_value == scope_of(date_time)
-             occurrences
-          else
-            @scoping_value = scope_of(date_time)
-            self.occurrences = list.map {|numbered_day| numbered_day.target_date_time_for(date_time)}.uniq.sort
-            occurrences
-          end
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_day
-        end
-
-        def candidate_acceptible?(candidate)
-          list.any? {|by_part| by_part.include?(candidate)}
-        end
-      end
-
-      class ByMonthdayIncrementer < ByNumberedDayIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :bymonthday, DailyIncrementer)
-        end
-
-        def scope_of(date_time)
-          date_time.month
-        end
-
-        def start_of_cycle(date_time)
-          date_time.change(:day => 1)
-        end
-
-        def advance_cycle(date_time)
-          first_day_of_month(advance_month(date_time))
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_day
-        end
-      end
-
-      class ByYeardayIncrementer < ByNumberedDayIncrementer #:nodoc:
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :byyearday, ByMonthdayIncrementer)
-        end
-
-        def start_of_cycle(date_time)
-          date_time.change(:month => 1, :day => 1)
-        end
-
-        def scope_of(date_time)
-          date_time.year
-        end
-
-        def advance_cycle(date_time)
-          first_day_of_year(advance_year(date_time))
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_day
-        end
-      end
-
-      class ByDayIncrementer < ListIncrementer #:nodoc:
-
-        def initialize(rrule, list, by_monthday_list, by_yearday_list, parent)
-          super(rrule, list, parent)
-          @monthday_filters = by_monthday_list
-          @yearday_filters = by_yearday_list
-          @by_day_scope = rrule.by_day_scope
-
-          case rrule.by_day_scope
-          when :yearly
-            @cycle_advance_proc = lambda {|date_time| first_day_of_year(advance_year(date_time))}
-            @current_proc = lambda {|date_time| same_year?(current, date_time)}
-            @first_day_proc = lambda {|date_time| first_day_of_year(date_time)}
-          when :monthly
-            @cycle_advance_proc = lambda {|date_time| first_day_of_month(advance_month(date_time))}
-            @current_proc = lambda {|date_time| same_month?(current, date_time)}
-            @first_day_proc = lambda {|date_time| first_day_of_month(date_time)}
-          when :weekly
-            @cycle_advance_proc = lambda {|date_time| first_day_of_week(rrule.wkst_day, advance_week(date_time))}
-            @current_proc = lambda {|date_time| same_week?(rrule.wkst_day, current, date_time)}
-            @first_day_proc = lambda {|date_time| first_day_of_week(rrule.wkst_day, date_time)}
-          else
-            raise "Invalid recurrence rule, byday needs to be scoped by month, week or year"
-          end
-        end
-
-        def self.for_rrule(rrule)
-          list = rrule.by_rule_list(:byday)
-          if list
-            sub_cycle_incrementer = DailyIncrementer.for_rrule(rrule)
-            new(rrule, list, rrule.by_rule_list(:bymonthday), rrule.by_rule_list(:byyearday), sub_cycle_incrementer)
-          else
-            ByYeardayIncrementer.for_rrule(rrule)
-          end
-        end
-
-        def daily_incrementer?
-          true
-        end
-
-        def start_of_cycle(date_time)
-          @first_day_proc.call(date_time)
-        end
-
-        def occurrences_for(date_time)
-          first_day = start_of_cycle(date_time)
-          result = list.map {|recurring_day| recurring_day.matches_for(first_day)}.flatten.uniq.sort
-          if @monthday_filters
-            result = result.select {|occurrence| @monthday_filters.any? {|recurring_day| recurring_day.include?(occurrence)}}
-          end
-          if @yearday_filters
-            result = result.select {|occurrence| @yearday_filters.any? {|recurring_day| recurring_day.include?(occurrence)}}
-          end
-          result
-        end
-
-        def candidate_acceptible?(candidate)
-          list.any? {|recurring_day| recurring_day.include?(candidate)}
-        end
-
-        def varying_time_attribute
-          :day
-        end
-
-        def advance_cycle(date_time)
-          @cycle_advance_proc.call(date_time)
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_day
-        end
-      end
-
-      class WeeklyIncrementer < FrequencyIncrementer #:nodoc:
-
-        attr_reader :wkst
-
-        # include WeeklyBydayMethods
-
-        def initialize(rrule, parent)
-          @wkst = rrule.wkst_day
-          super(rrule, parent)
-        end
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, "WEEKLY", ByDayIncrementer)
-        end
-
-        def multiplier
-          7
-        end
-
-        def advance_what
-          :days
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_week_with_wkst(wkst)
-        end
-      end
-
-      class ByWeekNoIncrementer < ListIncrementer #:nodoc:
-        attr_reader :wkst
-        # include WeeklyBydayMethods
-
-        def initialize(rrule, list, sub_cycle_incrementer)
-          @wkst = rrule.wkst_day
-          super(rrule, list, sub_cycle_incrementer)
-        end
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :byweekno, WeeklyIncrementer)
-        end
-
-        def weeknum_incrementer?
-          true
-        end
-
-        def first_within_outer_cycle(previous_occurrence, outer_range)
-          new_range_start = outer_range.first
-          new_range_end = new_range_start.end_of_iso_year(wkst)
-          super(previous_occurrence, outer_range.first..new_range_end)
-        end
-
-        def start_of_cycle(date_time)
-          result = date_time.at_start_of_iso_year(wkst)
-          result
-        end
-
-        def occurrences_for(date_time)
-          iso_year, year_start = *date_time.iso_year_and_week_one_start(wkst)
-          week_one_occurrence = date_time.change(
-            :year => year_start.year,
-            :month => year_start.month,
-            :day => year_start.day
-          )
-          weeks_in_year_plus_one = week_one_occurrence.iso_weeks_in_year(wkst)
-          weeks = list.map {|recurring_weeknum|
-            wk_num = recurring_weeknum.ordinal
-            (wk_num > 0) ? wk_num : weeks_in_year_plus_one + wk_num
-            }.uniq.sort
-          weeks.map {|wk_num| week_one_occurrence.advance(:days => (wk_num - 1) * 7)}
-        end
-
-        def candidate_acceptible?(candidate)
-          list.include?(candidate.iso_week_num(wkst))
-        end
-
-        def advance_cycle(date_time)
-          date_time.at_start_of_next_iso_year(wkst)
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_week_with_wkst(wkst)
-        end
-      end
-
-      class MonthlyIncrementer < FrequencyIncrementer #:nodoc:
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, "MONTHLY", ByWeekNoIncrementer)
-        end
-
-        def advance_what
-          :months
-        end
-        
-        def step(date_time)
-          if contains_daily_incrementer?
-            result = super(date_time).change(:day => 1)
-            result
-          else
-            super(date_time)
-          end
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_month
-        end
-      end
-
-      class ByMonthIncrementer < ListIncrementer #:nodoc:
-
-        def self.for_rrule(rrule)
-          conditional_incrementer(rrule, :bymonth, MonthlyIncrementer)
-        end
-
-        def occurrences_for(date_time)
-          if contains_daily_incrementer?
-            list.map {|value| date_time.change(:month => value, :day => 1)}
-          else
-            list.map {|value| date_time.in_month(value)}
-          end
-        end
-
-        def range_advance(date_time)
-          advance_year(date_time)
-        end
-
-        def start_of_cycle(date_time)
-          if contains_daily_incrementer?
-            date_time.change(:month => 1, :day => 1)
-          else
-            date_time.change(:month => 1)
-          end
-        end
-
-        def varying_time_attribute
-          :month
-        end
-
-        def advance_cycle(date_time)
-          if contains_daily_incrementer?
-            first_day_of_year(advance_year(date_time))
-          else
-            advance_year(date_time).change(:month => 1)
-          end
-        end
-
-        def end_of_occurrence(date_time)
-          date_time.end_of_month
-        end
-      end
-
-      class YearlyIncrementer < FrequencyIncrementer #:nodoc:
-
-        attr_reader :wkst
-
-        def initialize(rrule, sub_cycle_incrementer)
-          @wkst = rrule.wkst_day
-          super(rrule, sub_cycle_incrementer)
-        end
-
-        def self.from_rrule(rrule, start_time)
-          conditional_incrementer(rrule, "YEARLY", ByMonthIncrementer)
-        end
-
-        def advance_what
-          :years
-        end
-
-        def step(date_time)
-          if contains_weeknum_incrementer?
-            result = date_time
-            multiplier.times do
-              result = result.at_start_of_next_iso_year(wkst)
-            end
-            result
-          else
-            super(date_time)
-          end
-        end
-
-        def start_of_cycle(date_time)
-          if contains_weeknum_incrementer?
-            date_time.at_start_of_iso_year(wkst)
-          elsif contains_daily_incrementer?
-            date_time.change(:month => 1, :day => 1)
-          else
-            date_time.change(:month => 1)
-          end
-        end
-
-        def end_of_occurrence(date_time)
-          if contains_weeknum_incrementer?
-            date_time.end_of_iso_year(wkst)
-          else
-            date_time.end_of_year
-          end
-        end
-     end
-    end
-  end
-end