validate_xml_xsi 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea7f8a1a26dc8803332c448e4ab3609d9699f116f33ab3636a3cec9cf47c86b
-  data.tar.gz: 9423b6a6cccd460ef5949d39340bd7330e898e9791160e747e70014763cc4ddc
+  metadata.gz: 4fa9e060212c9992fc22333d6858d9005c0f0be545a1f921c2324fda0071a634
+  data.tar.gz: 880b5e1af35f7cfb1f7c71f09b7fd676632bf921c3ecd5af657c6ce0e4b36df6
 SHA512:
-  metadata.gz: 4ac1fdf7c33249fe3146fbb296dd10ec60f0a20b9cd9cbccf527fd408b66b3ed09c6d8a435c49b91f6c0e34ec452422d5d7cb2b8dab7045ba2e769e5035981f0
-  data.tar.gz: 7c3b944868fdc9545a30b50a571e1cc5a30e6a75889a1a861bfe3964da56e02af8650d3290180b1dabcfdfd53b9819116a0ba8a7b44dbb6c5a63ed82c15f3a83
+  metadata.gz: 63187e958fc288c4722444b0b73464a8af4f94776516dd619feb33bc9cbafbdc69dfca7c72fe7184a95c7014a838fbf10245db6d126d4beea1f04049573ef7f8
+  data.tar.gz: '0975b1be594880e516af4b8a0e758c50eec6c1d4d92621d4e3c870cfcdddde2c1f32973812f3ff4167832958d62f8bb2afb1563db462557904e2b8471c12e3e4'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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/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,8 +12,18 @@ class XML
   end
 
   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 @@ class 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.4"
+  spec.version       = "0.2.0"
   spec.authors       = ["David Hansen"]
   spec.email         = ["david@hansen4.net"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_xml_xsi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - David Hansen