vpim 0.602 → 0.604

data/CHANGES

@@ -1,6 +1,14 @@
+0.604 - 2008-03-13
+
+- Fixed a bug with lower-case UTF-16 encoded cards not being detected properly.
+
+- Skip over invalidly encoded vCard fields when enumerating them.
+
+
 0.602 - 2008-03-12
 
 - Updated reminder utility to work with iCal 3.
+
 - Reworked gem to include tests, samples, and binaries.
 
 

data/lib/vpim/vcard.rb

@@ -586,7 +586,7 @@ module Vpim
 
     # Return line for a field
     def f2l(field) #:nodoc:
-      Line.decode(@@decode, self, field)
+      Line.decode(@@decode, self, field) rescue nil
     end
 
     # With no block, returns an Array of Line. If +name+ is specified, the
@@ -662,7 +662,7 @@ module Vpim
     def Vcard.decode(card)
       if card.respond_to? :to_str
         string = card.to_str
-      elsif card.kind_of? IO
+      elsif card.respond_to? :read
         string = card.read(nil)
       else
         raise ArgumentError, "Vcard.decode cannot be called with a #{card.type}"
@@ -679,9 +679,9 @@ module Vpim
           arr = string.unpack('v*')
           arr.shift
           string = arr.pack('U*')
-        when /^\x00\x62/i
+        when /^\x00B/i
           string = string.unpack('n*').pack('U*')
-        when /^\x62\x00/i
+        when /^B\x00/i
           string = string.unpack('v*').pack('U*')
       end
 
@@ -769,11 +769,11 @@ module Vpim
       end
 
       if fields.first
-         line = Line.decode(@@decode, self, fields.first)
+        line = Line.decode(@@decode, self, fields.first) rescue nil
 
-         if line
-           return line.value
-         end
+        if line
+          return line.value
+        end
       end
 
       nil

data/lib/vpim/version.rb

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

data/test/test_vcard.rb

@@ -729,5 +729,57 @@ END:VCARD
     assert_equal(note, card.note)
   end
 
+  def test_empty_tel
+    cin = <<___
+BEGIN:VCARD
+TEL;HOME;FAX:
+END:VCARD
+___
+
+    card = Vpim::Vcard.decode(cin).first
+    assert_equal(card.telephone, nil)
+    assert_equal(card.telephone('HOME'), nil)
+    assert_equal([], card.telephones)
+    
+  end
+
+
+  def utf_name_test(c)
+
+    begin
+    card = Vpim::Vcard.decode(c).first
+    assert_equal("name", card.name.family)
+    rescue
+      $!.message << " #{c.inspect}"
+      raise
+    end
+  end
+
+  def be(s)
+    s.unpack('U*').pack('n*')
+  end
+  def le(s)
+    s.unpack('U*').pack('v*')
+  end
+
+  def test_utf_heuristics
+    bom = "\xEF\xBB\xBF"
+    dat = "BEGIN:VCARD\nN:name\nEND:VCARD\n"
+    utf_name_test(bom+dat)
+    utf_name_test(bom+dat.downcase)
+    utf_name_test(dat)
+    utf_name_test(dat.downcase)
+
+    utf_name_test(be(bom+dat))
+    utf_name_test(be(bom+dat.downcase))
+    utf_name_test(be(dat))
+    utf_name_test(be(dat.downcase))
+
+    utf_name_test(le(bom+dat))
+    utf_name_test(le(bom+dat.downcase))
+    utf_name_test(le(dat))
+    utf_name_test(le(dat.downcase))
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vpim
 version: !ruby/object:Gem::Version 
-  version: "0.602"
+  version: "0.604"
 platform: ruby
 authors: 
 - Sam Roberts
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-12 00:00:00 -07:00
+date: 2008-03-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency