ruby3mf 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 163777c2de18af302941ed630d19ec450185720f
-  data.tar.gz: 778102b12805993985dc783bb280893d9afd7b5c
+  metadata.gz: 8735913c55551b73173f7f8d17b8ec85031c4cb4
+  data.tar.gz: f0d565d1debb5049533f1bcd04c6942798a7e458
 SHA512:
-  metadata.gz: 7816012589525413ca61e18d4cfe134056772bb937262c09df16e5f441d025ad2fa3159acfdbef97f029e7bd6234ffb0b08d388322017b5f94f55de3d6dc1c2d
-  data.tar.gz: 5bcab26932d35dab05d571491b6218a588715851e8f09a244207fa528a38813b43f6f456e3afd3b6d36d1e76971e8e00aa5587d6d3950cf234ba0aab1e2f6dc7
+  metadata.gz: bd4d6bfa3f8308522b458318fb42eb648d1936f4748bacc983f4207328a15d762f21afc500b1873eef55993cac98e9dca44afdcd2061eb3e3ecf77053e6bfd82
+  data.tar.gz: 08a66aac1559d688a642801fb8add46beedc3743304f48472169f21739f81f3cc81057ea6e77999f8db0767485c574cbe959db1a9556e699e9a2d8fe94b5bc9d

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 .idea
 /spec/ruby3mf-testfiles/
+/profile-run/
+.DS_Store

data/bin/cli.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/ruby3mf'
+
+doc = Document.read(ARGV.first)

data/lib/ruby3mf/content_types.rb

@@ -14,8 +14,8 @@ class ContentTypes
         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
+        #optional_content_types = ['application/vnd.ms-printing.printticket+xml']
+        #all_types = required_content_types + optional_content_types
 
         types_node = doc.children.first
         types_node.children.each do |node|
@@ -35,8 +35,6 @@ class ContentTypes
         end
       rescue Nokogiri::XML::SyntaxError => e
         l.error "[Content_Types].xml file is not valid XML. #{e}", page: 15
-      rescue Zip::Error
-        l.error 'Problem extracting [Content_Types].xml from zip file'
       end
     end
 

data/lib/ruby3mf/document.rb

@@ -4,6 +4,7 @@ class Document
   attr_accessor :thumbnails
   attr_accessor :textures
   attr_accessor :objects
+  attr_accessor :zip_filename
 
   # Relationship Type => Class validating relationship type
   RELATIONSHIP_TYPES = {
@@ -21,18 +22,15 @@ class Document
   end
 
   def self.read(input_file)
-    m=self.new(input_file)
-    m.zip_filename = input_file    begin
-      Log3mf.context "examining zip" do |l|
+
+    m = new(input_file)
+
+    begin
+      Log3mf.context "zip" do |l|
         begin
           Zip.warn_invalid_date = false
           Zip::File.open(input_file) do |zip_file|
 
-            # puts "Zip contents:"
-            # zip_file.each do |entry|
-            #   puts entry
-            # end
-
             l.info "Zip file is valid"
 
             l.context "content types" do |l|
@@ -88,7 +86,6 @@ class Document
           return m
         rescue Zip::Error
           l.fatal_error 'File provided is not a valid ZIP archive', page: 9
-          return nil
         end
       end
     rescue Log3mf::FatalError
@@ -98,32 +95,33 @@ class Document
   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]
+    output_file = zip_filename if output_file.nil?
+
+    Zip::File.open(zip_filename) do |input_zip_file|
+
+      buffer = Zip::OutputStream.write_buffer do |out|
+        input_zip_file.entries.each do |e|
+          if e.directory?
+            out.copy_raw_entry(e)
           else
-            out.write e.get_input_stream.read
+            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
-    end
 
-    input_zip_file.close
+      File.open(output_file, "wb") {|f| f.write(buffer.string) }
+
+    end
 
-    File.open(output_file, "wb") {|f| f.write(buffer.string) }
   end
 
   def contents_for(path)
-    Zip::File.open(@zip_filename) do |zip_file|
+    Zip::File.open(zip_filename) do |zip_file|
       zip_file.glob(path).first.get_input_stream.read
     end
   end

data/lib/ruby3mf/hash.rb

@@ -55,4 +55,4 @@ class Hash
       end
     end
   end
-end
+end

data/lib/ruby3mf/model3mf.rb

@@ -12,6 +12,7 @@ class Model3mf
     end
   end
 
+
   def self.parse(document, zip_entry, relationships)
     model_hash = {}
     Log3mf.context "parsing model" do |l|
@@ -25,7 +26,6 @@ class Model3mf
         model_hash = Hash.from_xml(doc)
       rescue Nokogiri::XML::SyntaxError => e
         l.fatal_error "Model file invalid XML. Exception #{e}"
-        doc.errors.each { |error| l.error error }
       end
 
       l.context "verifying 3D payload required resources" do |l|

data/lib/ruby3mf/texture3mf.rb

@@ -6,11 +6,12 @@ class Texture3mf
   end
 
   def self.parse(document, relationship_file, relationships)
-    t = Texture3mf.new(document)
-    t.name = relationship_file.name
 
-    img_type = MimeMagic.by_magic(relationship_file.get_input_stream)
-    @bytes = relationship_file.get_input_stream.read
+    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.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

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/ruby3mf.rb

@@ -1,12 +1,12 @@
-require "ruby3mf/version"
-require "ruby3mf/log3mf"
-require "ruby3mf/document"
-require "ruby3mf/content_types"
-require "ruby3mf/hash"
-require "ruby3mf/model3mf"
-require "ruby3mf/relationships"
-require "ruby3mf/thumbnail3mf"
-require "ruby3mf/texture3mf"
+require_relative "ruby3mf/version"
+require_relative "ruby3mf/log3mf"
+require_relative "ruby3mf/document"
+require_relative "ruby3mf/content_types"
+require_relative "ruby3mf/hash"
+require_relative "ruby3mf/model3mf"
+require_relative "ruby3mf/relationships"
+require_relative "ruby3mf/thumbnail3mf"
+require_relative "ruby3mf/texture3mf"
 
 require 'zip'
 require 'nokogiri'

data/ruby3mf.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency 'rubyzip'
   spec.add_runtime_dependency 'nokogiri', '~>1.6.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cli.rb
 - bin/console
 - bin/setup
 - lib/ruby3mf.rb