ox 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 066b29e775aa1fbf8beb40e572299a3b99155c92
-  data.tar.gz: 41c0e36f4f7bbebcef8f27c7e75d80c3c6420423
+SHA256:
+  metadata.gz: 2bf1d16f91469616bdbecb3d9b5a63cae12d2b92bf7abcafac9159f3525f464e
+  data.tar.gz: 810e9202e1e726115b204145e00afe33f83870ddf6a72ec1f01cc0b62af7203d
 SHA512:
-  metadata.gz: fbdf712b54810a1bff6c211d0f4b7e63ee8a1ed48911b4d43491c3792acd44c3f32bdc6da7028f8de87dfcc937162bb8116e13c9d73c1a60998a7eafb71efa24
-  data.tar.gz: f7378812079495da8752277b52c7372e739b848e24cf1845eb6e1d48e625d560c93374373d7d429b2612111b2173a9ce180a32385734e3b2f8e073f0937b143a
+  metadata.gz: 42526f5a26342762291351438ca9372f931b831aa99c304e963cce2fd81d4a5fe3d03a09277b7d1de2f479f719ebff456c105fd708391eddeea35969965ad060
+  data.tar.gz: dfafe308bc9b25fa8005e56600ccdb630da0b008137baa2bc7efd0ada62a122a3acd386ac7587e95a624151ed933d19d508a59d8af1cfbb88e161357d5c9125f

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## 2.8.3 - March 3, 2018
+
+  - Attribute values now escape < and > on dump.
+
 ## 2.8.2 - November 1, 2017
 
   - Fixed bug with SAX parser that caused a crash with very long invalid instruction element.
@@ -7,7 +11,7 @@
 
 ## 2.8.1 - October 27, 2017
 
-  - Avoid crash with invalid XML passed to Oj.parse_obj().
+  - Avoid crash with invalid XML passed to Ox.parse_obj().
 
 ## 2.8.0 - September 22, 2017
 

data/README.md

@@ -1,6 +1,8 @@
 # Ox gem
 A fast XML parser and Object marshaller as a Ruby gem.
 
+[![Build Status](https://secure.travis-ci.org/ohler55/ox.png?branch=master)](http://travis-ci.org/ohler55/ox)
+
 ## Installation
     gem install ox
 
@@ -20,11 +22,6 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Build Status
 
-[![Build Status](https://secure.travis-ci.org/ohler55/ox.png?branch=master)](http://travis-ci.org/ohler55/ox)
-
-## Donate
-
-[![Gratipay](https://img.shields.io/gratipay/project/ox.svg)](https://gratipay.com/ox/)
 
 ## Links of Interest
 
@@ -218,6 +215,26 @@ puts "after parse"
 # after parse
 ```
 
+### Parsing XML into a Hash (fast)
+
+```ruby
+require 'ox'
+
+xml = %{
+<top name="sample">
+  <middle name="second">
+    <bottom name="third">Rock bottom</bottom>
+  </middle>
+</top>
+}
+
+puts Ox.load(xml, mode: :hash)
+puts Ox.load(xml, mode: :hash_no_attrs)
+
+#{:top=>[{:name=>"sample"}, {:middle=>[{:name=>"second"}, {:bottom=>[{:name=>"third"}, "Rock bottom"]}]}]}
+#{:top=>{:middle=>{:bottom=>"Rock bottom"}}}
+```
+
 ### Object XML format
 
 The XML format used for Object encoding follows the structure of the

data/ext/ox/dump.c

@@ -92,7 +92,7 @@ static const char	xml_friendly_chars[257] = "\
 
 static const char	xml_quote_chars[257] = "\
 :::::::::11::1::::::::::::::::::\
-11611151111111111111111111111111\
+11611151111111111111111111114141\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\

data/ext/ox/sax_buf.h

@@ -44,7 +44,7 @@ extern int	ox_sax_buf_read(Buf buf);
 
 static inline char
 buf_get(Buf buf) {
-    //printf("*** drive get from '%s'  from start: %ld  buf: %p  from read_end: %ld\n", buf->tail, buf->tail - buf->head, buf->head, buf->read_end - buf->tail);
+    printf("*** drive get from '%s'  from start: %ld  buf: %p  from read_end: %ld\n", buf->tail, buf->tail - buf->head, buf->head, buf->read_end - buf->tail);
     if (buf->read_end <= buf->tail) {
         if (0 != ox_sax_buf_read(buf)) {
             return '\0';

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-03-03 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
@@ -35,7 +35,6 @@ files:
 - ext/ox/cache8.c
 - ext/ox/cache8.h
 - ext/ox/dump.c
-- ext/ox/encode.h
 - ext/ox/err.c
 - ext/ox/err.h
 - ext/ox/extconf.rb
@@ -100,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ox
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.

data/ext/ox/encode.h

@@ -1,26 +0,0 @@
-/* encode.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
-
-#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__ */