ruby3mf 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c3c875e13f40a3230c7146228502167eae4452b
-  data.tar.gz: e572579b6da6f51705ced9dded95eec810a2230f
+  metadata.gz: d90fb95397ffff9fb584f6cd12134aa40b6271ef
+  data.tar.gz: 38411044dcd10075e8f147545f6c81eaf23c8359
 SHA512:
-  metadata.gz: 3eda18a557d21f60cf8236786002085afa545236e206df90794f66341125f447e48ffa1189a898786cabb678cab74f650f45867a49938abfea82072129d20fb8
-  data.tar.gz: e4da8cb5bdab1a1fac1b36cfa351d542ebcef28738c13716d6dc928ebcb7dc7b8978d2b7bba7d20ce51107f989bb4ee3eaf2b7cc64351787bf1f1432417f8bcc
+  metadata.gz: fafd151796e8e752fecbf967be80ff0fc29206f69f1fdd4e252b0302bffa4de2d0110fc7fb2f1d6fd708177ee40ea02d5a5745cb135a9c46d90954694ef749db
+  data.tar.gz: f98af76d0ffcbe56a67486b8b2e0a572ad49e30ac75836eb55db8ac98843be7086315edf6320fc1c4df49c1cfc984311f5f216ad9c3cf24b9ae65744f4ec4d7d

data/lib/ruby3mf.rb

@@ -8,8 +8,6 @@ require "ruby3mf/relationships"
 require "ruby3mf/thumbnail3mf"
 require "ruby3mf/texture3mf"
 
-
-
 require 'zip'
 require 'nokogiri'
 require 'json'

data/lib/ruby3mf/document.rb

@@ -3,6 +3,7 @@ class Document
   attr_accessor :models
   attr_accessor :thumbnails
   attr_accessor :textures
+  attr_accessor :objects
 
   # Relationship Type => Class validating relationship type
   RELATIONSHIP_TYPES = {
@@ -11,15 +12,17 @@ class Document
     'http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture' => {klass: 'Texture3mf', collection: :textures}
   }
 
-  def initialize
+  def initialize(zip_filename)
     self.models=[]
     self.thumbnails=[]
     self.textures=[]
+    self.objects={}
+    @zip_filename = zip_filename
   end
 
   def self.read(input_file)
-    m=self.new
-    begin
+    m=self.new(input_file)
+    m.zip_filename = input_file    begin
       Log3mf.context "examining zip" do |l|
         begin
           Zip.warn_invalid_date = false
@@ -72,7 +75,7 @@ class Document
                       m.send(relationship_type[:collection]) << {
                         rel_id: rel[:id],
                         target: rel[:target],
-                        object: Object.const_get(relationship_type[:klass]).parse(relationship_file, @relationships)
+                        object: Object.const_get(relationship_type[:klass]).parse(m, relationship_file, @relationships)
                       }
                     end
                   else
@@ -93,4 +96,29 @@ class Document
       return nil
     end
   end
+
+  def write(output_file = nil)
+    output_file = @zip_filename if output_file.nil?
+
+    input_zip_file = Zip::File.open(@zip_filename)
+
+    buffer = Zip::OutputStream.write_buffer do |out|
+      input_zip_file.entries.each do |e|
+        if e.directory?
+          out.copy_raw_entry(e)
+        else
+          out.put_next_entry(e.name)
+          if objects[e.name]
+            out.write objects[e.name]
+          else
+            out.write e.get_input_stream.read
+          end
+        end
+      end
+    end
+
+    input_zip_file.close
+
+    File.open(output_file, "wb") {|f| f.write(buffer.string) }
+  end
 end

data/lib/ruby3mf/log3mf.rb

@@ -69,7 +69,7 @@ class Log3mf
 
   def log(severity, message, options={})
     @log_list << ["#{@context_stack.join("/")}", severity, message, options] unless severity==:debug && ENV['LOGDEBUG'].nil?
-    #puts "[#{@context_stack.join("/")}] #{severity.to_s.upcase} #{message}"
+    # puts "[#{@context_stack.join("/")}] #{severity.to_s.upcase} #{message}"
     raise FatalError if severity == :fatal_error
   end
 

data/lib/ruby3mf/model3mf.rb

@@ -12,7 +12,7 @@ class Model3mf
     end
   end
 
-  def self.parse(zip_entry, relationships)
+  def self.parse(document, zip_entry, relationships)
     model_hash = {}
     Log3mf.context "parsing model" do |l|
       begin

data/lib/ruby3mf/texture3mf.rb

@@ -1,11 +1,25 @@
 class Texture3mf
+  attr_accessor :name
+
+  def initialize(document)
+    @doc = document
+  end
+
+  def self.parse(document, relationship_file, relationships)
+    t = Texture3mf.new(document)
+    t.name = relationship_file.name
 
-  def self.parse(relationship_file, relationships)
     img_type = MimeMagic.by_magic(relationship_file.get_input_stream)
+    @bytes = relationship_file.get_input_stream.read
     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
+    t
+  end
 
+  def update(bytes)
+    @doc.objects[name]=bytes
   end
+
 end

data/lib/ruby3mf/thumbnail3mf.rb

@@ -1,6 +1,6 @@
 class Thumbnail3mf
 
-  def self.parse(relationship_file, relationships)
+  def self.parse(doc, relationship_file, relationships)
     img_type = MimeMagic.by_magic(relationship_file.get_input_stream)
     Log3mf.context "Thumbnail3mf" do |l|
       l.debug "thumbnail is of type: #{img_type}"
@@ -8,4 +8,4 @@ class Thumbnail3mf
     end
 
   end
-end
+end

data/lib/ruby3mf/version.rb

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

metadata

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