ox 1.4.6 → 1.5.0

data/test/perf_obj.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby -wW1
 
 $: << '.'
-$: << '..'
 $: << '../lib'
 $: << '../ext'
 
@@ -14,13 +13,13 @@ end
 
 require 'optparse'
 require 'ox'
+require 'oj'
+require 'perf'
 require 'sample'
-require 'test/ox/doc'
 require 'files'
 
-$verbose = 0
-$ox_only = false
 $circular = false
+$indent = 0
 
 do_sample = false
 do_files = false
@@ -32,9 +31,6 @@ do_write = false
 $iter = 1000
 
 opts = OptionParser.new
-opts.on("-v", "increase verbosity")                         { $verbose += 1 }
-
-opts.on("-x", "ox only")                                    { $ox_only = true }
 opts.on("-c", "circular options")                           { $circular = true }
 
 opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
@@ -51,151 +47,78 @@ opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
+$obj = nil
+$xml = nil
+$mars = nil
+$json = nil
+
+unless do_load || do_dump || do_read || do_write
+  do_load = true
+  do_dump = true
+  do_read = true
+  do_write = true
+end
+
+# prepare all the formats for input
 if files.empty?
-  data = []
-  obj = do_sample ? sample_doc(2) : files('..')
-  mars = Marshal.dump(obj)
-  xml = Ox.dump(obj, :indent => 0, circular: $circular)
-  File.open('sample.xml', 'w') { |f| f.write(xml) }
-  File.open('sample.marshal', 'w') { |f| f.write(mars) }
-  data << { :file => 'sample.xml', :obj => obj, :xml => xml, :marshal => mars }
+  $obj = do_sample ? sample_doc(2) : files('..')
+  $mars = Marshal.dump($obj)
+  $xml = Ox.dump($obj, :indent => $indent, circular: $circular)
+  $json = Oj.dump($obj, :indent => $indent, circular: $circular)
+  File.open('sample.xml', 'w') { |f| f.write($xml) }
+  File.open('sample.json', 'w') { |f| f.write($json) }
+  File.open('sample.marshal', 'w') { |f| f.write($mars) }
 else
   puts "loading and parsing #{files}\n\n"
+  # TBD change to allow xml and json
   data = files.map do |f|
-    xml = File.read(f)
-    obj = Ox.load(xml);
-    mars = Marshal.dump(obj)
-    { :file => f, :obj => obj, :xml => xml, :marshal => mars }
+    $xml = File.read(f)
+    $obj = Ox.load($xml);
+    $mars = Marshal.dump($obj)
+    $json = Oj.dump($obj, :indent => $indent, circular: $circular)
   end
 end
 
-$ox_load_time = 0
-$mars_load_time = 0
-$ox_dump_time = 0
-$mars_dump_time = 0
-
-def perf_load(d)
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
+Oj.default_options = { :mode => :object, :indent => $indent }
 
-  if 0 < $verbose
-    obj = Ox.load(xml, :mode => :object, :trace => $verbose)
-    return
-  end
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load(xml, :mode => :object)
-  end
-  $ox_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Ox took #{$ox_load_time} seconds."
-
-  return if $ox_only
-  
-  start = Time.now
-  (1..$iter).each do
-    obj = Marshal.load(mars)
-  end
-  $mars_load_time = Time.now - start
-  puts "Marshalling #{$iter} times took #{$mars_load_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading.\n\n" % [$mars_load_time/$ox_load_time]
+if do_load
+  puts '-' * 80
+  puts "Load Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'load') { Ox.load($xml, :mode => :object) }
+  perf.add('Oj', 'load') { Oj.load($json) }
+  perf.add('Marshal', 'load') { Marshal.load($mars) }
+  perf.run($iter)
 end
 
-def perf_dump(d)
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.dump(obj, :indent => 2, :circular => $circular)
-    #puts "*** ox:\n#{xml}"
-  end
-  $ox_dump_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{$ox_dump_time} seconds."
-
-  return if $ox_only
-
-  obj = d[:obj]
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj)
-  end
-  $mars_dump_time = Time.now - start
-  puts "Marshal dumping #{$iter} times took #{$mars_dump_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [$mars_dump_time/$ox_dump_time]
+if do_dump
+  puts '-' * 80
+  puts "Dump Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'dump') { Ox.dump($obj, :indent => $indent, :circular => $circular) }
+  perf.add('Oj', 'dump') { Oj.dump($obj) }
+  perf.add('Marshal', 'dump') { Marshal.dump($obj) }
+  perf.run($iter)
 end
 
-def perf_read(d)
-  ox_read_time = 0
-  mars_read_time = 0
-
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-
-  # now load from the file
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load_file(filename, :mode => :object)
-  end
-  ox_read_time = Time.now - start
-  puts "Loading and parsing #{$iter} times with ox took #{ox_read_time} seconds."
-
-  if !$ox_only
-    start = Time.now
-    (1..$iter).each do
-      m = File.read(marshal_filename)
-      obj = Marshal.load(m)
-    end
-    mars_read_time = Time.now - start
-    puts "Reading and marshalling #{$iter} times took #{mars_read_time} seconds."
-    puts ">>> Ox is %0.1f faster than Marshal loading and parsing.\n\n" % [mars_read_time/ox_read_time]
-
-  end
+if do_read
+  puts '-' * 80
+  puts "Read from file Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'load_file') { Ox.load_file('sample.xml', :mode => :object) }
+  perf.add('Oj', 'load') { Oj.load_file('sample.json') }
+  perf.add('Marshal', 'load') { Marshal.load(File.new('sample.marshal')) }
+  perf.run($iter)
 end
 
-def perf_write(d)
-  ox_write_time = 0
-  mars_write_time = 0
-  
-  ox_filename = 'out.xml'
-  marshal_filename = 'out.marshal'
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.to_file(ox_filename, obj, :indent => 0)
-  end
-  ox_write_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{ox_write_time} seconds."
-
-  if !$ox_only
-    start = Time.now
-    (1..$iter).each do
-      m = Marshal.dump(obj, circular: $circular)
-      File.open(marshal_filename, "w") { |f| f.write(m) }
-    end
-    mars_write_time = Time.now - start
-    puts "Marshal dumping and writing #{$iter} times took #{mars_write_time} seconds."
-    puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [mars_write_time/ox_write_time]
-
-  end
+if do_write
+  puts '-' * 80
+  puts "Write to file Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'to_file') { Ox.to_file('sample.xml', $obj, :indent => $indent, :circular => $circular) }
+  perf.add('Oj', 'to_file') { Oj.to_file('sample.json', $obj) }
+  perf.add('Marshal', 'dump') { Marshal.dump($obj, File.new('sample.marshal', 'w')) }
+  perf.run($iter)
 end
 
-#if do_sample or do_files
-  data.each do |d|
-    puts "Using file #{d[:file]}."
-    
-    perf_load(d) if do_load
-    perf_dump(d) if do_dump
-    if do_load and do_dump
-      puts ">>> Ox is %0.1f faster than Marshal dumping and loading.\n\n" % [($mars_load_time + $mars_dump_time)/($ox_load_time + $ox_dump_time)] unless 0 == $mars_load_time
-    end
-
-    perf_read(d) if do_read
-    perf_write(d) if do_write
-
-  end
-#end
 

data/test/sample.rb

@@ -8,14 +8,13 @@ if $0 == __FILE__
 end
 
 require 'pp'
-require 'ox'
-require 'test/ox/doc'
+require 'sample/doc'
 
 
 def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
 
-  d = ::Test::Ox::Doc.new('Sample')
+  d = ::Sample::Doc.new('Sample')
 
   # add some history
   (0..size * 10).each do |i|
@@ -24,21 +23,21 @@ def sample_doc(size=3)
 
   # add some layers
   (1..size).each do |i|
-    layer = ::Test::Ox::Layer.new("Layer-#{i}")
+    layer = ::Sample::Layer.new("Layer-#{i}")
     (1..size).each do |j|
-      g = ::Test::Ox::Group.new
+      g = ::Sample::Group.new
       (1..size).each do |k|
-        g2 = ::Test::Ox::Group.new
-        r = ::Test::Ox::Rect.new(j * 40 + 10.0, i * 10.0,
+        g2 = ::Sample::Group.new
+        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
                                  10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
         r.add_prop(:part_of, layer.name)
         g2 << r
-        g2 << ::Test::Ox::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
+        g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
         g << g2
       end
-      g2 = ::Test::Ox::Group.new
+      g2 = ::Sample::Group.new
       (1..size).each do |k|
-        o = ::Test::Ox::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
+        o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
                                  6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o
@@ -52,11 +51,5 @@ def sample_doc(size=3)
   # some properties
   d.add_prop(:purpose, 'an example')
 
-  #pp d
-  #Ox.dump(d, :indent => 0)
   d
 end
-
-if $0 == __FILE__
-  File.open('foo.xml', "w") { |f| f.write(Ox.dump(sample_doc(3), :indent => 2)) }
-end

data/test/sample/change.rb

@@ -0,0 +1,14 @@
+
+module Sample
+  class Change
+    attr_accessor :time
+    attr_accessor :user
+    attr_accessor :comment
+    
+    def initialize(comment=nil, time=nil, user=nil)
+      @user = user || ENV['USER'] 
+      @time = time || Time.now
+      @comment = comment
+    end
+  end # Change
+end # Sample

data/test/sample/dir.rb

@@ -0,0 +1,19 @@
+
+require 'etc'
+
+module Sample
+
+  class Dir < File
+    attr_accessor :files
+
+    def initialize(filename)
+      super
+      @files = []
+    end
+    
+    def <<(f)
+      @files << f
+    end
+
+  end # Dir
+end # Sample

data/test/sample/doc.rb

@@ -0,0 +1,36 @@
+
+require 'sample/hasprops'
+require 'sample/group'
+require 'sample/layer'
+require 'sample/line'
+require 'sample/shape'
+require 'sample/oval'
+require 'sample/rect'
+require 'sample/text'
+require 'sample/change'
+
+module Sample
+  class Doc
+    include HasProps
+    
+    attr_accessor :title
+    attr_accessor :create_time
+    attr_accessor :user
+    # Hash of layers in the document indexed by layer name.
+    attr_reader :layers
+    attr_reader :change_history
+
+    def initialize(title)
+      @title = title
+      @user = ENV['USER']
+      @create_time = Time.now
+      @layers = { }
+      @change_history = []
+    end
+    
+    def add_change(comment, time=nil, user=nil)
+      @change_history << Change.new(comment, time, user)
+    end
+
+  end # Doc
+end # Sample

data/test/sample/file.rb

@@ -0,0 +1,48 @@
+
+require 'etc'
+
+module Sample
+
+  class File
+    attr_accessor :name, :ctime, :mtime, :size, :owner, :group, :permissions
+
+    def initialize(filename)
+      @name = ::File.basename(filename)
+      stat = ::File.stat(filename)
+      @ctime = stat.ctime
+      @mtime = stat.mtime
+      @size = stat.size
+      @owner = Etc.getpwuid(stat.uid).name
+      @group = Etc.getgrgid(stat.gid).name
+      if false
+        @permissions = {
+          'user' => { 
+            'read' => (0 != (stat.mode & 0x0100)),
+            'write' => (0 != (stat.mode & 0x0080)),
+            'execute' => (0 != (stat.mode & 0x0040))},
+          'group' => {
+            'read' => (0 != (stat.mode & 0x0020)),
+            'write' => (0 != (stat.mode & 0x0010)),
+            'execute' => (0 != (stat.mode & 0x0008))},
+          'other' => {
+            'read' => (0 != (stat.mode & 0x0004)),
+            'write' => (0 != (stat.mode & 0x0002)),
+            'execute' => (0 != (stat.mode & 0x0001))}
+        }
+      else
+        @permissions = {
+          'user' => [(0 != (stat.mode & 0x0100)) ? 'r' : '-',
+                     (0 != (stat.mode & 0x0080)) ? 'w' : '-',
+                     (0 != (stat.mode & 0x0040)) ? 'x' : '-'].join(''),
+          'group' => [(0 != (stat.mode & 0x0020)) ? 'r' : '-',
+                      (0 != (stat.mode & 0x0010)) ? 'w' : '-',
+                      (0 != (stat.mode & 0x0008)) ? 'x' : '-'].join(''),
+          'other' => [(0 != (stat.mode & 0x0004)) ? 'r' : '-',
+                      (0 != (stat.mode & 0x0002)) ? 'w' : '-',
+                      (0 != (stat.mode & 0x0001)) ? 'x' : '-'].join('')
+        }
+      end
+    end
+
+  end # File
+end # Sample

data/test/sample/group.rb

@@ -0,0 +1,16 @@
+
+module Sample
+  class Group
+    attr_reader :members
+    
+    def initialize()
+      @members = []
+    end
+    
+    def <<(member)
+      @members << member
+    end
+
+  end # Group
+end # Sample
+    

data/test/sample/hasprops.rb

@@ -0,0 +1,16 @@
+
+module Sample
+  module HasProps
+
+    def add_prop(key, value)
+      @props = { } unless self.instance_variable_defined?(:@props)
+      @props[key] = value
+    end
+
+    def props
+      @props = { } unless self.instance_variable_defined?(:@props)
+      @props
+    end
+    
+  end # HasProps
+end # Sample