ruby3mf 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e46e2c266255e1ff3e37964c3cce6306f9361ced
-  data.tar.gz: fcb133940bece74939393383af9c4f0df4234ba2
+  metadata.gz: e6ed7b5e499cd264c483fb07b8b64b2e87d66468
+  data.tar.gz: 7e4d586f7171056fc27a30295fb778c278f0cda1
 SHA512:
-  metadata.gz: d1569f55c29cc7b3617db2eea3bc529081dc6408a4191f38c781dc25620156ed4c5492a87a6ff3ca166af7dd2740ba7089cb29063286a3bb7c81e3f8d6477a0c
-  data.tar.gz: c31e67696eebe5f88a65f3cce3ebc591d6792432039259dac4bba7f856479c5f1ee5b6b9ffe689e758397006a8127d6c2f5f7ed35324debd68abf000e5211453
+  metadata.gz: 65fea6f8723fd942bb26876ccc2fdb74877a0c441264979e1ee1d88f2416085a701b023553a40d5a2cc5ce51a5ff1ae62aae6f6c5968920ddf94a99938892640
+  data.tar.gz: 5666f43cf880c92b2a2a583375c6eb4a64598e75b1ea3d4e182beddcaec4f07841027241bcf08ca194bc9a27d208b6b03eb2c66010b58da199df2d7ae338737d

data/.gitignore

@@ -11,3 +11,4 @@
 /spec/ruby3mf-testfiles/
 /profile-run/
 .DS_Store
+suite_test.txt

data/bin/suite_test.sh

@@ -6,7 +6,9 @@ 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}
+printf "\n\n==============================================================================="
+printf "\n\n  Test Suite: filter: ${MATCH} - $(date)\n" >> ${OUTFILE}
+printf "\n\n==============================================================================="
 
 echo "Positive Files -------------"
 printf "\nPositive Files -------------\n" >> ${OUTFILE}
@@ -35,5 +37,5 @@ for filename in ${BAD_FILES}; do
 done
 
 echo "All Done."
-printf "Completed -- $(date)\n\n" >> ${OUTFILE}
+printf "\nCompleted -- $(date)\n\n" >> ${OUTFILE}
 

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="30000"/>
+      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
     </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="30000"/>
+      <xs:element ref="triangle" minOccurs="1" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="CT_Triangle">

data/lib/ruby3mf/content_types.rb

@@ -62,10 +62,10 @@ class ContentTypes
           end
         end
         required_content_types.each do |req_type|
-          l.error "[Content_Types].xml is missing required ContentType \"#{req_type}\"", page: 10 unless found_types.values.include? req_type
+          l.error :invalid_content_type, mt: req_type unless found_types.values.include? req_type
         end
       rescue Nokogiri::XML::SyntaxError => e
-        l.error "[Content_Types].xml file is not valid XML. #{e}", page: 15
+        l.error :content_types_invalid_xml, e: "#{e}"
       end
     end
     return new(found_types, found_overrides)

data/lib/ruby3mf/document.rb

@@ -60,6 +60,7 @@ class Document
       Log3mf.context 'zip' do |l|
         begin
           Zip.warn_invalid_date = false
+          Zip.unicode_names = true
 
           # check for the general purpose flag set - if so, warn that 3mf may not work on some systems
           File.open(input_file, "r") do |file|
@@ -77,13 +78,7 @@ class Document
             zip_file.each do |part|
               l.context "part names /#{part.name}" do |l|
                 unless part.name.end_with? '[Content_Types].xml'
-                  begin
-                    u = URI part.name
-                  rescue ArgumentError, URI::InvalidURIError
-                    l.fatal_error "This NEVER Happens! mdw 12Jan2017"
-                    l.error :err_uri_bad
-                    next
-                  end
+                  next unless u = parse_uri(l, part.name)
 
                   u.path.split('/').each do |segment|
                     l.error :err_uri_hidden_file if (segment.start_with? '.') && !(segment.end_with? '.rels')
@@ -98,7 +93,7 @@ class Document
               if content_type_match
                 m.types = ContentTypes.parse(content_type_match)
               else
