hutch-xamplr 1.0.5 → 1.1.0

data/lib/xamplr/handwritten/example.rb

@@ -228,16 +228,6 @@ module XamplExample
 
     include ThingAsChild
 
-    @@to_yaml_properties = [
-            "@children",
-                    "@content"
-    ]
-
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Things.tag
       @@tag
     end
@@ -313,18 +303,8 @@ module XamplExample
     include ThingAsChild
     include ThingsAsChild
 
-    @@to_yaml_properties = [
-            "@pid",
-                    "@children",
-                    "@content"
-    ]
-
     attr_reader :pid
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Thing.tag
       @@tag
     end
@@ -413,17 +393,8 @@ module XamplExample
 
     include EmphAsChild
 
-    @@to_yaml_properties = [
-            "@kind",
-                    "@children"
-    ]
-
     attr_reader :kind
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Description.tag
       @@tag
     end
@@ -498,13 +469,6 @@ module XamplExample
             ]
 
 
-    @@to_yaml_properties = [
-            "@content"
-    ]
-
-
-    @@to_yaml_properties = [ "@content" ]
-
     def Emph.tag
       @@tag
     end
@@ -534,10 +498,6 @@ module XamplExample
       changed
     end
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def append_to(other)
       other.add_emph(self)
     end
@@ -577,18 +537,9 @@ module XamplExample
     ]
 
 
-    @@to_yaml_properties = [
-            "@id",
-                    "@value",
-    ]
-
     attr_reader :id
     attr_reader :value
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def KeyValue.tag
       @@tag
     end
@@ -676,18 +627,9 @@ module XamplExample
     ]
 
 
-    @@to_yaml_properties = [
-            "@kind",
-                    "@special",
-    ]
-
     attr_reader :kind
     attr_reader :special
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Stuff.tag
       @@tag
     end

data/lib/xamplr/handwritten/hand-example.rb

@@ -150,7 +150,6 @@ module XamplExample
     @@ns_tag = "{http://xampl.com/example}emph"
     @@module_name = "XamplExample"
     @@attributes = [ ]
-    @@to_yaml_properties = [ "@content" ]
 
     def Emph.tag
       @@tag
@@ -177,10 +176,6 @@ module XamplExample
       changed
     end
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def append_to(other)
       other.add_emph(self)
     end
@@ -218,14 +213,9 @@ module XamplExample
             [:@kind, "kind"],
                     [:@special, "special", "http://xampl.com/example/special"]
     ]
-    @@to_yaml_properties = [ "@kind", "@special" ]
 
     attr_reader :kind, :special
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Stuff.tag
       @@tag
     end
@@ -303,14 +293,8 @@ module XamplExample
 
     include EmphAsChild
 
-    @@to_yaml_properties = [ "@kind", "@children" ]
-
     attr_reader :kind
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Description.tag
       @@tag
     end
@@ -386,14 +370,8 @@ module XamplExample
     include ThingAsChild
     include KeyValueAsChild
 
-    @@to_yaml_properties = [ "@pid", "@content", "@children" ]
-
     attr_reader :pid
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def Thing.tag
       @@tag
     end
@@ -478,14 +456,9 @@ module XamplExample
             [:@id, "id"],
                     [:@value, "value"]
     ]
-    @@to_yaml_properties = [ "@id", "@value" ]
 
     attr_reader :id, :value
 
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def KeyValue.tag
       @@tag
     end

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

@@ -192,43 +192,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 << "leading content" << thing << "trailing content"
-
-    check_parents(big_thing)
-
-    #puts YAML::dump(big_thing)
-    #puts big_thing.to_xml
-
-    something = XamplObject.from_yaml(YAML::dump(big_thing))
-    assert_equal(something.to_xml, big_thing.to_xml)
-    check_parents(something)
-
-    something = XamplObject.from_yaml(big_thing.to_yaml)
-    assert_equal(something.to_xml, big_thing.to_xml)
-    check_parents(something)
-  end
-
   def test_from_xml
     emph_content_1 = "there"
     emph1 = Emph.new

data/lib/xamplr/mixins.rb

@@ -59,13 +59,6 @@ module Xampl
       end
       return self
     end
-
-    def stitch_yaml(depth=0)
-      initialize
-      if 0 < depth && self.persist_required then
-        self.force_load
-      end
-    end
   end
 
   module XamplWithSimpleContent
@@ -92,6 +85,11 @@ module Xampl
       visitor.after_visit_simple_content(self)
     end
 
+    def _content
+      accessed
+      @_content
+    end
+
     def _content=(v)
       accessed
       v = v.to_s if (v.kind_of? Symbol) and !Xampl.xampl_extends_symbols
@@ -168,13 +166,6 @@ module Xampl
       end
       return self
     end
-
-    def stitch_yaml(depth=0)
-      initialize
-      if 0 < depth && self.persist_required then
-        self.force_load
-      end
-    end
   end
 
   module XamplWithDataContent
@@ -211,6 +202,11 @@ module Xampl
       return @children
     end
 
+    def _content
+      accessed
+      @_content
+    end
+
     def _content=(v)
       accessed
       v = v.to_s if (v.kind_of? Symbol) and !Xampl.xampl_extends_symbols
@@ -288,24 +284,6 @@ module Xampl
       end
       return self
     end
-
-    def stitch_yaml(depth=0)
-      children_array = @children if defined? @children
-      initialize
-
-      if 0 < depth && self.persist_required then
-        self.force_load
-        return
-      end
-
-      @children = []
-      if children_array then
-        children_array.each{ | child |
-          child.stitch_yaml(1 + depth) if (child.kind_of? XamplObject)
-          self << child
-        }
-      end
-    end
   end
 
   module XamplWithMixedContent
@@ -417,22 +395,6 @@ module Xampl
       end
       return self
     end
-
-    def stitch_yaml(depth=0)
-      children_array = @children
-      initialize
-
-      if 0 < depth && self.persist_required then
-        self.force_load
-        return
-      end
-
-      @children = []
-      children_array.each{ | child |
-        child.stitch_yaml(1 + depth) if (child.kind_of? XamplObject)
-        self << child
-      }
-    end
   end
 end
 

data/lib/xamplr/persist-to-xml.rb

@@ -0,0 +1,249 @@
+require 'libxml'
+
+module Xampl
+
+  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)
+      unless defined?(@@doc) then
+        @@doc = LibXML::XML::Document.new()
+        @@doc.root = LibXML::XML::Node.new('r')
+        @@attr = LibXML::XML::Attr.new(@@doc.root, 'v', 'v')
+      end
+
+      @@attr.value = s.to_s
+      (@@doc.root.to_s)[6..-4]
+    end
+
+
+=begin
+
+    def attr_esc_old(s)
+      if (s.kind_of? XamplObject)
+        return attr_esc(s.to_xml)
+      end
+
+#      stupid_test()
+
+      result = s.to_s.dup
+
+      result.gsub!("&", "&amp;")
+      result.gsub!("<", "&lt;")
+      result.gsub!(">", "&gt;")
+      result.gsub!("'", "&apos;")
+      result.gsub!("\"", "&quot;")
+
+      return result
+    end
+
+=end
+
+
+#    def content_esc(s)
+#      #NO! the attribute has the right to compact white space
+#      unless defined?(@@doc) then
+#        @@doc = LibXML::XML::Document.new()
+#        @@doc.root = LibXML::XML::Node.new('r')
+#        @@attr = LibXML::XML::Attr.new(@@doc.root, 'v', 'v')
+#      end
+#
+#      @@attr.value = s
+#      (@@doc.root.to_s)[6..-4]
+#    end
+
+    #TODO -- use libxml for this too
+    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 do |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
+          @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
+        end
+      end
+    end
+
+    def persist_attribute(xampl)
+      @attr_list = []
+      pattr = xampl.indexed_by.to_s
+      if (nil != xampl.attributes) then
+        xampl.attributes.each do |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
+            @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
+            break
+          end
+        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 do |ns, prefix|
+#        result = sprintf("%s xmlns:%s='%s'", result, prefix[0..-2], ns)
+        result = sprintf("%s xmlns:%s=\"%s\"", result, prefix[0..-2], ns)
+      end
+      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 to_xml(out="", skip=[])
+      PersistXML.new(out).start(self).done
+    end
+  end
+
+end
+