vcard 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811c33352212ba0e5a9490290ae75cf988169535
-  data.tar.gz: 6aca3423ac347434f90e14fe1f49b61b5c540e16
+  metadata.gz: 2e912a9dfe65f2058669088fcb34f1be53147564
+  data.tar.gz: 3aad9b7c03a9f32a2173d3386985d075bb264fe6
 SHA512:
-  metadata.gz: eea48a1f834674499f4a52f4655cb7dd22bdf918f072048457ab0c405613f243867433de00ef8c70468b24b50302df70c560a70d4b168be9bd8915e67d3ddcb6
-  data.tar.gz: 34962466019666c8b7212446e5f025580109856115db59e2d9d59bbcc711c9fa6dfdc5df9e53f0b30a656b3ce3bd94ce7c3a38f0ab6b76f2a8c4f92cb40e7e57
+  metadata.gz: dbfb602829bfe1c2de00a99950c8783dd930fcd3de4099b84ab2089dda1b96f80ff2af39646e12f044ef235b248257290a07eafc6b5b042ba7d61129b98186bd
+  data.tar.gz: 33afb5ec28ca3e61b8077bec041a5b42e0cc850253fbf82238d68a044606cadf5dc3a50dc930dadc2585cddd9949256b3d8dcdcf1d3975ee42a432a04ff5dd8a

data/lib/vcard/bnf.rb

@@ -60,7 +60,12 @@ module Vcard
     # QSAFE-CHAR = WSP / %x21 / %x23-7E / NON-US-ASCII
     #  ; Any character except CTLs and DQUOTE
     # set ascii encoding so that multibyte chars can be properly escaped
-    QSAFECHAR = Regexp.new("[ \t\x21\x23-\x7e\x80-\xff]")
+    if RUBY_PLATFORM == "java" && RUBY_VERSION < "1.9"
+      # JRuby in 1.8 mode doesn't respect the file encoding. See https://github.com/jruby/jruby/issues/1191
+      QSAFECHAR = /[ \t\x21\x23-\x7e\x80-\xff]/
+    else
+      QSAFECHAR = Regexp.new("[ \t\x21\x23-\x7e\x80-\xff]")
+    end
     ALL_QSAFECHARS = /\A#{QSAFECHAR}*\z/
 
     # SAFE-CHAR  = WSP / %x21 / %x23-2B / %x2D-39 / %x3C-7E / NON-US-ASCII

data/lib/vcard/field.rb

@@ -41,7 +41,11 @@ module Vcard
         #   [<group>.]<name>;<pname>=<pvalue>,<pvalue>:<value>
 
         if group
-          line << group << "."
+          if group.class == Symbol
+            # Explicitly allow symbols
+            group = group.to_s
+          end
+          line << group.to_str << "."
         end
 
         line << name
@@ -88,7 +92,7 @@ module Vcard
           line << value.map { |v| Field.value_str(v) }.join(";")
 
         when Symbol
-          line << value
+          line << value.to_s
 
         else
           # FIXME - somewhere along here, values with special chars need escaping...

data/lib/vcard/version.rb

@@ -1,3 +1,3 @@
 module Vcard
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/test/field_test.rb

@@ -107,13 +107,17 @@ class FieldTest < Test::Unit::TestCase
     assert_equal("Z.B", f.group)
     assert_equal("z.b.NAME:z\n", f.encode)
 
-    assert_raises(TypeError) { f.value = :group }
+    f.value = :group
+    assert_equal("Z.B.NAME:group\n", f.encode)
+    f.value = "z"
 
     assert_equal("Z.B", f.group)
 
-    assert_equal("z.b.NAME:z\n", f.encode)
+    assert_equal("Z.B.NAME:z\n", f.encode)
 
-    assert_raises(TypeError) { f.group = :group }
+    f.group = :group
+    assert_equal("group.NAME:z\n", f.encode)
+    f.group = "z.b"
 
     assert_equal("z.b.NAME:z\n", f.encode)
     assert_equal("Z.B", f.group)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcard
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies: []
 description: Vcard extracted from Vpim
 email: