ruby3mf 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8735913c55551b73173f7f8d17b8ec85031c4cb4
-  data.tar.gz: f0d565d1debb5049533f1bcd04c6942798a7e458
+  metadata.gz: 0005d2dc2997eb363b5ddf6843fa2e67f51b0e3e
+  data.tar.gz: c0a75099c98df0e7dc9ed4f73b5c67d20ee333ba
 SHA512:
-  metadata.gz: bd4d6bfa3f8308522b458318fb42eb648d1936f4748bacc983f4207328a15d762f21afc500b1873eef55993cac98e9dca44afdcd2061eb3e3ecf77053e6bfd82
-  data.tar.gz: 08a66aac1559d688a642801fb8add46beedc3743304f48472169f21739f81f3cc81057ea6e77999f8db0767485c574cbe959db1a9556e699e9a2d8fe94b5bc9d
+  metadata.gz: 4aa121c5851a4b579aa261eda32712d0f3532b4529d95108b33ce4ff49e93fc43a1b33a9a0305d7b9912eaf1d6059cd7648abed1655cb40f78fc5b69ade391ae
+  data.tar.gz: eb813c2f3f33a70bff2a38979ce0a46babc95f5365ee0dc2c55560eb17bed2d9d66e31bcc228278882d799de5f9b255edec8e8cbaa9b7dd65f2150763520fe00

data/lib/ruby3mf/model3mf.rb

@@ -1,47 +1,23 @@
 class Model3mf
 
-  def self.extract_paths(value)
-    if value.is_a? Array
-      value.map { |v| extract_paths(v) }
-    else
-      if value.is_a? Hash
-        value[:path]
-      else
-        nil
-      end
-    end
-  end
-
-
   def self.parse(document, zip_entry, relationships)
-    model_hash = {}
+    model_doc = nil
+
     Log3mf.context "parsing model" do |l|
       begin
-        # parse model
-        doc = Nokogiri::XML(zip_entry.get_input_stream) do |config|
+        model_doc = Nokogiri::XML(zip_entry.get_input_stream) do |config|
           config.strict.nonet.noblanks
         end
-
         l.info "We Found a Model, and it's XML!"
-        model_hash = Hash.from_xml(doc)
       rescue Nokogiri::XML::SyntaxError => e
         l.fatal_error "Model file invalid XML. Exception #{e}"
       end
 
       l.context "verifying 3D payload required resources" do |l|
-        # find all resources (that are not the object) in model_hash
-
-        required_resources = []
-
-        model_hash[:model][:resources].each do |key, value|
-          required_resources << extract_paths(value)
-        end
-
-        required_resources.flatten!
-        required_resources.compact!
+        # 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] }
 
         missing_resources = (required_resources - relationship_resources)
@@ -55,6 +31,6 @@ class Model3mf
 
       end
     end
-    model_hash
+    model_doc
   end
 end

data/lib/ruby3mf/version.rb

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

metadata

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