-                l.fatal_error 'Missing required file: [Content_Types].xml', page: 4
+                l.fatal_error :missing_content_types
               end
             end
 
@@ -109,6 +104,17 @@ class Document
               zip_file.glob('**/*.rels').each do |rel|
                 m.relationships[rel.name] = Relationships.parse(rel)
               end
+
+              root_rels = m.relationships['_rels/.rels']
+              unless root_rels.nil?
+                start_part_rel = root_rels.select { |rel| rel[:type] == Document::MODEL_TYPE }.first
+                if start_part_rel
+                  start_part_target = start_part_rel[:target]
+                  start_part_types = m.relationships.flat_map { |k, v| v }.select { |rel| rel[:type] == Document::MODEL_TYPE && rel[:target] == start_part_target }
+                  l.error :invalid_startpart_target, :target => start_part_target if start_part_types.size > 1
+                end
+              end
+
             end
 
             l.context "print tickets" do |l|
@@ -120,22 +126,23 @@ class Document
               m.relationships.each do |file_name, rels|
                 rels.each do |rel|
                   l.context rel[:target] do |l|
-
-                    begin
-                      u = URI rel[:target]
-                    rescue URI::InvalidURIError
-                      l.error :err_uri_bad
-                      next
-                    end
+                    next unless u = parse_uri(l, rel[:target])
 
                     l.error :err_uri_relative_path unless u.to_s.start_with? '/'
 
                     target = rel[:target].gsub(/^\//, "")
                     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
-                    rel_type = rel[:type]
 
+                    # necessary since it has been observed that rubyzip treats all zip entry names
+                    # as ASCII-8BIT regardless if they really contain unicode chars. Without forcing
+                    # the encoding we are unable to find the target within the zip if the target contains
+                    # unicode chars.
+                    zip_target = target
+                    zip_target.force_encoding('ASCII-8BIT')
+                    relationship_file = zip_file.glob(zip_target).first
+
+                    rel_type = rel[:type]
                     if relationship_file
                       relationship_type = RELATIONSHIP_TYPES[rel_type]
                       if relationship_type.nil?
@@ -161,7 +168,7 @@ class Document
                         end
                       end
                     else
-                      l.error "Relationship Target file #{rel[:target]} not found", page: 11
+                      l.error :rel_file_not_found, mf: "#{rel[:target]}"
                     end
                   end
                 end
@@ -173,7 +180,7 @@ class Document
 
           return m
         rescue Zip::Error
-          l.fatal_error 'File provided is not a valid ZIP archive', page: 9
+          l.fatal_error :not_a_zip
         end
       end
     rescue Log3mf::FatalError
@@ -214,4 +221,22 @@ class Document
     end
   end
 
+  private
+
+  def self.parse_uri(logger, uri)
+    begin
+      reserved_chars = /[\[\]]/
+
+      if uri =~ reserved_chars
+        logger.error :err_uri_bad
+        return nil
+      end
+
+      u = Addressable::URI.parse uri
+    rescue ArgumentError, Addressable::URI::InvalidURIError
+      logger.error :err_uri_bad
+    end
+    u
+  end
+
 end

data/lib/ruby3mf/errors.yml

@@ -1,41 +1,11 @@
-resource_contentype_invalid:
-  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'
-  page: 13
-err_uri_hidden_file:
-  msg: "Other than /_rels/.rels, no segment of a 3MF part name may start with the '.' character"
-  page: 13
-err_uri_bad:
-  msg: 'Path names must be valid Open Package Convention URIs or IRIs'
-  page: 13
-err_uri_relative_path:
-  msg: 'Part names must not include relative paths'
-  page: 13
-model_resource_not_in_rels:
-  msg: "Missing required resource: %{mr}. Resource referenced in model, but not in .rels relationship file"
-  page: 10
-resource_3dmodel_orientation:
-  msg: "Bad triangle orientation"
-  page: 27
-resource_3dmodel_hole:
-  msg: "Hole in model"
-  page: 27
-resource_3dmodel_nonmanifold:
-  msg: "Non-manifold edge in 3dmodel"
+build_with_other_item:
+  msg: "build item with object of type other"
   page: 27
-3d_model_invalid_xml:
-  msg: "Model file invalid XML. Exception Start tag expected, '<' not found"
-  page:
-3d_payload_files:
-  msg: "Relationship Target file /3D/Texture/texture2.texture not found"
-  page: 11
 content_types_invalid_xml:
-  msg: "[Content_Types].xml file is not valid XML. Start tag expected, '<' not found"
+  msg: "[Content_Types].xml file is not valid XML. %{e}"
   page: 15
 dot_rels_file_has_invalid_xml:
-  msg: "Relationships (.rel) file is not a valid XML file: Start tag expected, '<' not found"
+  msg: "Relationships (.rel) file is not a valid XML file: %{e}"
   page: 4
 dot_rels_file_missing_relationships_element:
   msg: ".rels XML must have &lt;Relationships&gt; root element"
@@ -43,133 +13,176 @@ dot_rels_file_missing_relationships_element:
 dot_rels_file_no_relationship_element:
   msg: "No relationship elements found"
   page: 4
+duplicate_content_extension_types:
+  msg: "Only one ContentType definition is allowed per extension"
+  page: 8
+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
+err_uri_bad:
+  msg: 'Path names must be valid Open Package Convention URIs or IRIs'
+  page: 13
+err_uri_empty_segment:
+  msg: 'No segment of a 3MF part name path may be empty'
+  page: 13
+err_uri_hidden_file:
+  msg: "Other than /_rels/.rels, no segment of a 3MF part name may start with the '.' character"
+  page: 13
+err_uri_relative_path:
+  msg: 'Part names must not include relative paths'
+  page: 13
+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
+has_commas_for_floats:
+  msg: "numbers not formatted for the en-US locale"
+  page: 15
+has_improper_base_color:
+  msg: "An sRGB color MUST be specified with a value of a 6 or 8 digit hexadecimal number"
+  page: 35
+has_xml_space_attribute:
+  msg: "xml:space attribute is not allowed"
+  page: 16
 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 is missing a required StartPart relationship to the primary 3D payload"
+  msg: "[Content_Types].xml is missing required ContentType \"%{mt}\""
   page: 10
+invalid_image_content_type:
+  msg: "Invalid content type for %{extension}"
+  page: 22
+invalid_metadata_name:
+  msg: "Metadata names must be prefixed with a valid namespace"
+  page: 21
+invalid_metadata_under_defaultns:
+  msg: "Metadata without a namespace name must only contain allowed name values"
+  page: 21
+invalid_model_unit:
+  msg: "Invalid unit value of '%{unit}' specified in model file."
+  page: 17
 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
-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"
+invalid_startpart_type:
+  msg: "rels/.rels Relationship file is missing a required StartPart relationship to the primary 3D payload"
   page: 10
+invalid_texture_file_type:
+  msg: "Expected a png or jpeg texture but the texture was of type %{type}"
+  spec: :material
+  page: 16
 invalid_thumbnail_colorspace:
   msg: "CMYK JPEG images must not be used for the thumbnail"
   page: 36
+invalid_thumbnail_file:
+  msg: "thumbnail file must be valid image file"
+  page: 10
 invalid_thumbnail_file_type:
   msg: "Expected a png or jpeg thumbnail but the thumbnail was of type %{type}"
   page: 36
-invalid_texture_file_type:
-  msg: "Expected a png or jpeg texture but the texture was of type image/gif"
-  page: 16
-missing_content_types:
-  msg: "Missing required file: [Content_Types].xml"
-  page: 4
+invalid_vertex_index:
+  msg: "Triangle with a invalid vertex index"
+  page: 26
+invalid_xml_core:
+  msg: "XML file doesn't pass validation with the XSD file"
+  page: 15
+inward_facing_normal:
+  msg: "All trianges must be oriented with normals pointing away from interior"
+  page: 31
+metadata_elements_with_same_name:
+  msg: "metadata elements must not share the same name"
+  page: 22
 missing_content_type:
   msg: "Unable to find an associated content type for part '%{part}' in [Content_Types].xml"
   page: 10
+missing_content_types:
+  msg: "Missing required file: [Content_Types].xml"
+  page: 4
 missing_dot_rels_file:
   msg: "Missing required file _rels/.rels"
   page: 4
+missing_extension_namespace_uri:
+  msg: "Required extension '%{ns}' MUST refer to namespace with URI"
+  page: 14
+missing_model_children:
+  msg: "Model element must include resources and build as child elements"
+  page: 20
+missing_object_pid:
+  msg: "Object with triangle color override missing object level pid"
+  page: 26
+missing_object_reference:
+  msg: "3D objects not referenced by an item element"
+  page: 23
 missing_rels_folder:
   msg: "Missing required file _rels/.rels"
   page: 4
+model_invalid_xml:
+  msg: "Model file invalid XML. Exception %{e}"
+  page:
+model_resource_not_in_rels:
+  msg: "Missing required resource: %{mr}. Resource referenced in model, but not in .rels relationship file"
+  page: 10
+multiple_print_tickets:
+  msg: "Only one print ticket allowed for any given model"
+  page: 13
+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
+non_distinct_indices:
+  msg: "The indices v1, v2 and v3 MUST be distinct."
+  page: 31
 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
 not_a_zip:
   msg: "File provided is not a valid ZIP archive"
   page: 9
-zero_size_texture:
-  msg: "Texture file must be valid image file"
-  page: 16
-has_xml_space_attribute:
-  msg: "xml:space attribute is not allowed"
-  page: 16
-invalid_model_unit:
-  msg: "Invalid unit value of '%{unit}' specified in model file."
-  page: 17
-wrong_encoding:
-  msg: "XML content must be UTF8 encoded"
-  page: 15
-missing_object_pid:
-  msg: "Object with triangle color override missing object level pid"
-  page: 26
-missing_model_children:
-  msg: "Model element must include resources and build as child elements"
-  page: 20
+not_enough_triangles:
+  msg: "Mesh has fewer than four triangles"
+  page: 30
 object_with_components_and_pid:
   msg: "object with components and pid or pindex"
   page: 26
-build_with_other_item:
-  msg: "build item with object of type other"
+rel_file_not_found:
+  msg: "Relationship Target file %{mf} not found"
+  page: 11
+resource_3dmodel_hole:
+  msg: "Hole in model"
+  page: 27
+resource_3dmodel_nonmanifold:
+  msg: "Non-manifold edge in 3dmodel"
+  page: 27
+resource_3dmodel_orientation:
+  msg: "Bad triangle orientation"
   page: 27
+resource_contentype_invalid:
+  msg: "Relationship target %{rt} resource has invalid contenttype %{bt}"
+  page: 10
 resource_id_collision:
   msg: "resources must be unique within the model"
   page: 22
 resource_pid_missing:
-  msg:  "A model resource referenced a property group id (pid) that is not present. Missing pid is: %{pid}"
+  msg: "A model resource referenced a property group id (pid) that is not present. Missing pid is: %{pid}"
   page: 20
-metadata_elements_with_same_name:
-  msg: "metadata elements must not share the same name"
-  page: 22
-multiple_print_tickets:
-  msg: "Only one print ticket allowed for any given model"
-  page: 13
+schema_error:
+  msg: "Schema error found: %{e}"
+thumbnail_image_type_mismatch:
+  msg: "Image not of declared type"
+  page: 36
 unknown_required_extension:
   msg: "Required extension not supported: %{ext}"
   page: 14
-missing_extension_namespace_uri:
-  msg: "Required extension '%{ns}' MUST refer to namespace with URI"
-  page: 14
-invalid_metadata_under_defaultns:
-  msg: "Metadata without a namespace name must only contain allowed name values"
-  page: 21
-invalid_metadata_name:
-  msg: "Metadata names must be prefixed with a valid namespace"
-  page: 21
-has_commas_for_floats:
-  msg: "numbers not formatted for the en-US locale"
-  page: 15
-invalid_xml_core:
-  msg: "XML file doesn't pass validation with the XSD file"
+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
+wrong_encoding:
+  msg: "XML content must be UTF8 encoded"
   page: 15
-missing_object_reference:
-  msg: "3D objects not referenced by an item element"
-  page: 23
-non_distinct_indices:
-  msg: "The indices v1, v2 and v3 MUST be distinct."
-  page: 31
-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
-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
+zero_size_texture:
+  msg: "Texture file must be valid image file"
+  spec: :material
+  page: 16
+contains_xsi_namespace:
+  msg: "XML content must not use the xsi namespace as it is not defined in the XSD schema"
+  page: 15

data/lib/ruby3mf/log3mf.rb

@@ -70,8 +70,21 @@ class Log3mf
 
   def method_missing(name, *args, &block)
     if LOG_LEVELS.include? name.to_sym
-      log(name.to_sym, *args)
-    else+
+      if [:fatal_error, :error, :debug].include? name.to_sym
+        linenumber = caller_locations[0].to_s.split('/')[-1].split(':')[-2].to_s
+        filename = caller_locations[0].to_s.split('/')[-1].split(':')[0].to_s
+        options = {linenumber: linenumber, filename: filename}
+        # Mike: do not call error or fatal_error without an entry in errors.yml
+        raise "{fatal_}error called WITHOUT using error symbol from: #{filename}:#{linenumber}" if ( !(args[0].is_a? Symbol) && (name.to_sym != :debug) )
+
+        puts "***** Log3mf.#{name} called from #{filename}:#{linenumber} *****" if $DEBUG
+
+        options = options.merge(args[1]) if args[1]
+        log(name.to_sym, args[0], options)
+      else
+        log(name.to_sym, *args)
+      end
+    else
       super
     end
   end
@@ -80,11 +93,12 @@ class Log3mf
     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]
-    entry = { id: message,
-              context: "#{@context_stack.join("/")}",
-              severity: severity,
-              message: interpolate(error["msg"], options) }
+    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])
+    entry[:caller] = "#{options[:filename]}:#{options[:linenumber]}" if (options && options[:filename] && options[:linenumber])
     @log_list << entry
     raise FatalError if severity == :fatal_error
   end

data/lib/ruby3mf/mesh_analyzer.rb

@@ -1,14 +1,3 @@
-def find_child(node, child_name)
-  node.children.each do |child|
-    if child.name == child_name
-      return child
-    end
-  end
-
-  nil
-end
-
-
 class MeshAnalyzer
 
   def self.validate_object(object, includes_material)
@@ -27,6 +16,7 @@ class MeshAnalyzer
       meshs = object.css('mesh')
       meshs.each do |mesh|
 
+        num_vertices = mesh.css("vertex").count
         triangles = mesh.css("triangle")
         l.error :not_enough_triangles if triangles.count < 4
 
@@ -37,6 +27,8 @@ class MeshAnalyzer
             v2 = triangle.attributes["v2"].to_s.to_i
             v3 = triangle.attributes["v3"].to_s.to_i
 
+            l.error :invalid_vertex_index if [v1, v2, v3].select{|vertex| vertex >= num_vertices}.count > 0
+
             unless includes_material
               l.context "validating property overrides" do |l|
                 property_overrides = []

data/lib/ruby3mf/mesh_normal_analyzer.rb

@@ -0,0 +1,219 @@
+class MeshNormalAnalyzer
+
+  def initialize(mesh)
+    @vertices = []
+    @intersections = []
+
+    vertices_node = mesh.css("vertices")
+    vertices_node.children.each do |vertex_node|
+      if vertex_node.attributes.count > 0
+        x = vertex_node.attributes['x'].to_s.to_f
+        y = vertex_node.attributes['y'].to_s.to_f
+        z = vertex_node.attributes['z'].to_s.to_f
+        @vertices << [x, y, z]
+      end
+    end
+
+    @triangles = []
+    triangles_node = mesh.css("triangles")
+    triangles_node.children.each do |triangle_node|
+      if triangle_node.attributes.count > 0
+        v1 = triangle_node.attributes['v1'].to_s.to_i
+        v2 = triangle_node.attributes['v2'].to_s.to_i
+        v3 = triangle_node.attributes['v3'].to_s.to_i
+        @triangles << [v1, v2, v3]
+      end
+    end
+  end
+
+  def found_inward_triangle
+    # Trace a ray toward the center of the vertex points.  This will hopefully
+    # maximize our chances of hitting the object's trianges on the first try.
+    center = point_cloud_center(@vertices)
+
+    @point = [0.0, 0.0, 0.0]
+    @direction = vector_to(@point, center)
+
+    # Make sure that we have a reasonably sized direction.
+    # Might end up with a zero length vector if the center is also
+    # at the origin.
+    if magnitude(@direction) < 0.1
+      @direction = [0.57, 0.57, 0.57]
+    end
+
+    # make the direction a unit vector just to make the
+    # debug info easier to understand
+    @direction = normalize(@direction)
+
+    attempts = 0
+    begin
+      # Get all of the intersections from the ray and put them in order of distance.
+      # The triangle we hit that's farthest from the start of the ray should always be
+      # a triangle that points away from us (otherwise we would hit a triangle even
+      # further away, assuming the mesh is closed).
+      #
+      # One special case is when the set of triangles we hit at that distance is greater
+      # than one.  In that case we might have hit a "corner" of the model and so we don't
+      # know which of the two (or more) points away from us.  In that case, cast a random
+      # ray from the center of the object and try again.
+
+      @triangles.each do |tri|
+        v1 = @vertices[tri[0]]
+        v2 = @vertices[tri[1]]
+        v3 = @vertices[tri[2]]
+
+        process_triangle(@point, @direction, [v1, v2, v3])
+      end
+
+      if @intersections.count > 0
+        # Sort the intersections so we can find the hits that are furthest away.
+        @intersections.sort! {|left, right| left[0] <=> right[0]}
+
+        max_distance = @intersections.last[0]
+        furthest_hits = @intersections.select{|hit| (hit[0]-max_distance).abs < 0.0001}
+
+        # Print out the hits
+        # furthest_hits.each {|hit| puts hit[1].to_s}
+
+        found_good_hit = furthest_hits.count == 1
+      end
+
+      if found_good_hit
+        outside_triangle = furthest_hits.last[2]
+      else
+        @intersections = []
+        attempts = attempts + 1
+
+        target = [Random.rand(10)/10.0, Random.rand(10)/10.0, Random.rand(10)/10.0]
+        @point = center
+        @direction = normalize(vector_to(@point, target))
+      end
+    end until found_good_hit || attempts >= 10
+
+    # return true if we hit a triangle with an inward pointing normal
+    # (according to counter-clockwise normal orientation)
+    found_good_hit && !compare_normals(outside_triangle, @direction)
+  end
+
+  def compare_normals(triangle, hit_direction)
+    oriented_normal = cross_product(
+        vector_to(triangle[0], triangle[1]),
+        vector_to(triangle[1], triangle[2]))
+
+    angle = angle_between(oriented_normal, hit_direction)
+
+    angle < Math::PI / 2.0
+  end
+
+  def process_triangle(point, direction, triangle)
+    found_intersection, t = intersect(point, direction, triangle)
+
+    if t > 0
+      intersection = []
+      intersection[0] = point[0] + t * direction[0]
+      intersection[1] = point[1] + t * direction[1]
+      intersection[2] = point[2] + t * direction[2]
+
+      @intersections << [t, intersection, triangle]
+    end
+  end
+
+  def intersect(point, direction, triangle)
+    v0 = triangle[0]
+    v1 = triangle[1]
+    v2 = triangle[2]
+
+    return [false, 0] if v0.nil? || v1.nil? || v2.nil?
+
+    e1 = vector_to(v0, v1)
+    e2 = vector_to(v0, v2)
+
+    h = cross_product(direction, e2)
+    a = dot_product(e1, h)
+
+    if a.abs < 0.00001
+      return false, 0
+    end
+
+    f = 1.0/a
+    s = vector_to(v0, point)
+    u = f * dot_product(s, h)
+
+    if u < 0.0 || u > 1.0
+      return false, 0
+    end
+
+    q = cross_product(s, e1)
+    v = f * dot_product(direction, q)
+
+    if v < 0.0 || u + v > 1.0
+      return false, 0
+    end
+
+    t = f * dot_product(e2, q)
+    [t > 0, t]
+  end
+end
+
+# Various utility functions
+
+def cross_product(a, b)
+  result = [0, 0, 0]
+  result[0] = a[1]*b[2] - a[2]*b[1]
+  result[1] = a[2]*b[0] - a[0]*b[2]
+  result[2] = a[0]*b[1] - a[1]*b[0]
+
+  result
+end
+
+def dot_product(a, b)
+  a[0]*b[0] + a[1]*b[1] + a[2]*b[2]
+end
+
+def vector_to(a, b)
+  [b[0] - a[0], b[1] - a[1], b[2] - a[2]]
+end
+
+def magnitude(a)
+  Math.sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2])
+end
+
+def equal(a, b)
+  (a[0] - b[0]).abs < 0.0001 && (a[1] - b[1]).abs < 0.0001 && (a[2] - b[2]).abs < 0.0001
+end
+
+def angle_between(a, b)
+  cos_theta = dot_product(a, b) / (magnitude(a) * magnitude(b))
+  Math.acos(cos_theta)
+end
+
+def normalize(a)
+  length = magnitude(a)
+  [a[0]/length, a[1]/length, a[2]/length]
+end
+
+def point_cloud_center(vertices)
+  if vertices.count < 1
+    return [0, 0, 0]
+  end
+
+  vertex = vertices[0]
+  min_x = max_x = vertex[0]
+  min_y = max_y = vertex[1]
+  min_z = max_z = vertex[2]
+
+  vertices.each do |vertex|
+    x = vertex[0]
+    y = vertex[1]
+    z = vertex[2]
+
+    min_x = x if x < min_x
+    max_x = x if x > max_x
+    min_y = y if y < min_y
+    max_y = y if y > max_y
+    min_z = z if z < min_z
+    max_z = z if z > max_z
+  end
+
+  [(min_x + max_x) / 2.0, (min_y + max_y) / 2.0, (min_z + max_z) / 2.0]
+end

data/lib/ruby3mf/model3mf.rb

@@ -19,7 +19,7 @@ class Model3mf
       begin
         model_doc = XmlVal.validate_parse(zip_entry, SchemaFiles::SchemaTemplate)
       rescue Nokogiri::XML::SyntaxError => e
-        l.fatal_error "Model file invalid XML. Exception #{e}"
+        l.fatal_error :model_invalid_xml, e: e
       end
 
       l.context "verifying requiredextensions" do |l|
@@ -62,24 +62,10 @@ class Model3mf
           }
         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']
-          unless root_rels.nil?
-            start_part_rel = root_rels.select { |rel| rel[:type] == Document::MODEL_TYPE }.first
-            unless start_part_rel.nil? || start_part_rel[:target] != '/' + zip_entry.name
-              #Verify that the model is a valid root 3D model by checking if it has at least one object
-              l.fatal_error :invalid_startpart_target, :target => start_part_rel[:target] if model_doc.css("//model//resources//object").size == 0
-            end
-          else
-            l.fatal_error :missing_dot_rels_file
-          end
-        end
-
       end
 
       l.context 'verifying resources' do |l|
-        resources = find_child(model_doc.root, 'resources')
+        resources = model_doc.root.css("resources")
         if resources
           ids = resources.children.map { |child| child.attributes['id'].to_s if child.attributes['id'] }
           l.error :resource_id_collision if ids.uniq.size != ids.size
@@ -113,8 +99,19 @@ class Model3mf
           end
         end
       end
+
       includes_material = model_doc.namespaces.values.include?(MATERIAL_EXTENSION)
       MeshAnalyzer.validate(model_doc, includes_material)
+
+      l.context "verifying triangle normal" do |l|
+        model_doc.css('model/resources/object').select { |object| ['model', 'solidsupport', ''].include?(object.attributes['type'].to_s) }.each do |object|
+          meshes = object.css('mesh')
+          meshes.each do |mesh|
+            processor = MeshNormalAnalyzer.new(mesh)
+            l.error :inward_facing_normal if processor.found_inward_triangle
+          end
+        end
+      end
     end
     model_doc
   end

data/lib/ruby3mf/relationships.rb

@@ -35,14 +35,14 @@ class Relationships
               end
             end
           else
-            l.error "No relationship elements found", page: 4
+            l.error :dot_rels_file_no_relationship_element
           end
         else
-          l.error ".rels XML must have <Relationships> root element", page: 4
+          l.error :dot_rels_file_missing_relationships_element
         end
 
       rescue Nokogiri::XML::SyntaxError => e
-        l.error "Relationships (.rel) file is not a valid XML file: #{e.message}", page: 4
+        l.error :dot_rels_file_has_invalid_xml, e: "#{e.message}"
       end
     end
     relationships

