ruby_rnv 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b0a44425bf0b95c0b8eae8671e4236099e8812c4707242e23b9cf8d8493fa6
-  data.tar.gz: 59089293248b1dc8684584cd4e3c821805dea555f8dfdc9351451aca0ce8ba94
+  metadata.gz: 708b7824fc5d388ab19228ff035c2b2769a1d6847b95d3e56efe8350420ef29b
+  data.tar.gz: df218207c1ebfb2ca320ec3bfd03a04180b9eb5a0440676d054beb1fbcf5390d
 SHA512:
-  metadata.gz: 35bfea201f2bd6c4243cfdc1a645fb6434b1f02c49dd6ad00cf83470a8760fb0e47c6cfeb8b113c24c4a391539cd3db07e8945bc20c5d2137065849bdab82ac2
-  data.tar.gz: 6deaced66f1ed6cf800cabf0c09f77f61d6239ef6aa28fc1472501f33d30f6c85bbfead13aa763e6b50e3728042762a01bc04cd1eb5ed677f4856029a3cf0514
+  metadata.gz: 430139d49d8b6f90fab69c9d62c919b186af0cdd3aac94956fb8b57f406d87d5243fc153c058f942e568e8fc0592b41ab41df8f9b7de6da1971aeebca0b4643a
+  data.tar.gz: 60ca45977391df8f28cbe8c9ad2f13627a0c8379141ac4f9b084d4b1a01829b7aeb6b0d73dceda090304f694d8affb9e2d5a5f67442acc13c858bda07478467b

data/ext/rnv/ruby_rnv_err.c

@@ -463,7 +463,7 @@ VALUE ruby_create_error(VALUE self, VALUE line, VALUE col, VALUE xpath, int erno
     rb_iv_set(err_obj, "@line", line); // set line from sax parser
     rb_iv_set(err_obj, "@col", col);   // set col from sax parser
 
-    rb_iv_set(err_obj, "@xpath", xpath); // set line from sax parser
+    rb_iv_set(err_obj, "@xpath", xpath); // set xpath from sax parser
 
     rb_iv_set(err_obj, "@required", rb_ary_new2(0));
     rb_iv_set(err_obj, "@allowed", rb_ary_new2(0));
@@ -493,7 +493,6 @@ int ruby_verror_handler(void *data, int erno, char *format, va_list ap)
         VALUE r_last_col = rb_iv_get(self, "@last_col");
         int last_line = NUM2INT(r_last_line);
         int last_col = NUM2INT(r_last_col);
-        int xpath = NUM2INT(r_last_col);
 
         // only one error per line/col
         // if (document->last_line != last_line || document->last_col != last_col)

data/lib/rnv/error.rb

@@ -91,6 +91,10 @@ module RNV
         "datatype #{e[-2]}:#{e.last}"
       when :rn_nc_qname
         with_ns ? "#{e.first}:#{e.last}" : e.last
+      when :rn_p_text
+        "text"
+      when :rn_p_after
+        "after"
       else
         "unknown #{e.first}"
       end

data/lib/rnv/validator.rb

@@ -8,20 +8,52 @@ module RNV
   # @!visibility private
   class XpathNode
     attr_accessor :name
-    attr_accessor :uri, :namespaces
+    attr_accessor :uri, :namespaces, :rev_namespaces, :xpath_name
     attr_accessor :parent
+    attr_accessor :idx
     attr_accessor :children
 
     def initialize(name)
       @name = name
+      @idx = 0
       @children = []
+      @namespaces = {}
+      @rev_namespaces = {}
+      @xpath_name = nil
     end
 
-    def add_child(name, uri = nil, namespaces = {})
+    def add_child(name, uri = nil, local_namespaces = {})
       child = XpathNode.new(name)
       child.uri = uri
-      child.namespaces = namespaces
+
+      @rev_namespaces.each do |ns_uri, ns_alias|
+        child.rev_namespaces[ns_uri] = ns_alias
+      end
+      local_namespaces.each do |ns_alias, ns_uri|
+        child.rev_namespaces[ns_uri] = ns_alias
+      end
+
+      all_namespaces = {}
+      child.rev_namespaces.each do |ns_uri, ns_alias|
+        all_namespaces[ns_alias] ||= []
+        all_namespaces[ns_alias] << ns_uri
+      end
+
+      child.namespaces = @namespaces.dup
       child.parent = self
+      child.idx = self.children.count { |other_child| other_child.name == name } + 1
+
+      if child.rev_namespaces[child.uri]
+        if all_namespaces[child.rev_namespaces[child.uri]].length == 1
+          child.namespaces[child.rev_namespaces[child.uri]] = child.uri
+          child.xpath_name = "#{child.rev_namespaces[child.uri]}:#{child.name}[#{child.idx}]"
+        else
+          child.xpath_name = "*[local-name() = '#{child.name}'][#{child.idx}]" # we can't say which ns it is
+        end
+      else
+        child.xpath_name = "xmlns:#{child.name}[#{child.idx}]"
+      end
+
       @children << child
       child
     end
@@ -29,29 +61,13 @@ module RNV
     def to_xpath
       xpath = []
       current = self
-      namespaces = {}
-      rev_namespaces = {}
-      ns_current = self
-      while ns_current.name
-        ns_current.namespaces.each do |prefix, uri|
-          rev_namespaces[uri] ||= []
-          rev_namespaces[uri] << prefix
-        end
-        ns_current = ns_current.parent
-      end
-
-      rev_namespaces.each do |uri, prefixes|
-        if prefixes.length > 0
-          prefixes.select! { |prefix| prefix != "xmlns" }
-        end
-        namespaces[prefixes.first||"xmlns"] = uri
-      end
 
       while current.name
-        xpath << "#{rev_namespaces[current.uri]&.first||"xmlns"}:#{current.name}[#{current.parent.children.select { |child| child.name == current.name }.index(current) + 1}]"
+        xpath << current.xpath_name
         current = current.parent
       end
-      [xpath.reverse, namespaces]
+
+      [xpath.reverse, self.namespaces]
     end
   end
 
@@ -71,20 +87,19 @@ module RNV
       tag_attrs = attrs.map { |attr| [attr.uri ? "#{attr.uri}:#{attr.localname}" : attr.localname, attr.value] }
       tag_name = uri ? "#{uri}:#{name}" : name
       namespaces = {}
-      ns.each do |n|
+      ns&.each do |n|
         namespaces[n.first || "xmlns"] = n.last
       end
       @xpath_tree = @xpath_tree.add_child(name, uri, namespaces)
-
       update_line_col
       @document.start_tag(@pre_processor.tag(tag_name), @pre_processor.attributes(tag_attrs))
     end
 
     def end_element_namespace(name, prefix = nil, uri = nil)
-      @xpath_tree = @xpath_tree.parent
       tag_name = uri ? "#{uri}:#{name}" : name
       update_line_col
       @document.end_tag(@pre_processor.tag(tag_name))
+      @xpath_tree = @xpath_tree.parent
     end
 
     def characters(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler