validate_xml_xsi 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed79db97f53c99c86dff5c5acb649d7115dddd137ed5f91174aa12fe93187cf0
-  data.tar.gz: e6c379c63075f570f2f377f678476e410cbc5e0feb5a8091a4cc437b4b077877
+  metadata.gz: 4fa9e060212c9992fc22333d6858d9005c0f0be545a1f921c2324fda0071a634
+  data.tar.gz: 880b5e1af35f7cfb1f7c71f09b7fd676632bf921c3ecd5af657c6ce0e4b36df6
 SHA512:
-  metadata.gz: b8b464eff0d093ad0d3d7939045dcf3867f053f03966675a053a520af5786ebbef560584c17116bd2b0af7c101056772561621f6d1745404d3827a1e4807e85c
-  data.tar.gz: 32cf5298a1c8eca642701cec2966612fd3eabe17ed41ac92d531200d3f96a89a85d74a8a447ce4b0fc82209de200e0b5b92550f6d91ffa3e8264012475e4928a
+  metadata.gz: 63187e958fc288c4722444b0b73464a8af4f94776516dd619feb33bc9cbafbdc69dfca7c72fe7184a95c7014a838fbf10245db6d126d4beea1f04049573ef7f8
+  data.tar.gz: '0975b1be594880e516af4b8a0e758c50eec6c1d4d92621d4e3c870cfcdddde2c1f32973812f3ff4167832958d62f8bb2afb1563db462557904e2b8471c12e3e4'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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
+
 ## v0.1.1
 
 * Rev Nokogiri requirement to ~> 1.12.5 for CVE-2021-41098

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.2"
+  spec.version       = "0.2.0"
   spec.authors       = ["David Hansen"]
   spec.email         = ["david@hansen4.net"]
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/d-hansen/validate_xml_xsi"
-  spec.metadata["changelog_uri"] = "https://github.com/d-hansen/validate_xml_xsi/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/d-hansen/validate_xml_xsi/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -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.12.5"
+  spec.add_dependency "nokogiri", ">= 1.13.2"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: validate_xml_xsi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-03-08 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
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.2
 description: 
 email:
 - david@hansen4.net
@@ -75,7 +75,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/d-hansen/validate_xml_xsi
   source_code_uri: https://github.com/d-hansen/validate_xml_xsi
-  changelog_uri: https://github.com/d-hansen/validate_xml_xsi/CHANGELOG.md
+  changelog_uri: https://github.com/d-hansen/validate_xml_xsi/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.8
 signing_key: 
 specification_version: 4
 summary: Validate XML against it's embedded XSI elements that define the XSD's.