rubyredrick-ri_cal 0.0.2 → 0.0.3

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

@@ -4,19 +4,50 @@ module RiCal
       #- ©2009 Rick DeNatale
       #- All rights reserved. Refer to the file README.txt for the license
       #
-      module Conversions
+      module Conversions #:nodoc:
         # Parse the receiver as an RiCal::PropertyValue::DateTime
-        def to_ri_cal_date_time_value
-          RiCal::PropertyValue::DateTime.from_string(self)
+        def to_ri_cal_date_time_value(timezone_finder = nil)
+          params, value = *Parser.params_and_value(self, :no_leading_semicolon)
+          if PropertyValue::DateTime.valid_string?(value)
+             PropertyValue::DateTime.new(timezone_finder, :params => params, :value => value)
+           else
+             raise InvalidPropertyValue.new("#{self.inspect} is not a valid rfc 2445 date-time")
+           end
         end
+        
 
-        alias_method :to_ri_cal_date_or_date_time_value, :to_ri_cal_date_time_value
+        def to_ri_cal_date_or_date_time_value(timezone_finder = nil)
+          params, value = *Parser.params_and_value(self, :no_leading_semicolon)
+          if PropertyValue::DateTime.valid_string?(value) || PropertyValue::Date.valid_string?(value)
+            PropertyValue.date_or_date_time(timezone_finder, :params => params, :value => value)
+          else
+            raise InvalidPropertyValue.new("#{self.inspect} is not a valid rfc 2445 date or date-time")
+          end
+        end
 
         # Parse the receiver as an RiCal::PropertyValue::DurationValue
-        def to_ri_cal_duration_value
-          RiCal::PropertyValue::Duration.from_string(self)
+        def to_ri_cal_duration_value(timezone_finder = nil)
+          params, value = *Parser.params_and_value(self)
+          if PropertyValue::Duration.valid_string?(value)
+            PropertyValue::Duration.new(timezone_finder, :params => params, :value => value)
+          else
+            raise InvalidPropertyValue.new("#{self.inspect} is not a valid rfc 2445 duration")
+          end
         end
 
+        def to_ri_cal_occurrence_list_value(timezone_finder = nil)
+          params, value = *Parser.params_and_value(self, :no_leading_semicolon)
+          if PropertyValue::DateTime.valid_string?(value)
+            PropertyValue::DateTime.new(timezone_finder, :params => params, :value => value)
+          elsif PropertyValue::Date.valid_string?(value)
+            PropertyValue::Date.new(timezone_finder, :params => params, :value => value)
+          elsif PropertyValue::Period.valid_string?(value)
+            PropertyValue::Period.new(timezone_finder, :params => params, :value => value)
+          else
+            raise "Invalid value for occurrence list #{self.inspect}"
+          end
+        end
+ 
         # code stolen from ActiveSupport Gem
         unless  ::String.instance_methods.include?("camelize")
           # Convert the receiver to camelized form

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

@@ -6,20 +6,24 @@ module RiCal
       #
       module Conversions
         # Return an RiCal::PropertyValue::DateTime representing the receiver
-        def to_ri_cal_date_time_value
-          RiCal::PropertyValue::DateTime.from_time(self)
+        def to_ri_cal_date_time_value(timezone_finder = nil) #:nodoc:
+          RiCal::PropertyValue::DateTime.new(
+               timezone_finder, 
+               :value => strftime("%Y%m%dT%H%M%S"), 
+               :params => {"TZID" => self.tzid || :default})
         end
 
-        alias_method :to_ri_cal_date_or_date_time_value, :to_ri_cal_date_time_value
+        alias_method :to_ri_cal_date_or_date_time_value, :to_ri_cal_date_time_value #:nodoc:
+        alias_method :to_ri_cal_occurrence_list_value, :to_ri_cal_date_time_value #:nodoc:
 
         # Return the natural ri_cal_property for this object
-        def to_ri_cal_property_value
-          to_ri_cal_date_time_value
+        def to_ri_cal_property_value(timezone_finder = nil) #:nodoc:
+          to_ri_cal_date_time_value(timezone_finder)
         end
         
-        # Return a proxy to this object which will be interpreted as a floating time.
+        # Return a copy of this object which will be interpreted as a floating time.
         def with_floating_timezone
-          RiCal::TimeWithFloatingTimezone.new(self)
+          dup.set_tzid(:floating)
         end
       end
     end

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

@@ -0,0 +1,37 @@
+module RiCal
+  module CoreExtensions #:nodoc:
+    module Time #:nodoc:
+      #- ©2009 Rick DeNatale
+      #- All rights reserved. Refer to the file README.txt for the license
+      #
+      # Provides a tzid attribute for ::Time and ::DateTime
+      module TzidAccess
+        # The tzid attribute is used by RiCal, it should be a valid timezone identifier within a calendar,
+        # :floating to indicate a floating time, or nil to use the default timezone in effect
+        #
+        # See PropertyValue::DateTime#default_tzid= and Component::Calendar#tzid=
+        attr_accessor :tzid
+
+        # Convenience method, sets the tzid and returns the receiver
+        def set_tzid(time_zone_identifier)
+          self.tzid = time_zone_identifier
+          self
+        end
+      end
+    end
+  end
+
+  module TimeWithZoneExtension #:nodoc:
+    def tzid
+      time_zone.tzid.identifier
+    end
+  end
+end
+
+if Object.const_defined?(:ActiveSupport)
+  as = Object.const_get(:ActiveSupport)
+  if as.const_defined?(:TimeWithZone)
+    twz = as.const_get(:TimeWithZone)
+    twz.class_eval {include RiCal::TimeWithZoneExtension}
+  end
+end

data/lib/ri_cal/core_extensions/time.rb

@@ -1,4 +1,5 @@
 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
@@ -7,5 +8,6 @@ require "#{File.dirname(__FILE__)}/time/calculations.rb"
 class Time #:nodoc:
   include RiCal::CoreExtensions::Time::WeekDayPredicates
   include RiCal::CoreExtensions::Time::Calculations  
-  include RiCal::CoreExtensions::DateTime::Conversions
+  include RiCal::CoreExtensions::Time::Conversions
+  include RiCal::CoreExtensions::Time::TzidAccess
 end

data/lib/ri_cal/floating_timezone.rb

@@ -0,0 +1,32 @@
+module RiCal
+  #- ©2009 Rick DeNatale
+  #- All rights reserved. Refer to the file README.txt for the license
+  #
+  # FloatingTimezone represents the 'time zone' for a time or date time with no timezone
+  # Times with floating timezones are always interpreted in the timezone of the observer
+  class FloatingTimezone
+
+    def self.identifier #:nodoc:
+      nil
+    end
+
+    def self.tzinfo_timezone #:nodoc:
+      nil
+    end
+
+  def self.rational_utc_offset(local) #:nodoc:
+    Rational(0, 24)
+  end
+
+    # Return the time unchanged
+    def self.utc_to_local(time)
+      time.with_floating_timezone.to_ri_cal_date_time_value
+    end
+
+    # Return the time unchanged
+    def self.local_to_utc(time)
+      time.with_floating_timezone.to_ri_cal_date_time_value
+    end
+  end
+
+end

data/lib/ri_cal/invalid_property_value.rb

@@ -0,0 +1,8 @@
+module RiCal
+  #- ©2009 Rick DeNatale
+  #- All rights reserved. Refer to the file README.txt for the license
+  #
+  # An InvalidPropertyValue error is raised when an improper value is assigned to a property
+  class InvalidPropertyValue < StandardError
+  end
+end

data/lib/ri_cal/invalid_timezone_identifer.rb

@@ -9,11 +9,11 @@ module RiCal
   # such as importing a calendar which has forward reference to VTIMEZONE components.
   class InvalidTimezoneIdentifier < StandardError
     
-    def self.not_found_in_calendar(identifier)
+    def self.not_found_in_calendar(identifier) #:nodoc:
       new("#{identifier.inspect} is not the identifier of a VTIMEZONE component of this calendar")
     end
     
-    def self.invalid_tzinfo_identifier(identifier)
+    def self.invalid_tzinfo_identifier(identifier) #:nodoc:
       new("#{identifier.inspect} is not known to the tzinfo database")
     end
   end

data/lib/ri_cal/occurrence_enumerator.rb

@@ -84,8 +84,10 @@ module RiCal
         exclusion && occurrence[:start] == occurrence[:start]
       end
       
+      # Also exclude occurrences before the :starting date_time
       def exclude?(occurrence)
-        exclusion_match?(occurrence, exclusion_for(occurrence))
+        exclusion_match?(occurrence, exclusion_for(occurrence)) ||
+          (@start && occurrence[:start].to_datetime < @start)
       end
       
       # yield each occurrence to a block
@@ -95,12 +97,12 @@ module RiCal
         yielded = 0
         @next_exclusion = @exrules.next_occurrence
         while (occurrence)
-          if (@cutoff && occurrence[:start] >= @cutoff) || (@count && yielded >= @count)
+          if (@cutoff && occurrence[:start].to_datetime >= @cutoff) || (@count && yielded >= @count)
             occurrence = nil
           else
             unless exclude?(occurrence)
               yielded += 1
-             yield @component.recurrence(occurrence)
+              yield @component.recurrence(occurrence)
             end
             occurrence = @rrules.next_occurrence
           end

data/lib/ri_cal/parser.rb

@@ -19,7 +19,7 @@ module RiCal
       end
     end
 
-    def parse_params(string) #:nodoc:
+    def self.parse_params(string) #:nodoc:
       if string
         string.split(";").inject({}) { |result, val|
           m = /^(.+)=(.+)$/.match(val)
@@ -32,11 +32,11 @@ module RiCal
       end
     end
 
-    def params_and_value(string) #:nodoc:
+    def self.params_and_value(string, optional_initial_semi = false) #:nodoc:
       string = string.sub(/^:/,'')
-      return ["", string] unless string.match(/^;/)
+      return [{}, string] unless optional_initial_semi || string.match(/^;/)
       segments = string.sub(';','').split(":")
-      return ["", string] if segments.length < 2
+      return [{}, string] if segments.length < 2
       quote_count = 0
       gathering_params = true
       params = []
@@ -50,16 +50,16 @@ module RiCal
           values << segment
         end
       end
-      [params.join(":"), values.join(":")]
+      [parse_params(params.join(":")), values.join(":")]
     end
-
+    
     def separate_line(string) #:nodoc:
       match = string.match(/^([^;:]*)(.*)$/)
       name = match[1]
-      params, value = *params_and_value(match[2])
+      params, value = *Parser.params_and_value(match[2])
       {
         :name => name,
-        :params => parse_params(params),
+        :params => params,
         :value => value
       }
     end

data/lib/ri_cal/properties/alarm.rb

@@ -224,7 +224,7 @@ module RiCal
 
       # set the value of the ATTENDEE property to multiple values
       # one or more instances of CalAddress may be passed to this method
-      def attendees=(*ruby_values)
+      def attendees=(ruby_values)
         @attendee_property = ruby_values.map {|val| RiCal::PropertyValue::CalAddress.convert(self, val)}
       end
 
@@ -237,7 +237,7 @@ module RiCal
       # add one or more values to the ATTENDEE property
       # one or more instances of CalAddress may be passed to this method
       def  add_attendees(*ruby_values)
-       ruby_values.do {|val|  self.attendee_property << RiCal::PropertyValue::CalAddress.convert(self, val)}
+       ruby_values.each {|val|  self.attendee_property << RiCal::PropertyValue::CalAddress.convert(self, val)}
       end
 
       # add one value to the ATTENDEE property
@@ -249,7 +249,7 @@ module RiCal
       # remove one or more values from the ATTENDEE property
       # one or more instances of CalAddress may be passed to this method
       def  remove_attendees(*ruby_values)
-       ruby_values.do {|val|  self.attendee_property.delete(RiCal::PropertyValue::CalAddress.convert(self, val))}
+       ruby_values.each {|val|  self.attendee_property.delete(RiCal::PropertyValue::CalAddress.convert(self, val))}
       end
 
       # remove one value from the ATTENDEE property
@@ -261,7 +261,7 @@ module RiCal
       # return the value of the ATTENDEE property
       # which will be an array of instances of CalAddress
       def attendee
-        attendee_property.map {|prop| prop ? prop.value : prop}
+        attendee_property.map {|prop| prop ? prop.ruby_value : prop}
       end
 
       def attendee_property_from_string(line) # :nodoc:
@@ -287,7 +287,7 @@ module RiCal
 
       # set the value of the ATTACH property to multiple values
       # one or more instances of Uri may be passed to this method
-      def attachments=(*ruby_values)
+      def attachments=(ruby_values)
         @attach_property = ruby_values.map {|val| RiCal::PropertyValue::Uri.convert(self, val)}
       end
 
@@ -300,7 +300,7 @@ module RiCal
       # add one or more values to the ATTACH property
       # one or more instances of Uri may be passed to this method
       def  add_attachments(*ruby_values)
-       ruby_values.do {|val|  self.attach_property << RiCal::PropertyValue::Uri.convert(self, val)}
+       ruby_values.each {|val|  self.attach_property << RiCal::PropertyValue::Uri.convert(self, val)}
       end
 
       # add one value to the ATTACH property
@@ -312,7 +312,7 @@ module RiCal
       # remove one or more values from the ATTACH property
       # one or more instances of Uri may be passed to this method
       def  remove_attachments(*ruby_values)
-       ruby_values.do {|val|  self.attach_property.delete(RiCal::PropertyValue::Uri.convert(self, val))}
+       ruby_values.each {|val|  self.attach_property.delete(RiCal::PropertyValue::Uri.convert(self, val))}
       end
 
       # remove one value from the ATTACH property
@@ -324,7 +324,7 @@ module RiCal
       # return the value of the ATTACH property
       # which will be an array of instances of Uri
       def attach
-        attach_property.map {|prop| prop ? prop.value : prop}
+        attach_property.map {|prop| prop ? prop.ruby_value : prop}
       end
 
       def attach_property_from_string(line) # :nodoc: