validate_xml_xsi 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fa9e060212c9992fc22333d6858d9005c0f0be545a1f921c2324fda0071a634
-  data.tar.gz: 880b5e1af35f7cfb1f7c71f09b7fd676632bf921c3ecd5af657c6ce0e4b36df6
+  metadata.gz: 0fd07518ce27feb3ced81500c73f9ea2ba9a5a760b41e2ae18b905babf740a3f
+  data.tar.gz: 509f1417b6c544f48ef3eb1774c75175ffa82613cf24a840dd1dc2a8f4829f03
 SHA512:
-  metadata.gz: 63187e958fc288c4722444b0b73464a8af4f94776516dd619feb33bc9cbafbdc69dfca7c72fe7184a95c7014a838fbf10245db6d126d4beea1f04049573ef7f8
-  data.tar.gz: '0975b1be594880e516af4b8a0e758c50eec6c1d4d92621d4e3c870cfcdddde2c1f32973812f3ff4167832958d62f8bb2afb1563db462557904e2b8471c12e3e4'
+  metadata.gz: 7dd88a35fe216d3d02b9cb0de4d672bd309f180ac57595d8ac69abf86304d10550ba8322d402cd065cb89969d25313057ccbc1d64353a4da75dd2c18c7a8e4db
+  data.tar.gz: d7fe6994da9bf99d3302be3e8ec88c7168cb4c01d02debcf38560060007c8f2d4a36871e29b08a139636e3c137db7bd283c38fa6fc71c103b605c5059577b988

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.2.3
+
+* Rename XML_XSI::Schema::parse_schema to just XML_XSI::Schema::parse
+
+## v0.2.2
+
+* Break out parsing of the schema from validation so we can reference the schema if we need to.
+
+## v0.2.1
+
+* Update namespace to XML_XSI in bin/validate_xml_xsi utility
+
 ## v0.2.0
 
 * Change namespace to XML_XSI and rename/promote Validation::Error to Schema::ValidationError < StandardError.

data/bin/validate_xml_xsi

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

data/lib/validate_xml_xsi.rb

@@ -12,6 +12,7 @@ class XML_XSI
   end
 
   class Schema
+    class DocumentError < StandardError; end
     class ValidationError < StandardError
       Params = [:type, :file, :line, :column, :message, :err]
       attr_reader *Params, :description
@@ -22,9 +23,10 @@ class XML_XSI
       end
     end
 
-    def self.validate(xml_doc)
-      xml_doc = XML_XSI::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
-      errors = []
+    def self.parse(xml_doc)
+      unless xml_doc.is_a?(Nokogiri::XML::Document)
+        raise DocumentError.new("not a Nokogiri::XML::Document (class: #{xml_doc.class.name})!"
+      end
       ## 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" \
@@ -37,7 +39,7 @@ class XML_XSI
         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)
-              error "MISMATCHING XMLNS XSI: #{ns_set.first} -> #{ns_loc} VS #{ns_set.last}"
+              raise DocumentError.new("MISMATCHING XMLNS XSI: #{ns_set.first} -> #{ns_loc} VS #{ns_set.last}")
             end
           else
             schemata_by_ns[ns_set.first] = ns_set.last
@@ -48,7 +50,16 @@ class XML_XSI
         xsd_doc << "  <xsd:import namespace=\"#{ns_href}\" schemaLocation=\"#{ns_file}\"/>\n"
       end
       xsd_doc << "</xsd:schema>\n"
-      xsd = Nokogiri::XML.Schema(xsd_doc)
+      Nokogiri::XML::Schema.new(xsd_doc)
+    end
+
+    def self.validate(xml_doc, xsd = nil)
+      xml_doc = XML_XSI::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
+      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_schema(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)

data/validate_xml_xsi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "validate_xml_xsi"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.3"
   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.0
+  version: 0.2.3
 platform: ruby
 authors:
 - David Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler