ox 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d1bc0caa1f30250ac41bb09bf0e74146823e9a
-  data.tar.gz: 7b82a1d2ff0c9d3e3cbd386d6111dcc5df70fdd3
+  metadata.gz: 67efa2e182b17f740fb607db83a0a19e8cac6f69
+  data.tar.gz: 35a96cea460c51f6c511a9e7f7947246db358e6e
 SHA512:
-  metadata.gz: e483cedd63acafe9b3e4f2aa9cc197dc24f7120374c3be8c5966a4cb74d8e7bf0030101f0377130707caf08dc668d88f94e768a751e1efc216d5d8a137076c00
-  data.tar.gz: 9ee127f630abaae2f03377ce87cc54ca27e87e030165f5dd196c6566601e60ef7b07921c647857ea89bd8c8f694d77d6f625b0d908086deb82a23657708a8cc2
+  metadata.gz: 7e3fd93e060d88ad134b884be891563a168af3fd8847851aa8d12906ed8c4dd6757a4fd66a287883a5872281651a826b49e5da82ec03827d55bd2a2f3a9e9d87
+  data.tar.gz: d580345b51fb658223c25f15da6d0fa70ae79580984f1d275c8c6a6948e8a388af3412c5d3f8623224f082bbf33da88a6b4820cded7be16c37152e331ce5633a

data/README.md

@@ -34,14 +34,16 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
-### Current Release 2.1.4
+### Current Release 2.1.5
 
- - Fixed bug where the parser always started at the first position in a stringio
-   instead of the current position.
+ - Fixed symbol intern problem with Ruby 2.2.0. Symbols are not dynamic unless
+   rb_intern(). There does not seem to be a way to force symbols created with
+   encoding to be pinned.
 
-### Release 2.1.3
+### Release 2.1.4
 
- - Added check for @attributes being nil. Reported by and proposed fix by Elana.
+ - Fixed bug where the parser always started at the first position in a stringio
+   instead of the current position.
 
 ## Description
 

data/ext/ox/cache.c

@@ -67,7 +67,7 @@ ox_cache_new(Cache *cache) {
 }
 
 VALUE
-ox_cache_get(Cache cache, const char *key, VALUE **slot, char **keyp) {
+ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp) {
     unsigned char       *k = (unsigned char*)key;
     Cache               *cp;
 

data/ext/ox/cache.h

@@ -37,7 +37,7 @@ typedef struct _Cache   *Cache;
 
 extern void     ox_cache_new(Cache *cache);
 
-extern VALUE    ox_cache_get(Cache cache, const char *key, VALUE **slot, char **keyp);
+extern VALUE    ox_cache_get(Cache cache, const char *key, VALUE **slot, const char **keyp);
 
 extern void     ox_cache_print(Cache cache);
 

data/ext/ox/sax.c

@@ -91,6 +91,71 @@ static VALUE protect_parse(VALUE drp) {
     return Qnil;
 }
 
+#if HAS_ENCODING_SUPPORT || HAS_PRIVATE_ENCODING
+static int
+strIsAscii(const char *s) {
+    for (; '\0' != *s; s++) {
+	if (*s < ' ' || '~' < *s) {
+	    return 0;
+	}
+    }
+    return 1;
+}
+#endif
+
+VALUE
+str2sym(SaxDrive dr, const char *str, const char **strp) {
+    VALUE	*slot;
+    VALUE	sym;
+
+    if (dr->options.symbolize) {
+	if (Qundef == (sym = ox_cache_get(ox_symbol_cache, str, &slot, strp))) {
+#if HAS_ENCODING_SUPPORT
+	    if (0 != dr->encoding && !strIsAscii(str)) {
+		VALUE	rstr = rb_str_new2(str);
+
+		// TBD if sym can be pinned down then use this all the time
+		rb_enc_associate(rstr, dr->encoding);
+		sym = rb_funcall(rstr, ox_to_sym_id, 0);
+		*slot = Qundef;
+	    } else {
+		sym = ID2SYM(rb_intern(str));
+		*slot = sym;
+	    }
+#elif HAS_PRIVATE_ENCODING
+	    if (Qnil != dr->encoding && !strIsAscii(str)) {
+		VALUE	rstr = rb_str_new2(str);
+
+		rb_funcall(rstr, ox_force_encoding_id, 1, dr->encoding);
+		sym = rb_funcall(rstr, ox_to_sym_id, 0);
+		*slot = Qundef;
+	    } else {
+		sym = ID2SYM(rb_intern(str));
+		*slot = sym;
+	    }
+#else
+	    sym = ID2SYM(rb_intern(str));
+	    *slot = sym;
+#endif
+	}
+    } else {
+	sym = rb_str_new2(str);
+#if HAS_ENCODING_SUPPORT
+	if (0 != dr->encoding) {
+	    rb_enc_associate(sym, dr->encoding);
+	}
+#elif HAS_PRIVATE_ENCODING
+	if (Qnil != dr->encoding) {
+	    rb_funcall(sym, ox_force_encoding_id, 1, dr->encoding);
+	}
+#endif
+	if (0 != strp) {
+	    *strp = StringValuePtr(sym);
+	}
+    }
+    return sym;
+}
+
 void
 ox_sax_parse(VALUE handler, VALUE io, SaxOptions options) {
     struct _SaxDrive    dr;
@@ -708,14 +773,14 @@ read_comment(SaxDrive dr) {
  */
 static char
 read_element_start(SaxDrive dr) {
-    char	*ename = 0;
-    VALUE       name = Qnil;
-    char        c;
-    int         closed;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 1;
-    Hint	h = 0;
-    int		stackless = 0;
+    const char		*ename = 0;
+    volatile VALUE	name = Qnil;
+    char        	c;
+    int			closed;
+    int			line = dr->buf.line;
+    int			col = dr->buf.col - 1;
+    Hint		h = 0;
+    int			stackless = 0;
 
     if ('\0' == (c = read_name_token(dr))) {
         return '\0';
@@ -850,19 +915,18 @@ read_element_end(SaxDrive dr) {
 
 	if (0 == match) {
 	    // Not found so open and close element.
-	    char	*ename = 0;
 	    Hint	h = ox_hint_find(dr->hints, dr->buf.str);
 
 	    if (0 != h && h->empty) {
 		// Just close normally
-		name = str2sym(dr, dr->buf.str, &ename);
+		name = str2sym(dr, dr->buf.str, 0);
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' should not have a separate close element", EL_MISMATCH, dr->buf.str);
 		ox_sax_drive_error_at(dr, msg, line, col);
 		return c;
 	    } else {
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' closed but not opened", EL_MISMATCH, dr->buf.str);
 		ox_sax_drive_error_at(dr, msg, line, col);
-		name = str2sym(dr, dr->buf.str, &ename);
+		name = str2sym(dr, dr->buf.str, 0);
 		if (dr->has.start_element) {
 		    VALUE       args[1];
 

data/ext/ox/sax.h

@@ -70,52 +70,6 @@ extern int	ox_sax_collapse_special(SaxDrive dr, char *str, int line, int col);
 
 extern VALUE	ox_sax_value_class;
 
-inline static VALUE
-str2sym(SaxDrive dr, const char *str, char **strp) {
-    VALUE       *slot;
-    VALUE       sym;
-
-    if (dr->options.symbolize) {
-	if (Qundef == (sym = ox_cache_get(ox_symbol_cache, str, &slot, strp))) {
-#if HAS_ENCODING_SUPPORT
-	    if (0 != dr->encoding) {
-		VALUE	rstr = rb_str_new2(str);
-
-		rb_enc_associate(rstr, dr->encoding);
-		sym = rb_funcall(rstr, ox_to_sym_id, 0);
-	    } else {
-		sym = ID2SYM(rb_intern(str));
-	    }
-#elif HAS_PRIVATE_ENCODING
-	    if (Qnil != dr->encoding) {
-		VALUE	rstr = rb_str_new2(str);
-
-		rb_funcall(rstr, ox_force_encoding_id, 1, dr->encoding);
-		sym = rb_funcall(rstr, ox_to_sym_id, 0);
-	    } else {
-		sym = ID2SYM(rb_intern(str));
-	    }
-#else
-	    sym = ID2SYM(rb_intern(str));
-#endif
-	    *slot = sym;
-	}
-    } else {
-	sym = rb_str_new2(str);
-#if HAS_ENCODING_SUPPORT
-	if (0 != dr->encoding) {
-	    rb_enc_associate(sym, dr->encoding);
-	}
-#elif HAS_PRIVATE_ENCODING
-	if (Qnil != dr->encoding) {
-	    rb_funcall(sym, ox_force_encoding_id, 1, dr->encoding);
-	}
-#endif
-	if (0 != strp) {
-	    *strp = StringValuePtr(sym);
-	}
-    }
-    return sym;
-}
+extern VALUE	str2sym(SaxDrive dr, const char *str, const char **strp);
 
 #endif /* __OX_SAX_H__ */

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-30 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