ruby3mf 0.2.3 → 0.2.4

data/lib/ruby3mf/model3mf.rb

@@ -1,9 +1,13 @@
 class Model3mf
 
+  MATERIAL_EXTENSION = 'http://schemas.microsoft.com/3dmanufacturing/material/2015/02'
+  SLICE_EXTENSION = 'http://schemas.microsoft.com/3dmanufacturing/slice/2015/07'
+  PRODUCTION_EXTENSION = 'http://schemas.microsoft.com/3dmanufacturing/production/2015/06'
+
   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' => {},
+      MATERIAL_EXTENSION => {},
+      SLICE_EXTENSION => {},
+      PRODUCTION_EXTENSION => {}
   }.freeze
 
   VALID_CORE_METADATA_NAMES = ['Title', 'Designer', 'Description', 'Copyright', 'LicenseTerms', 'Rating', 'CreationDate', 'ModificationDate'].freeze
@@ -58,22 +62,6 @@ class Model3mf
           }
         end
 
-        l.context "verifying 3D resource types" do |l|
-          model_types = model_doc.css("//model//resources//*[path]").collect { |t| t["contenttype"] }
-
-          #for each, ensure they exist in ContentTypes
-          all_types = document.types.map { |t, v| v }
-
-          bad_types = (model_types - all_types)
-          if bad_types.empty?
-            l.info "All model resource contenttypes are valid"
-          else
-            bad_types.each { |bt|
-              l.error :resource_contentype_invalid, bt: bt
-            }
-          end
-        end
-
         l.context "verifying StartPart relationship points to the root 3D Model" do |l|
           #Find the root 3D model which is pointed to by the start part
           root_rels = document.relationships['_rels/.rels']
@@ -104,18 +92,9 @@ class Model3mf
       end
 
       l.context "verifying build items" do |l|
-        build = find_child(model_doc.root, "build")
-        if build
-          items = build.children.map { |child| child.attributes["objectid"].to_s() if child.name == "item" }
-
-          resources = find_child(model_doc.root, "resources")
-          resources.children.each do |resource|
-            if resource.name == "object"
-              object_id = resource.attributes["id"].to_s()
-              l.error :build_with_other_item if resource.attributes["type"].to_s() == "other" and items.include?(object_id)
-            end
-          end
-        end
+
+        l.error :build_with_other_item if model_doc.css('build/item').map { |x| x.attributes["objectid"].value }.map{ |id|  model_doc.search(".//xmlns:object[@id=$id][@type=$type]", nil, { :id => id, :type => 'other' } ) }.flatten.any?
+
       end
 
       l.context "checking metadata" do |l|
@@ -134,8 +113,8 @@ class Model3mf
           end
         end
       end
-
-      MeshAnalyzer.validate(model_doc)
+      includes_material = model_doc.namespaces.values.include?(MATERIAL_EXTENSION)
+      MeshAnalyzer.validate(model_doc, includes_material)
     end
     model_doc
   end

data/lib/ruby3mf/schema_files.rb

@@ -5,8 +5,22 @@ 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 )
+  class << self
+
+    def open(file)
+      @@template ||= File.open(file, "r") do |file|
+        file.read
+      end
+
+      yield(SchemaFiles.render)
+
+    end
+
+    def render
+       @@xsd_content ||= ERB.new(@@template).result( binding )
+    end
+
   end
 
+
 end

data/lib/ruby3mf/thumbnail3mf.rb

@@ -11,6 +11,11 @@ class Thumbnail3mf
 
       img_colorspace = MiniMagick::Image.read(relationship_file.get_input_stream).colorspace
       l.fatal_error :invalid_thumbnail_colorspace if img_colorspace.include? "CMYK"
+
+      if relationship_file.respond_to?(:name)
+        decl_type = doc.types.get_type(relationship_file.name)
+        l.error :thumbnail_image_type_mismatch if decl_type != img_type.to_s
+      end
     end
   end
 end

data/lib/ruby3mf/version.rb

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

data/lib/ruby3mf/xml_val.rb

@@ -10,13 +10,6 @@ class XmlVal
     doc
   end
 
-  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)
@@ -27,7 +20,7 @@ class XmlVal
 
       if schema_filename
         Log3mf.context "validating core schema" do |l|
-          open_schema_file(schema_filename) do |content|
+          SchemaFiles.open(schema_filename) do |content|
             xsd = Nokogiri::XML::Schema(content)
             puts "the schema is NIL!" if xsd.nil?
             core_schema_errors = xsd.validate(document)

data/suite.011917.out

@@ -0,0 +1,237 @@
+
+
+Positive
+...............
+../3mf-test-suite/Positive/PC_304_01.3mf
+  {:context=>"zip/relationship elements//Metadata/core.prop", :severity=>:error, :message=>"Invalid relationship type 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties' specified in .rels relationship file. Parts in the 3D payload MUST use one of the appropriate relationship types to establish that relationship between two parts in the payload."}
+.
+../3mf-test-suite/Positive/PC_305_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying 3D payload required resources/verifying 3D resource types", :severity=>:error, :message=>"Resource in model has invalid contenttype image/png"}
+  {:context=>"zip/relationship elements//3D/Textures/texture.png/Texture3mf", :severity=>:fatal_error, :message=>"Texture file must be valid image file"}
+.............
+../3mf-test-suite/Positive/PC_312_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying resources", :severity=>:error, :message=>"resources must be unique within the model"}
+.................................................................................
+../3mf-test-suite/Positive/PM_909_02.3mf
+  {:context=>"zip/relationship elements//2D/337.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PM_909_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/checking metadata", :severity=>:error, :message=>"Metadata without a namespace name must only contain allowed name values"}
+.
+../3mf-test-suite/Positive/PM_909_04.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PO_101_01.3mf
+  {:context=>"zip/content types", :severity=>:error, :message=>"Required 3D model payload not found with provided Content Type model extension: .ModeL"}
+.
+../3mf-test-suite/Positive/PO_101_02.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_101_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_102_01.3mf
+  {:context=>"zip/content types/parse", :severity=>:error, :message=>"[Content_Types].xml is missing required ContentType \"application/vnd.ms-package.3dmanufacturing-3dmodel+xml\""}
+  {:context=>"zip/content types", :severity=>:error, :message=>"Required 3D model payload not found with provided Content Type model extension: ."}
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.moodel/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_102_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PO_103_01.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_104_01.3mf
+  {:context=>"zip/relationship elements//2D/1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_104_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_104_03.3mf
+  {:context=>"zip/part names /2D/fdfd166f-4f4c-4259-bb96-01e4fb03\xC3\x86381.model", :severity=>:fatal_error, :message=>"This NEVER Happens! mdw 12Jan2017"}
+.
+../3mf-test-suite/Positive/PO_105_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_105_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PO_105_05.3mf
+  {:context=>"zip/relationship elements//2D/9e1cbf53-9bb1-48fb-aced-acbb9cbbe79f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PO_105_07.3mf
+  {:context=>"zip/relationship elements//2D/9e1cbf53-9bb1-48fb-aced-acbb9cbbe79f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_105_09.3mf
+  {:context=>"zip/relationship elements//2D/9e1cbf53-9bb1-48fb-aced-acbb9cbbe79f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+...
+../3mf-test-suite/Positive/PO_106_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PO_107_01.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_107_02.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PO_108_01.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_01.3mf
+  {:context=>"zip/relationship elements//2D/7b7c4f2f-3b64-49b9-a098-a978332e8d1a.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_04.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_05.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PP_701_07.3mf
+  {:context=>"zip/relationship elements//2D/d9d8d141-23ff-4cdc-8da1-66b33dd69757.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_08.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_09.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_11.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_12.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying 3D payload required resources/verifying StartPart relationship points to the root 3D Model", :severity=>:fatal_error, :message=>"Invalid StartPart target '/3D/3dmodel.model'. The 3MF Document StartPart relationship MUST point to the 3D Model part that identifies the root of the 3D payload."}
+.
+../3mf-test-suite/Positive/PP_701_13.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_14.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+...
+../3mf-test-suite/Positive/PP_701_17.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_18.3mf
+  {:context=>"zip/relationship elements//2D/0082f270-d84a-4646-8510-05bc3490bd6f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_19.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_20.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_21.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PP_701_23.3mf
+  {:context=>"zip/relationship elements//2D/dbc5f09a-6bf4-4e9b-9b70-0e418111e81f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+...
+../3mf-test-suite/Positive/PP_701_26.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_27.3mf
+  {:context=>"zip/relationship elements//2D/topref.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_701_30.3mf
+  {:context=>"zip/relationship elements//2D/0c853b1f-388f-4bd0-a23e-45426e2aa769.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PP_701_32.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying 3D payload required resources/verifying StartPart relationship points to the root 3D Model", :severity=>:fatal_error, :message=>"Invalid StartPart target '/3D/3dmodel.model'. The 3MF Document StartPart relationship MUST point to the 3D Model part that identifies the root of the 3D payload."}
+.
+../3mf-test-suite/Positive/PP_703_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PP_704_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+......
+../3mf-test-suite/Positive/PS_502_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_502_04.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_502_05.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_503_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_503_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+...
+../3mf-test-suite/Positive/PS_505_01.3mf
+  {:context=>"zip/relationship elements//2D/917d27a5-e210-4bd8-a430-0dacc3be6d95.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_505_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PS_506_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying resources", :severity=>:error, :message=>"resources must be unique within the model"}
+  {:context=>"zip/relationship elements//2D/ad8bd6de-d9b5-446a-8fcd-e75a3bc63c8b.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.....
+../3mf-test-suite/Positive/PS_509_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PS_509_04.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PS_511_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_511_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_511_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_511_04.3mf
+  {:context=>"zip/relationship elements//2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+...
+../3mf-test-suite/Positive/PS_512_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PS_513_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_513_03.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_514_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+..
+../3mf-test-suite/Positive/PS_515_01.3mf
+  {:context=>"zip/relationship elements//2D/9e1cbf53-9bb1-48fb-aced-acbb9cbbe79f.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+.
+../3mf-test-suite/Positive/PS_516_01.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/verifying 3D payload required resources/verifying StartPart relationship points to the root 3D Model", :severity=>:fatal_error, :message=>"Invalid StartPart target '/3D/3dmodel.model'. The 3MF Document StartPart relationship MUST point to the 3D Model part that identifies the root of the 3D payload."}
+.
+../3mf-test-suite/Positive/PS_516_02.3mf
+  {:context=>"zip/relationship elements//3D/3dmodel.model/parsing model/validations/validating core schema", :severity=>:fatal_error, :message=>"Model file invalid XML. Exception attribute use (unknown), attribute 'ref': The QName value '{http://www.w3.org/XML/1998/namespace}lang' does not resolve to a(n) attribute declaration."}
+
+
+Negative
+...............
+../3mf-test-suite/Negative/NC_405_04.3mf - No Errors Found!
+.....
+../3mf-test-suite/Negative/NC_407_02.3mf - No Errors Found!
+.......
+../3mf-test-suite/Negative/NC_411_01.3mf - No Errors Found!
+.....
+../3mf-test-suite/Negative/NC_413_01.3mf - No Errors Found!
+.................
+../3mf-test-suite/Negative/NO_202_01.3mf - No Errors Found!
+...
+../3mf-test-suite/Negative/NO_205_01.3mf - No Errors Found!
+.
+../3mf-test-suite/Negative/NO_205_02.3mf - No Errors Found!
+....
+../3mf-test-suite/Negative/NP_801_01.3mf - No Errors Found!
+...
+../3mf-test-suite/Negative/NP_801_04.3mf - No Errors Found!
+...
+../3mf-test-suite/Negative/NP_801_07.3mf - No Errors Found!
+.
+../3mf-test-suite/Negative/NP_801_08.3mf - No Errors Found!
+....................................

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
+- PO_102_03.3mf
 - README.md
 - Rakefile
 - bin/batch.rb
@@ -146,8 +147,13 @@ files:
 - bin/console
 - bin/folder_test.sh
 - bin/setup
-- bin/suite.rb
 - bin/suite_test.sh
+- foo/2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model
+- foo/3D/3dmodel.model
+- foo/3D/_rels/3dmodel.model.rels
+- foo/Thumbnails/ffffa6c3-ba74-4bea-a4d0-167a4211134d.model
+- foo/[Content_Types].xml
+- foo/_rels/.rels
 - lib/ruby3mf.rb
 - lib/ruby3mf/3MFcoreSpec_1.1.xsd.template
 - lib/ruby3mf/content_types.rb
@@ -166,6 +172,7 @@ files:
 - lib/ruby3mf/xml.xsd
 - lib/ruby3mf/xml_val.rb
 - ruby3mf.gemspec
+- suite.011917.out
 homepage: https://github.com/IPGPTP/ruby3mf
 licenses:
 - MIT

data/bin/suite.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/ruby3mf'
-
-# usage
-# bin/suite.rb {path to 3mf-test-suite} optional
-# assumes . is ~/src/ruby3mf and that ~/src/3mf-test-suite is path to suite repo files
-
-$stdout.sync = true
-
-good_files = Dir["#{ARGV[0] || '../3mf-test-suite'}/Positive/*.3mf"]
-bad_files = Dir["#{ARGV[0] || '../3mf-test-suite'}/Negative/*.3mf"]
-
-false_negatives = {}
-true_negatives={}
-false_positives = []
-
-def val3mf(f)
-  Log3mf.reset_log
-  Document.read(f)
-  Log3mf.entries(:fatal_error, :error)
-end
-
-puts "\n\nPositive"
-good_files.each do |file|
-  print "." # "Validating file: #{file}"
-  errors=val3mf(file)
-
-  if errors.size > 0
-    false_negatives[file]=errors
-    puts "\n#{file}"
-    errors.each do |ent|
-      h = {context: ent[0], severity: ent[1], message: ent[2]}
-      puts "  #{h}"
-    end
-  end
-
-end
-
-puts "\n\nNegative"
-bad_files.each do |file|
-  print "." #puts "Validating file #{file}"
-  errors=val3mf(file)
-  if errors.size > 0
-    true_negatives[file] = errors
-  else
-    false_positives << file
-    puts "\n#{file} - No Errors Found!"
-  end
-end