ruby_rnv 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72e473e7924c7c3e215b53e08311afcf6781bb17a3df2842300661e86b35601
-  data.tar.gz: e513f2403d0ae91f35fde8f4b81b264a3ff16bb0a6be5f1dc80b17f3aa00ddcc
+  metadata.gz: f815e167e18653e6820b447245834127448b9ac2b72c2f0228baefb40226007d
+  data.tar.gz: d192a9e1faa7e62c25caf68fca1beaeb7a77f706a85ecf50175f70c5e4dd45f4
 SHA512:
-  metadata.gz: b0ce856ca07f203e0a0a4307943a113ff703e5a32031946e463496d485b49bafbeeb42a9057b3d697a92a00294c5d79c29b6bc7be62565dc75a910f16b4c1dbf
-  data.tar.gz: 3a5028a2bf2d558a9a7501336fe190a994dc867dd9eef83fcf9ce38ff481f6c1743f77e9d5f604ee9f3d07e95840bf7d79870b163fabf9f866e7c122e40f570b
+  metadata.gz: 9d53f3238103630b7617fe91850bd4ad930781981cc3d67cd8a5f1d9cfb4ff90d9de6463483e2ee054bce3cbeb19f6407edeb5dd91008b222a464a6bd7ab07d0
+  data.tar.gz: 3613bb75f3ef998a5a90af133fcbcc40b51a7bb983149bbcb8bae67e800a72c5a61978f26fb96aed8ec707d2ecbac2a4356fbe457382dbf85277be6638257074

data/lib/rnv/error.rb

@@ -1,26 +1,57 @@
 module RNV
   class Error
+    attr_reader :original_message, :original_expected
+    attr_reader :ns_uri, :element, :attr, :value, :required, :allowed
+
+    # @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]
-        err_data.insert(@col - 1, "🢑")
+        if err_data
+          err_data.insert(@col - 1, "🢑")
 
-        start = 0
-        if @col > max_len
-          start = @col - max_len
+          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
-        out += (start > 0 ? "…" : "") + err_data[start..(@col + max_len)].strip + (@col + max_len < err_data.length ? "…" : "")
       end
       out
     end
@@ -32,8 +63,40 @@ module RNV
 
     # @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
+
+    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_nc_datatype
+        "datatype #{e[-2]}:#{e.last}"
+      when :rn_nc_qname
+        with_ns ? "#{e.first}:#{e.last}" : e.last
+      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,6 +3,8 @@ require 'rnv/rnv'
 require 'rnv/pre_processor'
 
 module RNV
+  class DocumentEmpty < StandardError; end
+
   # @!visibility private
   class NokogiriSaxDocument < Nokogiri::XML::SAX::Document
     # @return [Nokogiri::XML::SAX::ParserContext]
@@ -78,6 +80,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 +102,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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler