rubyredrick-ri_cal 0.0.6 → 0.0.7

data/History.txt

@@ -1,8 +1,12 @@
+=== 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
+   activesupport is present, and it is appropriate. See the README for details
 === 0.0.6
  * Added rake tasks to run specs with either the tzinfo gem or activesupport (<=2.2)
  * Default rake task now runs both of these
- === 0.0.5
-  * Fixed a bug in occurrence enumeration reported by paulsm on github
+=== 0.0.5
+ * Fixed a bug in occurrence enumeration reported by paulsm on github
 === 0.0.4
  * Fixed a bug in imported timezones reported by paulsm on github
 === 0.0.3

data/README.txt

@@ -181,6 +181,43 @@ or the equivalent
 
 event.dtstart = Time.parse("1/1/2010 00:00:00").set_tzid(:floating)
 
+=== RiCal produced Calendars and Tzinfo
+
+Calendars created by the RiCal Builder DSL use TZInfo as a source of time zone definition
+information. RFC 2445 does not specify standard names for time zones, so each time zone identifier
+(tzid) within an icalendar data stream must correspond to a VTIMEZONE component in that data
+stream.
+
+When an RiCal calendar is exported to an icalendar data stream, the needed VTIMEZONE components
+will be generated. In addition a parameter is added to the PRODID property of the calendar which
+identifies that the source of tzids is tzinfo. For purposes of this documentation such a calendar
+is called a tzinfo calendar.
+
+When RiCal imports an icalendar data stream produced by another library or application, such as
+Apple's ical.app, or Google mail, it will be recognized as not being a non-tzinfo calendar, and any
+tzids will be resolved using the included VTIMEZONEs. Note that these calendars may well use tzids
+which are not recognizable by the tzinfo gem or by the similar code provided by ActiveSupport,
+so care is needed in using them.
+
+=== Ruby values of DATETIME properties
+
+The result of accessing the value of a DATETIME property (e.g. event.dtstart) depends on several
+factors:
+
+ * If the property has a DATE value, then the result will be a Ruby Date object.
+
+ * Otherwise, if the property has a DATETIME value with a floating timezone, then the result will
+   be a Ruby DateTime object, the tzid attribute will be set to :floating, and will respond
+   truthily to has_floating_timezone?
+
+ * Otherwise if the value is attached to a property contained in a non-tzinfo calendar, or if the
+   ActiveSupport gem is not loaded, then the result will be a Ruby DateTime object, with the proper
+   offset from UTC, and with the tzid property set.
+
+ * Finally, if the value is attached to a property contained in a tzinfo calendar and the
+   ActiveSupport gem is loaded, then the result will be an ActiveSupport::TimeWithZone with the 
+   proper tzid.
+   
 ==== RDATE, and EXDATE properties (Occurrence Lists)
 
 A calendar component which supports recurrence properties (e.g. Event) may have zero or more RDATE

data/lib/ri_cal/component/calendar.rb

@@ -10,8 +10,8 @@ module RiCal
       attr_reader :tz_source #:nodoc:
 
       def initialize(parent=nil, &init_block) #:nodoc:
-        super
         @tz_source = 'TZINFO' # Until otherwise told
+        super
       end
 
       def self.entity_name #:nodoc:
@@ -122,21 +122,25 @@ module RiCal
           tzinfo.identifier
         end
 
-        def date_time(ruby_time, tzid) #:nodoc:
-          RiCal::PropertyValue::DateTime.new(calendar, :value => ruby_time, :params => {'TZID' => tzid})
+        def local_date_time(ruby_time, tzid) #:nodoc:
+          RiCal::PropertyValue::DateTime.new(calendar, :value => ruby_time.strftime("%Y%m%dT%H%M%S"), :params => {'TZID' => tzid})
+        end
+
+        def utc_date_time(ruby_time) #:nodoc
+            RiCal::PropertyValue::DateTime.new(calendar, :value => ruby_time.strftime("%Y%m%dT%H%M%SZ"))
         end
 
         def local_to_utc(utc) #:nodoc:
-          date_time(tzinfo.local_to_utc(utc.to_ri_cal_ruby_value), 'UTC')
+          utc_date_time(tzinfo.local_to_utc(utc.to_ri_cal_ruby_value))
         end
 
         def utc_to_local(local) #:nodoc:
-          date_time(tzinfo.utc_to_local(local.to_ri_cal_ruby_value), tzinfo.identifier)
+          local_date_time(tzinfo.utc_to_local(local.to_ri_cal_ruby_value), tzinfo.identifier)
         end
 
 
         def rational_utc_offset(local)
-          Rational(tzinfo.period_for_local(local, true).utc_offset, 3600) / 24
+          Rational(tzinfo.period_for_local(local, true).utc_total_offset, 3600) / 24
         end
 
       end

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

@@ -17,7 +17,7 @@ module RiCal
         def swallows_local?(local, std_candidate)
           ([local.year, local.month, local.day] == [dtstart.year,dtstart.month, dtstart.day]) && 
              local >= dtstart_property &&
-             local.advance(:seconds => (utc_total_offset - std_candidate.utc_total_offset)) < dtstart_property
+             local.advance(:seconds => (std_candidate.utc_total_offset - utc_total_offset)) < dtstart_property
         end
       end
     end

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

@@ -27,7 +27,7 @@ module RiCal
         end
         
         def utc_total_offset #:nodoc:
-          tzoffsetfrom_property.to_seconds
+          tzoffsetto_property.to_seconds
         end
 
         def exrule_property #:nodoc:

data/lib/ri_cal/component.rb

@@ -31,7 +31,7 @@ module RiCal
     end
 
     autoload :Timezone, "#{File.dirname(__FILE__)}/component/timezone.rb"
-    
+
     attr_accessor :imported #:nodoc:
 
     def initialize(parent=nil, &init_block) #:nodoc:
@@ -44,7 +44,7 @@ module RiCal
         end
       end
     end
-    
+
     def default_tzid #:nodoc:
       if @parent
         @parent.default_tzid
@@ -52,7 +52,7 @@ module RiCal
         PropertyValue::DateTime.default_tzid
       end
     end
-    
+
     def find_timezone(identifier) #:nodoc:
       if @parent
         @parent.find_timezone(identifier)
@@ -65,10 +65,18 @@ module RiCal
       end
     end
 
+    def tz_info_source?
+      if @parent
+        @parent.tz_info_source?
+      else
+        true
+      end
+    end
+
     def time_zone_for(ruby_object) #:nodoc:
       @parent.time_zone_for(ruby_object) #:nodoc:
     end
-    
+
     def subcomponent_class #:nodoc:
       {}
     end
@@ -87,7 +95,7 @@ module RiCal
     def self.parse(io) #:nodoc:
       Parser.new(io).parse
     end
-    
+
     def imported? #:nodoc:
       imported
     end
@@ -95,7 +103,7 @@ module RiCal
     def self.parse_string(string) #:nodoc:
       parse(StringIO.new(string))
     end
-    
+
     def subcomponents #:nodoc:
       @subcomponents ||= Hash.new {|h, k| h[k] = []}
     end
@@ -137,11 +145,11 @@ module RiCal
       @x_properties ||= {}
     end
 
-    # Add a n extended property 
+    # Add a n extended property
     def add_x_property(name, prop)
       x_properties[name] = prop
     end
-    
+
     def method_missing(selector, *args, &b) #:nodoc:
       xprop_candidate = selector.to_s
       if (match = /^x_(.+)(=?)$/.match(xprop_candidate))
@@ -202,7 +210,7 @@ module RiCal
         component.export_to(export_stream)
       end
     end
-    
+
     # return a string containing the rfc2445 format of the component
     def to_s
       io = StringIO.new

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

@@ -17,21 +17,32 @@ 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
 
   module TimeWithZoneExtension #:nodoc:
     def tzid
