hutch-xamplr 1.0.5 → 1.1.0

data/lib/xamplr/xampl-generator.rb

@@ -76,7 +76,7 @@ module XamplGenerator
       namespace = "" unless namespace
       is_empty = @xpp.emptyElement
 
-      nstag = "{{namespace}}#{name}"
+      nstag = "{{#{namespace}}}#{name}"
 
       elements = @elements_map[namespace]
       if nil == elements then

data/lib/xamplr/xampl-hand-generated.rb

@@ -479,21 +479,6 @@ module XamplGenerator
     ]
     include ElementAsChild
 
-    @@to_yaml_properties = [ "@pid" ]
-    @@to_yaml_properties_all = [
-            "@pid",
-                    "@children",
-                    "@_content"
-    ]
-
-    def to_yaml_properties
-      if is_yaml_root(self) then
-        return @@to_yaml_properties_all
-      else
-        return @@to_yaml_properties
-      end
-    end
-
     def Elements.lookup(pid)
       Xampl.lookup(Elements, pid)
     end
@@ -635,26 +620,6 @@ module XamplGenerator
     include ChildElementAsChild
     include AttributeAsChild
 
-    @@to_yaml_properties     = [
-            "@has_content",
-                    "@class_name",
-                    "@attribute_name",
-                    "@nstag",
-                    "@empty",
-                    "@indexed_by_attr",
-                    "@persisted",
-                    "@name",
-                    "@kind",
-                    "@namespace",
-                    "@package",
-                    "@children",
-                    "@_content"
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def has_content
       accessed
       @has_content
@@ -911,19 +876,6 @@ module XamplGenerator
                     [ :@package, "package" ],
     ]
 
-    @@to_yaml_properties =     [
-            "@element_name",
-                    "@name",
-                    "@namespace",
-                    "@index_class",
-                    "@index",
-                    "@package",
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def element_name
       accessed
       @element_name
@@ -1108,15 +1060,6 @@ module XamplGenerator
                     [ :@name, "name" ],
     ]
 
-    @@to_yaml_properties =     [
-            "@namespace",
-                    "@name",
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def namespace
       accessed
       @namespace
@@ -1249,15 +1192,6 @@ module XamplGenerator
     include IndexAttributeAsChild
     include ResolveAsChild
 
-    @@to_yaml_properties     = [
-            "@children",
-                    "@_content"
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def initialize
       super
 
@@ -1353,15 +1287,6 @@ module XamplGenerator
                     [ :@persisted, "persisted" ],
     ]
 
-    @@to_yaml_properties =     [
-            "@name",
-                    "@persisted",
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def name
       accessed
       @name
@@ -1495,16 +1420,6 @@ module XamplGenerator
                     [ :@preferred_prefix, "preferred_prefix" ],
     ]
 
-    @@to_yaml_properties =     [
-            "@namespace",
-                    "@pkg",
-                    "@preferred_prefix",
-    ]
-
-    def to_yaml_properties
-      @@to_yaml_properties
-    end
-
     def namespace
       accessed
       @namespace

data/lib/xamplr/xampl-module.rb

@@ -0,0 +1,36 @@
+
+require "xamplr/persister"
+
+
+module Xampl
+
+  @@xampl_extends_symbols = false
+
+  def Xampl.xampl_extends_symbols
+    @@xampl_extends_symbols
+  end
+
+  def Xampl.xampl_extends_symbols=(v)
+    @@xampl_extends_symbols = v
+
+    if @@xampl_extends_symbols then
+      Symbol.module_eval("include XamplExtensionsToRubyObjects")
+    end
+  end
+
+  class XamplLiteralRubyObject
+    def initialize(thing)
+      @thing = thing
+    end
+
+    def to_xml(out="")
+      out << @thing.to_s
+    end
+  end
+
+  module XamplExtensionsToRubyObjects
+    def to_xml(out="")
+      out << self.to_s
+    end
+  end
+end

data/lib/xamplr/xampl-object-internals.rb

@@ -0,0 +1,6 @@
+module Xampl
+
+  module InvalidXampl
+  end
+
+end

data/lib/xamplr/xampl-object.rb

@@ -1,14 +1,9 @@
-#!/usr/bin/env ruby
 
 module Xampl
 
-  module InvalidXampl
-  end
-
   module XamplObject
     attr_accessor :is_changed, :parents
 
-    @@yaml_root = nil
     @@preferred_ns_prefix = { "http://xampl.com/" => "xampl",
                               "http://xampl.com/generator" => "xampl-gen",
                               "http://www.w3.org/XML/1998/namespace" => "xml" }
@@ -76,8 +71,8 @@ module Xampl
     def init_attributes(attr_name, attr_namespace, attr_value)
       return unless attr_name
 
-      attr_name.each_index{ | i |
-        self.attributes.each{ | attr_spec |
+      attr_name.each_index do |i|
+        self.attributes.each do |attr_spec|
           if (2 == attr_spec.size) then
             if (attr_spec[1] == attr_name[i]) then
               self.instance_variable_set(attr_spec[0], attr_value[i])
@@ -87,8 +82,8 @@ module Xampl
               self.instance_variable_set(attr_spec[0], attr_value[i])
             end
           end
-        }
-      }
+        end
+      end
     end
 
     def compare_xampl(other)
@@ -96,14 +91,14 @@ module Xampl
       other.accessed if other
       return false unless self.class == other.class
       return false unless self.children.size == other.children.size
-      self.children.zip(other.children).each{ | c1, c2 |
+      self.children.zip(other.children).each do |c1, c2|
         return false unless c1.class == c2.class
         if c1.kind_of? String then
           return false unless c1 == c2
         else
           return false unless c1.compare_xampl(c2)
         end
-      }
+      end
       if (defined? self._content) and (defined? other._content) then
         return false unless self._content == other._content
       else
@@ -117,14 +112,14 @@ module Xampl
       other.accessed if other
       return false unless self.class == other.class
       return false unless self.children.size == other.children.size
-      self.children.zip(other.children).each{ | c1, c2 |
+      self.children.zip(other.children).each do |c1, c2|
         return false unless c1.class == c2.class
         if c1.kind_of? String then
           return false unless c1 == c2
         else
           return false unless c1 === c2
         end
-      }
+      end
       if (defined? self._content) and (defined? other._content) then
         return false unless self._content == other._content
       else
@@ -140,9 +135,6 @@ module Xampl
 
     module XamplRubyDefinition
       @@proc = nil
-#      def initialize
-      #	      @@proc = nil
-      #	    end
 
       def XamplRubyDefinition.build(target = nil)
         xampl = nil
@@ -186,33 +178,9 @@ module Xampl
       xampl = XamplRubyDefinition.build(target)
     end
 
-    def XamplObject.from_yaml(yaml_string, target=nil)
-      unstitched = YAML::load(yaml_string)
-      unstitched.stitch_yaml
-      if target then
-        vars = unstitched.instance_variables
-        vars.each { | ivar |
-          v = unstitched.instance_variable_get(ivar)
-          target.instance_variable_set(ivar, v)
-        }
-        unstitched = target
-      end
-      return unstitched
-    end
-
-    def is_yaml_root(xampl)
-      xampl == @@yaml_root
-    end
-
-    def as_yaml
-      @@yaml_root = self unless @@yaml_root
-      result = YAML::dump(self)
-      @@yaml_root = nil if self == @@yaml_root
-      return result
-    end
-
     def persist(out="", mentions=nil, rules=nil)
-      return PersistXML.new(out, mentions).start(self).done
+      persist_xml_new = PersistXML.new(out, mentions)
+      return persist_xml_new.start(self).done
     end
 
     def XamplObject.realise_from_xml_string(xml_string, target=nil, tokenise=true)
@@ -229,305 +197,6 @@ module Xampl
     end
   end
 
-  @@xampl_extends_symbols = false
-
-  def Xampl.xampl_extends_symbols
-    @@xampl_extends_symbols
-  end
-
-  def Xampl.xampl_extends_symbols=(v)
-    @@xampl_extends_symbols = v
-
-    if @@xampl_extends_symbols then
-      Symbol.module_eval("include XamplExtensionsToRubyObjects")
-    end
-  end
-
-  class XamplLiteralRubyObject
-    def initialize(thing)
-      @thing = thing
-    end
-
-    def to_xml(out="")
-      out << @thing.to_s
-    end
-  end
-
-  module XamplExtensionsToRubyObjects
-    def to_xml(out="")
-      out << self.to_s
-    end
-  end
-
-  module XamplPersistedObject
-    include XamplObject
-
-    attr_reader :persister
-    attr_accessor :load_needed
-
-    def persist_required
-      return true
-    end
-
-    def accessed
-      raise XamplIsInvalid.new(self) if invalid
-      # TODO -- why do I need to get rid of this line, alternatively, why
-      # is this next line even there? Well, because accessed is now called
-      # differently. But???
-      #raise NoActivePersister unless @persister
-
-      if @load_needed and @persister then
-        raise NoActivePersister.new unless @persister
-
-        if nil == Xampl.persister then
-          #raise UnmanagedChange.new(self)
-          if not @persister.syncing then
-            Xampl.read_only(@persister){
-              Xampl.lazy_load(self)
-            }
-          else
-            puts "LOAD NEEDED(2): REFUSED (persister: #{@persister.name})"
-            puts "                pid: #{self.get_the_index} #{self}"
-            caller(0).each { | trace | puts "  #{trace}"}
-          end
-        elsif Xampl.persister != @persister then
-          raise MixedPersisters.new(@persister, self)
-        elsif Xampl.persister == @persister then
-          if not @persister.syncing then
-            Xampl.lazy_load(self)
-          else
-            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
-            puts "                pid: #{self.get_the_index} #{self}"
-            caller(0).each { | trace | puts "  #{trace}"}
-          end
-        else
-          puts "LOAD NEEDED(4): REFUSED (persister: #{@persister.name})"
-          puts "                pid: #{self.get_the_index} #{self}"
-          caller(0).each { | trace | puts "  #{trace}"}
-        end
-      else
-        puts "LOAD NEEDED(5): REFUSED (persister: #{@persister})" if @load_needed
-        puts "                pid: #{self.get_the_index} #{self}" if @load_needed
-        caller(0).each { | trace | puts "  #{trace}"} if @load_needed
-      end
-    end
-
-    def changed
-      #puts "CHANGED: is_changed #{@is_changed} xampl #{self}"
-      unless Xampl.persister then
-        raise UnmanagedChange.new(self)
-      end
-      if @persister then
-        if Xampl.persister != @persister then
-          raise UnmanagedChange.new(self)
-        end
-        if @persister.block_changes then
-          raise BlockedChange.new(self)
-        end
-      end
-      unless @is_changed then
-        @is_changed = true
-        if @persister then
-          @persister.has_changed self
-        end
-      end
-    end
-
-    def force_load
-      @load_needed = true
-      @is_changed = false
-      @persister.has_not_changed(self) if @persister
-      self.clear_non_persistent_index_attributes
-      self.methods.grep(/init_.*_as_child/).each{ | method_name |
-        self.send(method_name)
-      }
-      @children = []
-    end
-
-    def reset_contents
-      self.clear_non_persistent_index_attributes
-      self.methods.grep(/init_.*_as_child/).each{ | method_name |
-        self.send(method_name)
-      }
-      @children = []
-    end
 
-    def introduce_persister(persister)
-      #accessed
-      if @persister and (@persister != persister) then
-        raise AlreadyKnownToPersister.new(self, persister)
-      end
-      @persister = persister
-      return true
-    end
-
-    def init_xampl_object
-      super
-      @persister = nil
-      @load_needed = false
-      if (Xampl.persister and Xampl.persister.automatic) then
-        Xampl.persister.introduce(self)
-      else
-        introduce_persister(nil)
-      end
-    end
-
-    def describe_yourself
-      nil
-    end
-  end
-
-  class XMLText
-    attr_accessor  :namespaces, :prefix_ns_map, :ns, :first_text, :text
-
-    def initialize
-      @namespaces = []
-      @prefix_ns_map = {}
-      @first_text = nil
-      @text = nil
-      @ns = nil
-    end
-
-    def start_element(pp, depth)
-      @namespaces = {}
-      @namespaces[pp.namespace] = pp.namespace
-
-      depth += 1
-
-      if @first_text then
-        @text << "<" << pp.qname
-
-        pp.attributeCount.times{ | i |
-          @text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
-
-          prefix = pp.attributePrefix(i)
-          if prefix then
-            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
-          end
-        }
-      else
-        @first_text = "<" << pp.qname
-
-        pp.attributeCount.times{ | i |
-          @first_text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
-
-          prefix = pp.attributePrefix(i)
-          if prefix then
-            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
-          end
-        }
-        @text = ""
-      end
-
-      prefix = pp.prefix
-      if prefix then
-        @prefix_ns_map[prefix] = pp.namespace
-      end
-
-      if @ns != pp.namespace then
-        @text << " xmlns='" << pp.namespace << "'"
-      end
-
-      @text << ">"
-
-      return depth
-    end
-
-    def end_element(pp, depth)
-      depth -= 1
-
-      @text << "</"
-      @text << pp.prefix << ":" if pp.prefix
-      @text << pp.name << ">"
-
-      return depth
-    end
-
-    def to_s
-      @text
-    end
-
-    def to_xml(xml_printer=nil)
-      @text
-    end
-
-    def build(pp)
-      @namespaces = {}
-      @first_text = nil
-      @text = nil
-
-      depth = start_element(pp, 0)
-
-      while true
-        raise XamplException.new("unexpected end of document") if pp.endDocument?
-
-        case pp.nextEvent
-        when Xampl_PP::START_DOCUMENT
-          raise XamplException.new("unexpected start of document")
-        when Xampl_PP::END_DOCUMENT
-          raise XamplException.new("unexpected end of document")
-        when Xampl_PP::START_ELEMENT
-          depth = start_element(pp, depth)
-        when Xampl_PP::END_ELEMENT
-          depth = end_element(pp, depth)
-          break if depth <= 0
-        when Xampl_PP::TEXT, Xampl_PP::CDATA_SECTION, Xampl_PP::ENTITY_REF
-          @text << pp.text
-          #when Xampl_PP::IGNORABLE_WHITESPACE
-          #when Xampl_PP::PROCESSING_INSTRUCTION
-          #when Xampl_PP::COMMENT
-          #when Xampl_PP::DOCTYPE
-        end
-      end
-
-      @namespaces = @namespaces.keys
-
-      @prefix_ns_map.sort.each { | prefix, ns |
-        @first_text << " xmlns:" << prefix << "='" << ns << "'"
-      }
-      @first_text << @text
-      @text = @first_text
-      @first_text = nil
-    end
-  end
-
-  class XamplIsInvalid < Exception
-    attr_reader :msg, :xampl
-
-    def initialize(xampl)
-      @xampl = xampl
-      @msg = "Invalid Xampl:: #{xampl}"
-    end
-
-    def message
-      @msg
-    end
-  end
-
-  class AlreadyKnownToPersister < Exception
-    attr_reader :msg, :xampl
-
-    def initialize(xampl, persister)
-      @xampl = xampl
-      @msg = "#{xampl} #{xampl.get_the_index} is already known by a persister: #{xampl.persister.name}, so cannot use persister #{persister.name}"
-    end
-
-    def message
-      @msg
-    end
-  end
-
-  class XamplException < Exception
-    attr_reader :name, :msg
-
-    def initialize(name, message=nil)
-      @name = name
-      @msg = message ? message : ""
-    end
-
-    def message
-      "XamplException #{@name} #{@msg}"
-    end
-  end
 end