ox 1.5.2 → 1.5.3

data/README.md

@@ -30,11 +30,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.5.2
+### Release 1.5.3
 
- - Added support for Date.
-
- - Exception encoding and decoding support improved.
+ - Backed off on using the stack for allocation as very large XML files are too large for many stacks.
 
 ## <a name="description">Description</a>
 

data/ext/ox/ox.c

@@ -36,6 +36,9 @@
 #include "ruby.h"
 #include "ox.h"
 
+// maximum to allocate on the stack, arbitrary limit
+#define SMALL_XML	65536
+
 typedef struct _YesNoOpt {
     VALUE       sym;
     char        *attr;
@@ -289,14 +292,22 @@ static VALUE
 to_obj(VALUE self, VALUE ruby_xml) {
     char        *xml;
     size_t	len;
+    VALUE	obj;
 
     Check_Type(ruby_xml, T_STRING);
     // the xml string gets modified so make a copy of it
     len = RSTRING_LEN(ruby_xml) + 1;
-    xml = ALLOCA_N(char, len);
+    if (SMALL_XML < len) {
+	xml = ALLOC_N(char, len);
+    } else {
+	xml = ALLOCA_N(char, len);
+    }
     strcpy(xml, StringValuePtr(ruby_xml));
-
-    return ox_parse(xml, ox_obj_callbacks, 0, 0, StrictEffort);
+    obj = ox_parse(xml, ox_obj_callbacks, 0, 0, StrictEffort);
+    if (SMALL_XML < len) {
+	xfree(xml);
+    }
+    return obj;
 }
 
 /* call-seq: parse(xml) => Ox::Document or Ox::Element
@@ -310,14 +321,22 @@ static VALUE
 to_gen(VALUE self, VALUE ruby_xml) {
     char        *xml;
     size_t	len;
+    VALUE	obj;
 
     Check_Type(ruby_xml, T_STRING);
     // the xml string gets modified so make a copy of it
     len = RSTRING_LEN(ruby_xml) + 1;
-    xml = ALLOCA_N(char, len);
+    if (SMALL_XML < len) {
+	xml = ALLOC_N(char, len);
+    } else {
+	xml = ALLOCA_N(char, len);
+    }
     strcpy(xml, StringValuePtr(ruby_xml));
-
-    return ox_parse(xml, ox_gen_callbacks, 0, 0, StrictEffort);
+    obj = ox_parse(xml, ox_gen_callbacks, 0, 0, StrictEffort);
+    if (SMALL_XML < len) {
+	xfree(xml);
+    }
+    return obj;
 }
 
 static VALUE
@@ -399,14 +418,22 @@ static VALUE
 load_str(int argc, VALUE *argv, VALUE self) {
     char        *xml;
     size_t	len;
+    VALUE	obj;
     
     Check_Type(*argv, T_STRING);
     // the xml string gets modified so make a copy of it
     len = RSTRING_LEN(*argv) + 1;
-    xml = ALLOCA_N(char, len);
+    if (SMALL_XML < len) {
+	xml = ALLOC_N(char, len);
+    } else {
+	xml = ALLOCA_N(char, len);
+    }
     strcpy(xml, StringValuePtr(*argv));
-
-    return load(xml, argc - 1, argv + 1, self);
+    obj = load(xml, argc - 1, argv + 1, self);
+    if (SMALL_XML < len) {
+	xfree(xml);
+    }
+    return obj;
 }
 
 /* call-seq: load_file(file_path, xml, options) => Ox::Document or Ox::Element or Object
@@ -428,10 +455,11 @@ load_str(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 load_file(int argc, VALUE *argv, VALUE self) {
-    char                *path;
-    char                *xml;
-    FILE                *f;
-    unsigned long       len;
+    char	*path;
+    char	*xml;
+    FILE	*f;
+    size_t	len;
+    VALUE	obj;
     
     Check_Type(*argv, T_STRING);
     path = StringValuePtr(*argv);
@@ -440,7 +468,11 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     fseek(f, 0, SEEK_END);
     len = ftell(f);
-    xml = ALLOCA_N(char, len + 1);
+    if (SMALL_XML < len) {
+	xml = ALLOC_N(char, len + 1);
+    } else {
+	xml = ALLOCA_N(char, len + 1);
+    }
     fseek(f, 0, SEEK_SET);
     if (len != fread(xml, 1, len, f)) {
         fclose(f);
@@ -448,8 +480,11 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     fclose(f);
     xml[len] = '\0';
-
-    return load(xml, argc - 1, argv + 1, self);
+    obj = load(xml, argc - 1, argv + 1, self);
+    if (SMALL_XML < len) {
+	xfree(xml);
+    }
+    return obj;
 }
 
 /* call-seq: sax_parse(handler, io, options)

data/lib/ox/version.rb

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

data/test/bug3.rb

@@ -2,20 +2,20 @@
 
 $: << '../lib'
 $: << '../ext'
+$: << '../../pod/modules/pod/cfg/lib'
+$: << '../../pod/modules/pod/core/lib'
+$: << '../../pod/modules/pod/esb/lib'
 
-require 'ox'
-
-def name_it()
-  begin
-    "x".foo
-  rescue Exception => e
-    #puts e.message
-    xml = Ox.dump(e, effort: :tolerant)
-    puts xml
-    o = Ox.load(xml, mode: :object)
-    puts o.message
-    puts Ox.dump(e)
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
   end
 end
 
-name_it()
+require 'ox'
+require 'pod/cfg'
+
+x = Ox.load_file('fail.xml', :mode => :object, :effort => :strict)
+
+puts "return is a #{x.class}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-03-21 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
@@ -54,7 +54,6 @@ files:
 - test/bug1.rb
 - test/bug2.rb
 - test/bug3.rb
-- test/bug4.rb
 - test/cache16_test.rb
 - test/cache8_test.rb
 - test/cache_test.rb
@@ -95,7 +94,6 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample.rb
-- test/sax_example.rb
 - test/sax_test.rb
 - test/test.rb
 - test/Sample.graffle
@@ -124,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ox
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.

data/test/bug4.rb

@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'stringio'
-require 'ox'
-
-x1 = %(<?xml version="1.0" encoding="ISO-8859-1" ?><tag key="value">Français</tag>).encode("ISO-8859-1")
-# => "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?><tag key=\"value\">Fran\xE7ais</tag>" 
-x1.encoding
-# => #<Encoding:ISO-8859-1> 
-
-x2 = %(<?xml version="1.0" encoding="UTF-8" ?><tag key="value">Français</tag>)
-# => "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><tag key=\"value\">Fran\xC3\xA7ais</tag>"
-x2.encoding
-# => #<Encoding:UTF-8> 
-
-class OH < ::Ox::Sax
-  def start_element(name)
-    puts "EL: #{name} (#{name.encoding})"
-  end
-
-  def end_element(name)
-  end
-
-  def attr(key, value)
-    puts "AT: #{key} => #{value} (#{key.encoding} => #{value.encoding})"
-  end
-
-  def text(value)
-    puts "TX: #{value} (#{value.encoding})"
-  end
-end
-
-::Ox.sax_parse OH.new, StringIO.new(x1)
-   # => AT: version => 1.0 (US-ASCII => ASCII-8BIT)
-   #    AT: encoding => ISO-8859-1 (US-ASCII => ISO-8859-1)
-   #    EL: tag (US-ASCII)
-   #    AT: key => value (US-ASCII => ISO-8859-1)
-   #    TX: Fran�ais (ISO-8859-1)
-
-puts
-
-::Ox.sax_parse OH.new, StringIO.new(x2)
-   # => AT: version => 1.0 (US-ASCII => ASCII-8BIT)
-   #    AT: encoding => UTF-8 (US-ASCII => UTF-8)
-   #    EL: tag (US-ASCII)
-   #    AT: key => value (US-ASCII => UTF-8)
-   #    TX: Français (UTF-8)
-
-puts
-x3 = %(<?xml version="1.0" encoding="ISO-8859-1" ?><tag Português="Español">Français</tag>).encode("ISO-8859-1")
-::Ox.sax_parse OH.new, StringIO.new(x3)
-
-puts
-x4 = %(<?xml version="1.0" encoding="UTF-8" ?><tag Português="Español">Français</tag>)
-::Ox.sax_parse OH.new, StringIO.new(x4)
-

data/test/sax_example.rb

@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '../lib'
-$: << '../ext'
-
-require 'stringio'
-require 'ox'
-
-class Sample < ::Ox::Sax
-  def start_element(name); puts "start: #{name}"; end
-  def end_element(name); puts "end: #{name}"; end
-  def attr(name, value); puts "  #{name} => #{value}"; end
-  def text(value); puts "text #{value}"; end
-end
-
-io = StringIO.new(%{
-<top name="sample">
-  <middle name="second">
-    <bottom name="third"/>
-  </middle>
-</top>
-})
-
-handler = Sample.new()
-Ox.sax_parse(handler, io)
-
-# outputs
-# start: top
-#   name => sample
-# start: middle
-#   name => second
-# start: bottom
-#   name => third
-# end: bottom
-# end: middle
-# end: top
-