-      time_zone.tzid.identifier
+      utc? ? "UTC" : time_zone.tzinfo.identifier
+    end
+
+    # Predicate indicating whether or not the instance represents a floating time
+    def has_floating_timezone?
+      false
+    end
+    
+    def to_ri_cal_date_or_date_time_value(timezone_finder=nil)
+      ::RiCal::PropertyValue::DateTime.new(timezone_finder, :params => {"TZID" => tzid}, :value => strftime("%Y%m%dT%H%M%S"))
     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
+if RiCal::TimeWithZone
+  RiCal::TimeWithZone.class_eval {include RiCal::TimeWithZoneExtension}
 end

data/lib/ri_cal/property_value/date_time/timezone_support.rb

@@ -4,7 +4,7 @@ module RiCal
       #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
       #
       # Time zone related methods for DateTime
-      module TimezoneSupport      
+      module TimezoneSupport
         # Return the timezone id of the receiver, or nil if it is a floating time
         def tzid
           @tzid  == :floating ? nil : @tzid
@@ -65,6 +65,19 @@ module RiCal
           tzid == "UTC"
         end
 
+        # Predicate indicating whether or not the instance represents a floating time
+        def floating?
+          tzid == :floating
+        end
+        
+        def has_valid_tzinfo_tzid? #:nodoc:
+          if tzid && tzid != :floating
+            TZInfo::Timezone.get(tzid) rescue false
+          else
+            false
+          end
+        end
+
         # Returns the simultaneous time in the specified zone.
         def in_time_zone(new_zone)
           new_zone = timezone_finder.find_timezone(new_zone)

data/lib/ri_cal/property_value/date_time.rb

@@ -16,10 +16,6 @@ module RiCal
       include TimezoneSupport
       include TimeMachine
 
-      # def initialize(timezone_finder, options={}) #:nodoc:
-      #   super(timezone_finder ? timezone_finder : Calendar.new, options)
-      # end
-      #
       def self.or_date(parent, line) # :nodoc:
         if /T/.match(line[:value] || "")
           new(parent, line)
@@ -280,8 +276,12 @@ module RiCal
       end
 
       # Returns a ruby DateTime object representing the receiver.
-       def ruby_value
-         ::DateTime.civil(year, month, day, hour, min, sec, rational_tz_offset).set_tzid(@tzid)
+      def ruby_value
+        if has_valid_tzinfo_tzid? && RiCal::TimeWithZone && tz_info_source?
+          RiCal::TimeWithZone.new(utc.to_datetime, ::Time.__send__(:get_zone, @tzid))
+        else
+          ::DateTime.civil(year, month, day, hour, min, sec, rational_tz_offset).set_tzid(@tzid)
+        end
       end
 
       alias_method :to_ri_cal_ruby_value, :to_datetime

data/lib/ri_cal/property_value/occurrence_list.rb

@@ -67,7 +67,7 @@ module RiCal
       def validate_elements # :nodoc:
         if @source_elements
           self.tzid = tzid_from_source_elements
-          @elements = values_to_elements(@source_elements)
+           @elements = values_to_elements(@source_elements)
           @value = @elements.map {|prop| prop.value}
         else
           @elements = values_to_elements(@value)

data/lib/ri_cal/property_value.rb

@@ -132,6 +132,14 @@ module RiCal
         PropertyValue::DateTime.default_tzid
       end
     end
+    
+    def tz_info_source? #:nodoc:
+      if timezone_finder
+        timezone_finder.tz_info_source?
+      else
+        true
+      end
+    end
   end
 end
 

data/lib/ri_cal.rb

@@ -11,7 +11,7 @@ module RiCal
   autoload :OccurrenceEnumerator, "#{my_dir}/ri_cal/occurrence_enumerator.rb"
   
   # :stopdoc:
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 
@@ -120,6 +120,17 @@ 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.  

data/ri_cal.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ri_cal}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   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-17}
+  s.date = %q{2009-05-18}
   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.

data/spec/ri_cal/component/event_spec.rb

@@ -1,5 +1,4 @@
 #- ©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
@@ -29,8 +28,9 @@ describe RiCal::Component::Event do
       end
 
       it "should accept a single Time and replace the existing rdate" do
+        ::RiCal::PropertyValue::DateTime.default_tzid = 'UTC'
         @event.rdate = Time.local(2009, 1, 2, 1, 23, 45)
-        @event.rdate.should == [[DateTime.parse("20090102T012345")]]
+        @event.rdate.should == [[result_time_in_zone(2009, 1, 2, 1, 23, 45, "UTC")]]
       end
 
       it "should accept a single rfc2445 date-time format string  and replace the existing rdate" do
@@ -40,7 +40,7 @@ describe RiCal::Component::Event do
 
       it "should accept a tzid prefixed rfc2445 date-time format string  and replace the existing rdate" do
         @event.rdate = "TZID=America/New_York:20090102T012345"
-        @event.rdate.should == [[DateTime.civil(2009, 1, 2, 1, 23, 45, Rational(-5, 24))]]
+        @event.rdate.should == [[result_time_in_zone(2009, 1, 2, 1, 23, 45, "America/New_York")]]
       end
 
     end
@@ -129,7 +129,7 @@ describe RiCal::Component::Event do
       end
 
       it "should interpret it as the correct date-time" do
-        @it.should == DateTime.civil(2009, 5, 14, 20, 24, 00, Rational(-5,24))
+        @it.should == result_time_in_zone(2009, 5, 14, 20, 24, 00, "America/New_York")
       end
 
       it "should set the tzid to America/New_York" do
@@ -309,4 +309,115 @@ describe RiCal::Component::Event do
       unfold(@it.export).should match(/^DTSTART;VALUE=DATE:20090422$/)
     end
   end
+
+  if RiCal::TimeWithZone
+    context "with ActiveSupport loaded" do
+
+      context "An event in a non-tzinfo source calendar" do
+              before(:each) do
+                cals = RiCal.parse_string <<ENDCAL
+BEGIN:VCALENDAR
+X-WR-TIMEZONE:America/New_York
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZNAME:EST
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+SEQUENCE:5
+TRANSP:OPAQUE
+UID:00481E53-9258-4EA7-9F8D-947D3041A3F2
+DTSTART;TZID=US/Eastern:20090224T090000
+DTSTAMP:20090225T000908Z
+SUMMARY:Test Event
+CREATED:20090225T000839Z
+DTEND;TZID=US/Eastern:20090224T100000
+RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20090228T045959Z
+END:VEVENT
+END:VCALENDAR
+ENDCAL
+          @event = cals.first.events.first
+        end
+
+        it "should produce a DateTime for dtstart" do
+          @event.dtstart.should be_instance_of(DateTime)
+        end
+      end
+
+      context "An event starting in Paris and ending in New York" do
+
+        before(:each) do
+          @start = Time.now.utc.in_time_zone("Europe/Paris")
+          @finish = Time.now.utc.in_time_zone("America/New_York")
+          cal = RiCal.Calendar do |ical|
+            ical.event do |ievent|
+              ievent.dtstart @start
+              ievent.dtend   @finish
+            end
+          end
+          @event = cal.events.first
+        end
+
+        it "should have the right time zone for dtstart" do
+          @event.dtstart.tzid.should == "Europe/Paris"
+        end
+
+        it "should produce a TimeWithZone for dtstart" do
+          @event.dtstart.should be_instance_of(RiCal::TimeWithZone)
+        end
+
+        # ActiveRecord::TimeWithZone doesn't implement == as expected
+        it "should produce a dtstart which looks like the provided value" do
+          @event.dtstart.to_s.should == @start.to_s
+        end
+
+        it "should have the right time zone for dtend" do
+          @event.dtend.tzid.should == "America/New_York"
+        end
+
+        it "should produce a TimeWithZone for dtend" do
+          @event.dtend.should be_instance_of(RiCal::TimeWithZone)
+        end
+
+        # ActiveRecord::TimeWithZone doesn't implement == as expected
+        it "should produce a dtend which looks like the provided value" do
+          @event.dtend.to_s.should == @finish.to_s
+        end
+      end
+    end
+  end
+
+    context "An event with a floating start" do
+
+      before(:each) do
+        cal = RiCal.Calendar do |ical|
+          ical.event do |ievent|
+            ievent.dtstart "20090530T120000"
+          end
+        end
+        @event = cal.events.first
+      end
+
+      it "should produce a DateTime for dtstart" do
+        @event.dtstart.should be_instance_of(DateTime)
+      end
+
+      it "should have a floating dtstart" do
+        @event.dtstart.should have_floating_timezone
+      end
+    end
 end

data/spec/ri_cal/component/timezone_spec.rb

@@ -197,7 +197,7 @@ ENDCAL
     
     context "the events dtstart" do
       it "should be the right DateTime" do
-        @event.dtstart.should == DateTime.civil(2009, 2, 24, 9, 0, 0, Rational(-4, 24))
+        @event.dtstart.should == DateTime.civil(2009, 2, 24, 9, 0, 0, Rational(-5, 24))
       end
       
       it "should have the right tzid" do
@@ -207,7 +207,7 @@ ENDCAL
     
     context "the events dtend" do
       it "should be the right DateTime" do
-        @event.dtend.should == DateTime.civil(2009, 2, 24, 10, 0, 0, Rational(-4, 24))
+        @event.dtend.should == DateTime.civil(2009, 2, 24, 10, 0, 0, Rational(-5, 24))
       end
       
       it "should have the right tzid" do

data/spec/ri_cal/property_value/occurrence_list_spec.rb

@@ -3,65 +3,70 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe RiCal::PropertyValue::OccurrenceList do
-  
+
   context ".convert method" do
     context "with a single datetime" do
       before(:each) do
         @it = RiCal::PropertyValue::OccurrenceList.convert(nil, DateTime.parse("5 May 2009, 9:32 am"))
       end
-      
+
       it "should produce the right ical representation" do
         @it.to_s.should == ":20090505T093200Z"
       end
-      
+
       it "should have the right ruby value" do
         @it.ruby_value.should == [DateTime.parse("5 May 2009, 9:32 am")]
       end
-      
+
       it "should have the right elements" do
         @it.send(:elements).should == [RiCal::PropertyValue::DateTime.new(nil, :value => "20090505T093200Z" )]
       end
     end
-    
+
     context "with conflicting timezones" do
       before(:each) do
         @event = RiCal.Event
       end
-      
+
       it "should raise an InvalidPropertyValue if an argument does not match an explicit time zone" do
         lambda {RiCal::PropertyValue::OccurrenceList.convert(@event, "America/New_York", Time.now.set_tzid("America/Chicago"))}.should raise_error(RiCal::InvalidPropertyValue)
       end
-      
+
       it "should raise an InvalidPropertyValue if the arguments have mixed time zones" do
         lambda {RiCal::PropertyValue::OccurrenceList.convert(@event, Time.now.set_tzid("America/New_York"), Time.now.set_tzid("America/Chicago"))}.should raise_error(RiCal::InvalidPropertyValue)
       end
     end
-    
+
     context "with a tzid and a single datetime" do
       before(:each) do
-        timezone = mock("Timezone", :rational_utc_offset => Rational(-5, 24))
-        timezone_finder = mock("tz_finder", :find_timezone => timezone, :default_tzid => "UTC")        
-        @it = RiCal::PropertyValue::OccurrenceList.convert(timezone_finder, 'US/Eastern', "19620220T144739")
+        timezone = mock("Timezone",
+          :rational_utc_offset => Rational(-5, 24),
+          :local_to_utc => RiCal::PropertyValue.date_or_date_time(nil, :value => "19620220T194739"),
+          :name => 'America/New_York'
+          )
+
+        timezone_finder = mock("tz_finder", :find_timezone => timezone, :default_tzid => "UTC", :tz_info_source? => true)
+        @it = RiCal::PropertyValue::OccurrenceList.convert(timezone_finder, 'America/New_York', "19620220T144739")
       end
-      
+
       it "should produce the right ical representation" do
-        @it.to_s.should == ";TZID=US/Eastern:19620220T144739"
+        @it.to_s.should == ";TZID=America/New_York:19620220T144739"
       end
-      
+
       context "its ruby value" do
 
         it "should be the right DateTime" do
-          @it.ruby_value.should == [DateTime.civil(1962, 2, 20, 14, 47, 39, Rational(-5, 24))]
+          @it.ruby_value.should == [result_time_in_zone(1962, 2, 20, 14, 47, 39, 'America/New_York')]
         end
-        
+
         it "should have the right tzid" do
-          @it.ruby_value.first.tzid.should == "US/Eastern"
+          @it.ruby_value.first.tzid.should == "America/New_York"
         end
       end
-      
+
       it "should have the right elements" do
-        @it.send(:elements).should == [RiCal::PropertyValue::DateTime.new(nil, :params=> {'TZID' => 'US/Eastern'}, :value => "19620220T144739" )]
+        @it.send(:elements).should == [RiCal::PropertyValue::DateTime.new(nil, :params=> {'TZID' => 'America/New_York'}, :value => "19620220T144739" )]
       end
     end
-  end 
+  end
 end

data/spec/ri_cal/property_value_spec.rb

@@ -1,5 +1,4 @@
 #- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
-
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 require 'tzinfo'
 
@@ -81,7 +80,11 @@ describe RiCal::PropertyValue do
       
       describe "FORM #3 date with local time and time zone reference p 36" do
         before(:each) do
-          timezone = mock("Timezone", :rational_utc_offset => Rational(-4, 24))
+          timezone = mock("Timezone", 
+            :rational_utc_offset => Rational(-4, 24), 
+            :local_to_utc => RiCal::PropertyValue.date_or_date_time(nil, :value => "19970714T163456Z"),
+            :name => 'US-Eastern'
+            )
           timezone_finder = mock("tz_finder", :find_timezone => timezone)
           @prop = RiCal::PropertyValue.date_or_date_time(timezone_finder, :value => "19970714T123456", :params => {'TZID' => 'US-Eastern'})
         end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ri_cal]))
 require 'cgi'
+require 'tzinfo'
 
 module Kernel
   def rputs(*args)
@@ -17,3 +18,25 @@ end
 def dt_prop(date_time, tzid = "US/Eastern")
   RiCal::PropertyValue::DateTime.convert(nil, date_time_with_zone(date_time, tzid))
 end
+
+def offset_for_tzid(year, month, day, hour, min, sec, tzid, alternate)
+  tz = TZInfo::Timezone.get(tzid) rescue nil
+  if tz
+    Rational(tz.period_for_local(DateTime.civil(year, month, day, hour, min, sec)).utc_total_offset, 86400)
+  else
+    provided_offset
+  end
+end
+
+if RiCal::TimeWithZone
+  def result_time_in_zone(year, month, day, hour, min, sec, tzid, alternate_offset = nil)
+    DateTime.civil(year, month, day, hour, min, sec, 
+       offset_for_tzid(year, month, day, hour, min, sec, tzid, alternate_offset)).in_time_zone(tzid)
+  end
+else
+  def result_time_in_zone(year, month, day, hour, min, sec, tzid, alternate_offset = nil)
+    DateTime.civil(year, month, day, hour, min, sec, 
+    offset_for_tzid(year, month, day, hour, min, sec, tzid, alternate_offset)).set_tzid(tzid)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyredrick-ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: ri_cal
 dependencies: 
 - !ruby/object:Gem::Dependency