xsd 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b12830c536c37e72b109727f470d45de29b6c852e62476cd3aa5578dd3b9c7
-  data.tar.gz: 248b65a3794a6c83a6aca695b0d565d55b971991272fd5f7f0a8a841fb8847ec
+  metadata.gz: ab9eaf4eb6b8aacde5379acdc08cc16c3d85e3dc9d75a5887b2f1db05ea6ed58
+  data.tar.gz: 8c5fdbf108a6867689ff3292a5e208a33160f232b4a3d3a96eb55e42e9b6da7e
 SHA512:
-  metadata.gz: ac15d2c2c163bd70f007fd76b5c007fbc786ed09d5609a2d6dba5aa8836144917a5159a32c1b7f47aa250bd18034d8339f445180fc4cd330745138ec60283e32
-  data.tar.gz: 7db0b9ac2ba0c97aab16d84db5145b4a8a18c901f3c24c8fd13a73b96a1998083a41cff38c3b0f7098dc53457b693e0ee5d3d941ceb1712f38a54924d32ce544
+  metadata.gz: d75af5531e7763eb3bc9359b2992e03704d963cfbc394a863022a3ff8db87d97db368409666bc7540f2fc772b78e2b25ab59905301e19d370827750050823462
+  data.tar.gz: 2b06fd643f69e41017683b689e614dbef7c42dca4fefbdec753f7f8edcc0978caf80eefe8c7d68e4acdc86aadd2777160a5cd7105a776d13ebfc2c57fc5af45c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [2.2.0] - 2023-07-10
+
+- Fixed built-in types detection for unprefixed schema namespace
+- Move validation to Schema object
+
 ## [2.1.0] - 2023-07-10
 
 - Add support for <xs:include> element

data/lib/xsd/base_object.rb

@@ -346,5 +346,12 @@ module XSD
         name.to_sym
       end
     end
+
+    # Return string if it is not empty, or nil otherwise
+    # @param [String, nil] string
+    # @return String, nil
+    def nil_if_empty(string)
+      string&.empty? ? nil : string
+    end
   end
 end

data/lib/xsd/objects/schema.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'tmpdir'
+require 'securerandom'
+
 module XSD
   # The schema element defines the root element of a schema.
   # Parent elements: NONE
@@ -108,23 +111,23 @@ module XSD
       attributes
     end
 
-    # Get target namespace prefix. There may be more than one prefix, but we return only first defined
-    # @return String
+    # Get target namespace prefix
+    # @return String, nil
     def target_namespace_prefix
-      @target_namespace_prefix ||= namespaces.key(target_namespace)&.sub(/^xmlns:?/, '') || ''
+      nil_if_empty(@target_namespace_prefix ||= namespaces.key(target_namespace)&.sub(/^xmlns:?/, '') || '')
     end
 
     # Get schema namespace prefix
-    # @return String
+    # @return String, nil
     def namespace_prefix
-      @namespace_prefix ||= namespaces.key(XML_SCHEMA).sub(/^xmlns:?/, '')
+      nil_if_empty(@namespace_prefix ||= namespaces.key(XML_SCHEMA).sub(/^xmlns:?/, ''))
     end
 
     # Check if namespace is a target namespace
     # @param [String, nil] namespace
     # @return Boolean
     def targets_namespace?(namespace)
-      namespace == target_namespace || namespaces[namespace.empty? ? 'xmlns' : "xmlns:#{namespace}"] == target_namespace
+      namespace == target_namespace || namespaces[namespace.nil? ? 'xmlns' : "xmlns:#{namespace}"] == target_namespace
     end
 
     # Override map_children on schema to get objects from all loaded schemas
@@ -157,5 +160,97 @@ module XSD
       aliases = [ns, namespaces["xmlns:#{(ns || '').gsub(/^xmlns:/, '')}"], reader.namespace_prefixes[ns]].compact
       imports.find { |import| aliases.include?(import.namespace) }
     end
+
+    # Validate XML against current schema
+    # @param [String, Pathname, Nokogiri::XML::Document] xml
+    def validate_xml(xml)
+      # validate input
+      raise ValidationError unless xml.is_a?(Nokogiri::XML::Document) || xml.is_a?(Pathname) || xml.is_a?(String)
+
+      begin
+        document = xml.is_a?(Nokogiri::XML::Document) ? xml : Nokogiri::XML(xml)
+      rescue Nokogiri::XML::SyntaxError => e
+        raise ValidationError, e
+      end
+
+      errors = schema_validator.validate(document)
+      raise ValidationError, errors.map(&:message).join('; ') if errors.any?
+    end
+
+    # Validate current schema against XMLSchema 1.0
+    def validate
+      begin
+        schema_validator
+      rescue Nokogiri::XML::SyntaxError => e
+        # TODO: display import map name for imported_xsd
+        message = e.message + (e.file ? " in file '#{File.basename(e.file)}'" : '')
+        raise ValidationError, message
+      end
+    end
+
+    private
+
+    # Get Nokogiri::XML::Schema object to validate against
+    # @return Nokogiri::XML::Schema
+    def schema_validator
+      return @schema_validator if @schema_validator
+
+      # if !imported_xsd.empty?
+      # imports are explicitly provided - put all files in one tmpdir and update import paths appropriately
+      # TODO: save file/path map to display in errors
+      Dir.mktmpdir('XSD', reader.tmp_dir) do |dir|
+        # create primary xsd file
+        file = "#{::SecureRandom.urlsafe_base64}.xsd"
+
+        # create imported xsd files
+        recursive_import_xsd(self, file, Set.new) do |f, data|
+          File.write("#{dir}/#{f}", data)
+        end
+
+        # read schema from tmp file descriptor
+        io = File.open("#{dir}/#{file}")
+        @schema_validator = create_xml_schema(io)
+      end
+      # else
+      #   @schema_validator = create_xml_schema(schema.node.to_xml)
+      # end
+
+      @schema_validator
+    end
+
+    # Сформировать имена файлов и содержимое XSD схем для корректной валидации
+    # @param [Schema] schema
+    # @param [String] file
+    # @param [Set] processed
+    def recursive_import_xsd(schema, file, processed, &block)
+      # handle recursion
+      namespace = schema.target_namespace
+      return if processed.include?(namespace)
+
+      processed.add(namespace)
+
+      data = schema.node.to_xml
+
+      schema.imports.each do |import|
+        name      = "#{::SecureRandom.urlsafe_base64}.xsd"
+        location  = import.schema_location
+        namespace = import.namespace
+
+        if location
+          data = data.sub("schemaLocation=\"#{location}\"", "schemaLocation=\"#{name}\"")
+        else
+          data = data.sub("namespace=\"#{namespace}\"", "namespace=\"#{namespace}\" schemaLocation=\"#{name}\"")
+        end
+        recursive_import_xsd(import.imported_schema, name, processed, &block)
+      end
+
+      block.call(file, data)
+    end
+
+    # Create Nokogiri XML Schema instance with preconfigured options
+    # @param [IO, String] io
+    def create_xml_schema(io)
+      Nokogiri::XML::Schema(io, Nokogiri::XML::ParseOptions.new.nononet)
+    end
   end
 end

data/lib/xsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XSD
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/xsd/xml.rb

@@ -6,7 +6,6 @@ require 'net/http'
 module XSD
   class XML
     include Generator
-    include Validator
 
     attr_reader :options, :object_cache, :schemas, :namespace_prefixes
 

data/lib/xsd.rb

@@ -38,6 +38,5 @@ require 'xsd/objects/any_attribute'
 require 'xsd/objects/key'
 require 'xsd/objects/keyref'
 require 'xsd/generator'
-require 'xsd/validator'
 require 'xsd/exceptions'
 require 'xsd/xml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xsd
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - d.arkhipov
@@ -109,7 +109,6 @@ files:
 - lib/xsd/shared/min_max_occurs.rb
 - lib/xsd/shared/referenced.rb
 - lib/xsd/shared/simple_typed.rb
-- lib/xsd/validator.rb
 - lib/xsd/version.rb
 - lib/xsd/xml.rb
 - xsd.gemspec

data/lib/xsd/validator.rb

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-module XSD
-  module Validator
-    # Validate XML against XSD
-    # @param [String, Pathname, Nokogiri::XML::Document] xml
-    def validate_xml(xml)
-      # validate input
-      raise ValidationError unless xml.is_a?(Nokogiri::XML::Document) || xml.is_a?(Pathname) || xml.is_a?(String)
-
-      begin
-        document = xml.is_a?(Nokogiri::XML::Document) ? xml : Nokogiri::XML(xml)
-      rescue Nokogiri::XML::SyntaxError => e
-        raise ValidationError, e
-      end
-
-      errors = schema_validator.validate(document)
-      raise ValidationError, errors.map(&:message).join('; ') if errors.any?
-    end
-
-    # Validate XSD against another XSD (by default uses XMLSchema 1.0)
-    def validate
-      begin
-        schema_validator
-      rescue Nokogiri::XML::SyntaxError => e
-        # TODO: display import map name for imported_xsd
-        message = e.message + (e.file ? " in file '#{File.basename(e.file)}'" : '')
-        raise ValidationError, message
-      end
-    end
-
-    private
-
-    # Get Nokogiri::XML::Schema object to validate against
-    # @return Nokogiri::XML::Schema
-    def schema_validator
-      return @schema_validator if @schema_validator
-
-      if !imported_xsd.empty?
-        # imports are explicitly provided - put all files in one tmpdir and update import paths appropriately
-        # TODO: save file/path map to display in errors
-        Dir.mktmpdir('XSD', tmp_dir) do |dir|
-          # create primary xsd file
-          file = "#{SecureRandom.urlsafe_base64}.xsd"
-
-          # create imported xsd files
-          recursive_import_xsd(self, file, Set.new) do |f, data|
-            File.write("#{dir}/#{f}", data)
-          end
-
-          # read schema from tmp file descriptor
-          io = File.open("#{dir}/#{file}")
-          @schema_validator = create_xml_schema(io)
-        end
-      else
-        @schema_validator = create_xml_schema(self.xsd)
-      end
-
-      @schema_validator
-    end
-
-    # Сформировать имена файлов и содержимое XSD схем для корректной валидации
-    # @param [XML] reader
-    # @param [String] file
-    # @param [Set] processed
-    def recursive_import_xsd(reader, file, processed, &block)
-      # handle recursion
-      namespace = reader.schema.target_namespace
-      return if processed.include?(namespace)
-
-      processed.add(namespace)
-
-      data = reader.xml
-
-      reader.imports.each do |import|
-        name = "#{SecureRandom.urlsafe_base64}.xsd"
-        data = data.sub("schemaLocation=\"#{import.schema_location}\"", "schemaLocation=\"#{name}\"")
-        recursive_import_xsd(import.imported_reader, name, processed, &block)
-      end
-
-      block.call(file, data)
-    end
-
-    # Create Nokogiri XML Schema instance with preconfigured options
-    # @param [IO] io
-    def create_xml_schema(io)
-      Nokogiri::XML::Schema(io, Nokogiri::XML::ParseOptions.new.nononet)
-    end
-  end
-end