validate_xml_xsi 0.1.4 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea7f8a1a26dc8803332c448e4ab3609d9699f116f33ab3636a3cec9cf47c86b
-  data.tar.gz: 9423b6a6cccd460ef5949d39340bd7330e898e9791160e747e70014763cc4ddc
+  metadata.gz: 761ad7abcb22af7828d754ff0b1ec2bfdd67e48e8edb82a1d306c05c3b9b3391
+  data.tar.gz: ad4000467221dbb6937c1ea9103d8b109666fe17b15f1480937ea7915b37797f
 SHA512:
-  metadata.gz: 4ac1fdf7c33249fe3146fbb296dd10ec60f0a20b9cd9cbccf527fd408b66b3ed09c6d8a435c49b91f6c0e34ec452422d5d7cb2b8dab7045ba2e769e5035981f0
-  data.tar.gz: 7c3b944868fdc9545a30b50a571e1cc5a30e6a75889a1a861bfe3964da56e02af8650d3290180b1dabcfdfd53b9819116a0ba8a7b44dbb6c5a63ed82c15f3a83
+  metadata.gz: df5c7aa8152d8353a26285efc3d183e9a9f7813bbad785596a53ab52cf5903360b5ed76b56fe87762a08aa870a721bbad5fc82495a2b51b53d9f3d2f6d2a0b0a
+  data.tar.gz: f3e9dbb10e87fc26bef8ae1011ac27aa39148df13fa10055754f728539cb2eccdf830d065e8305e1b37be9bc137587370cb7d667f7d9cef7d574692bb7832679

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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.
+
 ## v0.1.4
 
 * Change module XML, Validation, & Schema to be classes instead.

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

@@ -1,18 +1,7 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
 
-class XML
-  class Validation
-    class Error
-      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
-      end
-    end
-  end
-
+class XML_XSI
   def self.parse(obj)
     filename = nil
     obj = File::read(filename = obj) if obj.is_a?(String) && File::exist?(obj)
@@ -23,9 +12,21 @@ class XML
   end
 
   class Schema
-    def self.validate(xml_doc)
-      xml_doc = XML::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
-      errors = []
+    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
+        super(@description)
+      end
+    end
+
+    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" \
@@ -38,7 +39,7 @@ class XML
         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
@@ -49,16 +50,25 @@ class XML
         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 << XML::Validation::Error.new(:XSD, err.file, err.line, err.column, err_msg, err)
+        errors << ValidationError.new(:XSD, err.file, err.line, err.column, err_msg, err)
       end
       errs = xsd.validate(xml_doc)
       errs.each do |err|
         err_msg = (/ERROR: /.match(err.message)) ? $' : err.message
         fname = (err.file.nil?) ? xml_doc.filename : err.file
-        errors << XML::Validation::Error.new(:XML, fname, err.line, err.column, err_msg, err)
+        errors << ValidationError.new(:XML, fname, err.line, err.column, err_msg, err)
       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.1.4"
+  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.1.4
+  version: 0.2.2
 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