vpim 0.604 → 0.619

data/CHANGES

@@ -1,3 +1,19 @@
+0.619 - 2008-03-30
+
+- Fixed some problems with rescue statements not being specific enough.
+
+- Vcard#birthday may now return a DateTime.
+
+- Added Vcard#urls
+
+- Fixed a mispelled Uri in Vcard#url
+
+- Global fix of misspellings of "occurrence"
+
+- KAddressBook compatibility fix - allow / in field names, even though it is
+  illegal in vCard 3.0.
+
+
 0.604 - 2008-03-13
 
 - Fixed a bug with lower-case UTF-16 encoded cards not being detected properly.

data/README

@@ -36,9 +36,9 @@ subscribe to "vpim-talk":
 
 = Thanks
 
-- Ruby Forge: for their generous hosting of this project.
-- ZipDX.com: for sponsoring support for FREQ=weekly and BYSETPOS in recurrence
-  rules.
+- http://RubyForge.org: for their generous hosting of this project.
+- http://ZipDX.com: for sponsoring development of FREQ=weekly and BYSETPOS in
+  recurrence rules.
 
 = Examples
 

data/bin/reminder

@@ -117,8 +117,8 @@ end
 
 puts
 
-def start_of_first_occurence(t0, t1, e)
-  e.occurences.each_until(t1).each do |t|
+def start_of_first_occurrence(t0, t1, e)
+  e.occurrences.each_until(t1).each do |t|
     # An event might start before t0, but end after it..., in which case
     # we are still interested.
     if (t + (e.duration || 0)) >= t0
@@ -129,7 +129,7 @@ def start_of_first_occurence(t0, t1, e)
 end
 
 all_events.sort! do |lhs, rhs|
-  start_of_first_occurence(t0, t1, lhs) <=> start_of_first_occurence(t0, t1, rhs)
+  start_of_first_occurrence(t0, t1, lhs) <=> start_of_first_occurrence(t0, t1, rhs)
 end
 
 all_events.each do |e|
@@ -145,7 +145,7 @@ all_events.each do |e|
   end
 
   i = 1
-  e.occurences.each_until(t1).each do |t|
+  e.occurrences.each_until(t1).each do |t|
     # An event might start before t0, but end after it..., in which case
     # we are still interested.
     dstr = ''

data/lib/vpim/date.rb

@@ -61,7 +61,7 @@ class Date
   # +mon+, and day-of-the-week +wday+.
   #
   # The nth, +n+, occurrence of +wday+ within the period will be generated
-  # (+n+ defaults to 1).  If +n+ is positive, the nth occurence from the
+  # (+n+ defaults to 1).  If +n+ is positive, the nth occurrence from the
   # beginning of the period will be returned, if negative, the nth occurrence
   # from the end of the period will be returned.
   #
@@ -154,7 +154,7 @@ class DateGen
   # 0-6, where 0 is Sunday).
   #
   # If +n+ is specified, only the nth occurrence of +wday+ within the period
-  # will be generated.  If +n+ is positive, the nth occurence from the
+  # will be generated.  If +n+ is positive, the nth occurrence from the
   # beginning of the period will be returned, if negative, the nth occurrence
   # from the end of the period will be returned.
   #

data/lib/vpim/property/recurrence.rb

@@ -25,18 +25,20 @@ module Vpim
       # need it, contact me and implementation will get on the schedule.
       module Recurrence
         # The times this event occurs, as a Vpim::Rrule.
-        def occurences
+        def occurrences
           start = dtstart
           unless start
-            raise ArgumentError, "Components with no DTSTART: don't have occurences!"
+            raise ArgumentError, "Components with no DTSTART: don't have occurrences!"
           end
           Vpim::Rrule.new(start, propvalue('RRULE'))
         end
 
+        alias occurences occurrences #:nodoc: backwards compatibility
+
         # Check if this event overlaps with the time period later than or equal to +t0+, but
         # earlier than +t1+.
         def occurs_in?(t0, t1)
-          occurences.each_until(t1).detect { |t| tend = t + (duration || 0); tend > t0 }
+          occurrences.each_until(t1).detect { |t| tend = t + (duration || 0); tend > t0 }
         end
 
         def rdates

data/lib/vpim/rfc2425.rb

@@ -15,7 +15,8 @@ module Vpim
     # 1*(ALPHA / DIGIT / "-")
     # Note: I think I can add A-Z here, and get rid of the "i" matches elsewhere.
     # Note: added '_' to allowed because its produced by Notes - X-LOTUS-CHILD_UID
-    NAME    = '[-a-z0-9_]+'
+    # Note: added '/' to allowed because its produced by KAddressBook - X-messaging/xmpp-All:
+    NAME    = '[-a-z0-9_/]+'
 
     # <"> <Any character except CTLs, DQUOTE> <">
     QSTR    = '"([^"]*)"'
@@ -51,7 +52,7 @@ module Vpim
     # time-second = 2 DIGIT
     # time-secfrac = "," 1*DIGIT
     # time-zone = "Z" / time-numzone
-    # time-numzome = sign time-hour [":"] time-minute
+    # time-numzone = sign time-hour [":"] time-minute
     TIME = '(\d\d):?(\d\d):?(\d\d)(\.\d+)?(Z|[-+]\d\d:?\d\d)?'
 
     # integer = (["+"] / "-") 1*DIGIT
@@ -111,7 +112,7 @@ module Vpim
     [$1.to_i, $2.to_i, $3.to_i]
   end
 
-  # Convert a RFC 2425 date into an array of Date objects.
+  # Convert a RFC 2425 date into a Date object.
   def self.decode_date_to_date(v)
     Date.new(*decode_date(v))
   end
@@ -174,6 +175,12 @@ module Vpim
     ]
   end
 
+  def Vpim.decode_date_time_to_datetime(v) #:nodoc:
+    year, month, day, hour, min, sec, secfrac, tz = Vpim.decode_date_time(v)
+    # TODO - DateTime understands timezones, so we could decode tz and use it.
+    DateTime.civil(year, month, day, hour, min, sec, 0)
+  end
+
   # Vpim.decode_boolean
   #
   # float

data/lib/vpim/rrule.rb

@@ -32,7 +32,7 @@ end
 
 module Vpim
 
-  # Implements the iCalendar recurence rule syntax. See etc/rrule.txt for the
+  # Implements the iCalendar recurrence rule syntax. See etc/rrule.txt for the
   # syntax description and examples from RFC 2445. The description is pretty
   # hard to understand, but the examples are more helpful.
   #
@@ -124,7 +124,7 @@ module Vpim
        end
     end
 
-    # Return an Enumerable, it's #each() will yield over all occurences up to
+    # Return an Enumerable, it's #each() will yield over all occurrences up to
     # (and not including) time +dountil+.
     def each_until(dountil)
       Vpim::Enumerator.new(self, dountil)
@@ -133,7 +133,7 @@ module Vpim
     # Yields for each +ytime+ in the recurring set of events.
     #
     # Warning: the set may be infinite! If you need an upper bound on the
-    # number of occurences, you need to implement a count, or pass a time,
+    # number of occurrences, you need to implement a count, or pass a time,
     # +dountil+, which will not be iterated past (i.e. all times yielded will be
     # less than +dountil+).
     #
@@ -152,7 +152,7 @@ module Vpim
       end
       count = 1
 
-      # With no recurrence, DTSTART is the only occurence.
+      # With no recurrence, DTSTART is the only occurrence.
       if !@rrule
         return self
       end
@@ -171,7 +171,7 @@ module Vpim
 
         case @freq
           #when 'YEARLY' then
-          # Don't need to keep track of year, all occurences are within t's
+          # Don't need to keep track of year, all occurrences are within t's
           # year.
         when 'MONTHLY'  then  days.month = t.month
         when 'WEEKLY'   then  #days.month = t.month
@@ -298,7 +298,7 @@ module Vpim
           end.compact # set positions out of scope will be nil, RFC says ignore them
         end
 
-        # Yield the occurence, if we haven't gone over COUNT, or past UNTIL, or
+        # Yield the occurrence, if we haven't gone over COUNT, or past UNTIL, or
         # past the end of representable time.
 
         yset.each do |y|

data/lib/vpim/vcard.rb

@@ -446,11 +446,9 @@ module Vpim
     def decode_date_or_datetime(field) #:nodoc:
       date = nil
       begin
-        date = Vpim.decode_date(field.value_raw)
-        date = Date.new(*date)
+        date = Vpim.decode_date_to_date(field.value_raw)
       rescue Vpim::InvalidEncodingError
-        # FIXME - try and decode as DATE-TIME
-        raise
+        date = Vpim.decode_date_time_to_datetime(field.value_raw)
       end
       Line.new( field.group, field.name, date )
     end
@@ -460,7 +458,9 @@ module Vpim
         return decode_date_or_datetime(field)
 
       rescue Vpim::InvalidEncodingError
-        if field.value =~ /(\d+)-(\d+)-(\d+)/
+        # Hack around BDAY dates hat are correct in the month and day, but have
+        # some kind of garbage in the year.
+        if field.value =~ /^\s*(\d+)-(\d+)-(\d+)\s*$/
           y = $1.to_i
           m = $2.to_i
           d = $3.to_i
@@ -502,7 +502,7 @@ module Vpim
     end
 
     def decode_uri(field) #:nodoc:
-      Line.new( field.group, field.name, Uri.new(field.value) )
+      Line.new( field.group, field.name, Attachment::Uri.new(field.value, nil) )
     end
 
     def decode_agent(field) #:nodoc:
@@ -586,7 +586,11 @@ module Vpim
 
     # Return line for a field
     def f2l(field) #:nodoc:
-      Line.decode(@@decode, self, field) rescue nil
+      begin
+        Line.decode(@@decode, self, field)
+      rescue InvalidEncodingError
+        # Skip invalidly encoded fields.
+      end
     end
 
     # With no block, returns an Array of Line. If +name+ is specified, the
@@ -769,7 +773,10 @@ module Vpim
       end
 
       if fields.first
-        line = Line.decode(@@decode, self, fields.first) rescue nil
+        line = begin
+                 Line.decode(@@decode, self, fields.first)
+               rescue Vpim::InvalidEncodingError
+               end
 
         if line
           return line.value
@@ -955,11 +962,16 @@ module Vpim
 
     ## UID
 
-    # The URL value, a Uri. A wrapper around #value('NOTE').
+    # The URL value, a Attachment::Uri. A wrapper around #value('URL').
     def url
       value('URL')
     end
 
+    # The URL values, an Attachment::Uri. A wrapper around #values('URL').
+    def urls
+      values('URL')
+    end
+
     # The VERSION multiplied by 10 as an Integer.  For example, a VERSION:2.1
     # vCard would have a version of 21, and a VERSION:3.0 vCard would have a
     # version of 30.

data/lib/vpim/version.rb

@@ -7,9 +7,9 @@
 =end
 
 module Vpim
-  PRODID = '-//Ensemble Independent//vPim 0.604//EN'
+  PRODID = '-//Ensemble Independent//vPim 0.619//EN'
 
-  VERSION = '0.604'
+  VERSION = '0.619'
 
   # Return the API version as a string.
   def Vpim.version

data/samples/cmd-itip.rb

@@ -94,7 +94,7 @@ ARGV.each do |file|
       puts "Organized by: #{e.organizer.to_s}"
 
       # TODO - spec as hours/mins/secs
-      e.occurences.each_with_index do |t, i|
+      e.occurrences.each_with_index do |t, i|
         if(i < 1)
           puts "At time: #{t}" +( e.duration ? " for #{Duration.secs(e.duration).to_s}" : '' )
         else

data/samples/ics-dump.rb

@@ -155,7 +155,7 @@ def puts_properties(c)
   end
 
   begin
-    c.occurences.each_with_index do |t, i|
+    c.occurrences.each_with_index do |t, i|
       if(i < 10)
         puts "   #{i+1} -> #{t}"
       else
@@ -164,7 +164,7 @@ def puts_properties(c)
       end
     end
   rescue ArgumentError
-    # No occurences.
+    # No occurrences.
   end
 
 end

data/samples/reminder.rb

@@ -117,8 +117,8 @@ end
 
 puts
 
-def start_of_first_occurence(t0, t1, e)
-  e.occurences.each_until(t1).each do |t|
+def start_of_first_occurrence(t0, t1, e)
+  e.occurrences.each_until(t1).each do |t|
     # An event might start before t0, but end after it..., in which case
     # we are still interested.
     if (t + (e.duration || 0)) >= t0
@@ -129,7 +129,7 @@ def start_of_first_occurence(t0, t1, e)
 end
 
 all_events.sort! do |lhs, rhs|
-  start_of_first_occurence(t0, t1, lhs) <=> start_of_first_occurence(t0, t1, rhs)
+  start_of_first_occurrence(t0, t1, lhs) <=> start_of_first_occurrence(t0, t1, rhs)
 end
 
 all_events.each do |e|
@@ -145,7 +145,7 @@ all_events.each do |e|
   end
 
   i = 1
-  e.occurences.each_until(t1).each do |t|
+  e.occurrences.each_until(t1).each do |t|
     # An event might start before t0, but end after it..., in which case
     # we are still interested.
     dstr = ''

data/test/test_ical.rb

@@ -100,6 +100,25 @@ ___
     assert_equal(icstodo, cal.to_s)
   end
 
+  # Tracker #18920
+  def test_recurring_todos
+icstodo =<<___
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VTODO
+SUMMARY:todo
+DTSTART:20040415T120000
+RRULE:FREQ=WEEKLY;COUNT=2
+END:VTODO
+END:VCALENDAR
+___
+
+    cal = Icalendar.decode(icstodo).first
+    todo = cal.todos.first
+    assert(todo)
+    assert_equal(todo.occurrences.to_a.size, 2)
+  end
+
   def test_1
     req = Icalendar.decode(Req_1).first
 

data/test/test_rrule.rb

@@ -214,7 +214,7 @@ VEC
     )
   end
 
-  def test_rfc2445_examples_weekly_for_10_occurences
+  def test_rfc2445_examples_weekly_for_10_occurrences
     # Weekly for 10 occurrences
     #
     #   DTSTART;TZID=US-Eastern:19970902T090000

data/test/test_vcard.rb

@@ -16,7 +16,7 @@ def assert_equal_nospace(expected, got)
 end
 
 
-# Test cases: multiple occurences of type
+# Test cases: multiple occurrences of type
 =begin
 begin:VCARD
 version:2.1
@@ -743,6 +743,65 @@ ___
     
   end
 
+  def test_slash_in_field_name
+    cin = <<___
+BEGIN:VCARD
+X-messaging/xmpp-All:some@jabber.id
+END:VCARD
+___
+
+    card = Vpim::Vcard.decode(cin).first
+    assert_equal(card.value("X-messaging/xmpp-All"), "some@jabber.id")
+    assert_equal(card["X-messaging/xmpp-All"], "some@jabber.id")
+  end
+
+  def test_url_decode
+    cin=<<'---'
+BEGIN:VCARD
+URL:www.email.com
+URL:www.work.com
+END:VCARD
+---
+    card = Vpim::Vcard.decode(cin).first
+
+    assert_equal("www.email.com", card.url.uri)
+    assert_equal("www.email.com", card.url.uri.to_s)
+    assert_equal("www.email.com", card.urls.first.uri)
+    assert_equal("www.work.com", card.urls.last.uri)
+  end
+
+  def test_bday_decode
+    cin=<<'---'
+BEGIN:VCARD
+BDAY:1970-07-14
+END:VCARD
+---
+    card = Vpim::Vcard.decode(cin).first
+
+    card.birthday
+
+    assert_equal(Date.new(1970, 7, 14), card.birthday)
+    assert_equal(1, card.values("bday").size)
+
+    # Nobody should have multiple bdays, I hope, but its allowed syntactically,
+    # so test it, along with some variant forms of BDAY
+    cin=<<'---'
+BEGIN:VCARD
+BDAY:1970-07-14
+BDAY:70-7-14
+BDAY:1970-07-15T03:45:12
+BDAY:1970-07-15T03:45:12Z
+END:VCARD
+---
+    card = Vpim::Vcard.decode(cin).first
+
+    assert_equal(Date.new(1970, 7, 14), card.birthday)
+    assert_equal(4, card.values("bday").size)
+    assert_equal(Date.new(1970, 7, 14), card.values("bday").first)
+    assert_equal(Date.new(Time.now.year, 7, 14), card.values("bday")[1])
+    assert_equal(DateTime.new(1970, 7, 15, 3, 45, 12).to_s, card.values("bday")[2].to_s)
+    assert_equal(DateTime.new(1970, 7, 15, 3, 45, 12).to_s, card.values("bday").last.to_s)
+  end
 
   def utf_name_test(c)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vpim
 version: !ruby/object:Gem::Version 
-  version: "0.604"
+  version: "0.619"
 platform: ruby
 authors: 
 - Sam Roberts
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-13 00:00:00 -07:00
+date: 2008-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
         version: "0"
     version: 
 description: This is a pure-ruby library for decoding and encoding vCard and iCalendar data ("personal information") called vPim.
-email: viextech+vpimgem@rubyforge.org
+email: vieuxtech@gmail.com
 executables: 
 - reminder
 - rrule