xml-smart 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c272b4aa72d95425ca2b859c94043b0bde69a567b5f10cccebd7dfcba68043e
-  data.tar.gz: 2f5f5741e4e27ea007067f358b1b7136b7a2c78a96006297443a9358e5150dce
+  metadata.gz: bfea354650019ab5f80ac4522562ba55fb0e71b88885a74ada76b3f948c936b8
+  data.tar.gz: bcccdac2fb2eb4492af1301092fcbbb89f7458dea67854d857696586c3042eb7
 SHA512:
-  metadata.gz: 36f069c18fe7280180ed36822acb2c21bdfb84f3de55bb01197188ba9fe975f283def0ff03a5dbfb3d378ea5f7cccd0633984ad86b27602a289099f0be72d94e
-  data.tar.gz: 5b328fbc369182401edba0d3e0d24fe7f6a41252c444fd091dc73e2e9bf587e2472afd0901427b69981395e594447d6ed95e858bd797e78ef4ec974ead87c20e
+  metadata.gz: 4cf2e0c62c1f8be0d82a326c2c396e6849ce6670335296cb693168c11c4e8d4f1c239de944af2ab9d560b2d8720c2f7677951d8eb772eb10401d22a5096a60c9
+  data.tar.gz: 452a5dddb8f0235cb3a1d0839b9a72e060165177557fd439736f43d804a1918fa881e4b62c84627c0fd4c429bb626f6bdf3f4cb0db6fab1c5071d6a13caf4f1c

data/example/{xpath_visual.rb → xpath_visual}

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require 'rubygems'
 require 'term/ansicolor'
-require "#{File.dirname($0)}/../lib/xml/smart"
+require_relative "../lib/xml/smart"
 include Term::ANSIColor
 
 def rememberPath(path,output)
@@ -30,10 +30,21 @@ def prnTree(node,depth,mixed)
   print "\n" unless mixed
 end
 
-doc = XML::Smart.open(File.dirname($0) + "/EXAMPLE.xml")
+def help
+  puts "Usage: xpath_visual.rb FILE \"XPATH\""
+  exit
+end
 
-# xpath expression that should be visualised
-xpath = ARGV[0] || "/"
+if ARGV.length < 2
+  help
+else
+  # xpath expression that should be visualised
+  xpath = ARGV[1..-1].join(' ') || "/"
+  unless File.exists?(ARGV[0])
+    help
+  end
+  doc = XML::Smart.open_unprotected(ARGV[0])
+end
 
 # remember pathes, that an xpath expression selects
 @remember = []

data/lib/xml/smart.rb

@@ -257,4 +257,9 @@ module XML
 
     class Error < RuntimeError; end
   end
+
+  module Common
+    def self::pretty_path
+    end
+  end
 end

data/lib/xml/smart_domattribute.rb

@@ -4,31 +4,34 @@ module XML
 
       class Attribute
         def initialize(attr)
-          @attr = attr
+          @node = attr
         end
 
         def ===(cls); self.is_a? cls; end
 
-        def to_s; @attr.content; end
-        def to_i; @attr.content.to_i; end
-        def to_f; @attr.content.to_f; end
+        def to_s; @node.content; end
+        def to_i; @node.content.to_i; end
+        def to_f; @node.content.to_f; end
 
-        def qname; QName.new @attr; end
-        def path; @attr.path; end
+        def qname; QName.new @node; end
+        def path; @node.path; end
 
-        def value;  @attr.content; end;
-        def value=(val); @attr.content = val; end;
+        def value;  @node.content; end;
+        def value=(val); @node.content = val; end;
 
         def ==(other)
           return false unless other
           return false unless other.respond_to?(:unique_id)
           unique_id == other.unique_id
         end
-        def unique_id; @attr.pointer_id; end
+        def unique_id; @node.pointer_id; end
 
-        def parent; Dom::smart_helper(@attr.parent); end
+        def parent; Dom::smart_helper(@node.parent); end
+
+        alias :text :value
+        alias :text= :value=
       end
 
-    end  
-  end  
-end  
+    end
+  end
+end

data/lib/xml/smart_domelement.rb

@@ -4,13 +4,13 @@ module XML
 
       class Element
         def initialize(element)
-          @element = element
+          @node = element
         end
 
         def ===(cls); self.is_a? cls; end
 
         def find(xpath)
-          Dom::smart_helper(@element.xpath_fast(xpath))
+          Dom::smart_helper(@node.xpath_fast(xpath))
         end
 
         def add_helper(attrs)
@@ -20,24 +20,24 @@ module XML
             attrs[0] = attrs[0].dup
             if attrs[0].sub!(/([^:]+):/, '')
               pfx = $1
-              if @element.document.user_custom_namespace_prefixes.has_key?(pfx)
-                @element.document.custom_namespace_prefixes.each do |k,v|
-                  if @element.document.user_custom_namespace_prefixes[pfx] == v
-                    ns = @element.document.user_custom_namespace_prefixes[pfx]
+              if @node.document.user_custom_namespace_prefixes.has_key?(pfx)
+                @node.document.custom_namespace_prefixes.each do |k,v|
+                  if @node.document.user_custom_namespace_prefixes[pfx] == v
+                    ns = @node.document.user_custom_namespace_prefixes[pfx]
                   end
                 end
               end
               if ns.nil?
-                if @element.document.custom_namespace_prefixes.has_key?(pfx)
-                  ns = @element.document.custom_namespace_prefixes[pfx]
+                if @node.document.custom_namespace_prefixes.has_key?(pfx)
+                  ns = @node.document.custom_namespace_prefixes[pfx]
                 else
                   raise Error, 'No valid namespace'
                 end
               end
             end
-            tmp = Nokogiri::XML::Node.new attrs[0], @element.document
+            tmp = Nokogiri::XML::Node.new attrs[0], @node.document
             unless ns.nil?
-              @element.namespace_scopes.each do |nss|
+              @node.namespace_scopes.each do |nss|
                 tmp.namespace = nss if nss.href == ns
               end
             end
@@ -59,13 +59,13 @@ module XML
             end
             return [tmp,false]
           elsif attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::Element)
-            ele = attrs[0].instance_variable_get(:@element)
-            same = ele.document.root.pointer_id == @element.document.root.pointer_id
+            ele = attrs[0].instance_variable_get(:@node)
+            same = ele.document.root.pointer_id == @node.document.root.pointer_id
             return [same ? ele : ele.dup, !same]
           elsif attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::NodeSet)
             nos = attrs[0].instance_variable_get(:@nodeset)
             if nos.length > 0
-              same = nos.first.document.root.pointer_id == @element.document.root.pointer_id
+              same = nos.first.document.root.pointer_id == @node.document.root.pointer_id
               if same
                 return [nos, false]
               else
@@ -76,13 +76,13 @@ module XML
               return [nos, false]
             end
           elsif attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::Element) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
-            ele = attrs[0].instance_variable_get(:@element)
-            same = ele.document.root.pointer_id == @element.document.root.pointer_id
+            ele = attrs[0].instance_variable_get(:@node)
+            same = ele.document.root.pointer_id == @node.document.root.pointer_id
             return [attrs[1] == XML::Smart::COPY ? ele.dup : ele, !same]
           elsif attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::NodeSet) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
             nos = attrs[0].instance_variable_get(:@nodeset)
             if nos.length > 0
-              same = nos.first.document.root.pointer_id == @element.document.root.pointer_id
+              same = nos.first.document.root.pointer_id == @node.document.root.pointer_id
               if attrs[1] == XML::Smart::COPY
                 tnos = nos.map{|e|e.dup}
                 nos = Nokogiri::XML::NodeSet.new(nos.first.document,tnos)
@@ -92,7 +92,7 @@ module XML
               return [nos, false]
             end
           elsif attrs.length == 2 && attrs[0].is_a?(String) && attrs[1].is_a?(String) && attrs[0][0] == '?'
-            tmp = Nokogiri::XML::ProcessingInstruction.new @element.document, attrs[0].sub(/./,''), attrs[1]
+            tmp = Nokogiri::XML::ProcessingInstruction.new @node.document, attrs[0].sub(/./,''), attrs[1]
             return [tmp,false]
           end
           return [nil, false]
@@ -100,10 +100,10 @@ module XML
         private :add_helper
         def add(*attrs)
           tmp, update = add_helper(attrs)
-          res = Dom::smart_helper(@element.add_child tmp)
+          res = Dom::smart_helper(@node.add_child tmp)
           if update
-            @element.document.custom_namespace_prefixes_update
-            @element.document.ns_update
+            @node.document.custom_namespace_prefixes_update
+            @node.document.ns_update
           end
           res
         end
@@ -116,35 +116,35 @@ module XML
         end
         def add_before(*attrs)
           tmp, update = add_helper(attrs)
-          res = Dom::smart_helper(@element.add_previous_sibling tmp)
+          res = Dom::smart_helper(@node.add_previous_sibling tmp)
           if update
-            @element.document.custom_namespace_prefixes_update
-            @element.document.ns_update
+            @node.document.custom_namespace_prefixes_update
+            @node.document.ns_update
           end
           res
         end
         def add_after(*attrs)
           tmp, update = add_helper(attrs)
-          res = Dom::smart_helper(@element.add_next_sibling tmp)
+          res = Dom::smart_helper(@node.add_next_sibling tmp)
           if update
-            @element.document.custom_namespace_prefixes_update
-            @element.document.ns_update
+            @node.document.custom_namespace_prefixes_update
+            @node.document.ns_update
           end
           res
         end
 
         def dump
           doc = Nokogiri::XML::Document.new
-          doc.root = @element
+          doc.root = @node
           doc.root.to_s
         end
 
-        def to_s; @element.content; end
-        def to_i; @element.content.to_i; end
-        def to_f; @element.content.to_f; end
+        def to_s; @node.content; end
+        def to_i; @node.content.to_i; end
+        def to_f; @node.content.to_f; end
 
-        def namespace?; !@element.namespace.nil?; end
-        def namespace; namespace? ? Namespace.new(@element.namespace) : nil; end
+        def namespace?; !@node.namespace.nil?; end
+        def namespace; namespace? ? Namespace.new(@node.namespace) : nil; end
         def namespace=(n)
           n = case n
             when Namespace
@@ -154,67 +154,67 @@ module XML
             else
               return
           end
-          tmp = @element.document.custom_namespace_prefixes[n] || @element.document.user_custom_namespace_prefixes[n]
+          tmp = @node.document.custom_namespace_prefixes[n] || @node.document.user_custom_namespace_prefixes[n]
           unless tmp.nil?
-            @element.namespace_scopes.each do |nss|
-              @element.namespace = nss if nss.href == tmp
+            @node.namespace_scopes.each do |nss|
+              @node.namespace = nss if nss.href == tmp
             end
           end
         end
-        def namespaces; NamespaceSet.new(self,@element); end
+        def namespaces; NamespaceSet.new(self,@node); end
 
         def xinclude!(basedir=nil)
-          @element.do_xinclude_manual(basedir)
-          @element.document.custom_namespace_prefixes_update
-          @element.document.ns_update
+          @node.do_xinclude_manual(basedir)
+          @node.document.custom_namespace_prefixes_update
+          @node.document.ns_update
           true
         end
 
         def replace_by(n)
           case n
-            when Element; Element.new @element.replace(n.instance_variable_get(:@element).dup)
-            when NodeSet; NodeSet.new @element.replace(n.instance_variable_get(:@nodeset).dup)
+            when Element; Element.new @node.replace(n.instance_variable_get(:@node).dup)
+            when NodeSet; NodeSet.new @node.replace(n.instance_variable_get(:@nodeset).dup)
             else
               nil
           end
         end
 
-        def qname; QName.new @element; end
-        def attributes; AttributeSet.new @element; end
+        def qname; QName.new @node; end
+        def attributes; AttributeSet.new @node; end
 
-        def text; @element.xpath_fast("string(text())"); end
-        def text=(t); @element.content = t.to_s if t.respond_to? :to_s; end
+        def text; @node.xpath_fast("string(text())"); end
+        def text=(t); @node.content = t.to_s if t.respond_to? :to_s; end
 
         def children; find('*|text()'); end
         def children?; find('*|text()').length > 0 end
         def parent
-          Dom::smart_helper(@element.parent)
+          Dom::smart_helper(@node.parent)
         end
-        def parent?; !@element.parent.nil?; end
+        def parent?; !@node.parent.nil?; end
 
         def empty?; !children?; end
         def mixed?;
-          @element.xpath_fast('*').length > 0 &&  @element.xpath_fast("string(text())") != '';
+          @node.xpath_fast('*').length > 0 &&  @node.xpath_fast("string(text())") != '';
         end
         def text_only?;
-          @element.xpath_fast('*').length == 0 &&  @element.xpath_fast("string(text())") != '';
+          @node.xpath_fast('*').length == 0 &&  @node.xpath_fast("string(text())") != '';
         end
         def element_only?;
-          @element.xpath_fast('*').length > 0 &&  @element.xpath_fast("string(text())") == '';
+          @node.xpath_fast('*').length > 0 &&  @node.xpath_fast("string(text())") == '';
         end
 
-        def path; @element.path[-1] != ']' ? @element.path + '[1]' : @element.path; end
+        def path; @node.path[-1] != ']' ? @node.path + '[1]' : @node.path; end
 
         def ==(other)
           return false unless other
           return false unless other.respond_to?(:unique_id)
           unique_id == other.unique_id
         end
-        def unique_id; @element.pointer_id; end
+        def unique_id; @node.pointer_id; end
 
         def to_doc
           doc = Nokogiri::XML::Document.new
-          doc.root = @element
+          doc.root = @node
           Dom.new(doc)
         end
       end

data/lib/xml/smart_domtext.rb

@@ -3,23 +3,23 @@ module XML
     class Dom
 
       class Text
-        def initialize(text); @text = text; end
+        def initialize(text); @node = text; end
 
         def ===(cls); self.is_a? cls; end
 
         def dump; to_s; end
-        def to_s; @text.content.to_s; end
-        def to_f; @text.content.to_f; end
-        def to_i; @text.content.to_i; end
+        def to_s; @node.content.to_s; end
+        def to_f; @node.content.to_f; end
+        def to_i; @node.content.to_i; end
 
-        def text; @text.content; end
-        def text=(t); @text.content = t.to_s if t.respond_to? :to_s; end
+        def text; @node.content; end
+        def text=(t); @node.content = t.to_s if t.respond_to? :to_s; end
 
-        def parent; Node.new(@text.parent); end
+        def parent; Node.new(@node.parent); end
 
-        def path; @text.path; end
+        def path; @node.path; end
       end
-    
+
     end
   end
-end  
+end

data/lib/xml/smart_processinginstruction.rb

@@ -3,39 +3,39 @@ module XML
 
     class ProcessingInstruction
       def initialize(element)
-        @element = element
+        @node = element
       end
 
       def ===(cls); self.is_a? cls; end
 
-      def dump; @element.to_s; end
+      def dump; @node.to_s; end
 
       def replace_by(n)
         case n
-          when ProcessingInstruction; ProcessingInstruction.new @element.replace(n.instance_variable_get(:@element))
+          when ProcessingInstruction; ProcessingInstruction.new @node.replace(n.instance_variable_get(:@node))
           else
             nil
         end
       end
 
-      def qname; QName.new @element; end
+      def qname; QName.new @node; end
 
-      def content; @element.content end
-      def content=(t); @element.content = t.to_s if t.respond_to? :to_s; end
+      def content; @node.content end
+      def content=(t); @node.content = t.to_s if t.respond_to? :to_s; end
 
       def parent
-        Dom::smart_helper(@element.parent)
+        Dom::smart_helper(@node.parent)
       end
-      def parent?; !@element.parent.nil?; end
+      def parent?; !@node.parent.nil?; end
 
-      def path; @element.path; end
+      def path; @node.path; end
 
       def ==(other)
         return false unless other
         return false unless other.respond_to?(:unique_id)
         unique_id == other.unique_id
       end
-      def unique_id; @element.pointer_id; end
+      def unique_id; @node.pointer_id; end
     end
   end
 end

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = "xml-smart"
-  s.version               = "0.4.1"
+  s.version               = "0.4.2"
   s.platform              = Gem::Platform::RUBY
   s.license               = "LGPL-3.0"
   s.summary               = "An xml library that doesn't suck - since 2004."
@@ -11,6 +11,8 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.extra_rdoc_files      = ['README.rdoc']
   s.test_files            = Dir['test/tc_*.rb','test/*.xml','test/*.rng','test/*.xsd','test/smartrunner.rb','minitest/*']
+  s.bindir                = 'example'
+  s.executables           = ['xpath_visual']
 
   s.authors               = ['Juergen eTM Mangler']
   s.email                 = 'juergen.mangler@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
-bindir: bin
+bindir: example
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -73,7 +73,8 @@ dependencies:
 description: An xml library that doesn't suck (since 2004). Based on Nokogiri since
   2012. For more info check out the Documentation link below.
 email: juergen.mangler@gmail.com
-executables: []
+executables:
+- xpath_visual
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -82,10 +83,9 @@ files:
 - COPYING
 - README.rdoc
 - Rakefile
+- example/CARD.xml
 - example/EXAMPLE.xml
-- example/SIC.ml
-- example/ssss.xml
-- example/xpath_visual.rb
+- example/xpath_visual
 - lib/xml/XSDtoRNG.xsl
 - lib/xml/smart.rb
 - lib/xml/smart_dom.rb

data/example/SIC.ml

@@ -1,10 +0,0 @@
-<Customers>
-  <Customer ID="1">
-     Queen Falafel
-     <Address>Stollgasse</Address>
-  </Customer>
-  <Customer ID="2">
-     Queen Falafel
-     <Address>Wagramerstrasse</Address>
-  </Customer>
-</Customers>