validate_xml_xsi 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c5ac37713b7e95310d504a0a36588cdc41df1018bdb652b6523dbee15db692
-  data.tar.gz: cbde25bb692893ca7c4016cae7ae48942198bbc52ff5222372c1fc8716fce585
+  metadata.gz: cd9945266a2c29343a35a65c781dfef0fdc7338f70127ecf1b922c114cfd0d94
+  data.tar.gz: 9a38160f434f39a28e6fe1c6230e164ff975bd20675dff3524236e1b90d051da
 SHA512:
-  metadata.gz: e0667d41e91afa39246c1a4a5b042183d94f5fc698a9e9b12e7dde04cc37b0e225f3bdeeca59d6bd9714a3b181d82faa49292e4d892b08b462f4f4a4e5325c05
-  data.tar.gz: 3e713b4ccd60302d49cbe6bb36767df587eb090d968a9cb134fa98a99b56c342432f3d9921c040090887e885affacb91db1f8ad5f304538c86eb716eb6858f7b
+  metadata.gz: 25bca27d272577cf6af92a6e46978158fe0f277dcb40eaff1634907fa34e28e641f7eb205bccb1030a83a150ae7c2c33b736d983d0e6da9ca3b8f644365f9ae0
+  data.tar.gz: 22e380124fcd7afd9e576ec0cfa7273c96fb273563afd78ec6dc540ce662f5b07d62b375c856b86a01f256e5ee49cf1bff566de65af78d7f242669e25a976270

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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.
+
 ## v0.1.3
 
 * Rev Nokogiri requirement to >= 1.13.2 for CVE-2021-30560 & CVE-2022-23308

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'
 
-module XML
-  module 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)
@@ -22,9 +11,19 @@ module XML
     xml_doc
   end
 
-  module Schema
+  class Schema
+    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.validate(xml_doc)
-      xml_doc = XML::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
+      xml_doc = XML_XSI::parse(xml_doc) unless xml_doc.is_a?(Nokogiri::XML::Document)
       errors = []
       ## Build an all-in-one XSD document that imports all of the separate schema locations
       xsd_doc = "<?xml version=\"1.0\"?>\n"
@@ -52,13 +51,13 @@ module XML
       xsd = Nokogiri::XML.Schema(xsd_doc)
       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.3"
+  spec.version       = "0.2.1"
   spec.authors       = ["David Hansen"]
   spec.email         = ["david@hansen4.net"]
 
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "bundler", ">= 2.1"
+  spec.add_development_dependency "rake", ">= 13.0"
 
   spec.add_dependency "nokogiri", ">= 1.13.2"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: validate_xml_xsi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - David Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.8
 signing_key: 
 specification_version: 4
 summary: Validate XML against it's embedded XSI elements that define the XSD's.