ox 2.1.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51863f95cc7782f0645385202e4d127994448832
-  data.tar.gz: 651e6890f72ebb7093eb96fdc116faf9885cfc75
+  metadata.gz: a72bd41c796380d832d6fe08b7b7e77aeca0bbe4
+  data.tar.gz: 5aa7c7ef218a7a97cda25bd1586e133f168e91af
 SHA512:
-  metadata.gz: 5ba36a153b758ad852bee9fb0cb1c245bcf64934e2a8f3ec84d5e21109d3bf6f90221ec632431d674f522e9eedde106d72f6403ad646f91fa59f58c9f6b225e5
-  data.tar.gz: e6703f7d082b29dc8f786e13abd5bc105d3683187fb654910510d470813775bfce23bef4aa49f9a98253005ccd13a3170f59e0dfb9558e0047fad74d3ff7349e
+  metadata.gz: 715a10def5ec9ab769de09a7ac0ed6e7cbd56b48cb75a8e5f347a3143cfb3128df8224bf2a7b3d7d598fd297ef294f3120a5de3ad153e4a175d970005bb5f9a6
+  data.tar.gz: d6edb43235036f091a8150b998a5ce4115c19317203cc853d60f3e34f77b3971896c4bd87fae16b74ce9e3ce6f950664eec7fb42232bd88c12329e93f887bbc0

data/README.md

@@ -30,11 +30,19 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 *Fast JSON parser and marshaller on RubyGems*: https://rubygems.org/gems/oj
 
-*Fast JSON parser and marshaller on GitHub*: https://rubygems.org/gems/oj
+*Fast JSON parser and marshaller on GitHub*: https://github.com/ohler55/oj
 
 ## Release Notes
 
-### Current Release 2.1.8
+### Current Release 2.2.0
+
+ - Added the SAX convert_special option to the default options.
+
+ - Added the SAX smart option to the default options.
+
+ - Other SAX options are now taken from the defaults if not specified.
+
+### Release 2.1.8
 
  - Fixed a bug that caused all input to be read before parsing with the sax
    parser and an IO.pipe.

data/ext/ox/ox.c

@@ -145,6 +145,8 @@ struct _Options	 ox_default_options = {
     StrictEffort,	/* effort */
     Yes,		/* sym_keys */
     NoSkip,		/* skip */
+    No,			/* smart */
+    No,			/* convert_special */
 #if HAS_PRIVATE_ENCODING
     Qnil		/* rb_enc */
 #else
@@ -223,6 +225,8 @@ defuse_bom(char *xml, Options options) {
  * - effort: [:strict|:tolerant|:auto_define] set the tolerance level for loading
  * - symbolize_keys: [true|false|nil] symbolize element attribute keys or leave as Strings
  * - skip: [:skip_none|:skip_return|:skip_white] determines how to handle white space in text
+ * - smart: [true|false|nil] flag indicating the SAX parser uses hints if available (use with html)
+ * - convert_special: [true|false|nil] flag indicating special characters like < are converted with the SAX parser
  * @return [Hash] all current option settings.
  *
  * Note that an indent of less than zero will result in a tight one line output
@@ -242,6 +246,8 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, circular_sym, (Yes == ox_default_options.circular) ? Qtrue : ((No == ox_default_options.circular) ? Qfalse : Qnil));
     rb_hash_aset(opts, xsd_date_sym, (Yes == ox_default_options.xsd_date) ? Qtrue : ((No == ox_default_options.xsd_date) ? Qfalse : Qnil));
     rb_hash_aset(opts, symbolize_keys_sym, (Yes == ox_default_options.sym_keys) ? Qtrue : ((No == ox_default_options.sym_keys) ? Qfalse : Qnil));
+    rb_hash_aset(opts, smart_sym, (Yes == ox_default_options.smart) ? Qtrue : ((No == ox_default_options.smart) ? Qfalse : Qnil));
+    rb_hash_aset(opts, convert_special_sym, (Yes == ox_default_options.convert_special) ? Qtrue : ((No == ox_default_options.convert_special) ? Qfalse : Qnil));
     switch (ox_default_options.mode) {
     case ObjMode:	rb_hash_aset(opts, mode_sym, object_sym);	break;
     case GenMode:	rb_hash_aset(opts, mode_sym, generic_sym);	break;
@@ -292,6 +298,8 @@ set_def_opts(VALUE self, VALUE opts) {
 	{ xsd_date_sym, &ox_default_options.xsd_date },
 	{ circular_sym, &ox_default_options.circular },
 	{ symbolize_keys_sym, &ox_default_options.sym_keys },
+	{ smart_sym, &ox_default_options.smart },
+	{ convert_special_sym, &ox_default_options.convert_special },
 	{ Qnil, 0 }
     };
     YesNoOpt	o;
@@ -695,10 +703,10 @@ static VALUE
 sax_parse(int argc, VALUE *argv, VALUE self) {
     struct _SaxOptions	options;
 
-    options.symbolize = 1;
-    options.convert_special = 0;
-    options.smart = 0;
-    options.skip = NoSkip;
+    options.symbolize = (No != ox_default_options.sym_keys);
+    options.convert_special = (Yes == ox_default_options.convert_special);
+    options.smart = (Yes == ox_default_options.smart);
+    options.skip = ox_default_options.skip;
 
     if (argc < 2) {
 	rb_raise(ox_parse_error_class, "Wrong number of arguments to sax_parse.\n");

data/ext/ox/ox.h

@@ -131,6 +131,8 @@ typedef struct _Options {
     char	effort;		/* Effort */
     char	sym_keys;	/* symbolize keys */
     char	skip;		/* skip mode */
+    char	smart;		/* YesNo sax smart mode */
+    char	convert_special;/* YesNo sax smart mode */
 #if HAS_ENCODING_SUPPORT
     rb_encoding	*rb_enc;
 #elif HAS_PRIVATE_ENCODING

data/lib/ox.rb

@@ -1,30 +1,5 @@
 # Copyright (c) 2011, Peter Ohler<br>
 # 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.
 
 # === Description:
 # 

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-04-20 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
@@ -97,4 +97,3 @@ signing_key:
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
-has_rdoc: true