ox 1.4.3 → 1.4.4

data/README.md

@@ -26,19 +26,20 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.3
+### Release 1.4.4
 
- - In tolerant mode attribute values can now be surrounded by single quotes.
- - In tolerant mode attribute values can now be without quotes as long as they do not contain spaces and are followed by a white space character.
+ - Fixed off by 1 error that caused reallocation error for long XML messages.
 
 ## <a name="description">Description</a>
 
 Optimized XML (Ox), as the name implies was written to provide speed optimized
-XML handling. It was designed to be an alternative to Nokogiri in generic XML
-parsing and as an alternative to Marshal for Object serialization. 
+XML handling. It was designed to be an alternative to Nokogiri and other Ruby
+XML parsers in generic XML parsing and as an alternative to Marshal for Object
+serialization.
 
-Unlike Nokogiri Ox is self contained. Ox uses nothing other than standard C
-libraries so version issues with libXml are not an issue.
+Unlike some other Ruby XML parsers, Ox is self contained. Ox uses nothing
+other than standard C libraries so version issues with libXml are not an
+issue.
 
 Marshal uses a binary format for serializing Objects. That binary format
 changes with releases making Marshal dumped Object incompatible between some
@@ -48,9 +49,9 @@ used for inspecting the serialize Object. Ox on the other hand uses human
 readable XML. Ox also includes options that allow strict, tolerant, or a mode
 that automatically defines missing classes.
 
-It is possible to write an XML serialization gem with Nokogiri but writing
-such a package in Ruby results in a module significantly slower than
-Marshal. This is what triggered the start of Ox development.
+It is possible to write an XML serialization gem with Nokogiri or other XML
+parsers but writing such a package in Ruby results in a module significantly
+slower than Marshal. This is what triggered the start of Ox development.
 
 Ox handles XML documents in three ways. It is a generic XML parser and writer,
 a fast Object / XML marshaller, and a stream SAX parser. Ox was written for

data/ext/ox/dump.c

@@ -1012,7 +1012,7 @@ dump_obj_to_xml(VALUE obj, Options copts, Out out) {
 
     out->w_time = (Yes == copts->xsd_date) ? dump_time_xsd : dump_time_thin;
     out->buf = (char*)malloc(65336);
-    out->end = out->buf + 65336;
+    out->end = out->buf + 65325; // 1 less than end plus extra for possible errors
     out->cur = out->buf;
     out->circ_cache = 0;
     out->circ_cnt = 0;

data/lib/ox/version.rb

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

data/test/big.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  while (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'ox'
+
+def dump(cnt = 10000)
+  h = { }
+  cnt.times do |i|
+    h[i] = [i * 2, "this is #{i}"]
+  end
+  xml = Ox.dump(h)
+  puts "size: #{xml.size}"
+end
+
+dump(200000)

data/test/bug3.rb

@@ -3,19 +3,21 @@
 $: << '../lib'
 $: << '../ext'
 
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
 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)
+def dump(cnt = 100000)
+  cnt.times do |i|
+    xml = Ox.dump([:inc, 1])
+    #puts xml
+    
   end
 end
 
-name_it()
+dump()

data/test/bug4.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '../lib'
+$: << '../ext'
+
+require 'ox'
+
+#xml = File.read('bug4.xml')
+xml = File.read('bug4.xml')
+
+doc = Ox.parse(xml)

metadata

@@ -1,28 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ox
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.4
   prerelease: 
-  version: 1.4.3
 platform: ruby
-authors: 
+authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-08 00:00:00 +09:00
-default_executable: 
+date: 2012-01-13 00:00:00.000000000Z
 dependencies: []
-
-description: A fast XML parser and object serializer that uses only standard C lib.
+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 optimized\nXML handling. It was designed to be an alternative to Nokogiri
+  and other Ruby\nXML parsers for generic XML parsing and as an alternative to Marshal
+  for Object\nserialization. "
 email: peter@ohler.com
 executables: []
-
-extensions: 
+extensions:
 - ext/ox/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/ox/bag.rb
 - lib/ox/cdata.rb
 - lib/ox/comment.rb
@@ -51,9 +51,11 @@ files:
 - ext/ox/parse.c
 - ext/ox/sax.c
 - test/bench.rb
+- test/big.rb
 - test/bug1.rb
 - test/bug2.rb
 - test/bug3.rb
+- test/bug4.rb
 - test/cache16_test.rb
 - test/cache8_test.rb
 - test/cache_test.rb
@@ -81,41 +83,37 @@ files:
 - test/perf_sax.rb
 - test/perf_write.rb
 - test/sample.rb
-- test/sax_example.rb
 - test/sax_test.rb
 - test/test.rb
 - test/Sample.graffle
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: https://github.com/ohler55/ox
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ox
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.
 test_files: []
-
+has_rdoc: true

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
-