vcard 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bdb030a7ce2a3ae4022f885235da55331c7c941
-  data.tar.gz: 18d1c27ac1b06adbc578e8108ef2844ab5aa9d3d
+  metadata.gz: 3c2ef2a283e0f9ae5c01e3e793b168180a27bedd
+  data.tar.gz: 5d18623c35560ec4aa4c414e5717d4722b1dae8f
 SHA512:
-  metadata.gz: 528bae8e2e63b4cfae77cd039cb7f1cd554234e336ab63af5a4c31e3699f7e6af1d2a8659754bc4dc6257a8e6216f0e08a42602794700c955257cd2a966e67c9
-  data.tar.gz: c0581ce26d5b096cf8cebe20e0d6ea590432ab276f24b7d372a396335af369c9cab947766e030176bc0e6dcc1a7eadff346382392d0b46d5382d7a5a5d98f1ec
+  metadata.gz: 2accc8617384161cab0e8aba53f87f5c4093d716c8318ab1fd18414addec87f6fa82555fd8a131beb3c9e49997388fbb44ef0a5c248deebe812b31b75516ffa2
+  data.tar.gz: 3e8cdc45d84873083cd8a56076712b7bd4e6cfba9b6500ea62cce0d208ce762c518462fb7537724d82f1351b3b79e108246d6a52d4da9f4e692d0c265986b977

data/lib/vcard.rb

@@ -184,7 +184,7 @@ module Vcard
   end
 
   def self.encode_text(v) #:nodoc:
-    v.to_str.gsub(/([\\,;\n])/) { $1 == "\n" ? "\\n" : "\\#{$1}" }
+    v.to_str.gsub(/[\\,;]/, '\\\\\0').gsub(/\r?\n/, "\\n")
   end
 
   # v is an Array of String, or just a single String

data/lib/vcard/version.rb

@@ -1,3 +1,3 @@
 module Vcard
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/vcard_test.rb

@@ -485,18 +485,30 @@ EOF
   end
 
   def test_role
-    role = 'Office Manager;Something Else'
+    card = Vcard::Vcard::Maker.make2 do |m|
+      m.name do |n|
+        n.given = "John"
+        n.family = "Woe"
+      end
+      m.role = "Office Manager\r\n;Something Else"
+    end
+    assert_equal "Office Manager\n;Something Else", card.role
+    assert_match /Office Manager\\n\\;Something Else/, card.to_s
+    card = Vcard::Vcard.decode(card.encode).first
+    assert_equal "Office Manager\n;Something Else", card.role
+  end
 
+  def test_note
     card = Vcard::Vcard::Maker.make2 do |m|
       m.name do |n|
         n.given = "John"
         n.family = "Woe"
       end
-      m.role = 'Office Manager;Something Else'
+      m.add_note note = "line1\r\n;line2"
     end
-    assert_equal(role, card.role)
-    assert(card.to_s['Office Manager\;Something Else'])
+    assert_equal "line1\n;line2", card.note
+    assert_match /line1\\n\\;line2/, card.to_s
     card = Vcard::Vcard.decode(card.encode).first
-    assert_equal(role, card.role)
+    assert_equal "line1\n;line2", card.note
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcard
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Kuba Kuźma