jruby-rfc2445 0.1.0 → 0.5.0

data/lib/rrule.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/rfc2445.jar'
 
 class RRule
   include_class('com.google.ical.values.RRule'){|package,name| "J#{name}" }
+  include_class('com.google.ical.values.DateTimeValue')
+  include_class('com.google.ical.values.DateValue')
   
   RRULE = 'RRULE'
   EXRULE = 'EXRULE'
@@ -221,10 +223,17 @@ class RRule
     self
   end
   
-  # Gets the end date
+  # Gets the end date, assume it is UTC for now
   def until
     d = @rrule.getUntil
-    d ? JTime.local(d.year, d.month, d.day, d.hour, d.minute, d.second) : nil
+    case d
+    when DateTimeValue
+      JTime.from_date_time_value(d)
+    when DateValue
+      JTime.from_date_value(d)
+    else
+      nil
+    end
   end
   
   # Sets the end date

data/spec/rfc2445_spec.rb

@@ -286,7 +286,7 @@ describe RRule do
   end
   
   it "should set and get the until date" do
-    now = JTime.new
+    now = JTime.new.utc
     @rrule.until = now
     @rrule.until.year.should == now.year
     @rrule.until.month.should == now.month
@@ -419,9 +419,9 @@ describe ICalParseUtil do
     jtime1.should be_instance_of(JTime)
     jtime1.hour.should == 0
     
-    jtime2 = ICalParseUtil.parse_datetime('DTEND;TZID=America/Los_Angeles:20090320T170000')
+    jtime2 = ICalParseUtil.parse_datetime('DTEND;TZID=America/Los_Angeles:20090320T180000')
     jtime2.should be_instance_of(JTime)
-    jtime2.hour.should == 0
+    jtime2.hour.should == 1
     
     jtime3 = ICalParseUtil.parse_datetime(nil)
     jtime3.should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-rfc2445
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors: 
   - Jerry Luk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -08:00
+date: 2010-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: []