ruby_rnv 0.4.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899300861f1a2b315f879d451a7a5ee472302fbdac26ea775a2e56e09793d98c
-  data.tar.gz: 4f2139ddde96c34a077e124600bb7cbbb0e98ef5db5fe5c57066bdcc8fd4c089
+  metadata.gz: 4214fd7cf9852894c4b122a3d2d8bc15a87c4e0aa464bb3bcb359cfe0449c3a4
+  data.tar.gz: bbb487f231d7cf15affaaab7f794e656100f57a1022682994da12ceb0619b5fc
 SHA512:
-  metadata.gz: c9660b568d0a4fe092080bb095fd80125540ece28c669ecae73faa9391567a337fcd8799702b29bdcecd022b9613f76c3d9e6013f3c289000a5a98950bd67860
-  data.tar.gz: 63924d0755a95489733c62ccde564260750dcfea5e0a366e26d6663178b00e47d6ee095f18b8cee293c7c4eba457746a86cb9eedb696c7e63321449cbbf89536
+  metadata.gz: 0c4d44f5a42521cda63da8f2e4c51b05e7812896e778da25ec1795b69af5f55e60ed58e542c58f96715e40fc697da4063eda47bff4165f68823edd4919c08c91
+  data.tar.gz: 8c62a8ba7a327c7728b647617f66c4c116a85391b73a72597c29475b8c2e67aa74ab4c73e3b363002027b6390b769c174f0836df6060521ace149370cf54a24c

data/ext/rnv/ruby_rnv.c

@@ -67,7 +67,7 @@ VALUE rb_document_init(VALUE self)
 
   document->opened = document->ok = 0;
 
-  document->nexp = 16; /* maximum number of candidates to display */
+  document->nexp = 256; /* maximum number of candidates to display */
   document->text = NULL;
 
   rb_iv_set(self, "@errors", rb_ary_new2(0));
@@ -462,6 +462,12 @@ void Init_rnv()
    */
   rb_define_attr(Document, "last_col", 1, 1);
 
+  /*
+   * xpath to node, set by SAX handler
+   * @return [String]
+   */
+  rb_define_attr(Document, "xpath", 1, 1);
+
   /*
  * errors from current document
  * @return [Array<RNV::Error>]

data/ext/rnv/ruby_rnv_err.c

@@ -439,7 +439,7 @@ static void ruby_parse_error(VALUE err_obj, int erno, va_list ap)
     //  return id;
 }
 
-VALUE ruby_create_error(VALUE self, VALUE line, VALUE col, int erno, char *format, va_list ap)
+VALUE ruby_create_error(VALUE self, VALUE line, VALUE col, VALUE xpath, int erno, char *format, va_list ap)
 {
     VALUE err_class = Error;
     VALUE err_obj = rb_class_new_instance(0, NULL, err_class);
@@ -463,6 +463,8 @@ VALUE ruby_create_error(VALUE self, VALUE line, VALUE col, int erno, char *forma
     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, "@required", rb_ary_new2(0));
     rb_iv_set(err_obj, "@allowed", rb_ary_new2(0));
     return err_obj;
@@ -481,7 +483,7 @@ int ruby_verror_handler(void *data, int erno, char *format, va_list ap)
 
     if (erno & ERBIT_RNL || erno & ERBIT_RNC || erno & ERBIT_RND)
     {
-        VALUE err_obj = ruby_create_error(self, INT2NUM(-1), INT2NUM(-1), erno, format, ap);
+        VALUE err_obj = ruby_create_error(self, INT2NUM(-1), INT2NUM(-1), Qnil, erno, format, ap);
         rb_iv_set(err_obj, "@original_expected", rb_str_new2(""));
         rb_ary_push(errors, err_obj);
     }
@@ -491,14 +493,15 @@ 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)
+        // if (document->last_line != last_line || document->last_col != last_col)
         {
             document->last_line = last_line;
             document->last_col = last_col;
 
-            VALUE err_obj = ruby_create_error(self, r_last_line, r_last_col, erno, format, ap);
+            VALUE err_obj = ruby_create_error(self, r_last_line, r_last_col, rb_iv_get(self, "@xpath"), erno, format, ap);
 
             VALUE expected = rb_str_new2("");
 

data/lib/rnv/error.rb

@@ -1,7 +1,8 @@
 module RNV
   class Error
     attr_reader :original_message, :original_expected
-    attr_reader :ns_uri, :element, :attr, :value, :required, :allowed
+    attr_reader :ns_uri, :element, :attr, :value
+    attr_reader :xpath
 
     # @return [String]
     def message
@@ -33,8 +34,8 @@ module RNV
 
     # @return [String]
     def compact_expected
-      [(compact_required_set.length > 0 ? compact_expected_phrase(compact_required_set) +" required" : nil),
-      (compact_allowed_set.length > 0 ? compact_expected_phrase(compact_allowed_set) + " allowed" : nil)].join("; ")
+      [(compact_required_set.length > 0 ? compact_expected_phrase(compact_required_set) + " required" : nil),
+       (compact_allowed_set.length > 0 ? compact_expected_phrase(compact_allowed_set) + " allowed" : nil)].join("; ")
     end
 
     # @param [String] data original content
@@ -43,7 +44,7 @@ module RNV
       out = ""
       if data and @line
         err_data = data.split("\n")[@line - 1]
-        if err_data
+        if err_data && err_data.length > @col - 1
           err_data.insert(@col - 1, "🢑")
 
           start = 0
@@ -66,6 +67,14 @@ module RNV
       "#<RNV::Error code: :#{@code}, message: '#{self.message}', expected: '#{self.expected}, line: #{@line}, column: #{@col}>"
     end
 
+    def required
+      @required.select{|a| @attr ? a.first == :rn_p_attribute : true}
+    end
+
+    def allowed
+      @allowed.select{|a| @attr ? a.first == :rn_p_attribute : true}
+    end
+
     private
 
     def compact_expected_to_s(e, with_ns = false)
@@ -73,27 +82,35 @@ module RNV
       when :rn_p_attribute
         compact_expected_to_s(e.last, with_ns)
       when :rn_p_element
-        "<"+compact_expected_to_s(e.last, with_ns)+">"
+        "<" + compact_expected_to_s(e.last, with_ns) + ">"
       when :rn_p_data
         compact_expected_to_s(e.last, with_ns)
+      when :rn_p_value
+        "\"#{e.last}\""
       when :rn_nc_datatype
         "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
     end
 
     def compact_required_set
-      @compact_required_set ||= @required.map{|r| compact_expected_to_s(r)}.compact.uniq
+      @compact_required_set ||= required.map { |r| compact_expected_to_s(r) }.compact.uniq
     end
 
     def compact_allowed_set
-      @compact_allowed_set ||= @allowed.map{|r| compact_expected_to_s(r)}.compact.uniq
+      @compact_allowed_set ||= allowed.map { |r| compact_expected_to_s(r) }.compact.uniq
     end
 
     def compact_expected_phrase(set)
       if set.length > 1
-        set[0..-2].join(", ") + " or "+set.last
+        set[0..-2].join(", ") + " or " + set.last
       else
         set.last
       end

data/lib/rnv/validator.rb

@@ -5,36 +5,96 @@ require 'rnv/pre_processor'
 module RNV
   class DocumentEmpty < StandardError; end
 
+  # @!visibility private
+  class XpathNode
+    attr_accessor :name
+    attr_accessor :uri, :namespaces
+    attr_accessor :parent
+    attr_accessor :children
+
+    def initialize(name)
+      @name = name
+      @children = []
+    end
+
+    def add_child(name, uri = nil, namespaces = {})
+      child = XpathNode.new(name)
+      child.uri = uri
+      child.namespaces = namespaces
+      child.parent = self
+      @children << child
+      child
+    end
+
+    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
+        current_name_with_ns = "#{rev_namespaces[current.uri]&.first||"xmlns"}:#{current.name}"
+        xpath << "#{current_name_with_ns}[#{current.parent.children.select { |child| child.name == current.name }.index(current) + 1}]"
+        current = current.parent
+      end
+      [xpath.reverse, namespaces]
+    end
+  end
+
   # @!visibility private
   class NokogiriSaxDocument < Nokogiri::XML::SAX::Document
     # @return [Nokogiri::XML::SAX::ParserContext]
-    attr_accessor :ctx, :pre_processor
+    attr_accessor :ctx
+    attr_accessor :pre_processor
+
     # @param [RNV::Document] document
     def initialize(document)
       @document = document
+      @xpath_tree = XpathNode.new(nil)
     end
 
     def start_element_namespace(name, attrs = [], prefix = nil, uri = nil, ns = nil)
       tag_attrs = attrs.map { |attr| [attr.uri ? "#{attr.uri}:#{attr.localname}" : attr.localname, attr.value] }
       tag_name = uri ? "#{uri}:#{name}" : name
-      @document.start_tag(@pre_processor.tag(tag_name), @pre_processor.attributes(tag_attrs))
+      namespaces = {}
+      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)
       tag_name = uri ? "#{uri}:#{name}" : name
-      @document.end_tag(@pre_processor.tag(tag_name))
       update_line_col
+      @document.end_tag(@pre_processor.tag(tag_name))
+      @xpath_tree = @xpath_tree.parent
     end
 
-    def characters str
-      @document.characters(@pre_processor.text(str))
+    def characters(value)
       update_line_col
+      @document.characters(@pre_processor.text(value))
     end
 
-    def cdata_block str
-      @document.characters(@pre_processor.text(str))
+    def cdata_block(value)
       update_line_col
+      @document.characters(@pre_processor.text(value))
     end
 
     private
@@ -42,6 +102,8 @@ module RNV
     def update_line_col
       @document.last_line = @ctx.line
       @document.last_col = @ctx.column
+      xpath = @xpath_tree.to_xpath
+      @document.xpath = ["/" + xpath.first.join("/"), xpath.last]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.2
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler