ruby3mf 0.2.3 → 0.2.4

data/foo/3D/3dmodel.model

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<model unit="millimeter" xml:lang="en-US" xmlns="http://schemas.microsoft.com/3dmanufacturing/core/2015/02" xmlns:s="http://schemas.microsoft.com/3dmanufacturing/slice/2015/07" requiredextensions="s p" xmlns:p="http://schemas.microsoft.com/3dmanufacturing/production/2015/06">
+  <resources>
+    <s:slicestack id="3" zbottom="0.000">
+      <s:sliceref slicestackid="1" slicepath="/2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model"  />
+    </s:slicestack>
+
+    <object id="2" name="S11_cube_NA_Sliced"  s:meshresolution="lowres" s:slicestackid="3" p:UUID="ffffa2c3-ba74-4bea-a4d0-167a4211134d">
+      <mesh>
+        <vertices>
+          <vertex x="100.001" y="100.000" z="100.000" />
+          <vertex x="100.001" y="0.000" z="100.000" />
+          <vertex x="100.001" y="100.000" z="0.000" />
+          <vertex x="0.000" y="100.000" z="0.000" />
+          <vertex x="100.001" y="0.000" z="0.000" />
+          <vertex x="0.000" y="0.000" z="0.000" />
+          <vertex x="0.000" y="0.000" z="100.000" />
+          <vertex x="0.000" y="100.000" z="100.000" />
+        </vertices>
+        <triangles>
+          <triangle v1="0" v2="1" v3="2" />
+          <triangle v1="3" v2="0" v3="2" />
+          <triangle v1="4" v2="3" v3="2" />
+          <triangle v1="5" v2="3" v3="4" />
+          <triangle v1="4" v2="6" v3="5" />
+          <triangle v1="6" v2="7" v3="5" />
+          <triangle v1="7" v2="6" v3="0" />
+          <triangle v1="1" v2="6" v3="4" />
+          <triangle v1="5" v2="7" v3="3" />
+          <triangle v1="7" v2="0" v3="3" />
+          <triangle v1="2" v2="1" v3="4" />
+          <triangle v1="0" v2="6" v3="1" />
+        </triangles>
+      </mesh>
+    </object>
+  </resources>
+  <build p:UUID="ab2ef9d9-5cb2-414c-bfed-a29e29e1f977">
+    <item objectid="2" transform="1.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.0000 0.0000 1.0000 30.0990 35.1000 30.1000" p:UUID="e0ad3d02-a9f2-47e7-b84f-12c588837f5b"/>
+  </build>
+</model>

data/foo/3D/_rels/3dmodel.model.rels

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Target="/2D/ffffa2c3-ba74-4bea-a4d0-167a4211134d.model" Id="rel1" Type="http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel"/>
+</Relationships>

data/foo/[Content_Types].xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml" />
+  <Default Extension="model" ContentType="application/vnd.ms-package.3dmanufacturing-3dmodel+xml" />
+  <Default Extension="png" ContentType="image/png" />
+  <Override PartName="/Thumbnails/ffffa6c3-ba74-4bea-a4d0-167a4211134d.model" ContentType="image/png" />
+</Types>

data/foo/_rels/.rels

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Target="/3D/3dmodel.model" Id="rel0" Type="http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel"/>
+  <Relationship Target="/Thumbnails/ffffa6c3-ba74-4bea-a4d0-167a4211134d.model" Id="rel2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail"/>
+</Relationships>

data/lib/ruby3mf/3MFcoreSpec_1.1.xsd.template

@@ -71,7 +71,7 @@ Items within this schema follow a simple naming convention of appending a prefix
     <xs:sequence>
       <xs:element ref="vertices"/>
       <xs:element ref="triangles"/>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="30000"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="CT_Vertices">
@@ -87,7 +87,7 @@ Items within this schema follow a simple naming convention of appending a prefix
   </xs:complexType>
   <xs:complexType name="CT_Triangles">
     <xs:sequence>
-      <xs:element ref="triangle" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element ref="triangle" minOccurs="1" maxOccurs="30000"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="CT_Triangle">

data/lib/ruby3mf/content_types.rb

@@ -1,36 +1,61 @@
 class ContentTypes
 
-  def self.parse(zip_entry)
-    found_types={}
-    found_overrides={}
+  def initialize(found={}, over={})
+    @found_types=found
+    @found_overrides=over
+  end
+
+  def size
+    @found_types.size + @found_overrides.size
+  end
+
+  def empty?
+    size == 0
+  end
+
+  def get_type(target)
+    target = (target.start_with?('/') ? target : '/' + target).downcase
+    if @found_overrides[target]
+      content_type = @found_overrides[target]
+    else
+      extension = File.extname(target).strip.downcase[1..-1]
+      content_type = @found_types[extension]
+    end
+    content_type
+  end
+
+  def get_types()
+    return @found_types.values + @found_overrides.values
+  end
+
+  private
 
+  def self.parse(zip_entry)
+    found_types = {}
+    found_overrides = {}
     Log3mf.context "parse" do |l|
       begin
-
         doc = XmlVal.validate_parse(zip_entry)
 
         l.warning '[Content_Types].xml must contain exactly one root node' unless doc.children.size == 1
         l.warning '[Content_Types].xml must contain root name Types' unless doc.children.first.name == "Types"
 
-        required_content_types = ['application/vnd.openxmlformats-package.relationships+xml', 'application/vnd.ms-package.3dmanufacturing-3dmodel+xml']
-        #optional_content_types = ['application/vnd.ms-printing.printticket+xml']
-        #all_types = required_content_types + optional_content_types
+        required_content_types = ['application/vnd.openxmlformats-package.relationships+xml']
 
         types_node = doc.children.first
         types_node.children.each do |node|
           l.context node.name do |l|
             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']
+              extension = node['Extension'].downcase
+              l.info "Setting type hash #{extension}=#{node['ContentType']}"
+              l.error :duplicate_content_extension_types if !found_types[extension].nil?
+              found_types[extension] = node['ContentType']
             elsif node.name == 'Override'
-              l.error :empty_override_part_name if node['PartName'].empty?
+              part_name = node['PartName'].downcase
+              l.error :empty_override_part_name if part_name.empty?
 
-              l.error :duplicate_content_override_types if !found_overrides[node['PartName']].nil?
-              found_overrides[node['PartName']] = node['ContentType']
+              l.error :duplicate_content_override_types if !found_overrides[part_name].nil?
+              found_overrides[part_name] = node['ContentType']
             else
               l.warning "[Content_Types].xml:#{node.line} contains unexpected element #{node.name}", page: 10
             end
@@ -43,7 +68,6 @@ class ContentTypes
         l.error "[Content_Types].xml file is not valid XML. #{e}", page: 15
       end
     end
-
-    found_types
+    return new(found_types, found_overrides)
   end
 end

data/lib/ruby3mf/document.rb

@@ -19,20 +19,12 @@ class Document
   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},
-    THUMBNAIL_TYPE => {klass: 'Thumbnail3mf', collection: :thumbnails},
-    TEXTURE_TYPE => {klass: 'Texture3mf', collection: :textures},
-    PRINT_TICKET_TYPE => {}
+    MODEL_TYPE => {klass: 'Model3mf', collection: :models, valid_types: ['application/vnd.ms-package.3dmanufacturing-3dmodel+xml']},
+    THUMBNAIL_TYPE => {klass: 'Thumbnail3mf', collection: :thumbnails, valid_types: THUMBNAIL_TYPES},
+    TEXTURE_TYPE => {klass: 'Texture3mf', collection: :textures, valid_types: TEXTURE_TYPES},
+    PRINT_TICKET_TYPE => {valid_types: ['application/vnd.ms-printing.printticket+xml']}
   }
 
   def initialize(zip_filename)
@@ -41,7 +33,7 @@ class Document
     self.textures=[]
     self.objects={}
     self.relationships={}
-    self.types={}
+    self.types=nil
     self.parts=[]
     @zip_filename = zip_filename
   end
@@ -49,7 +41,7 @@ class Document
   #verify that each texture part in the 3MF is related to the model through a texture relationship in a rels file
   def self.validate_texture_parts(document, log)
     unless document.types.empty?
-      document.parts.select { |part| TEXTURE_TYPES.include?(document.types[File.extname(part).strip.downcase[1..-1]]) }.each do |tfile|
+      document.parts.select { |part| TEXTURE_TYPES.include?(document.types.get_type(part)) }.each do |tfile|
         if document.textures.select { |f| f[:target] == tfile }.size == 0
           if document.thumbnails.select { |t| t[:target] == tfile }.size == 0
             log.context "part names" do |l|
@@ -105,10 +97,6 @@ class Document
               content_type_match = zip_file.glob('\[Content_Types\].xml').first
               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.fatal_error 'Missing required file: [Content_Types].xml', page: 4
               end
@@ -146,26 +134,24 @@ class Document
                     l.error :err_uri_empty_segment if target.end_with? '/' or target.include? '//'
                     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]]
+                      relationship_type = RELATIONSHIP_TYPES[rel_type]
                       if relationship_type.nil?
-                        l.error :invalid_relationship_type, type: rel[:type]
+                        l.warning :unsupported_relationship_type, type: rel[:type], target: rel[:target]
                       else
+                        # check that relationships are valid; extensions and relationship types must jive
+                        content_type = m.types.get_type(target)
+                        expected_content_type = relationship_type[:valid_types]
+
+                        if (expected_content_type)
+                          l.error :missing_content_type, part: target 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
+
                         unless relationship_type[:klass].nil?
                           m.send(relationship_type[:collection]) << {
                             rel_id: rel[:id],

data/lib/ruby3mf/edge_list.rb

@@ -1,6 +1,6 @@
 class EdgeList
 
-  def initialize()
+  def initialize
     @edges = { }
   end
 
@@ -34,14 +34,14 @@ class EdgeList
     @edges[edge]
   end
 
-  def print_list()
+  def print_list
     @edges.each do |key, value|
       (pos, neg) = value
       puts "#{pos} : #{neg}"
     end
   end
 
-  def verify_edges()
+  def verify_edges
     @edges.each do |key, value|
       (pos, neg) = value
 
@@ -58,4 +58,3 @@ class EdgeList
   end
 
 end
-

data/lib/ruby3mf/errors.yml

@@ -47,13 +47,13 @@ invalid_content_type:
   msg: "[Content_Types].xml is missing required ContentType \"application/vnd.openxmlformats-package.relationships+xml\""
   page: 10
 invalid_startpart_type:
-  msg: "rels/.rels Relationship file has an invalid attribute type for the root 3D Model (StartPart). The required type is \"http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel\""
+  msg: "rels/.rels Relationship file is missing a required StartPart relationship to the primary 3D payload"
   page: 10
 invalid_startpart_target:
   msg: "Invalid StartPart target '%{target}'. The 3MF Document StartPart relationship MUST point to the 3D Model part that identifies the root of the 3D payload."
   page: 10
-invalid_relationship_type:
-  msg: "Invalid relationship type '%{type}' 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."
+unsupported_relationship_type:
+  msg: "Validation of relationship type '%{type}' is not supported by this tool. The targeted part '%{target}' will not be validated."
   page: 10
 invalid_thumbnail_file:
   msg: "thumbnail file must be valid image file"
@@ -70,8 +70,8 @@ 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"
+missing_content_type:
+  msg: "Unable to find an associated content type for part '%{part}' in [Content_Types].xml"
   page: 10
 missing_dot_rels_file:
   msg: "Missing required file _rels/.rels"
@@ -86,9 +86,6 @@ non_unique_rel_id:
 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
-no_3d_model:
-  msg: "Required 3D model payload not found with provided Content Type model extension: .%{extension}"
-  page: 10
 not_a_zip:
   msg: "File provided is not a valid ZIP archive"
   page: 9
@@ -166,4 +163,13 @@ duplicate_content_override_types:
   page: 8
 empty_override_part_name:
   msg: "Overrides can't have empty partname"
-  page: 8
+  page: 8
+not_enough_triangles:
+  msg: "Mesh has fewer than four triangles"
+  page: 30
+has_base_materials_gradient:
+  msg: "Base materials form a gradient on one or more triangles. Interpolation of materials is not supported in the core spec."
+  page: 31
+thumbnail_image_type_mismatch:
+  msg: "Image not of declared type"
+  page: 36

data/lib/ruby3mf/log3mf.rb

@@ -27,15 +27,24 @@ class Log3mf
 
   LOG_LEVELS = [:fatal_error, :error, :warning, :info, :debug]
 
+  SPEC_LINKS = {
+    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',
+    #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'
+  }.freeze
+
   # Allows us to throw FatalErrors if we ever get errors of severity :fatal_error
   class FatalError < RuntimeError
   end
 
-  def initialize()
+  def initialize
     @log_list = []
     @context_stack = []
     @ledger = []
-    errormap_path = File.join(File.dirname(__FILE__),"errors.yml")
+    errormap_path = File.join(File.dirname(__FILE__), "errors.yml")
     @errormap = YAML.load_file(errormap_path)
   end
 
@@ -50,10 +59,7 @@ class Log3mf
 
   def context (context_description, &block)
     @context_stack.push(context_description)
-    #puts "started context #{@context_stack.join("/")}"
-
     retval = block.call(Log3mf.instance)
-
     @context_stack.pop
     retval
   end
@@ -71,11 +77,15 @@ class Log3mf
   end
 
   def log(severity, message, options = {})
-    error = @errormap.fetch(message.to_s) { {"msg" => message.to_s, "page" => nil } }
+    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?
+    entry = { id: message,
+              context: "#{@context_stack.join("/")}",
+              severity: severity,
+              message: interpolate(error["msg"], options) }
+    entry[:spec_ref] = spec_link(options[:spec], options[:page]) if (options && options[:page])
+    @log_list << entry
     raise FatalError if severity == :fatal_error
   end
 
@@ -88,7 +98,8 @@ class Log3mf
   end
 
   def entries(*levels)
-    @log_list.select { |i| levels.include? i[1] }
+    return @log_list if levels.size == 0
+    @log_list.select { |i| levels.include? i[:severity] }
   end
 
   def self.entries(*l)
@@ -97,31 +108,11 @@ class Log3mf
 
   def spec_link(spec, page)
     spec = :core unless spec
-    doc_urls={
-      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',
-      #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
-
-  def to_hash
-    @log_list.collect { |ent|
-      h = { context: ent[0], severity: ent[1], message: ent[2] }
-      h[:spec_ref] = spec_link(ent[3][:spec], ent[3][:page]) if (ent[3] && ent[3][:page])
-      h
-    }
-  end
-
-  def self.to_hash
-    Log3mf.instance.to_hash
+    "#{SPEC_LINKS[spec]}#page=#{page}"
   end
 
   def to_json
-    to_hash.to_json
+    @log_list.to_json
   end
 
   def self.to_json

data/lib/ruby3mf/mesh_analyzer.rb

@@ -11,7 +11,7 @@ end
 
 class MeshAnalyzer
 
-  def self.validate_object(object)
+  def self.validate_object(object, includes_material)
     Log3mf.context "verifying object" do |l|
       children = object.children.map { |child| child.name }
       have_override = object.attributes["pid"] or object.attributes["pindex"]
@@ -24,15 +24,30 @@ class MeshAnalyzer
       # if a triangle has a pid, then the object needs a pid
       has_triangle_pid = false
 
-      mesh = find_child(object, "mesh")
-      if mesh
-        triangles = find_child(mesh, "triangles")
+      meshs = object.css('mesh')
+      meshs.each do |mesh|
+
+        triangles = mesh.css("triangle")
+        l.error :not_enough_triangles if triangles.count < 4
 
         if triangles
-          triangles.children.each do |triangle|
-            v1 = triangle.attributes["v1"].to_s().to_i()
-            v2 = triangle.attributes["v2"].to_s().to_i()
-            v3 = triangle.attributes["v3"].to_s().to_i()
+          triangles.each do |triangle|
+
+            v1 = triangle.attributes["v1"].to_s.to_i
+            v2 = triangle.attributes["v2"].to_s.to_i
+            v3 = triangle.attributes["v3"].to_s.to_i
+
+            unless includes_material
+              l.context "validating property overrides" do |l|
+                property_overrides = []
+                property_overrides << triangle.attributes['p1'].to_s.to_i if triangle.attributes['p1']
+                property_overrides << triangle.attributes['p2'].to_s.to_i if triangle.attributes['p2']
+                property_overrides << triangle.attributes['p3'].to_s.to_i if triangle.attributes['p3']
+
+                property_overrides.reject! { |prop| prop.nil? }
+                l.error :has_base_materials_gradient unless property_overrides.uniq.size <= 1
+              end
+            end
 
             if v1 == v2 || v2 == v3 || v3 == v1
               l.error :non_distinct_indices
@@ -41,45 +56,33 @@ class MeshAnalyzer
             list.add_edge(v1, v2)
             list.add_edge(v2, v3)
             list.add_edge(v3, v1)
-
-            if not has_triangle_pid
+            unless has_triangle_pid
               has_triangle_pid = triangle.attributes["pid"] != nil
             end
           end
 
-          has_object_material = object.attributes["pid"] and object.attributes["pindex"]
-          if has_triangle_pid and not has_object_material
+          if has_triangle_pid && !(object.attributes["pindex"] && object.attributes["pid"])
             l.error :missing_object_pid
           end
 
-          result = list.verify_edges()
+          result = list.verify_edges
           if result == :bad_orientation
-            l.fatal_error :resource_3dmodel_orientation
+            l.error :resource_3dmodel_orientation
           elsif result == :hole
-            l.fatal_error :resource_3dmodel_hole
+            l.error :resource_3dmodel_hole
           elsif result == :nonmanifold
-            l.fatal_error :resource_3dmodel_nonmanifold
+            l.error :resource_3dmodel_nonmanifold
           end
+
         end
       end
     end
   end
 
-  def self.validate(model_doc)
-    root = model_doc.root
-    node = root
-
-    if node.name == "model"
-      resources = find_child(node, "resources")
-
-      if resources
-        resources.children.each do |resource|
-          solid_model = resource.attributes["type"].to_s() == "model" or resource.attributes["type"].to_s() == "solidsupport"
-          if resource.name == "object" and solid_model
-            validate_object(resource)
-          end
-        end
-      end
+  def self.validate(model_doc, includes_material)
+    model_doc.css('model/resources/object').select { |object| ['model', 'solidsupport', ''].include?(object.attributes['type'].to_s) }.each do |object|
+      validate_object(object, includes_material)
     end
   end
-end
+
+end