hutch-xamplr 1.0.5 → 1.1.0

data/lib/xamplr/templates/child_indexed.template

@@ -23,7 +23,7 @@
       accessed
       index = #{element.attribute_name}.get_the_index
       if(nil == index) then
-        raise XamplException.new("no value for the index '#{element.indexed_by_attr}' of #{element.attribute_name} defined in : " << #{element.attribute_name}.pp_xml)
+        raise Xampl::XamplException.new("no value for the index '#{element.indexed_by_attr}' of #{element.attribute_name} defined in : " << #{element.attribute_name}.pp_xml)
       end
 
       existing = @#{element.attribute_name}_child[index]

data/lib/xamplr/templates/element_classes.template

@@ -7,5 +7,5 @@
 | elsif "mixed" == @element.kind then
 |   element_mixed(result)
 | else
-|   raise XamplException.new(:unkown_kind_of_element, "unknown element kind: '#{@element.kind}'")
+|   raise Xampl::XamplException.new(:unkown_kind_of_element, "unknown element kind: '#{@element.kind}'")
 | end

data/lib/xamplr/templates/element_data.template

@@ -64,47 +64,8 @@
 |
 |}
 |
-|
-|if @element.persisted then
 |
 
-    @@to_yaml_properties = [ "@#{@element.indexed_by_attr}" ]
-    @@to_yaml_properties_all = [
-|
-|else
-|
-
-    @@to_yaml_properties     = [
-|
-|end
-|
-|@element.attribute_child.each{ | attribute |
-|
-                                 "@#{attribute.name}",
-|
-|}
-|
-                                 "@children",
-                                 "@_content"
-                               ]
-
-    def to_yaml_properties
-|
-|if @element.persisted then
-|
-      if is_yaml_root(self) then
-        return @@to_yaml_properties_all
-      else
-        return @@to_yaml_properties
-      end
-|
-|else
-|
-      @@to_yaml_properties
-|
-|end
-|
-    end
 |
 |if @element.persisted then
 |

data/lib/xamplr/templates/element_empty.template

@@ -63,46 +63,6 @@
 |}
 |
 |if @element.persisted then
-|
-
-    @@to_yaml_properties = [ "@#{@element.indexed_by_attr}" ]
-    @@to_yaml_properties_all = [
-
-|
-|else
-|
-
-    @@to_yaml_properties =     [
-|
-|end
-|
-|@element.attribute_child.each{ | attribute |
-|
-                                 "@#{attribute.name}",
-|
-|}
-|
-                               ]
-
-    def to_yaml_properties
-|
-|if @element.persisted then
-|
-      if is_yaml_root(self) then
-        return @@to_yaml_properties_all
-      else
-        return @@to_yaml_properties
-      end
-|
-|else
-|
-      @@to_yaml_properties
-|
-|end
-|
-    end
-|
-|if @element.persisted then
 |
 
     def #{@element.class_name}.lookup(pid)

data/lib/xamplr/templates/element_mixed.template

@@ -63,47 +63,6 @@
 |}
 |
 |if @element.persisted then
-|
-
-    @@to_yaml_properties = [ "@#{@element.indexed_by_attr}" ]
-    @@to_yaml_properties_all = [
-
-|
-|else
-|
-
-    @@to_yaml_properties     = [
-|
-| end
-|
-|@element.attribute_child.each{ | attribute |
-|
-                                 "@#{attribute.name}",
-|
-|}
-|
-                                 "@children"
-                               ]
-
-    def to_yaml_properties
-|
-|if @element.persisted then
-|
-      if is_yaml_root(self) then
-        return @@to_yaml_properties_all
-      else
-        return @@to_yaml_properties
-      end
-|
-|else
-|
-      @@to_yaml_properties
-|
-|end
-|
-    end
-|
-|if @element.persisted then
 |
 
     def #{@element.class_name}.lookup(pid)

data/lib/xamplr/templates/element_simple.template

@@ -63,46 +63,6 @@
 |}
 |
 |if @element.persisted then
-|
-
-    @@to_yaml_properties = [ "@#{@element.indexed_by_attr}" ]
-    @@to_yaml_properties_all = [
-|
-|else
-|
-
-    @@to_yaml_properties     = [
-|
-|end
-|
-|@element.attribute_child.each{ | attribute |
-|
-                                 "@#{attribute.name}",
-|
-|}
-|
-                                 "@_content"
-                               ]
-
-    def to_yaml_properties
-|
-|if @element.persisted then
-|
-      if is_yaml_root(self) then
-        return @@to_yaml_properties_all
-      else
-        return @@to_yaml_properties
-      end
-|
-|else
-|
-      @@to_yaml_properties
-|
-|end
-|
-    end
-|
-|if @element.persisted then
 |
 
     def #{@element.class_name}.lookup(pid)

data/lib/xamplr/test-support/bench.rb

@@ -13,21 +13,18 @@ include Benchmark
 # results from 16 October 2005
 #
 
-#Rebuilding From String (YAML & XML) count: 1000 (est. ~ 11s)
+#Rebuilding From String (XML) count: 1000 (est. ~ 11s)
 #                user     system      total        real
-#yaml        2.590000   0.050000   2.640000 (  3.180061)
 #xml         5.970000   0.080000   6.050000 (  6.573804)
 #ruby        1.660000   0.030000   1.690000 (  2.017015)
 
-#Serialize to String (YAML & XML) count: 1000 (est. ~ 25s)
+#Serialize to String (XML) count: 1000 (est. ~ 25s)
 #                user     system      total        real
-#yaml       14.360000   0.250000  14.610000 ( 16.128599)
 #xml         1.460000   0.020000   1.480000 (  1.576753)
 #ruby        0.890000   0.010000   0.900000 (  1.102071)
 
-#Round Tripping (YAML & XML) count: 1000 (est. ~ 40s)
+#Round Tripping (XML) count: 1000 (est. ~ 40s)
 #                user     system      total        real
-#yaml       17.420000   0.270000  17.690000 ( 19.390348)
 #xml         7.890000   0.110000   8.000000 (  8.860720)
 #ruby        2.780000   0.040000   2.820000 (  3.131707)
 
@@ -62,10 +59,8 @@ module Bench
     #ruby_printer = RubyPrinter.new
     #ruby_s = ruby_printer.to_ruby(thing)
     ruby_s = thing.to_ruby
-    yaml_s = thing.as_yaml
     xml_s = thing.persist
 
-    #puts yaml_s
     puts xml_s
     puts ruby_s
     puts "++++++++++++++++++++++++++++++++++++"
@@ -73,13 +68,8 @@ module Bench
     puts big_thing.to_ruby
     puts "++++++++++++++++++++++++++++++++++++"
 
-    puts "Rebuilding From String (YAML & XML) count: #{count} (est. ~ 11s)"
+    puts "Rebuilding From String (XML) count: #{count} (est. ~ 11s)"
     bm(10) do | x |
-      x.report("yaml") {
-        count.times {
-          something = XamplObject.from_yaml(yaml_s)
-        }
-      }
       x.report("xml") {
         count.times {
           another_big_thing = XamplObject.from_xml_string(xml_s)
@@ -92,13 +82,8 @@ module Bench
       }
     end
 
-    puts "Serialize to String (YAML & XML) count: #{count} (est. ~ 25s)"
+    puts "Serialize to String (XML) count: #{count} (est. ~ 25s)"
     bm(10) do | x |
-      x.report("yaml") {
-        count.times {
-          yaml_s = thing.as_yaml
-        }
-      }
       x.report("xml") {
         count.times {
           xml_s = thing.persist
@@ -111,13 +96,8 @@ module Bench
       }
     end
 
-    puts "Round Tripping (YAML & XML) count: #{count} (est. ~ 40s)"
+    puts "Round Tripping (XML) count: #{count} (est. ~ 40s)"
     bm(10) do | x |
-      x.report("yaml") {
-        count.times {
-          something = XamplObject.from_yaml(thing.as_yaml)
-        }
-      }
       x.report("xml") {
         count.times {
           another_thing = XamplObject.from_xml_string(thing.persist)

data/lib/xamplr/test-support/test.rb

@@ -257,50 +257,6 @@ class TestXampl < Test::Unit::TestCase
     check_parents(big_thing)
   end
 
-  def test_yaml_round_trip
-    emph_content_1 = "there"
-    emph1 = Emph.new
-    emph1 << emph_content_1
-
-    emph_content_2 = "are"
-    emph2 = Emph.new
-    emph2.content = emph_content_2
-
-    desc1 = Description.new
-    desc1.kind = "desc1"
-
-    desc1.is_changed = nil
-    desc1 << "hello " << emph1 << "! How " << emph2 << " you?"
-
-    thing = Thing.new
-    thing.pid = "thing"
-    thing.new_stuff.kind = "stuff1"
-    thing << desc1
-
-    big_thing = Thing.new("big_thing")
-    big_thing << "leading content" << thing << "trailing content"
-
-    check_parents(big_thing)
-
-    #puts YAML::dump(big_thing)
-    #puts big_thing.test_to_xml
-
-    #something = XamplObject.from_yaml(YAML::dump(big_thing))
-    pp_xml = big_thing.pp_xml
-    bt_as_yaml = big_thing.as_yaml
-
-    something = XamplObject.from_yaml(bt_as_yaml)
-
-    assert_not_same(something, big_thing)
-    assert_equal(something.test_to_xml, big_thing.persist)
-    check_parents(something)
-
-    something = XamplObject.from_yaml(big_thing.as_yaml)
-    assert_equal(something.test_to_xml, big_thing.persist)
-    assert_not_same(something, big_thing)
-    check_parents(something)
-  end
-
   def test_from_xml
     emph_content_1 = "there"
     emph1 = Emph.new
@@ -563,25 +519,6 @@ class TestXampl < Test::Unit::TestCase
     assert(thing === found)
   end
 
-  def test_in_memory_persistence_yaml
-    pname = "test_in_memory_persistence_yaml" << Time.now.strftime("%Y%m%d-%H%M-%S") << rand.to_s
-    Xampl.enable_persister(pname, :in_memory, :yaml_format)
-    persister2 = Xampl.persister
-
-    stuff = Stuff.new
-    thing = Thing.new
-    thing.pid = "thing"
-    thing << stuff
-
-    Xampl.introduce_to_persister(thing)
-    Xampl.sync
-    Xampl.clear_cache
-    found = Xampl.lookup(Thing, "thing")
-
-    assert_not_equal(thing, found)
-    assert(thing === found)
-  end
-
   def test_in_memory_persistence_rollback
     pname = "first" << Time.now.strftime("%Y%m%d-%H%M-%S") << rand.to_s
     original_persister = Xampl.enable_persister(pname, :in_memory)
@@ -854,30 +791,6 @@ class TestXampl < Test::Unit::TestCase
     assert_equal(thing.object_id, found.object_id)
   end
 
-  def test_filesystem_persistence_yaml
-    pname = "test_filesystem_persistence_yaml" << Time.now.strftime("%Y%m%d-%H%M-%S") << rand.to_s
-    Xampl.enable_persister(pname, :filesystem, :yaml_format)
-    persister2 = Xampl.persister
-
-    stuff = Stuff.new
-    thing = Thing.new
-    thing.pid = "thing"
-    thing << stuff
-
-    Xampl.introduce_to_persister(thing)
-    Xampl.sync
-
-    thing.info = "force emptying"
-
-    Xampl.rollback
-
-    assert(thing.load_needed)
-
-    found = Xampl.lookup(Thing, "thing")
-
-    assert_equal(thing.object_id, found.object_id)
-  end
-
   def test_filesystem_persistence_automatic
     stuff = Stuff.new
     thing = Thing.new
@@ -1045,12 +958,11 @@ class TestXampl < Test::Unit::TestCase
 
     keep_new_thing = new_thing
 
-    # these (to xml, ruby, yaml) will NOT suck the child thing into memory
+    # these (to xml, ruby) will NOT suck the child thing into memory
     xml = thing.test_to_xml
 
     ruby = thing.to_ruby
     ruby_thing = XamplObject.from_ruby(ruby)
-    yaml_thing = XamplObject.from_yaml(thing.as_yaml)
 
     assert_equal(0, Xampl.persister.read_count, "not in the cache")
 

data/lib/xamplr/visitor.rb

@@ -1,4 +1,3 @@
-
 module Xampl
 
   class Visitor
@@ -137,782 +136,5 @@ module Xampl
       @cycling = false
     end
   end
-
-  class CountingVisitor < Visitor
-    attr_accessor :count
-
-    def initialize
-      super
-      @count = 0
-    end
-
-    def before_visit(xampl)
-      @count += 1
-    end
-  end
-
-  class ResetIsChanged < Visitor
-    def initialize
-      super
-    end
-
-    def start(xampl, verbose=false)
-      @verbose = verbose
-      if verbose
-        puts "RESET IS CHANGED.... #{xampl}"
-        puts "SKIPPING!!!" unless xampl.persist_required and xampl.load_needed
-      end
-
-      return if xampl.persist_required and xampl.load_needed
-      super(xampl)
-    end
-
-    def before_visit(xampl)
-      if xampl.is_changed then
-        puts "RESET CHANGED: #{xampl} and continue" if verbose
-        xampl.is_changed = false;
-      else
-        puts "RESET CHANGED: #{xampl} block" if verbose
-        @no_children = true
-      end
-    end
-  end
-
-  class MarkChangedDeep < Visitor
-    def initialize
-      super
-    end
-
-    def before_visit(xampl)
-      xampl.changed if xampl.persist_required
-    end
-  end
-
-  class PrettyXML < Visitor
-    attr_accessor :ns_to_prefix, :start_body, :body, :out
-    attr_accessor :indent, :indent_step
-
-    @@compact = true
-
-    def PrettyXML.compact
-      @@compact
-    end
-
-    def PrettyXML.compact=(v)
-      @@compact = v
-    end
-
-    def initialize(out="", skip=[])
-      super()
-
-      @out = out
-      @indent = ""
-      @indent_step = "  "
-      @start_attr_indent = ""
-      @was_attr = false
-
-      @depth = 0
-
-      @skip = {}
-      skip.each{ | ns |
-        @skip[ns] = ns
-      }
-
-      @ns_to_prefix = {}
-      @start_body = nil
-      @body = ""
-      @attr_list = nil
-
-      @insert_comment = nil
-    end
-
-    def short_circuit
-      body << @insert_comment if @insert_comment
-      @insert_comment = nil
-    end
-
-    def cycle(xampl)
-      @short_circuit = true
-      @insert_comment = "<!-- CYCLE -->"
-      return true
-    end
-
-    def revisit(xampl)
-      @insert_comment = "<!-- You've seen this before -->"
-      #body << "<!-- You've seen this before -->"
-      return true
-    end
-
-    def register_ns(ns)
-      if (0 == ns.length) then
-        return ""
-      end
-
-      prefix = ns_to_prefix[ns]
-      if (nil == prefix) then
-        preferred = XamplObject.lookup_preferred_ns_prefix(ns)
-        prefix = "" << preferred << ":" if preferred
-        prefix = "ns" << ns_to_prefix.size.to_s << ":" unless prefix
-        ns_to_prefix[ns] = prefix
-      end
-      return prefix
-    end
-
-    def attr_esc(s)
-      if (s.kind_of? XamplObject)
-        return attr_esc(s.to_xml)
-      end
-
-      result = s.to_s.dup
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-      result.gsub!(">", "&gt;")
-      result.gsub!("'", "&apos;")
-      result.gsub!("\"", "&quot;")
-
-      return result
-    end
-
-    def content_esc(s)
-      result = s.to_s.dup
-
-      return result if (s.kind_of? XamplObject)
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-
-      return result
-    end
-
-    def attribute(xampl)
-      @attr_list = []
-      pid = nil
-      if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
-          unless @skip[attr_spec[2]] then
-            value = xampl.instance_variable_get(attr_spec[0])
-            if value then
-              prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-              @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'")
-            end
-          end
-        }
-        @attr_list.sort!
-      end
-#@attr_list << " xampl:marker='OKAY: #{ xampl }'"
-    end
-
-    def persist_attribute(xampl)
-      @attr_list = []
-      if xampl.persist_required then
-        index = xampl.indexed_by.to_s
-        if index then
-          value = xampl.get_the_index
-          @attr_list << (" " << index << "='" << attr_esc(value) << "'") if value
-        end
-      else
-        attribute(xampl)
-#@attr_list << " xampl:wtf='WTF??'"
-      end
-    end
-
-    def show_attributes(attr_indent)
-      if (nil == @attr_list) then
-        return ""
-      else
-        result = @attr_list.join(attr_indent)
-        if (0 == result.length) then
-          return ""
-        else
-          return result
-        end
-      end
-    end
-
-    def do_indent
-      return "\n" << @indent << (@indent_step * @depth)
-    end
-
-    def start_element(xampl)
-      xampl.accessed
-
-      if @revisiting or @cycling then
-        @short_circuit = true
-        persist_attribute(xampl)
-      else
-        attribute(xampl)
-      end
-
-      tag = xampl.tag
-      ns = xampl.ns
-      indent = do_indent
-      tag_info = "" << "<" << register_ns(ns) << tag
-      attr_indent = "" << indent << (" " * tag_info.size)
-      unless @start_body then
-        @start_attr_indent = attr_indent
-        attr_defn = show_attributes(attr_indent)
-        @start_body = "" << indent << tag_info << attr_defn
-        @was_attr = true if 0 < attr_defn.size
-      else
-        @body << indent << tag_info << show_attributes(attr_indent)
-      end
-    end
-
-    def end_element(xampl)
-      tag = xampl.tag
-      ns = xampl.ns
-      if @@compact then
-        @body << "</" << register_ns(ns) << tag << ">"
-      else
-        @body << do_indent << "</" << register_ns(ns) << tag << ">"
-      end
-    end
-
-    def define_ns
-      result = ""
-      indent = @was_attr
-      ns_to_prefix.each{ | ns, prefix |
-        result = sprintf("%s%s xmlns:%s='%s'", result, indent ? @start_attr_indent : "", prefix[0..-2], ns)
-        indent = true
-      }
-      return result
-    end
-
-    def done
-      out << @start_body << define_ns << @body
-    end
-
-    def before_visit_without_content(xampl)
-      start_element(xampl)
-      @body << "/>"
-    end
-
-    def before_visit_simple_content(xampl)
-      start_element(xampl)
-      @body << ">"
-      @body << content_esc(xampl._content) if xampl._content
-      end_element(xampl)
-    end
-
-    def before_visit_data_content(xampl)
-      start_element(xampl)
-      @body << ">"
-      @body << content_esc(xampl._content) if xampl._content
-      @depth += 1
-    end
-
-    def after_visit_data_content(xampl)
-      @depth += -1
-      end_element(xampl)
-    end
-
-    def before_visit_mixed_content(xampl)
-      start_element(xampl)
-      @body << ">"
-      @depth += 1
-    end
-
-    def after_visit_mixed_content(xampl)
-      @depth -= 1
-      end_element(xampl)
-    end
-
-    def before_visit(xampl)
-      unless xampl.kind_of?(XamplObject) and @skip[xampl.ns] then
-        if xampl.respond_to? "before_visit_by_element_kind" then
-          xampl.before_visit_by_element_kind(self)
-        else
-          @body << xampl.to_s
-        end
-      else
-        @no_children = true
-      end
-    end
-
-    def after_visit(xampl)
-      xampl.after_visit_by_element_kind(self) if xampl.respond_to? "after_visit_by_element_kind"
-    end
-
-    def visit_string(string)
-      @body << string
-    end
-  end
-
-  class PersistXML < Visitor
-    attr_accessor :ns_to_prefix, :start_body, :body, :out, :mentions
-
-    def initialize(out="", mentions=nil)
-      super()
-
-      @out = out
-      @was_attr = false
-
-      @mentions = mentions
-
-      @ns_to_prefix = {}
-      @start_body = nil
-      @body = ""
-      @attr_list = nil
-    end
-
-    def cycle(xampl)
-      raise XamplException.new(:cycle_detected_in_xampl_cluster) unless xampl.kind_of?(XamplPersistedObject)
-      return true
-    end
-
-    def revisit(xampl)
-      return true
-    end
-
-    def register_ns(ns)
-      if (0 == ns.length) then
-        return ""
-      end
-
-      prefix = ns_to_prefix[ns]
-      if (nil == prefix) then
-        preferred = XamplObject.lookup_preferred_ns_prefix(ns)
-        prefix = "" << preferred << ":" if preferred
-        prefix = "ns" << ns_to_prefix.size.to_s << ":" unless prefix
-        ns_to_prefix[ns] = prefix
-      end
-      return prefix
-    end
-
-    def attr_esc(s)
-      if (s.kind_of? XamplObject)
-        return attr_esc(s.to_xml)
-      end
-
-      result = s.to_s.dup
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-      result.gsub!(">", "&gt;")
-      result.gsub!("'", "&apos;")
-      result.gsub!("\"", "&quot;")
-
-      return result
-    end
-
-    def content_esc(s)
-      result = s.to_s.dup
-
-      return result if (s.kind_of? XamplObject)
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-
-      return result
-    end
-
-    def attribute(xampl)
-      @attr_list = []
-      if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
-          prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-          value = xampl.instance_variable_get(attr_spec[0])
-          @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") \
-                unless nil == value
-        }
-      end
-    end
-
-    def persist_attribute(xampl)
-      @attr_list = []
-      pattr = xampl.indexed_by.to_s
-      if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
-          if pattr == attr_spec[1] then
-            prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-            value = xampl.instance_variable_get(attr_spec[0])
-            @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") \
-                  unless nil == value
-            break
-          end
-        }
-      end
-    end
-
-    def show_attributes
-      result = @attr_list.join(" ")
-      if (0 == result.length) then
-        return ""
-      else
-        return result
-      end
-    end
-
-    def start_element(xampl)
-      tag = xampl.tag
-      ns = xampl.ns
-      tag_info = "" << "<" << register_ns(ns) << tag
-      unless @start_body then
-        attribute(xampl)
-        attr_defn = show_attributes
-        @start_body = "" << tag_info << attr_defn
-        @was_attr = true if 0 < attr_defn.size
-      else
-        if xampl.persist_required then
-          @mentions << xampl if @mentions
-          @no_children = true
-          persist_attribute(xampl)
-        else
-          attribute(xampl)
-        end
-        @body << tag_info << show_attributes
-      end
-    end
-
-    def end_element(xampl)
-      tag = xampl.tag
-      ns = xampl.ns
-      @body << "</" << register_ns(ns) << tag << ">"
-    end
-
-    def define_ns
-      result = ""
-      ns_to_prefix.each{ | ns, prefix |
-        result = sprintf("%s xmlns:%s='%s'", result, prefix[0..-2], ns)
-      }
-      return result
-    end
-
-    def done
-      out << @start_body << define_ns << @body
-    end
-
-    def before_visit_without_content(xampl)
-      start_element(xampl)
-      @body << "/>"
-    end
-
-    def before_visit_simple_content(xampl)
-      start_element(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        @body << ">"
-        @body << content_esc(xampl._content) if xampl._content
-        end_element(xampl)
-      end
-    end
-
-    def before_visit_data_content(xampl)
-      start_element(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        @body << ">"
-        @body << content_esc(xampl._content) if xampl._content
-      end
-    end
-
-    def after_visit_data_content(xampl)
-      end_element(xampl) unless @no_children
-    end
-
-    def before_visit_mixed_content(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        start_element(xampl)
-        @body << ">"
-      end
-    end
-
-    def after_visit_mixed_content(xampl)
-      end_element(xampl) unless @no_children
-    end
-
-    def before_visit(xampl)
-      if xampl.respond_to? "before_visit_by_element_kind" then
-        xampl.before_visit_by_element_kind(self)
-      else
-        @body << xampl.to_s
-      end
-    end
-
-    def after_visit(xampl)
-      xampl.after_visit_by_element_kind(self) if xampl.respond_to? "after_visit_by_element_kind"
-    end
-
-    def visit_string(string)
-      @body << string
-    end
-  end
-
-  class CopyXML < Visitor
-    attr_accessor :ns_to_prefix, :start_body, :body
-
-    def CopyXML.copy(root, translate_pids={})
-      CopyXML.new.make_copy(root, translate_pids)
-    end
-
-    def make_copy(root, translate_pids)
-      @was_attr = false
-
-      @ns_to_prefix = {}
-      @start_body = nil
-      @body = ""
-      @attr_list = nil
-
-      @pid_translations_old_to_new = translate_pids
-      @pid_translations_new_to_old = translate_pids.invert
-
-      @persisted_xampl_found = { @current_root.get_the_index => root }
-      @copies_by_old_pid = {}
-
-      while true do
-        copy_these = []
-
-        @persisted_xampl_found.each do | pid, xampl |
-          copy_these << xampl unless @copies_by_old_pid[pid]
-        end
-
-        break if 0 == copy_these.length
-
-        @persisted_xampl_found = {}
-        copy_these.each do | xampl |
-          @current_root = xampl
-          @out = ""
-          @copies_by_old_pid[@current_root.get_the_index] = @out
-
-          copy_xampl(@current_root)
-        end
-      end
-
-      return @copies_by_old_pid
-    end
-
-    def copy_xampl(root)
-      start(root).done
-    end
-
-    @@base_pid = Time.now.to_i.to_s + "_"
-    @@gen_pid = 0
-
-    def get_the_new_pid(xampl)
-      current_pid = xampl.get_the_index
-      @persisted_xampl_found[current_pid] = xampl
-
-      new_pid = @pid_translations_old_to_new[current_pid]
-
-      unless new_pid then
-        @@gen_pid += 1
-        new_pid = @@base_pid + @@gen_pid.to_s
-
-        @pid_translations_old_to_new[current_pid] = new_pid
-        @pid_translations_new_to_old[new_pid] = current_pid
-      end
-
-      return new_pid
-    end
-
-    def cycle(xampl)
-      raise XamplException.new(:cycle_detected_in_xampl_cluster) unless xampl.kind_of?(XamplPersistedObject)
-      return true
-    end
-
-    def revisit(xampl)
-      return true
-    end
-
-    def register_ns(ns)
-      if (0 == ns.length) then
-        return ""
-      end
-
-      prefix = ns_to_prefix[ns]
-      if (nil == prefix) then
-        preferred = XamplObject.lookup_preferred_ns_prefix(ns)
-        prefix = "" << preferred << ":" if preferred
-        prefix = "ns" << ns_to_prefix.size.to_s << ":" unless prefix
-        ns_to_prefix[ns] = prefix
-      end
-      return prefix
-    end
-
-    def attr_esc(s)
-      if (s.kind_of? XamplObject)
-        return attr_esc(s.to_xml)
-      end
-
-      result = s.to_s.dup
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-      result.gsub!(">", "&gt;")
-      result.gsub!("'", "&apos;")
-      result.gsub!("\"", "&quot;")
-
-      return result
-    end
-
-    def content_esc(s)
-      result = s.to_s.dup
-
-      return result if (s.kind_of? XamplObject)
-
-      result.gsub!("&", "&amp;")
-      result.gsub!("<", "&lt;")
-
-      return result
-    end
-
-    def attribute(xampl)
-      @attr_list = []
-      if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
-          prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-          value = get_the_new_pid(xampl.instance_variable_get(attr_spec[0]))
-          @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") \
-                unless nil == value
-        }
-      end
-    end
-
-    def persist_attribute(xampl)
-      @attr_list = []
-      pattr = xampl.indexed_by.to_s
-      if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
-          if pattr == attr_spec[1] then
-            prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
-            value = xampl.instance_variable_get(attr_spec[0])
-            @attr_list << (" " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'") \
-                  unless nil == value
-            break
-          end
-        }
-      end
-    end
-
-    def show_attributes
-      result = @attr_list.join(" ")
-      if (0 == result.length) then
-        return ""
-      else
-        return result
-      end
-    end
-
-    def start_element(xampl)
-      tag = xampl.tag
-      ns = xampl.ns
-      tag_info = "" << "<" << register_ns(ns) << tag
-      unless @start_body then
-        attribute(xampl)
-        attr_defn = show_attributes
-        @start_body = "" << tag_info << attr_defn
-        @was_attr = true if 0 < attr_defn.size
-      else
-        if xampl.persist_required then
-          @no_children = true
-          persist_attribute(xampl)
-        else
-          attribute(xampl)
-        end
-        @body << tag_info << show_attributes
-      end
-    end
-
-    def end_element(xampl)
-      tag = xampl.tag
-      ns = xampl.ns
-      @body << "</" << register_ns(ns) << tag << ">"
-    end
-
-    def define_ns
-      result = ""
-      ns_to_prefix.each{ | ns, prefix |
-        result = sprintf("%s xmlns:%s='%s'", result, prefix[0..-2], ns)
-      }
-      return result
-    end
-
-    def done
-      out << @start_body << define_ns << @body
-    end
-
-    def before_visit_without_content(xampl)
-      start_element(xampl)
-      @body << "/>"
-    end
-
-    def before_visit_simple_content(xampl)
-      start_element(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        @body << ">"
-        @body << content_esc(xampl._content) if xampl._content
-        end_element(xampl)
-      end
-    end
-
-    def before_visit_data_content(xampl)
-      start_element(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        @body << ">"
-        @body << content_esc(xampl._content) if xampl._content
-      end
-    end
-
-    def after_visit_data_content(xampl)
-      end_element(xampl) unless @no_children
-    end
-
-    def before_visit_mixed_content(xampl)
-      if @no_children then
-        @body << "/>"
-      else
-        start_element(xampl)
-        @body << ">"
-      end
-    end
-
-    def after_visit_mixed_content(xampl)
-      end_element(xampl) unless @no_children
-    end
-
-    def before_visit(xampl)
-      if xampl.respond_to? "before_visit_by_element_kind" then
-        xampl.before_visit_by_element_kind(self)
-      else
-        @body << xampl.to_s
-      end
-    end
-
-    def after_visit(xampl)
-      xampl.after_visit_by_element_kind(self) if xampl.respond_to? "after_visit_by_element_kind"
-    end
-
-    def visit_string(string)
-      @body << string
-    end
-  end
-
-  module XamplObject
-    def pp_xml(out="", skip=[])
-      PrettyXML.new(out, skip).start(self).done
-    end
-
-    def to_xml(out="", skip=[])
-      PersistXML.new(out).start(self).done
-    end
-
-    def copy_xampl(root, translate_pids={})
-      CopyXML.copy(root, translate_pids)
-    end
-
-    def mark_changed_deep
-      MarkChangedDeep.new.start(self)
-    end
-  end
-
 end