ox 1.6.9 → 1.7.0

data/README.md

@@ -34,9 +34,13 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.7.0
+
+ - Added support for BOM in the SAX parser.
+
 ### Release 1.6.9
 
- - Added support for BOM. They are honored for and handled correctly for UTF-8. Others cause encoding issues with Ruby or raise an error as others are not ASCII compatible..
+ - Added support for BOM. They are honored for and handled correctly for UTF-8. Others cause encoding issues with Ruby or raise an error as others are not ASCII compatible.
 
 ## <a name="description">Description</a>
 

data/ext/ox/ox.c

@@ -131,16 +131,8 @@ static VALUE	xsd_date_sym;
 
 #if HAS_ENCODING_SUPPORT
 rb_encoding	*ox_utf8_encoding = 0;
-static rb_encoding	*ox_utf16le_encoding = 0;
-static rb_encoding	*ox_utf16be_encoding = 0;
-static rb_encoding	*ox_utf32le_encoding = 0;
-static rb_encoding	*ox_utf32be_encoding = 0;
 #else
 void		*ox_utf8_encoding = 0;
-static void	*ox_utf16le_encoding = 0;
-static void	*ox_utf16be_encoding = 0;
-static void	*ox_utf32le_encoding = 0;
-static void	*ox_utf32be_encoding = 0;
 #endif
 
 struct _Options	 ox_default_options = {
@@ -866,10 +858,6 @@ void Init_ox() {
     rb_define_module_function(Ox, "cache8_test", cache8_test, 0);
 #if HAS_ENCODING_SUPPORT
     ox_utf8_encoding = rb_enc_find("UTF-8");
-    ox_utf16le_encoding = rb_enc_find("UTF-16LE");
-    ox_utf16be_encoding = rb_enc_find("UTF-16BE");
-    ox_utf32le_encoding = rb_enc_find("UTF-32LE");
-    ox_utf32be_encoding = rb_enc_find("UTF-32BE");
 #endif
 }
 

data/ext/ox/sax.c

@@ -409,7 +409,20 @@ read_children(SaxDrive dr, int first) {
     
     while (!err) {
         dr->str = dr->cur; /* protect the start */
-        if ('\0' == (c = next_non_white(dr))) {
+	c = sax_drive_get(dr);
+	if (first) {
+	    if (0xEF == (uint8_t)c) { /* only UTF8 is supported */
+		if (0xBB == (uint8_t)sax_drive_get(dr) && 0xBF == (uint8_t)sax_drive_get(dr)) {
+#if HAS_ENCODING_SUPPORT
+		    dr->encoding = ox_utf8_encoding;
+#endif
+		    c = sax_drive_get(dr);
+		} else {
+		    sax_drive_error(dr, "invalid format, invalid BOM or a binary file.", 1);
+		}
+	    }
+	}
+        if ('\0' == c || (is_white(c) && '\0' == (c = next_non_white(dr)))) {
             if (!first) {
                 sax_drive_error(dr, "invalid format, element not terminated", 1);
                 err = 1;

data/lib/ox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2012-11-27 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