Merge pull request #7 from seth-macpherson/master

Code patch to correct invalid multibyte escape
qoobaa · Jan 31, 2013 · 1f23988 · 1f23988
2 parents f44a3d1 + 86f243a
commit 1f23988
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/vcard/bnf.rb b/lib/vcard/bnf.rb
@@ -1,3 +1,4 @@
+# encoding: ascii
 # Copyright (C) 2008 Sam Roberts
 
 # This library is free software; you can redistribute it and/or modify
@@ -59,12 +60,14 @@ module Bnf #:nodoc:
 
     # QSAFE-CHAR = WSP / %x21 / %x23-7E / NON-US-ASCII
     #  ; Any character except CTLs and DQUOTE
-    QSAFECHAR = /[ \t\x21\x23-\x7e\x80-\xff]/
+    # set ascii encoding so that multibyte chars can be properly escaped
+    QSAFECHAR = Regexp.new("[ \t\x21\x23-\x7e\x80-\xff]")
     ALL_QSAFECHARS = /\A#{QSAFECHAR}*\z/
 
     # SAFE-CHAR  = WSP / %x21 / %x23-2B / %x2D-39 / %x3C-7E / NON-US-ASCII
     #   ; Any character except CTLs, DQUOTE, ";", ":", ","
-    SAFECHAR = /[ \t\x21\x23-\x2b\x2d-\x39\x3c-\x7e\x80-\xff]/
+    # escape character classes then create new Regexp
+    SAFECHAR = Regexp.new(Regexp.escape("[ \t\x21\x23-\x2b\x2d-\x39\x3c-\x7e\x80-\xff]"))
     ALL_SAFECHARS = /\A#{SAFECHAR}*\z/
   end
 end
diff --git a/lib/vcard/version.rb b/lib/vcard/version.rb
@@ -1,3 +1,3 @@
 module Vcard
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end