duxml 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f772c1ba8d9273a741654080c50a9fd036857e
-  data.tar.gz: bfe95900d4dde785d67cfe97be650e1ad522aae5
+  metadata.gz: 2112e7514be18ba981441e3bf2ce709214022103
+  data.tar.gz: c937e76e2c260d688f7607078f4c924224ef1c16
 SHA512:
-  metadata.gz: ac0c3fec115acf89ba0e7c9da62e9de7f36a9367578754cd5b3f9559bc263cf8d598852dbfebaa7fa6d8dce4bdc0d6f3d8cdf2b6e805cfee96722f86f7ec9e7f
-  data.tar.gz: e35353df9aeb7b737fdc326ea968503aea8bf9f5c8106ee429f09b30961e4be07beccd6114be17aed93f0abde673fb92c87fe9e4e430d5a42209f2a90ead595f
+  metadata.gz: 961905236877bba259f7331b993417b381f97ed0307bddb2206a16409c3ad630d1c1d814b50008d562062cc9471ac06ff920f63e3575df06e6baaa5819965f2d
+  data.tar.gz: d0c73ee66fc501bacd47cae5ddbee3117824154962cd41695d504b59c5b76181dcf26b389ce003089bfbee79fe87aed2c1458bb1b44b52d03c2c594c35becf8a

data/lib/duxml/doc.rb

@@ -80,6 +80,12 @@ module Duxml
       File.write(Meta.meta_path(path), meta.xml.to_s)
       self
     end
+
+    def <<(obj)
+      super(obj)
+      obj.set_doc! self
+      self
+    end
   end # class Document < Element
 end
 

data/lib/duxml/doc/element.rb

@@ -18,6 +18,15 @@ module Duxml
   class Element < ::Ox::Element
     include ElementGuts
 
+    # line number
+    @line
+
+    # column
+    @column
+
+    # document to which this Element belongs
+    @doc
+
     # operates in two modes:
     # - from Ruby
     # - from file
@@ -27,6 +36,7 @@ module Duxml
     # @param name [String] name of element, in both Ruby and file modes
     # @param _line_or_content [Fixnum, Array, Hash] line number of element file mode; if Array, new child nodes; if Hash, attributes; can be nil
     # @param _col_or_children [Fixnum, Array] column position in file mode; if Array, new child nodes; can be nil
+    # @return [Element] new XML Element
     def initialize(name, _line_or_content=nil, _col_or_children=nil)
       super name
       @line = _line_or_content if _line_or_content.respond_to?(:%)
@@ -37,7 +47,7 @@ module Duxml
       @nodes = NodeSet.new(self) if @nodes.empty?
     end
 
-    attr_reader :line, :column
+    attr_reader :line, :column, :doc
 
     attr_accessor :nodes
   end
@@ -48,6 +58,17 @@ module Duxml
       line < 0 || column < 0
     end
 
+    # @param _doc [Doc] document to which this element belongs - recursively applies to all descendants of this node
+    # @return [Element] self
+    def set_doc!(_doc)
+      @doc = _doc
+      traverse do |node|
+        next if node === self or node.is_a?(String)
+        node.set_doc!(_doc)
+      end
+      self
+    end
+
     # @see Ox::Element#<<
     # this override reports changes to history; NewText for Strings, Add for elements
     #
@@ -82,6 +103,7 @@ module Duxml
           if obj.count_observers < 1 && @observer_peers
             obj.add_observer(@observer_peers.first.first)
           end
+          obj.set_doc! @doc
       end
       report(type, obj, index)
       self

data/lib/duxml/saxer.rb

@@ -7,18 +7,22 @@ module Duxml
     @io
 
     attr_accessor :io
-    # @param path [String] path of file to parse
-    # @return [Doc] finished document with each Element's line and column info added
-    def sax(path, obs=nil)
-      io = File.open path
+    # @param path_or_xml [String] path of file to parse or XML as String
+    # @return [Doc, Element] finished document with each Element's line and column info added
+    def sax(path_or_xml, obs=nil)
+      doc_or_no = File.exists?(path_or_xml)
+      io = doc_or_no ? File.open(path_or_xml): path_or_xml
       saxer = DocuLiner.new(Duxml::Doc.new, obs)
       Ox.sax_parse(saxer, io, {convert_special: true, symbolize: false})
       doc = saxer.cursor
+      return doc.root unless doc_or_no
       doc.add_observer obs if obs and doc.count_observers < 1
-      doc.path = path
+      doc.path = path_or_xml
       doc
     end
 
+    alias_method :parse, :sax
+
     class DocuLiner < ::Ox::Sax
       # @param doc [Ox::Document] document that is being constructed as XML is parsed
       # @param _observer [Object] object that will observe this document's content
@@ -39,7 +43,7 @@ module Duxml
 
       def start_element(name)
         cursor.nodes.insert(-1, Duxml::Element.new(name, line, column))
-        cursor_stack << cursor.nodes.last
+        cursor_stack << cursor.nodes.last.set_doc!(cursor_stack.first)
       end
 
       def attr(name, val)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duxml
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.8
 platform: ruby
 authors:
 - Peter Kong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox