validate_xml_xsi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9945266a2c29343a35a65c781dfef0fdc7338f70127ecf1b922c114cfd0d94
-  data.tar.gz: 9a38160f434f39a28e6fe1c6230e164ff975bd20675dff3524236e1b90d051da
+  metadata.gz: 761ad7abcb22af7828d754ff0b1ec2bfdd67e48e8edb82a1d306c05c3b9b3391
+  data.tar.gz: ad4000467221dbb6937c1ea9103d8b109666fe17b15f1480937ea7915b37797f
 SHA512:
-  metadata.gz: 25bca27d272577cf6af92a6e46978158fe0f277dcb40eaff1634907fa34e28e641f7eb205bccb1030a83a150ae7c2c33b736d983d0e6da9ca3b8f644365f9ae0
-  data.tar.gz: 22e380124fcd7afd9e576ec0cfa7273c96fb273563afd78ec6dc540ce662f5b07d62b375c856b86a01f256e5ee49cf1bff566de65af78d7f242669e25a976270
+  metadata.gz: df5c7aa8152d8353a26285efc3d183e9a9f7813bbad785596a53ab52cf5903360b5ed76b56fe87762a08aa870a721bbad5fc82495a2b51b53d9f3d2f6d2a0b0a
+  data.tar.gz: f3e9dbb10e87fc26bef8ae1011ac27aa39148df13fa10055754f728539cb2eccdf830d065e8305e1b37be9bc137587370cb7d667f7d9cef7d574692bb7832679

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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

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_schema(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.1"
+  spec.version       = "0.2.2"
   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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler