ruby_rnv 0.3.1 → 0.5.1

data/ext/rnv/src/xsd.h

@@ -14,10 +14,9 @@
 #define XSD_ER_WS 5
 #define XSD_ER_ENUM 6
 
-extern void xsd_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
+extern void xsd_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
 extern void xsd_init(rx_st_t *rx_st);
-extern void xsd_clear(void);
 
 extern int xsd_allows(rx_st_t *rx_st, char *typ,char *ps,char *s,int n);
 extern int xsd_equal(rx_st_t *rx_st, char *typ,char *val,char *s,int n);

data/lib/rnv/data_type_library.rb

@@ -2,21 +2,19 @@ module RNV
   # Datatype library callback object
   # @see https://www.oasis-open.org/committees/relax-ng/spec-20010811.html#IDA1I1R
   class DataTypeLibrary
-    # @param [String] typ
+    # @param [String] typ the data type
     # @param [String] val
     # @param [String] s
-    # @param [Integer] n
     # @return [Boolean]
-    def equal(typ, val, s, n)
+    def equal(typ, val, s)
       true
     end
 
-    # @param [String] typ
+    # @param [String] typ the data type
     # @param [String] ps
-    # @param [String] s
-    # @param [Integer] n
+    # @param [String] s the value
     # @return [Boolean]
-    def allows(typ, ps, s, n)
+    def allows(typ, ps, s)
       true
     end
   end

data/lib/rnv/error.rb

@@ -1,13 +1,115 @@
 module RNV
   class Error
+    attr_reader :original_message, :original_expected
+    attr_reader :ns_uri, :element, :attr, :value
+    attr_reader :xpath
+
+    # @return [String]
+    def message
+      @original_message
+    end
+
+    # @return [String]
+    def expected
+      @original_expected
+    end
+
+    # @return [String]
+    def compact_message
+      case @code
+      when :rnv_er_elem
+        "element <#{@element}> is not allowed"
+      when :rnv_er_ufin
+        "element <#{@element}> is incomplete"
+      when :rnv_er_akey
+        "attribute #{@attr} is not allowed"
+      when :rnv_er_aval
+        "attribute #{@attr} has invalid value '#{@value}'"
+      when :rnv_er_amis
+        "element <#{@element}> attribute missing"
+      else
+        @original_message
+      end
+    end
+
+    # @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("; ")
+    end
+
+    # @param [String] data original content
+    # @return [String] context
+    def contextualize(data, max_len = 60)
+      out = ""
+      if data and @line
+        err_data = data.split("\n")[@line - 1]
+        if err_data && err_data.length > @col - 1
+          err_data.insert(@col - 1, "🢑")
+
+          start = 0
+          if @col > max_len
+            start = @col - max_len
+          end
+          out += (start > 0 ? "…" : "") + err_data[start..(@col + max_len)].strip + (@col + max_len < err_data.length ? "…" : "")
+        end
+      end
+      out
+    end
+
     # @return [String]
     def to_s
-      "#{@line}:#{@col}:error: #{@message}\n#{@expected}"
+      "#{@line}:#{@col}:error: #{self.message}\n#{self.expected}"
     end
 
     # @return [String]
     def inspect
-      "#<RNV::Error code: :#{@code}, message: '#{@message}', expected: '#{@expected} line: #{@line}, column: #{@col}>"
+      "#<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)
+      case e.first
+      when :rn_p_attribute
+        compact_expected_to_s(e.last, with_ns)
+      when :rn_p_element
+        "<" + 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
+      else
+        "unknown #{e.first}"
+      end
+    end
+
+    def compact_required_set
+      @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
+    end
+
+    def compact_expected_phrase(set)
+      if set.length > 1
+        set[0..-2].join(", ") + " or " + set.last
+      else
+        set.last
+      end
     end
   end
-end
+end

data/lib/rnv/validator.rb

@@ -3,36 +3,98 @@ require 'rnv/rnv'
 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
+        xpath << "#{rev_namespaces[current.uri]&.first||"xmlns"}:#{current.name}[#{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)
-      update_line_col
       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|
+        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)
-      update_line_col
+      @xpath_tree = @xpath_tree.parent
       tag_name = uri ? "#{uri}:#{name}" : name
+      update_line_col
       @document.end_tag(@pre_processor.tag(tag_name))
     end
 
-    def characters str
+    def characters(value)
       update_line_col
-      @document.characters(@pre_processor.text(str))
+      @document.characters(@pre_processor.text(value))
     end
 
-    def cdata_block str
+    def cdata_block(value)
       update_line_col
-      @document.characters(@pre_processor.text(str))
+      @document.characters(@pre_processor.text(value))
     end
 
     private
@@ -40,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
 
@@ -78,6 +142,8 @@ module RNV
       rnv_doc = NokogiriSaxDocument.new(@document)
       rnv_doc.pre_processor = pre_processor
 
+      raise RNV::DocumentEmpty if str.nil? or str.empty?
+
       parser = Nokogiri::XML::SAX::Parser.new(rnv_doc)
       parser.parse_memory(str) do |ctx|
         ctx.replace_entities = true
@@ -98,6 +164,8 @@ module RNV
 
       file = xml.is_a?(File) ? xml : File.open(xml)
 
+      raise RNV::DocumentEmpty if file.size == 0
+
       parser = Nokogiri::XML::SAX::Parser.new(rnv_doc)
       parser.parse(file) do |ctx|
         ctx.replace_entities = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - Gemfile
 - ext/rnv/extconf.rb
 - ext/rnv/ruby_rnv.c
+- ext/rnv/ruby_rnv.h
+- ext/rnv/ruby_rnv_err.c
 - ext/rnv/src/ary.c
 - ext/rnv/src/ary.h
 - ext/rnv/src/drv.c