- 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

Author: sam-github

CHANGES

@@ -1,4 +1,12 @@
 
+- 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

THANKS

@@ -0,0 +1,2 @@
+Jade Meskill
+Ryan King

TODO

@@ -21,7 +21,6 @@ Read code:
 I have the changes locally to make dtstart/... return Date or Time,
 depending on what the start is. The change breaks other things. :-(
 
-
 - can't export if there is a Vtodo?
 
 - EXDATE, etc.

lib/vpim/rfc2425.rb

@@ -52,7 +52,7 @@ module Bnf #:nodoc:
     # 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
@@ -112,7 +112,7 @@ def Vpim.decode_date(v) # :nodoc:
     [$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
@@ -175,6 +175,12 @@ def Vpim.decode_date_time(v) # :nodoc:
     ]
   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

lib/vpim/vcard.rb

@@ -446,11 +446,9 @@ def decode_n(field) #:nodoc:
     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 @@ def decode_bday(field) #:nodoc:
         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 @@ def decode_structured_text(field) #:nodoc:
     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 @@ def self.decode(decode, card, field) #:nodoc:
 
     # 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 @@ def value(name, type = nil)
       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 @@ def telephones #:yield:tel
 
     ## 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.

test/test_vcard.rb

@@ -755,6 +755,53 @@ def test_slash_in_field_name
     assert_equal(card["X-messaging/xmpp-All"], "[email protected]")
   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)