ox 1.4.0 → 1.4.1

data/README.md

@@ -26,10 +26,9 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.0
+### Release 1.4.1
 
- - Fixed bug in parsing the xml instruction.
- - Added locate() method that provides simple and limited xpath like functionality.
+ - Empty CDATA buf found and fixed by adamvaughan on github
 
 ## <a name="description">Description</a>
 

data/ext/ox/sax.c

@@ -451,7 +451,8 @@ read_cdata(SaxDrive dr) {
     char        c;
     int         end = 0;
 
-    dr->str = dr->cur - 1; // mark the start
+    dr->cur--; // back up to the start in case the cdata is empty
+    dr->str = dr->cur; // mark the start
     while (1) {
         c = sax_drive_get(dr);
         if (']' == c) {

data/lib/ox/element.rb

@@ -112,9 +112,7 @@ module Ox
     # @param [Array] path array of steps in a path
     # @param [Array] found matching nodes
     def alocate(path, found)
-      #puts "*** locate_dig(#{path}, #{found})"
       step = path[0]
-      #puts "***  #{step}"
       if step.start_with?('@') # attribute
         raise InvalidPath.new(path) unless 1 == path.size
         step = step[1..-1]

data/lib/ox/version.rb

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

data/test/bench.rb

@@ -0,0 +1,53 @@
+# Message Pack vs similar utilities
+# using ruby 1.9.2p290 (2011-07-09 revision 32553) [x86_64-darwin10.8.0]
+#
+# Packing
+# pack: message pack               0.142954
+# pack: marshall                   0.636924
+# pack: json                       3.001180
+# pack: ox                         0.108832
+# 
+# Unpacking
+# unpack: message pack             0.260064
+# unpack: marshal                  0.616197
+# unpack: marshal                  0.609927
+# unpack: ox                       0.287053
+
+require 'msgpack'
+require 'json'
+require 'ox'
+
+iter = 100000
+
+duck = { 'sound' => 'quack', 'name' => 'Daffy', 'feet' => 2, 'wings' => true }
+dude = { 'sound' => "I'm the dude!", 'name' => 'Lebowski', 'missing a rug' => true, 'missing money' => 1_000_000.00 }
+stuff = { :string => "A string", :array => [true, 2, 'yes'], :hash => { :string => "not very deep" }}
+
+def bench(title, iter, &blk)
+  start = Time.now
+  (1..iter).each { blk.call }
+  time = Time.now - start
+  puts "%-30s %10.6f" % [title, time]
+end
+
+def bench_all(title, iter, obj)
+  puts "\n#{title} Packing"
+  bench('pack: message pack', iter) { MessagePack.pack(obj) }
+  bench('pack: marshall', iter) { Marshal.dump(obj) }
+  bench('pack: json', iter) { JSON.dump(obj) }
+  bench('pack: ox', iter) { Ox.dump(obj) }
+
+  puts "\n#{title} Unpacking"
+  mp_obj = MessagePack.pack(obj)
+  bench('unpack: message pack', iter) { MessagePack.unpack(mp_obj) }
+  mars_obj = Marshal.dump(obj)
+  bench('unpack: marshal', iter) { Marshal.load(mars_obj) }
+  json_obj = JSON.dump(obj)
+  bench('unpack: json', iter) { JSON.parse(json_obj) }
+  ox_obj = Ox.dump(obj)
+  bench('unpack: ox', iter) { Ox.parse_obj(ox_obj) }
+end
+
+bench_all('duck', iter, duck)
+bench_all('dude', iter, dude)
+bench_all('stuff', iter, stuff)

data/test/perf_mars.rb

@@ -50,7 +50,7 @@ data = {
   :Rational => ::Test::Ox::Wrap.new(),
   :Struct => ::Test::Ox::Wrap.new(),
   :Class => ::Test::Ox::Wrap.new(),
-  :Object => ::Test::Ox::Wrap.new()
+  :Object => ::Test::Ox::Wrap.new(),
 }
 
 s = Struct.new('Zoo', :x, :y, :z)
@@ -74,7 +74,8 @@ s = Struct.new('Zoo', :x, :y, :z)
   data[:Object].values << ::Test::Ox::Wrap.new(i)
 end
 
-puts "type      Ox      Marshal  ratio"
+puts "           load                        dump"
+puts "type       Ox      Marshal  ratio      Ox      Marshal  ratio"
 data.each do |type,a|
   #xml = Ox.dump(a, :indent => -1, :xsd_date => true)
   xml = Ox.dump(a, :indent => -1)
@@ -85,13 +86,29 @@ data.each do |type,a|
     obj = Ox.load(xml, :mode => :object)
     #pp obj
   end
-  ox_time = Time.now - start
+  ox_load_time = Time.now - start
   
   m = Marshal.dump(a)
   start = Time.now
   (1..it).each do
     obj = Marshal.load(m)
   end
-  marshal_time = Time.now - start
-  puts "%8s  %6.3f  %6.3f    %0.1f" % [type.to_s, ox_time, marshal_time, marshal_time / ox_time]
+  mars_load_time = Time.now - start
+
+  obj = Ox.load(xml, :mode => :object)
+  start = Time.now
+  (1..it).each do
+    xml = Ox.dump(a, :indent => -1)
+  end
+  ox_dump_time = Time.now - start
+
+  start = Time.now
+  (1..it).each do
+    m = Marshal.dump(a)
+  end
+  mars_dump_time = Time.now - start
+
+  puts "%8s  %6.3f  %6.3f    %0.1f       %6.3f  %6.3f    %0.1f" % [type.to_s,
+                                       ox_load_time, mars_load_time, mars_load_time / ox_load_time,
+                                       ox_dump_time, mars_dump_time, mars_dump_time / ox_dump_time]
 end

data/test/sax_test.rb

@@ -351,6 +351,24 @@ encoding = "UTF-8" ?>},
                    [:error, "invalid format, cdata terminated unexpectedly", 5, 1]])
   end
   
+  def test_sax_cdata_empty
+    parse_compare(%{<?xml version="1.0"?>
+<top>
+  <child><![CDATA[]]></child>
+  <child><![CDATA[This is CDATA.]]></child>
+</top>
+},
+                  [[:instruct, 'xml'],
+                   [:attr, :version, '1.0'],
+                   [:start_element, :top],
+                   [:start_element, :child],
+                   [:cdata, ''],
+                   [:end_element, :child],
+                   [:start_element, :child],
+                   [:cdata, 'This is CDATA.'],
+                   [:end_element, :child],
+                   [:end_element, :top]])
+  end
 
   def test_sax_mixed
     parse_compare(%{<?xml version="1.0"?>

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ox
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors: 
 - Peter Ohler
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +09:00
+date: 2011-11-16 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +50,7 @@ files:
 - ext/ox/ox.c
 - ext/ox/parse.c
 - ext/ox/sax.c
+- test/bench.rb
 - test/bug1.rb
 - test/bug2.rb
 - test/bug3.rb
@@ -106,21 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ox
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.