ruby3mf 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28365afa35fee85496d68bd42bce1b2f2c8c9881
-  data.tar.gz: abb54781a8012d7526662ff118502f5ee55fa0f1
+  metadata.gz: f15c7a59a41748c2b7f788fbdc89a930f4799f74
+  data.tar.gz: e0cfb446ab590d4d036f939f25c4b1cb10c5c692
 SHA512:
-  metadata.gz: 73d47d9de40fda1e701f11452c6feab4c479a59798a23d439045ec7810fba6b43a2aa639b9f48c7c475d061524b8d71b0b3a316de851f9c3d8f2a24e8c82137a
-  data.tar.gz: ffd4f47c393311dba9c00d3aa78fb5aa1eaf2e128af72d28d4d724569064631e162409925fc9691c46045ba4cad402ab779ca4695e66d1bc9a0108daf4122e66
+  metadata.gz: 4d79b78bf1b7ef8a7e4a72e1caac69dd7dd73147928e22d65d83aab3b1c5ec67c752842f4f18c2c217a8d2227c360b65bba61e9f40c7ef052d00454e812ea8b7
+  data.tar.gz: 735bcb3499bcbf02278a8dd58f5a956b3a101cd157493d2aa730318e47e68249e9d8135c2ad3f37a34fae3d223e197a067fb9b285c6d42ec31e581c3520cc3bc

data/lib/ruby3mf/document.rb

@@ -1,5 +1,7 @@
 class Document
 
+  attr_accessor :types
+  attr_accessor :relationships
   attr_accessor :models
   attr_accessor :thumbnails
   attr_accessor :textures
@@ -18,6 +20,8 @@ class Document
     self.thumbnails=[]
     self.textures=[]
     self.objects={}
+    self.relationships=[]
+    self.types=[]
     @zip_filename = zip_filename
   end
 
@@ -37,7 +41,7 @@ class Document
               # 1. Get Content Types
               content_type_match = zip_file.glob('\[Content_Types\].xml').first
               if content_type_match
-                @types = ContentTypes.parse(content_type_match)
+                m.types = ContentTypes.parse(content_type_match)
               else
                 l.error "Missing required file: [Content_Types].xml", page: 4
               end
@@ -52,15 +56,14 @@ class Document
               rel_file = zip_file.glob('_rels/.rels').first
               l.fatal_error "Missing required file _rels/.rels", page: 4 unless rel_file
 
-              @relationships=[]
               zip_file.glob('**/*.rels').each do |rel|
-                @relationships += Relationships.parse(rel)
+                m.relationships += Relationships.parse(rel)
               end
             end
 
             l.context "relationship elements" do |l|
               # 3. Validate all relationships
-              @relationships.each do |rel|
+              m.relationships.each do |rel|
                 l.context rel[:target] do |l|
                   target = rel[:target].gsub(/^\//, "")
                   relationship_file = zip_file.glob(target).first
@@ -73,7 +76,7 @@ class Document
                       m.send(relationship_type[:collection]) << {
                         rel_id: rel[:id],
                         target: rel[:target],
-                        object: Object.const_get(relationship_type[:klass]).parse(m, relationship_file, @relationships)
+                        object: Object.const_get(relationship_type[:klass]).parse(m, relationship_file)
                       }
                     end
                   else

data/lib/ruby3mf/model3mf.rb

@@ -1,6 +1,6 @@
 class Model3mf
 
-  def self.parse(document, zip_entry, relationships)
+  def self.parse(document, zip_entry)
     model_doc = nil
 
     Log3mf.context "parsing model" do |l|
@@ -17,8 +17,8 @@ class Model3mf
         # results = model_doc.css("model resources m:texture2d")
         required_resources = model_doc.css("//model//resources//*[path]").collect { |n| n["path"] }
 
-        # for each, ensure that they exist in @relationships
-        relationship_resources = relationships.map { |relationship| relationship[:target] }
+        # for each, ensure that they exist in m.relationships
+        relationship_resources = document.relationships.map { |relationship| relationship[:target] }
 
         missing_resources = (required_resources - relationship_resources)
         if missing_resources.empty?
@@ -29,6 +29,23 @@ 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|
+              puts "bad type: #{bt}"
+              l.error "resource in model has invalid contenttype #{bt}", page: 10
+            }
+          end
+        end
+
       end
     end
     model_doc

data/lib/ruby3mf/texture3mf.rb

@@ -5,14 +5,14 @@ class Texture3mf
     @doc = document
   end
 
-  def self.parse(document, relationship_file, relationships)
+  def self.parse(document, relationship_file)
 
     t = new(document)
     t.name = relationship_file.name
     stream = relationship_file.get_input_stream
     img_type = MimeMagic.by_magic(stream)
-    @bytes = stream.read
     Log3mf.context "Texture3mf" do |l|
+      l.fatal_error "Texture file must be valid image file", spec: :material, page: 16 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
     end

data/lib/ruby3mf/thumbnail3mf.rb

@@ -1,8 +1,9 @@
 class Thumbnail3mf
 
-  def self.parse(doc, relationship_file, relationships)
+  def self.parse(doc, relationship_file)
     img_type = MimeMagic.by_magic(relationship_file.get_input_stream)
     Log3mf.context "Thumbnail3mf" do |l|
+      l.fatal_error "thumbnail file must be valid image file", page: 10 unless img_type
       l.debug "thumbnail is of type: #{img_type}"
       l.error "Expected a png or jpeg thumbnail but the thumbnail was of type #{img_type}", page: 12 unless ['image/png', 'image/jpeg'].include? img_type.type
     end

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler