ruby3mf 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2103e190da26beb2e01fb74ce4faf7443085ca3a
-  data.tar.gz: 21b7a9b19a9ebcf65661481138afdbb7b27c2c8e
+  metadata.gz: 5c3c875e13f40a3230c7146228502167eae4452b
+  data.tar.gz: e572579b6da6f51705ced9dded95eec810a2230f
 SHA512:
-  metadata.gz: 7d91f2e9ec52ea81032401064895e83ea4bd7c6d17b93af515a02f5d4aa7c66143e578b1736f50c206e73efd866ec1848483b08341577742d3452569c6c17399
-  data.tar.gz: d69275d9af624eb6f612569259cea989098acfa4b32e96a4be20c2cc097c6c3de39921f2f2752b85f7bb54b582916e8706ea17cda0068f705df33624cde6c024
+  metadata.gz: 3eda18a557d21f60cf8236786002085afa545236e206df90794f66341125f447e48ffa1189a898786cabb678cab74f650f45867a49938abfea82072129d20fb8
+  data.tar.gz: e4da8cb5bdab1a1fac1b36cfa351d542ebcef28738c13716d6dc928ebcb7dc7b8978d2b7bba7d20ce51107f989bb4ee3eaf2b7cc64351787bf1f1432417f8bcc

data/lib/ruby3mf.rb

@@ -6,6 +6,7 @@ require "ruby3mf/hash"
 require "ruby3mf/model3mf"
 require "ruby3mf/relationships"
 require "ruby3mf/thumbnail3mf"
+require "ruby3mf/texture3mf"
 
 
 

data/lib/ruby3mf/document.rb

@@ -2,19 +2,19 @@ class Document
 
   attr_accessor :models
   attr_accessor :thumbnails
-  # attr_accessor :textures
+  attr_accessor :textures
 
   # Relationship Type => Class validating relationship type
   RELATIONSHIP_TYPES = {
     'http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel' => {klass: 'Model3mf', collection: :models},
-    'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail' => {klass: 'Thumbnail3mf', collection: :thumbnails} #,
-    # 'http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture' => {klass: 'Texture3d', collection: :textures}
+    'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail' => {klass: 'Thumbnail3mf', collection: :thumbnails},
+    'http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture' => {klass: 'Texture3mf', collection: :textures}
   }
 
   def initialize
     self.models=[]
     self.thumbnails=[]
-    # self.textures=[]
+    self.textures=[]
   end
 
   def self.read(input_file)

data/lib/ruby3mf/log3mf.rb

@@ -89,14 +89,21 @@ class Log3mf
     Log3mf.instance.entries(*l)
   end
 
-  def spec_link(page)
-    "http://3mf.io/wp-content/uploads/2016/03/3MFcoreSpec_1.1.pdf#page=#{page}"
+  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'
+    }
+    "#{doc_urls[spec]}#page=#{page}"
   end
 
   def to_json
     @log_list.collect { |ent|
       h = { context: ent[0], severity: ent[1], message: ent[2] }
-      h[:spec_ref] = spec_link(ent[3][:page]) if (ent[3] && ent[3][:page])
+      h[:spec_ref] = spec_link(ent[3][:spec], ent[3][:page]) if (ent[3] && ent[3][:page])
       h
     }.to_json
   end
@@ -115,7 +122,7 @@ class Log3mf
     @log_list.each do |logline|
       msg = logline[2]
       if logline[3] && logline[3][:page]
-        msg = "<a href=\"#{spec_link(logline[3][:page])}\" target=\"_blank\">#{msg}</a>"
+        msg = "<a href=\"#{spec_link(logline[3][:spec], logline[3][:page])}\" target=\"_blank\">#{msg}</a>"
       end
       s << "[#{logline[0].ljust(longest_context)}] #{logline[1].to_s.upcase.ljust(longest_severity)} #{msg}"
     end

data/lib/ruby3mf/texture3mf.rb

@@ -0,0 +1,11 @@
+class Texture3mf
+
+  def self.parse(relationship_file, relationships)
+    img_type = MimeMagic.by_magic(relationship_file.get_input_stream)
+    Log3mf.context "Texture3mf" do |l|
+      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
+
+  end
+end

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/ruby3mf/log3mf.rb
 - lib/ruby3mf/model3mf.rb
 - lib/ruby3mf/relationships.rb
+- lib/ruby3mf/texture3mf.rb
 - lib/ruby3mf/thumbnail3mf.rb
 - lib/ruby3mf/version.rb
 - ruby3mf.gemspec