data/lib/ruby3mf/texture3mf.rb

@@ -11,9 +11,9 @@ class Texture3mf
     stream = relationship_file.get_input_stream
     img_type = MimeMagic.by_magic(stream)
     Log3mf.context "Texture3mf" do |l|
-      l.fatal_error "Texture file must be valid image file", spec: :material, page: 16 unless img_type
+      l.fatal_error :zero_size_texture unless img_type
       l.debug "texture is of type: #{img_type}"
-      l.error "Expected a png or jpeg texture but the texture was of type #{img_type}", spec: :material, page: 16 unless ['image/png', 'image/jpeg'].include? img_type.type
+      l.error(:invalid_texture_file_type, type: img_type) unless ['image/png', 'image/jpeg'].include? img_type.type
     end
     t
   end

data/lib/ruby3mf/version.rb

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

data/lib/ruby3mf/xml_val.rb

@@ -17,6 +17,7 @@ class XmlVal
       l.error :dtd_not_allowed if dtd_exists?(file)
       l.error :has_commas_for_floats if bad_floating_numbers?(document)
       l.warning :missing_object_reference if objects_not_referenced?(document)
+      l.error :contains_xsi_namespace if contains_xsi_namespace?(document)
 
       if schema_filename
         Log3mf.context "validating core schema" do |l|
@@ -29,7 +30,7 @@ class XmlVal
               if error_involves_colorvalue?(error)
                 l.error :has_improper_base_color
               else
-                l.error error
+                l.error :schema_error, e: error
               end
             end
           end
@@ -66,4 +67,8 @@ class XmlVal
   def self.error_involves_colorvalue?(error)
     error.to_s.include?("ST_ColorValue") || error.to_s.include?("displaycolor")
   end
+
+  def self.contains_xsi_namespace?(document)
+    document.namespaces.has_value?('http://www.w3.org/2001/XMLSchema-instance')
+  end
 end

data/lib/ruby3mf.rb

@@ -11,6 +11,7 @@ require_relative "ruby3mf/texture3mf"
 require_relative "ruby3mf/xml_val"
 require_relative "ruby3mf/edge_list"
 require_relative "ruby3mf/mesh_analyzer"
+require_relative "ruby3mf/mesh_normal_analyzer"
 
 require 'zip'
 require 'nokogiri'
@@ -18,6 +19,7 @@ require 'json'
 require 'mimemagic'
 require 'uri'
 require 'yaml'
+require "addressable/uri"
 
 module Ruby3mf
   # Your code goes here...

data/ruby3mf.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri', '~>1.6.8'
   spec.add_runtime_dependency 'mimemagic'
   spec.add_runtime_dependency 'mini_magick', '~> 4.6'
+  spec.add_runtime_dependency 'addressable', '~> 2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: Read, write and validate 3MF files with Ruby easily.
 email:
 - mwhit@hp.com
@@ -139,7 +153,6 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
-- PO_102_03.3mf
 - README.md
 - Rakefile
 - bin/batch.rb
@@ -163,6 +176,7 @@ files:
 - lib/ruby3mf/interpolation.rb
 - lib/ruby3mf/log3mf.rb
 - lib/ruby3mf/mesh_analyzer.rb
+- lib/ruby3mf/mesh_normal_analyzer.rb
 - lib/ruby3mf/model3mf.rb
 - lib/ruby3mf/relationships.rb
 - lib/ruby3mf/schema_files.rb