ruby3mf 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e69399223f22bf72d431f634a3dae81966252da
-  data.tar.gz: f8a87375c839cb3e42e00496104ee0c0a6a1c93f
+  metadata.gz: 2d2f6346320579794b80cb51d43cc89d2bfe62c5
+  data.tar.gz: 69c77fd6fe56952bc7e66b7bb0d8c113dbc35fc8
 SHA512:
-  metadata.gz: 8ad2102f909a1df3f614010c4738b81e5b0ece6415d6f3f6cc47951151ed57f282b3150e4c2c581b41cd2685f46253df48c40117fbf0a323968a41502f594412
-  data.tar.gz: 7c0182a9da87926ad9a76eb604a72dfc68926720b14e7174a4672d8c8f18773bdfb835b6fff4c428983bdb9dbdf169b7980b55fec53aea070d697a98c8e36322
+  metadata.gz: 56d2dbe4baa8689c8eaa1f227a407c960204f820d27c5f907d3b0201baa8c3b5a96c05f25abb4f8f6d4df88fc6b8975ec74d774c2972c8b4d0d8de7a8c556945
+  data.tar.gz: 7c934b3b61c37585696697e644fb63d4ffe516d07e5f10c7fde335baac6e2b879db3de0c6d91c6a1574432bb053de3d69289986f4ad63952b742a63172178d2c

data/bin/batch.rb

@@ -1,21 +1,22 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/ruby3mf'
-
-files = Dir["spec/ruby3mf-testfiles/#{ARGV[0] || "failing_cases"}/*.#{ARGV[1] || '3mf'}"]
-
-files.each do |file|
-  begin
-    Log3mf.reset_log
-    doc = Document.read(file)
-    errors = Log3mf.entries(:error, :fatal_error)
-
-    puts "=" * 100
-    puts "Validating file: #{file}"
-    errors.each do |ent|
-      h = { context: ent[0], severity: ent[1], message: ent[2] }
-      puts h
-    end
-    rescue
-  end
-end
+#!/usr/bin/env ruby
+
+require_relative '../lib/ruby3mf'
+
+files = Dir["spec/ruby3mf-testfiles/#{ARGV[0] || "failing_cases"}/*.#{ARGV[1] || '3mf'}"]
+
+files.each do |file|
+  begin
+    Log3mf.reset_log
+    doc = Document.read(file)
+    errors = Log3mf.entries(:error, :fatal_error)
+
+    puts "=" * 100
+    puts "Validating file: #{file}"
+
+    errors.each do |ent|
+      h = { context: ent[0], severity: ent[1], message: ent[2] }
+      puts h
+    end
+    rescue
+  end
+end

data/bin/cli.rb

@@ -10,3 +10,6 @@ errors.each do |ent|
   h = { file: filename, context: ent[0], severity: ent[1], message: ent[2] }
   puts h
 end
+
+# set exit code for suite test usage
+exit errors.size == 0

data/bin/suite_test.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+MATCH=$1
+OUTFILE=suite_test.txt
+GOOD_FILES=../3mf-test-suite/Positive/${MATCH}*.3mf
+BAD_FILES=../3mf-test-suite/Negative/${MATCH}*.3mf
+
+echo "Test Suite: filter: ${MATCH}"
+printf "\n\nTest Suite: filter: ${MATCH} - $(date)\n" >> ${OUTFILE}
+
+echo "Positive Files -------------"
+printf "\nPositive Files -------------\n" >> ${OUTFILE}
+for filename in ${GOOD_FILES}; do
+  if [ -f ${filename} ]; then
+    echo "  Validating ${filename}"
+    result=$(( ~/src/ruby3mf/bin/cli.rb ${filename} ) 2>&1)
+    if [ $? -ne 0 ]; then
+      echo "    Failed!"
+      printf "  ${filename}\n    $result\n" >> ${OUTFILE}
+    fi
+  fi
+done
+
+echo "Negative Files -------------"
+printf "\nNegative Files -------------\n" >> suite_test.txt
+for filename in ${BAD_FILES}; do
+  if [ -f ${filename} ]; then
+    echo "  Validating ${filename}"
+    result=$(( ~/src/ruby3mf/bin/cli.rb ${filename} ) 2>&1)
+    if [ $? -eq 0 ]; then
+      echo "    Passed!"
+      printf "  ${filename} - No Errors found!\n" >> ${OUTFILE}
+    fi
+  fi
+done
+
+echo "All Done."
+printf "Completed -- $(date)\n\n" >> ${OUTFILE}
+

data/lib/ruby3mf.rb

@@ -1,5 +1,6 @@
 require_relative "ruby3mf/version"
 require_relative "ruby3mf/interpolation"
+require_relative "ruby3mf/schema_files"
 require_relative "ruby3mf/log3mf"
 require_relative "ruby3mf/document"
 require_relative "ruby3mf/content_types"

data/lib/ruby3mf/{3MFcoreSpec_1.1.xsd → 3MFcoreSpec_1.1.xsd.template}

@@ -3,7 +3,7 @@
            targetNamespace="http://schemas.microsoft.com/3dmanufacturing/core/2015/02" elementFormDefault="unqualified"
            attributeFormDefault="unqualified" blockDefault="#all">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+             schemaLocation= "<%= SchemaFiles::SchemaLocation %>" />
   <xs:annotation>
     <xs:documentation><![CDATA[
    Schema notes:

data/lib/ruby3mf/content_types.rb

@@ -2,6 +2,7 @@ class ContentTypes
 
   def self.parse(zip_entry)
     found_types={}
+    found_overrides={}
 
     Log3mf.context "parse" do |l|
       begin
@@ -18,13 +19,20 @@ class ContentTypes
         types_node = doc.children.first
         types_node.children.each do |node|
           l.context node.name do |l|
-            unless node.name == 'Default'
-              l.warning "[Content_Types].xml:#{node.line} contains unexpected element #{node.name}", page: 10
-            else
+            if node.name == 'Default'
               # l.error "[Content_Types].xml:#{node.line} contains Default node without defined Extension attribute" unless node['Extension'].is_a? String
               # l.error "[Content_Types].xml:#{node.line} contains Default node with unexpected ContentType \"#{node['ContentType']}\"", page: 10 unless all_types.include? node['ContentType']
               l.info "Setting type hash #{node['Extension']}=#{node['ContentType']}"
+
+              l.error :duplicate_content_extension_types if !found_types[node['Extension']].nil?
               found_types[node['Extension']] = node['ContentType']
+            elsif node.name == 'Override'
+              l.error :empty_override_part_name if node['PartName'].empty?
+
+              l.error :duplicate_content_override_types if !found_overrides[node['PartName']].nil?
+              found_overrides[node['PartName']] = node['ContentType']
+            else
+              l.warning "[Content_Types].xml:#{node.line} contains unexpected element #{node.name}", page: 10
             end
           end
         end

data/lib/ruby3mf/document.rb

@@ -15,6 +15,18 @@ class Document
   TEXTURE_TYPE = 'http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture'
   PRINT_TICKET_TYPE = 'http://schemas.microsoft.com/3dmanufacturing/2013/01/printticket'
 
+  # Image Content Types
+  THUMBNAIL_TYPES = %w[image/jpeg image/png].freeze
+  TEXTURE_TYPES = %w[image/jpeg image/png application/vnd.ms-package.3dmanufacturing-3dmodeltexture].freeze
+
+  # Relationship to valid Content types
+  REL_TO_CONTENT_TYPES = {
+      MODEL_TYPE => 'application/vnd.ms-package.3dmanufacturing-3dmodel+xml',
+      PRINT_TICKET_TYPE => 'application/vnd.ms-printing.printticket+xml',
+      TEXTURE_TYPE => TEXTURE_TYPES,
+      THUMBNAIL_TYPE => THUMBNAIL_TYPES
+  }
+
   # Relationship Type => Class validating relationship type
   RELATIONSHIP_TYPES = {
     MODEL_TYPE => {klass: 'Model3mf', collection: :models},
@@ -23,15 +35,13 @@ class Document
     PRINT_TICKET_TYPE => {}
   }
 
-  TEXTURE_TYPES = %w[image/jpeg image/png application/vnd.ms-package.3dmanufacturing-3dmodeltexture]
-
   def initialize(zip_filename)
     self.models=[]
     self.thumbnails=[]
     self.textures=[]
     self.objects={}
     self.relationships={}
-    self.types=[]
+    self.types={}
     self.parts=[]
     @zip_filename = zip_filename
   end
@@ -96,10 +106,11 @@ class Document
               if content_type_match
                 m.types = ContentTypes.parse(content_type_match)
                 model_extension = m.types.key('application/vnd.ms-package.3dmanufacturing-3dmodel+xml')
+                model_extension = model_extension.downcase unless model_extension.nil?
                 model_file = zip_file.glob("**/*.#{model_extension}").first
                 l.error :no_3d_model, extension: model_extension if model_file.nil?
               else
-                l.error 'Missing required file: [Content_Types].xml', page: 4
+                l.fatal_error 'Missing required file: [Content_Types].xml', page: 4
               end
             end
 
@@ -136,6 +147,20 @@ class Document
                     l.error :err_uri_relative_path if target.include? '/../'
                     relationship_file = zip_file.glob(target).first
 
+                    # check that relationships are valid; extensions and relationship types must jive
+                    extension = File.extname(target).strip.downcase[1..-1]
+
+                    content_type = m.types[extension]
+                    rel_type = rel[:type]
+                    expected_content_type = REL_TO_CONTENT_TYPES[rel_type]
+
+                    if (expected_content_type)
+                      l.error :missing_extension_in_content_types, ext: extension unless content_type
+                      l.error :resource_contentype_invalid, bt: content_type, rt: rel[:target] unless (!content_type.nil? && expected_content_type.include?(content_type))
+                    else
+                      l.info "found unrecognized relationship type: #{rel_type}"
+                    end
+
                     if relationship_file
                       relationship_type = RELATIONSHIP_TYPES[rel[:type]]
                       if relationship_type.nil?

data/lib/ruby3mf/errors.yml

@@ -1,5 +1,5 @@
 resource_contentype_invalid:
-  msg: "Resource in model has invalid contenttype %{bt}"
+  msg: "Relationship target %{rt} resource has invalid contenttype %{bt}"
   page: 10
 err_uri_empty_segment:
   msg: 'No segment of a 3MF part name path may be empty'
@@ -70,12 +70,19 @@ invalid_texture_file_type:
 missing_content_types:
   msg: "Missing required file: [Content_Types].xml"
   page: 4
+missing_extension_in_content_types:
+  msg: "Missing extension '%{ext}' in [Content_Types].xml"
+  page: 10
 missing_dot_rels_file:
   msg: "Missing required file _rels/.rels"
   page: 4
 missing_rels_folder:
   msg: "Missing required file _rels/.rels"
   page: 4
+non_unique_rel_id:
+  msg: "The ID value '%{id}' appears more than once in '%{file}'.  Within a rels file, all ID's must be unique"
+  page: 8 #TODO:change this to page 23 of the OPC spec once logging supports linking to that spec
+  spec: opc
 multiple_relationships:
   msg: "There MUST NOT be more than one relationship of a given relationship type from one part to a second part"
   page: 10
@@ -148,3 +155,15 @@ non_distinct_indices:
 has_improper_base_color:
   msg: "An sRGB color MUST be specified with a value of a 6 or 8 digit hexadecimal number"
   page: 35
+duplicate_content_extension_types:
+  msg: "Only one ContentType definition is allowed per extension"
+  page: 8
+invalid_image_content_type:
+  msg: "Invalid content type for %{extension}"
+  page: 22
+duplicate_content_override_types:
+  msg: "Only one override is allowed per part"
+  page: 8
+empty_override_part_name:
+  msg: "Overrides can't have empty partname"
+  page: 8

data/lib/ruby3mf/log3mf.rb

@@ -65,7 +65,7 @@ class Log3mf
   def method_missing(name, *args, &block)
     if LOG_LEVELS.include? name.to_sym
       log(name.to_sym, *args)
-    else
+    else+
       super
     end
   end
@@ -73,6 +73,7 @@ class Log3mf
   def log(severity, message, options = {})
     error = @errormap.fetch(message.to_s) { {"msg" => message.to_s, "page" => nil } }
     options[:page] = error["page"] unless options[:page]
+    options[:spec] = error["spec"] unless options[:spec]
     message = interpolate(error["msg"], options)
     @log_list << ["#{@context_stack.join("/")}", severity, message, options] unless severity==:debug && ENV['LOGDEBUG'].nil?
     raise FatalError if severity == :fatal_error
@@ -100,7 +101,9 @@ class Log3mf
       core: 'http://3mf.io/wp-content/uploads/2016/03/3MFcoreSpec_1.1.pdf',
       material: 'http://3mf.io/wp-content/uploads/2015/04/3MFmaterialsSpec_1.0.1.pdf',
       production: 'http://3mf.io/wp-content/uploads/2016/07/3MFproductionSpec.pdf',
-      slice: 'http://3mf.io/wp-content/uploads/2016/07/3MFsliceSpec.pdf'
+      slice: 'http://3mf.io/wp-content/uploads/2016/07/3MFsliceSpec.pdf',
+      #opc: 'http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-376,%20Fourth%20Edition,%20Part%202%20-%20Open%20Packaging%20Conventions.zip'
+      opc: 'http://3mf.io/wp-content/uploads/2016/03/3MFcoreSpec_1.1.pdf'
     }
     "#{doc_urls[spec]}#page=#{page}"
   end

data/lib/ruby3mf/model3mf.rb

@@ -1,14 +1,11 @@
 class Model3mf
 
-  VALID_UNITS = ['micron', 'millimeter', 'centimeter', 'meter', 'inch', 'foot'].freeze
   VALID_EXTENSIONS = {
       'http://schemas.microsoft.com/3dmanufacturing/slice/2015/07' => {},
       'http://schemas.microsoft.com/3dmanufacturing/material/2015/02' => {},
       'http://schemas.microsoft.com/3dmanufacturing/production/2015/06' => {},
   }.freeze
 
-  SCHEMA = '3MFcoreSpec_1.1.xsd'
-
   VALID_CORE_METADATA_NAMES = ['Title', 'Designer', 'Description', 'Copyright', 'LicenseTerms', 'Rating', 'CreationDate', 'ModificationDate'].freeze
 
   def self.parse(document, zip_entry)
@@ -16,7 +13,7 @@ class Model3mf
 
     Log3mf.context "parsing model" do |l|
       begin
-        model_doc = XmlVal.validate_parse(zip_entry, SCHEMA)
+        model_doc = XmlVal.validate_parse(zip_entry, SchemaFiles::SchemaTemplate)
       rescue Nokogiri::XML::SyntaxError => e
         l.fatal_error "Model file invalid XML. Exception #{e}"
       end

data/lib/ruby3mf/relationships.rb

@@ -15,6 +15,7 @@ class Relationships
             relationship_elements.each do |node|
               if node.is_a?(Nokogiri::XML::Element) && node.name == "Relationship"
                 l.error :multiple_relationships if (relationships.select { |r| r[:target] == node['Target'] && r[:type] == node['Type'] }.size > 0)
+                l.error :non_unique_rel_id, :file => zip_entry.name, :id => node['Id'] if (relationships.select { |r| r[:id] == node['Id'] }.size > 0)
                 relationships << {target: node['Target'], type: node['Type'], id: node['Id']}
                 l.info "adding relationship: #{relationships.last.inspect}"
               else

data/lib/ruby3mf/schema_files.rb

@@ -0,0 +1,12 @@
+require 'erb'
+
+class SchemaFiles
+
+  SchemaTemplate  = File.join(File.dirname(__FILE__), "3MFcoreSpec_1.1.xsd.template")
+  SchemaLocation  = File.join(File.dirname(__FILE__), "xml.xsd")
+
+  def self.render(template)
+    ERB.new(template).result( binding )
+  end
+
+end

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/ruby3mf/xml.xsd

@@ -0,0 +1,286 @@
+<?xml version='1.0'?>
+<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns   ="http://www.w3.org/1999/xhtml"
+  xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   <div>
+    <h1>About the XML namespace</h1>
+
+    <div class="bodytext">
+     <p>
+      This schema document describes the XML namespace, in a form
+      suitable for import by other schema documents.
+     </p>
+     <p>
+      See <a href="http://www.w3.org/XML/1998/namespace.html">
+      http://www.w3.org/XML/1998/namespace.html</a> and
+      <a href="http://www.w3.org/TR/REC-xml">
+      http://www.w3.org/TR/REC-xml</a> for information
+      about this namespace.
+     </p>
+     <p>
+      Note that local names in this namespace are intended to be
+      defined only by the World Wide Web Consortium or its subgroups.
+      The names currently defined in this namespace are listed below.
+      They should not be used with conflicting semantics by any Working
+      Group, specification, or document instance.
+     </p>
+     <p>
+      See further below in this document for more information about <a
+      href="#usage">how to refer to this schema document from your own
+      XSD schema documents</a> and about <a href="#nsversioning">the
+      namespace-versioning policy governing this schema document</a>.
+     </p>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+
+      <h3>lang (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose value
+       is a language code for the natural language of the content of
+       any element; its value is inherited.  This name is reserved
+       by virtue of its definition in the XML specification.</p>
+
+    </div>
+    <div>
+     <h4>Notes</h4>
+     <p>
+      Attempting to install the relevant ISO 2- and 3-letter
+      codes as the enumerated possible values is probably never
+      going to be a realistic possibility.
+     </p>
+     <p>
+      See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
+       http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
+      and the IANA language subtag registry at
+      <a href="http://www.iana.org/assignments/language-subtag-registry">
+       http://www.iana.org/assignments/language-subtag-registry</a>
+      for further information.
+     </p>
+     <p>
+      The union allows for the 'un-declaration' of xml:lang with
+      the empty string.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+  <xs:simpleType>
+   <xs:union memberTypes="xs:language">
+    <xs:simpleType>
+     <xs:restriction base="xs:string">
+      <xs:enumeration value=""/>
+     </xs:restriction>
+    </xs:simpleType>
+   </xs:union>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="space">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+
+      <h3>space (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose
+       value is a keyword indicating what whitespace processing
+       discipline is intended for the content of the element; its
+       value is inherited.  This name is reserved by virtue of its
+       definition in the XML specification.</p>
+
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
+   <xs:documentation>
+    <div>
+
+      <h3>base (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose value
+       provides a URI to be used as the base for interpreting any
+       relative URIs in the scope of the element on which it
+       appears; its value is inherited.  This name is reserved
+       by virtue of its definition in the XML Base specification.</p>
+
+     <p>
+      See <a
+      href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
+      for information about this attribute.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="id" type="xs:ID">
+  <xs:annotation>
+   <xs:documentation>
+    <div>
+
+      <h3>id (as an attribute name)</h3>
+      <p>
+       denotes an attribute whose value
+       should be interpreted as if declared to be of type ID.
+       This name is reserved by virtue of its definition in the
+       xml:id specification.</p>
+
+     <p>
+      See <a
+      href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
+      for information about this attribute.
+     </p>
+    </div>
+   </xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+  <xs:attribute ref="xml:id"/>
+ </xs:attributeGroup>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div>
+
+    <h3>Father (in any context at all)</h3>
+
+    <div class="bodytext">
+     <p>
+      denotes Jon Bosak, the chair of
+      the original XML Working Group.  This name is reserved by
+      the following decision of the W3C XML Plenary and
+      XML Coordination groups:
+     </p>
+     <blockquote>
+       <p>
+	In appreciation for his vision, leadership and
+	dedication the W3C XML Plenary on this 10th day of
+	February, 2000, reserves for Jon Bosak in perpetuity
+	the XML name "xml:Father".
+       </p>
+     </blockquote>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div xml:id="usage" id="usage">
+    <h2><a name="usage">About this schema document</a></h2>
+
+    <div class="bodytext">
+     <p>
+      This schema defines attributes and an attribute group suitable
+      for use by schemas wishing to allow <code>xml:base</code>,
+      <code>xml:lang</code>, <code>xml:space</code> or
+      <code>xml:id</code> attributes on elements they define.
+     </p>
+     <p>
+      To enable this, such a schema must import this schema for
+      the XML namespace, e.g. as follows:
+     </p>
+     <pre>
+          &lt;schema . . .>
+           . . .
+           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+     </pre>
+     <p>
+      or
+     </p>
+     <pre>
+           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
+     </pre>
+     <p>
+      Subsequently, qualified reference to any of the attributes or the
+      group defined below will have the desired effect, e.g.
+     </p>
+     <pre>
+          &lt;type . . .>
+           . . .
+           &lt;attributeGroup ref="xml:specialAttrs"/>
+     </pre>
+     <p>
+      will define a type which will schema-validate an instance element
+      with any of those attributes.
+     </p>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>
+   <div id="nsversioning" xml:id="nsversioning">
+    <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
+    <div class="bodytext">
+     <p>
+      In keeping with the XML Schema WG's standard versioning
+      policy, this schema document will persist at
+      <a href="http://www.w3.org/2009/01/xml.xsd">
+       http://www.w3.org/2009/01/xml.xsd</a>.
+     </p>
+     <p>
+      At the date of issue it can also be found at
+      <a href="http://www.w3.org/2001/xml.xsd">
+       http://www.w3.org/2001/xml.xsd</a>.
+     </p>
+     <p>
+      The schema document at that URI may however change in the future,
+      in order to remain compatible with the latest version of XML
+      Schema itself, or with the XML namespace itself.  In other words,
+      if the XML Schema or XML namespaces change, the version of this
+      document at <a href="http://www.w3.org/2001/xml.xsd">
+       http://www.w3.org/2001/xml.xsd
+      </a>
+      will change accordingly; the version at
+      <a href="http://www.w3.org/2009/01/xml.xsd">
+       http://www.w3.org/2009/01/xml.xsd
+      </a>
+      will not change.
+     </p>
+     <p>
+      Previous dated (and unchanging) versions of this schema
+      document are at:
+     </p>
+     <ul>
+      <li><a href="http://www.w3.org/2009/01/xml.xsd">
+	http://www.w3.org/2009/01/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2007/08/xml.xsd">
+	http://www.w3.org/2007/08/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2004/10/xml.xsd">
+	http://www.w3.org/2004/10/xml.xsd</a></li>
+      <li><a href="http://www.w3.org/2001/03/xml.xsd">
+	http://www.w3.org/2001/03/xml.xsd</a></li>
+     </ul>
+    </div>
+   </div>
+  </xs:documentation>
+ </xs:annotation>
+
+</xs:schema>

data/lib/ruby3mf/xml_val.rb

@@ -2,7 +2,7 @@ require 'nokogiri'
 
 class XmlVal
 
-  def self.validate_parse(xml_file, schema_name=nil)
+  def self.validate_parse(xml_file, schema_name = nil)
     doc = Nokogiri::XML(xml_file.get_input_stream) do |config|
       config.strict.nonet.noblanks
     end
@@ -10,7 +10,14 @@ class XmlVal
     doc
   end
 
-  def self.validate(file, document, schema_filename=nil)
+  def self.open_schema_file(file)
+    File.open(file, "r") do |file|
+      template = file.read
+      yield(SchemaFiles.render(template))
+    end
+  end
+
+  def self.validate(file, document, schema_filename = nil)
     Log3mf.context "validations" do |l|
       l.error :has_xml_space_attribute if space_attribute_exists?(document)
       l.error :wrong_encoding if xml_not_utf8_encoded?(document)
@@ -20,8 +27,8 @@ class XmlVal
 
       if schema_filename
         Log3mf.context "validating core schema" do |l|
-          File.open(File.join(File.dirname(__FILE__), schema_filename), "r") do |file|
-            xsd = Nokogiri::XML::Schema(file.read)
+          open_schema_file(schema_filename) do |content|
+            xsd = Nokogiri::XML::Schema(content)
             puts "the schema is NIL!" if xsd.nil?
             core_schema_errors = xsd.validate(document)
             l.error :invalid_xml_core if core_schema_errors.size > 0
@@ -39,7 +46,7 @@ class XmlVal
   end
 
   def self.objects_not_referenced?(document)
-    document.css('object').map { |x| x.attributes["id"].value } != document.css('item').map { |x| x.attributes["objectid"].value }
+    document.css('object').map { |x| x.attributes["id"].value } != document.css('build/item').map { |x| x.attributes["objectid"].value }
   end
 
   def self.bad_floating_numbers?(document)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,8 +147,9 @@ files:
 - bin/folder_test.sh
 - bin/setup
 - bin/suite.rb
+- bin/suite_test.sh
 - lib/ruby3mf.rb
-- lib/ruby3mf/3MFcoreSpec_1.1.xsd
+- lib/ruby3mf/3MFcoreSpec_1.1.xsd.template
 - lib/ruby3mf/content_types.rb
 - lib/ruby3mf/document.rb
 - lib/ruby3mf/edge_list.rb
@@ -158,9 +159,11 @@ files:
 - lib/ruby3mf/mesh_analyzer.rb
 - lib/ruby3mf/model3mf.rb
 - lib/ruby3mf/relationships.rb
+- lib/ruby3mf/schema_files.rb
 - lib/ruby3mf/texture3mf.rb
 - lib/ruby3mf/thumbnail3mf.rb
 - lib/ruby3mf/version.rb
+- lib/ruby3mf/xml.xsd
 - lib/ruby3mf/xml_val.rb
 - ruby3mf.gemspec
 homepage: https://github.com/IPGPTP/ruby3mf