validate_xml_xsi 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4252059ac1bc3c6ae4aa11ca57703dea71d54a107483129d76955f371a6b56b7
-  data.tar.gz: a1c8bf3d962e546e85d8a39a156d562144df7b12a6c38724e74d264287ac304c
+  metadata.gz: aeccb816b7e38de2b2cc3b29dd0f3035e56f8bf2190f9d1281ae11ec73573efb
+  data.tar.gz: '0953d2190b837f8b692b468c3e06d77c55cad671a03ed4eaf2e7219e31013cc3'
 SHA512:
-  metadata.gz: dbc3ee5c3c8d136b280b8bf7414934c4b8d1e18b2f6ae37a92ff5314bd1ce9028528c69876c64b52ebe8a3d54ed579255c7de327118e5ebaf6b73ccea4b02af1
-  data.tar.gz: d1524cf149f1439ecab4215100de7718465b5a7147796382ecaf42fd08a63030a584bfe6c39d0f46cf298c07f1128b885f75c78dfe3c0d4566a1a0f47ae4a97c
+  metadata.gz: 323fc0b7cd7b322ff35c72dd77ae1b33b5aee6b5bed953ed7b3e965cc7924bb98c36145a2296e279a6c6e208c9aa056e33809f00f3e9272d15b898425bc3e407
+  data.tar.gz: 8d79a528c2fb9172b2d0d29bcd10f67d241a792fba510b613eed501645d73cb137ed3ba0af0223b5b4cd3510025268184a42e487810428b196d17664778501a1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.4
+
+* Fix some silly syntax errors
+
 ## v0.2.3
 
 * Rename XML_XSI::Schema::parse_schema to just XML_XSI::Schema::parse

data/bin/validate_xml_xsi

@@ -3,7 +3,7 @@ require 'validate_xml_xsi'
 
 while ARGV.size > 0
   fname = ARGV.shift
-  errors = XML_XSI::Schema::validate(fname)
+  errors = XML_XSI::Schema::new(XML_XSI.parse(fname)).validate
   if errors.empty?
     puts "XML Schema check complete - NO ERRORS!"
   else

data/lib/validate_xml_xsi.rb

@@ -14,32 +14,52 @@ class XML_XSI
   class Schema
     class DocumentError < StandardError; end
     class ValidationError < StandardError
-      Params = [:type, :file, :line, :column, :message, :err]
-      attr_reader *Params, :description
-      def initialize(*args)
-        Params.each.with_index { |param, idx| instance_variable_set("@#{param.to_s}", args[idx]) }
-        @description = "#{@type.to_s} ERROR [#{@file}:#{@line}:#{@column}]: #{@message}".freeze
+      attr_reader :type, :file, :line, :column, :level, :message, :description, :error
+      def initialize(type, err, filename = nil)
+        @type = type
+        @error = err
+        @file = filename.nil? ? @error.file : filename
+        @line = @error.line
+        @column = @error.column
+        if /((?:ERROR)|(?:WARNING)): /.match(@error.message)
+          @level = $1
+          @message = $'
+          @description = "#{@type.to_s} #{@level.to_s} [#{@file}:#{@line}:#{@column}]: #{@message}".freeze
+        else
+          @level = ''
+          @message = @error.message
+          @description = "#{@type.to_s} #{@message}".freeze
+        end
         super(@description)
       end
     end
 
-    def self.parse(xml_doc)
+    attr_reader :xsd
+    def initialize(xml_doc)
       unless xml_doc.is_a?(Nokogiri::XML::Document)
-        raise DocumentError.new("not a Nokogiri::XML::Document (class: #{xml_doc.class.name})!")
+        raise DocumentError.new("invalid Nokogiri::XML::Document - #{xml_doc.class.name}")
+      end
+      @document = xml_doc
+      ## Determine default/top/root namespace
+      target_ns_href = nil
+      @document.namespaces.each do |ns_prefix, ns_href|
+        target_ns_href = ns_href if ns_prefix.nil? || ns_prefix.empty? || ns_prefix.eql?('xmlns')
       end
+      raise DocumentError.new("Unable to determine default (xmlns) namespace!") if target_ns_href.nil? || target_ns_href.empty?
       ## Build an all-in-one XSD document that imports all of the separate schema locations
-      xsd_doc = "<?xml version=\"1.0\"?>\n"
-      xsd_doc << "<xsd:schema targetNamespace=\"http://www.w3.orig/XML/1998/namespace\"\n" \
-                 "            xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
+      @xsd = "<?xml version=\"1.0\"?>\n"
+      @xsd << "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
+                 "            targetNamespace=\"#{target_ns_href}\"\n" \
                  "            version=\"1.0\">\n"
+      ## Include the default xml namespace
+      schemata_by_ns = {}
       ## Iterate over all the elements and find any xsi:schemaLocation attributes
       ## and build a hash of all of the namespaces and locations
-      schemata_by_ns = {}
-      xml_doc.search('//*[@xsi:schemaLocation]').each do |elem|
+      @document.search('//*[@xsi:schemaLocation]').each do |elem|
         elem['xsi:schemaLocation'].scan(/(\S+)\s+(\S+)/).each do |ns_set|
           if ns_loc = schemata_by_ns[ns_set.first]
             unless ns_loc.eql?(ns_set.last)
-              raise DocumentError.new("MISMATCHING XMLNS XSI: #{ns_set.first} -> #{ns_loc} VS #{ns_set.last}")
+              raise DocumentError.new("MISMATCHING namespace: #{ns_set.first} -> #{ns_loc} VS #{ns_set.last}")
             end
           else
             schemata_by_ns[ns_set.first] = ns_set.last
@@ -47,28 +67,25 @@ class XML_XSI
         end
       end
       schemata_by_ns.each do |ns_href, ns_file|
-        xsd_doc << "  <xsd:import namespace=\"#{ns_href}\" schemaLocation=\"#{ns_file}\"/>\n"
+        @xsd << (ns_href.eql?(target_ns_href) ?
+                    "  <xsd:include schemaLocation=\"#{ns_file}\"/>\n" :
+                    "  <xsd:import namespace=\"#{ns_href}\" schemaLocation=\"#{ns_file}\"/>\n")
       end
-      xsd_doc << "</xsd:schema>\n"
-      Nokogiri::XML::Schema.new(xsd_doc)
+      @xsd << "</xsd:schema>\n"
+
+      ## Create the Schema objects
+      @schema = Nokogiri::XML::Schema.new(@xsd)
     end
 
-    def self.validate(xml_doc, xsd = nil)
-      xml_doc = XML_XSI::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
+    def validate
       errors = []
-      unless xsd.nil? || xsd.is_a?(Nokogiri::XML::Schema)
-        raise DocumentError.new("Invalid XSD - not a Nokogiri::XML::Schema (class: #{xsd.class.name})!")
-      end
-      xsd = self.parse(xml_doc) if xsd.nil?
-      xsd.errors.each do |err|
-        err_msg = (/ERROR: /.match(err.message)) ? $' : err.message
-        errors << ValidationError.new(:XSD, err.file, err.line, err.column, err_msg, err)
+      @schema.errors.each do |err|
+        errors << ValidationError.new(:XSD, err)
       end
-      errs = xsd.validate(xml_doc)
+      errs = @schema.validate(@document)
       errs.each do |err|
-        err_msg = (/ERROR: /.match(err.message)) ? $' : err.message
-        fname = (err.file.nil?) ? xml_doc.filename : err.file
-        errors << ValidationError.new(:XML, fname, err.line, err.column, err_msg, err)
+        fname = (err.file.nil?) ? @document.filename : err.file
+        errors << ValidationError.new(:XML, err, fname)
       end
       errors
     end

data/validate_xml_xsi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "validate_xml_xsi"
-  spec.version       = "0.2.4"
+  spec.version       = "0.3.0"
   spec.authors       = ["David Hansen"]
   spec.email         = ["david@hansen4.net"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate_xml_xsi
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - David Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler