ox 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082093a98968b620e01ba43e96933e0f3710e1fa
-  data.tar.gz: 9322b6eaa676a1c5f43838fa414199e7f9586191
+  metadata.gz: 7e0f1c9717a0c2a666b6131188f72dcb26b88230
+  data.tar.gz: 93edf8cebd1ef9390ee531b957aa2369b4542a92
 SHA512:
-  metadata.gz: 2f4de79cc51b46e8767b754b87ba2ba7d48e2d0f7bbe4f9997070ca5f9417db978fc01f64e1781e3a4aa54277e3a2335cfe533101a0f15c70e9cf4ece028047a
-  data.tar.gz: 312228d635f3765efe2a11f46e9a1b57c20ca7fdf1e55f0f6996d11252e1cedca3dfe0efa4e594bb2391560519936714d101e8b9e66ea66c9fae3a902ee21b2e
+  metadata.gz: 7f2a045152966f88e3ed61aa5804810e3584afc8b05ba129b627c86e7343d9263b95bf39531158bed3d349e8b7dfc2cc7a1f58e7fe2023b53ecd004756e5d345
+  data.tar.gz: cf8ab5d25d451ffaf01b8029f72c41bfdb521637189ed3df4a60e7e4ebd566ce8ada66bb397149aa60e9ca9958cf5a0553bb5616c42add5f418b8d4fc8ef7b3f

data/README.md

@@ -34,9 +34,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.4
+### Release 2.0.5
 
- - Fixed SAX parser handling of &#nnnn; encoded characters.
+ - Better support for special character encoding with 1.8.7.
 
 ## <a name="description">Description</a>
 

data/ext/ox/encode.h

@@ -0,0 +1,51 @@
+/* encode.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __OX_ENCODE_H__
+#define __OX_ENCODE_H__
+
+#include "ruby.h"
+#if HAS_ENCODING_SUPPORT
+#include "ruby/encoding.h"
+#endif
+
+static inline VALUE
+ox_encode(VALUE rstr) {
+#if HAS_ENCODING_SUPPORT
+    rb_enc_associate(rstr, ox_utf8_encoding);
+#else
+    if (Qnil != ox_utf8_encoding) {
+	rstr = rb_funcall(ox_utf8_encoding, ox_iconv_id, 1, rstr);
+    }
+#endif
+    return rstr;
+}
+
+#endif /* __OX_ENCODE_H__ */

data/ext/ox/sax.c

@@ -62,6 +62,8 @@
 #define EL_MISMATCH	"Start End Mismatch: "
 #define INV_ELEMENT	"Invalid Element: "
 
+#define UTF8_STR	"UTF-8"
+
 static void		sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, SaxOptions options);
 static void		parse(SaxDrive dr);
 // All read functions should return the next character after the 'thing' that was read and leave dr->cur one after that.
@@ -173,6 +175,8 @@ sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, SaxOptions options) {
     } else {
         dr->encoding = rb_str_new2(ox_default_options.encoding);
     }
+#else
+    dr->encoding = 0;
 #endif
 }
 
@@ -216,6 +220,8 @@ skipBOM(SaxDrive dr) {
 	    dr->encoding = ox_utf8_encoding;
 #elif HAS_PRIVATE_ENCODING
 	    dr->encoding = ox_utf8_encoding;
+#else
+	    dr->encoding = UTF8_STR;
 #endif
 	    c = buf_get(&dr->buf);
 	} else {
@@ -987,6 +993,8 @@ read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req)
 		dr->encoding = rb_enc_find(dr->buf.str);
 #elif HAS_PRIVATE_ENCODING
 		dr->encoding = rb_str_new2(dr->buf.str);
+#else
+		dr->encoding = dr->buf.str;
 #endif
 		is_encoding = 0;
 	    }
@@ -1211,6 +1219,12 @@ ox_sax_collapse_special(SaxDrive dr, char *str, int line, int col) {
 		} else if (Qnil == dr->encoding) {
 		    dr->encoding = ox_utf8_encoding;
 		    b = ox_ucs_to_utf8_chars(b, u);
+#else
+		} else if (0 == dr->encoding) {
+		    dr->encoding = UTF8_STR;
+		    b = ox_ucs_to_utf8_chars(b, u);
+		} else if (0 == strcasecmp(UTF8_STR, dr->encoding)) {
+		    b = ox_ucs_to_utf8_chars(b, u);
 #endif
 		} else {
 		    ox_sax_drive_error(dr, NO_TERM "Invalid encoding, need UTF-8 encoding to parse &#nnnn; character sequences.");

data/ext/ox/sax.h

@@ -55,6 +55,8 @@ typedef struct _SaxDrive {
     rb_encoding *encoding;
 #elif HAS_PRIVATE_ENCODING
     VALUE	encoding;
+#else
+    const char	*encoding;
 #endif
 } *SaxDrive;
 

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed
@@ -39,6 +39,7 @@ files:
 - ext/ox/base64.h
 - ext/ox/cache.h
 - ext/ox/cache8.h
+- ext/ox/encode.h
 - ext/ox/err.h
 - ext/ox/helper.h
 - ext/ox/ox.h