ri_cal 0.8.2 → 0.8.4

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.8.3 - 18 September 2009
+  Refactored load structure, should now be conforming to    
+        http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices
+    I did finesse the load path issue a bit as a workaround to RSpec not putting lib on $LOADPATH
+    the lib directory will get added to load path IF IT ISN"T ALREADY THERE
+    
+  Fixes http://rick_denatale.lighthouseapp.com/projects/30941/tickets/25
+     please clean your code up to be quiet
+     
+   Thanks to Ryan for such a courteous problem report.
 === 0.8.2 - 4 September 2009
   Fixes http://rick_denatale.lighthouseapp.com/projects/30941/tickets/23
         initialization_methodsrb-syntax

data/Manifest.txt

@@ -50,10 +50,11 @@ 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/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
@@ -81,11 +82,31 @@ 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/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
@@ -98,7 +119,6 @@ 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

data/lib/ri_cal.rb

@@ -9,12 +9,35 @@ module RiCal
   
   my_dir =  File.dirname(__FILE__)
   
-  autoload :Component, "#{my_dir}/ri_cal/component.rb"
-  autoload :TimezonePeriod, "#{my_dir}/ri_cal/properties/timezone_period.rb"
-  autoload :OccurrenceEnumerator, "#{my_dir}/ri_cal/occurrence_enumerator.rb"
+  $LOAD_PATH << my_dir unless $LOAD_PATH.include?(my_dir)
+
+  if Object.const_defined?(:ActiveSupport)
+    as = Object.const_get(:ActiveSupport)
+    if as.const_defined?(:TimeWithZone)
+      time_with_zone = as.const_get(:TimeWithZone)
+    end
+  end
   
+  # TimeWithZone will be set to ActiveSupport::TimeWithZone if the activesupport gem is loaded
+  # otherwise it will be nil
+  TimeWithZone = time_with_zone  
+  
+  autoload :Component, "ri_cal/component.rb"
+  autoload :CoreExtensions, "ri_cal/core_extensions.rb" 
+  autoload :FastDateTime, "ri_cal/fast_date_time.rb" 
+  autoload :FloatingTimezone, "ri_cal/floating_timezone.rb" 
+  autoload :InvalidPropertyValue, "ri_cal/invalid_property_value.rb" 
+  autoload :InvalidTimezoneIdentifier, "ri_cal/invalid_timezone_identifier.rb" 
+  autoload :OccurrenceEnumerator, "ri_cal/occurrence_enumerator.rb"
+  autoload :OccurrencePeriod, "ri_cal/occurrence_period.rb"
+  autoload :TimezonePeriod, "ri_cal/properties/timezone_period.rb"
+  autoload :Parser, "ri_cal/parser.rb"
+  autoload :Properties, "ri_cal/properties.rb"
+  autoload :PropertyValue, "ri_cal/property_value.rb" 
+  autoload :RequiredTimezones, "ri_cal/required_timezones.rb" 
+  require "ri_cal/core_extensions.rb"
   # :stopdoc:
-  VERSION = '0.8.2'
+  VERSION = '0.8.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 
@@ -123,17 +146,6 @@ module RiCal
     Component::TimezonePeriod.new(&init_block)
   end
 
-  if Object.const_defined?(:ActiveSupport)
-    as = Object.const_get(:ActiveSupport)
-    if as.const_defined?(:TimeWithZone)
-      time_with_zone = as.const_get(:TimeWithZone)
-    end
-  end
-  
-  # TimeWithZone will be set to ActiveSupport::TimeWithZone if the activesupport gem is loaded
-  # otherwise it will be nil
-  TimeWithZone = time_with_zone
-
   # return a new Todo calendar component.  If a block is provided it will will be executed in
   # the context of a builder object which can be used to initialize the properties and alarms of the 
   # new Todo.  
@@ -171,5 +183,5 @@ end  # module RiCal
 end
 
 
-RiCal.require_all_libs_relative_to(__FILE__)
+#RiCal.require_all_libs_relative_to(__FILE__)
 # EOF

data/lib/ri_cal/component.rb

@@ -2,6 +2,17 @@ module RiCal
   #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
   #
   class Component #:nodoc:
+
+    autoload :Alarm, "ri_cal/component/alarm.rb"
+    autoload :Calendar, "ri_cal/component/calendar.rb"
+    autoload :Event, "ri_cal/component/event.rb"
+    autoload :Freebusy, "ri_cal/component/freebusy.rb"
+    autoload :Journal, "ri_cal/component/journal.rb"
+    autoload :NonStandard, "ri_cal/component/non_standard.rb"
+    autoload :TZInfoTimezone, "ri_cal/component/t_z_info_timezone.rb"
+    autoload :Timezone, "ri_cal/component/timezone.rb"
+    autoload :Todo, "ri_cal/component/todo.rb"
+
     class ComponentBuilder #:nodoc:
       def initialize(component)
         @component = component
@@ -30,8 +41,6 @@ module RiCal
       end
     end
 
-    autoload :Timezone, "#{File.dirname(__FILE__)}/component/timezone.rb"
-
     attr_accessor :imported #:nodoc:
 
     def initialize(parent=nil, entity_name = nil, &init_block) #:nodoc:
@@ -241,9 +250,4 @@ module RiCal
       wrapper_calendar.export(stream)
     end
   end
-end
-
-Dir[File.dirname(__FILE__) + "/component/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require path
 end

data/lib/ri_cal/component/alarm.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties alarm.rb])
-
 module RiCal
 
   class Component

data/lib/ri_cal/component/calendar.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties calendar.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license

data/lib/ri_cal/component/event.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties event.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license

data/lib/ri_cal/component/freebusy.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties freebusy.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license

data/lib/ri_cal/component/journal.rb

@@ -1,6 +1,3 @@
-
-require File.join(File.dirname(__FILE__), %w[.. properties journal.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license

data/lib/ri_cal/component/non_standard.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties alarm.rb])
-
 module RiCal
 
   class Component

data/lib/ri_cal/component/timezone.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties timezone.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
@@ -10,6 +8,11 @@ module RiCal
     #
     # to see the property accessing methods for this class see the RiCal::Properties::Timezone module
     class Timezone < Component
+      
+      autoload :TimezonePeriod, "ri_cal/component/timezone/timezone_period.rb"
+      autoload :StandardPeriod, "ri_cal/component/timezone/standard_period.rb"
+      autoload :DaylightPeriod, "ri_cal/component/timezone/daylight_period.rb"
+      
       include RiCal::Properties::Timezone
 
         # The identifier of the timezone, e.g. "Europe/Paris".
@@ -192,6 +195,3 @@ module RiCal
 end
 
 
-%w[timezone_period.rb daylight_period.rb standard_period.rb].each do |filename|
-  require "#{File.dirname(__FILE__)}/timezone/#{filename}"
-end

data/lib/ri_cal/component/timezone/timezone_period.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. .. properties timezone_period.rb])
-
 module RiCal
   class Component
     class Timezone

data/lib/ri_cal/component/todo.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), %w[.. properties todo.rb])
-
 module RiCal
   class Component
     #- ©2009 Rick DeNatale

data/lib/ri_cal/core_extensions.rb

@@ -1,6 +1,11 @@
 #- ©2009 Rick DeNatale
 #- All rights reserved. Refer to the file README.txt for the license
 #
-Dir[File.dirname(__FILE__) + "/core_extensions/*.rb"].sort.each do |path|
-  require path
-end
+
+require "ri_cal/core_extensions/array.rb"
+require "ri_cal/core_extensions/date.rb"
+require "ri_cal/core_extensions/date_time.rb"
+require "ri_cal/core_extensions/object.rb"
+require "ri_cal/core_extensions/string.rb"
+require "ri_cal/core_extensions/time.rb"
+

data/lib/ri_cal/core_extensions/array.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/array/conversions.rb"
+require "ri_cal/core_extensions/array/conversions.rb"
 class Array #:nodoc:
   #- ©2009 Rick DeNatale
   #- All rights reserved. Refer to the file README.txt for the license

data/lib/ri_cal/core_extensions/date.rb

@@ -1,6 +1,6 @@
-require "#{File.dirname(__FILE__)}/date/conversions.rb"
-require "#{File.dirname(__FILE__)}/time/week_day_predicates.rb"
-require "#{File.dirname(__FILE__)}/time/calculations.rb"
+require "ri_cal/core_extensions/date/conversions.rb"
+require "ri_cal/core_extensions/time/week_day_predicates.rb"
+require "ri_cal/core_extensions/time/calculations.rb"
 require 'date'
 
 class Date #:nodoc:

data/lib/ri_cal/core_extensions/date_time.rb

@@ -1,7 +1,7 @@
-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"
+require "ri_cal/core_extensions/date_time/conversions.rb"
+require "ri_cal/core_extensions/time/tzid_access.rb"
+require "ri_cal/core_extensions/time/week_day_predicates.rb"
+require "ri_cal/core_extensions/time/calculations.rb"
 require 'date'
 
 class DateTime #:nodoc:

data/lib/ri_cal/core_extensions/object.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/object/conversions.rb"
+require "ri_cal/core_extensions/object/conversions.rb"
 
 class Object #:nodoc:
   #- ©2009 Rick DeNatale

data/lib/ri_cal/core_extensions/string.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/string/conversions.rb"
+require "ri_cal/core_extensions/string/conversions.rb"
 
 class String #:nodoc:
   #- ©2009 Rick DeNatale

data/lib/ri_cal/core_extensions/time.rb

@@ -1,10 +1,11 @@
-require "#{File.dirname(__FILE__)}/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"
 #- ©2009 Rick DeNatale
 #- All rights reserved. Refer to the file README.txt for the license
 #
+require "ri_cal/core_extensions/time/conversions.rb"
+require "ri_cal/core_extensions/time/tzid_access.rb"
+require "ri_cal/core_extensions/time/week_day_predicates.rb"
+require "ri_cal/core_extensions/time/calculations.rb"
+
 class Time #:nodoc:
   include RiCal::CoreExtensions::Time::WeekDayPredicates
   include RiCal::CoreExtensions::Time::Calculations  

data/lib/ri_cal/fast_date_time.rb

@@ -130,7 +130,7 @@ module RiCal
         [day_delta, new_secs_since_bod]
       elsif new_secs_since_bod > 0
         [day_delta + (new_secs_since_bod / SECONDS_IN_A_DAY), new_secs_since_bod % SECONDS_IN_A_DAY]
-      else new_secs_since_bod
+      else
         [day_delta - (1 + new_secs_since_bod.abs / SECONDS_IN_A_DAY), 
          SECONDS_IN_A_DAY - (new_secs_since_bod.abs % SECONDS_IN_A_DAY)]
       end

data/lib/ri_cal/properties.rb

@@ -0,0 +1,12 @@
+module RiCal
+  module Properties #:nodoc:
+    autoload :Alarm, "ri_cal/properties/alarm.rb"
+    autoload :Calendar, "ri_cal/properties/calendar.rb"
+    autoload :Event, "ri_cal/properties/event.rb"
+    autoload :Freebusy, "ri_cal/properties/freebusy.rb"
+    autoload :Journal, "ri_cal/properties/journal.rb"
+    autoload :Timezone, "ri_cal/properties/timezone.rb"
+    autoload :TimezonePeriod, "ri_cal/properties/timezone_period.rb"
+    autoload :Todo, "ri_cal/properties/todo.rb"
+  end
+end

data/lib/ri_cal/property_value.rb

@@ -3,6 +3,20 @@ module RiCal
   #
   # PropertyValue provides common implementation of various RFC 2445 property value types
   class PropertyValue
+    
+    autoload :Array, "ri_cal/property_value/array.rb"
+    autoload :CalAddress, "ri_cal/property_value/cal_address.rb"
+    autoload :Date, "ri_cal/property_value/date.rb"
+    autoload :DateTime, "ri_cal/property_value/date_time.rb"
+    autoload :Duration, "ri_cal/property_value/duration.rb"
+    autoload :Geo, "ri_cal/property_value/geo.rb"
+    autoload :Integer, "ri_cal/property_value/integer.rb"
+    autoload :OccurrenceList, "ri_cal/property_value/occurrence_list.rb"
+    autoload :Period, "ri_cal/property_value/period.rb"
+    autoload :RecurrenceRule, "ri_cal/property_value/recurrence_rule.rb"
+    autoload :Text, "ri_cal/property_value/text.rb"
+    autoload :Uri, "ri_cal/property_value/uri.rb"
+    autoload :UtcOffset, "ri_cal/property_value/utc_offset.rb"
 
     attr_writer :params, :value #:nodoc:
     attr_reader :timezone_finder #:nodoc:
@@ -142,8 +156,3 @@ module RiCal
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + "/property_value/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require path
-end

data/lib/ri_cal/property_value/duration.rb

@@ -34,7 +34,7 @@ module RiCal
       end
 
       def self.convert(parent, ruby_object) # :nodoc:
-        ruby_object.to_ri_cal_duration_value.for_parent(parent)
+        ruby_object.to_ri_cal_duration_value
       end
 
       def value=(string) # :nodoc:

data/lib/ri_cal/property_value/recurrence_rule.rb

@@ -1,7 +1,3 @@
-Dir[File.dirname(__FILE__) + "/recurrence_rule/*.rb"].sort.each do |path|
-  require path
-end
-
 module RiCal
   class PropertyValue
     #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
@@ -11,6 +7,19 @@ module RiCal
     # rfc 2445 section 4.3.10 pp 40-45
     class RecurrenceRule < PropertyValue
       
+      autoload :EnumerationSupportMethods, "ri_cal/property_value/recurrence_rule/enumeration_support_methods.rb"
+      autoload :OccurrenceIncrementer,     "ri_cal/property_value/recurrence_rule/occurrence_incrementer.rb"
+      autoload :Enumerator, "ri_cal/property_value/recurrence_rule/enumerator.rb"
+      autoload :InitializationMethods, "ri_cal/property_value/recurrence_rule/initialization_methods.rb"
+      autoload :NegativeSetposEnumerator, "ri_cal/property_value/recurrence_rule/negative_setpos_enumerator.rb"
+      autoload :NumberedSpan, "ri_cal/property_value/recurrence_rule/numbered_span.rb"
+      autoload :RecurringDay, "ri_cal/property_value/recurrence_rule/recurring_day.rb"
+      autoload :RecurringMonthDay, "ri_cal/property_value/recurrence_rule/recurring_month_day.rb"
+      autoload :RecurringNumberedWeek, "ri_cal/property_value/recurrence_rule/recurring_numbered_week.rb"
+      autoload :RecurringYearDay, "ri_cal/property_value/recurrence_rule/recurring_year_day.rb"
+      autoload :TimeManipulation, "ri_cal/property_value/recurrence_rule/time_manipulation.rb"
+      autoload :Validations, "ri_cal/property_value/recurrence_rule/validations.rb"
+      
       def initialize(parent, value_hash) # :nodoc:
         @by_list_hash = {}
         super

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

@@ -16,21 +16,21 @@ module RiCal
               start_time.change(:seconds => 0)
             when "HOURLY"
               start_time.change(
-              :minutes => 0, 
+              :minutes => 0,
               :seconds => start_time.sec
               )
             when "DAILY"
               start_time.change(
               :hour => 0,
-              :minutes => start_time.min, 
+              :minutes => start_time.min,
               :seconds => start_time.sec
               )
             when "WEEKLY"
               start_of_week(time)
             when "MONTHLY"
               start_time.change(
-              :day => 1, 
-              :hour => start_time.hour, 
+              :day => 1,
+              :hour => start_time.hour,
               :minutes => start_time.min,
               :seconds => start_time.sec
               )
@@ -47,7 +47,7 @@ module RiCal
             start_time
           end
         end
-        
+
         def enumerator(component) # :nodoc:
           Enumerator.for(self, component, by_list[:bysetpos])
         end
@@ -60,26 +60,26 @@ module RiCal
           case freq
           when "SECONDLY"
             [time1.year, time1.month, time1.day, time1.hour, time1.min, time1.sec] ==
-            [time2.year, time2.month, time2.day, time2.hour, time2.min, time2.sec] 
+            [time2.year, time2.month, time2.day, time2.hour, time2.min, time2.sec]
           when "MINUTELY"
             [time1.year, time1.month, time1.day, time1.hour, time1.min] ==
-            [time2.year, time2.month, time2.day, time2.hour, time2.min] 
+            [time2.year, time2.month, time2.day, time2.hour, time2.min]
           when "HOURLY"
             [time1.year, time1.month, time1.day, time1.hour] ==
-            [time2.year, time2.month, time2.day, time2.hour] 
+            [time2.year, time2.month, time2.day, time2.hour]
           when "DAILY"
             [time1.year, time1.month, time1.day] ==
-            [time2.year, time2.month, time2.day] 
+            [time2.year, time2.month, time2.day]
           when "WEEKLY"
             sow1 = start_of_week(time1)
             sow2 = start_of_week(time2)
             [sow1.year, sow1.month, sow1.day] ==
-            [sow2.year, sow2.month, sow2.day] 
+            [sow2.year, sow2.month, sow2.day]
           when "MONTHLY"
             [time1.year, time1.month] ==
-            [time2.year, time2.month] 
+            [time2.year, time2.month]
           when "YEARLY"
-            time1.year == time2.year 
+            time1.year == time2.year
           end
         end
 
@@ -90,7 +90,10 @@ module RiCal
             nil
           end
         end
-        
+
+        def incrementer_from_start_time(start_time)
+          RecurrenceRule::OccurrenceIncrementer.from_rrule(self, start_time)
+        end
       end
     end
   end