ruby3mf 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560dd08731ad8ca1bd20f9368086f8bd55cb175a
-  data.tar.gz: ee40d214929e604a7596032941c0bf872590f6f5
+  metadata.gz: 737fe004ae04714fe3a70c43ec4ccfa82b0472fb
+  data.tar.gz: 887d66d7fc0779bd0094ebd3c7a09fbfd3c1bc16
 SHA512:
-  metadata.gz: 59f57931ceaffec30387c9edcea8e79e95648350ce9b2dce71f2723037d3f854a20a8933209ba68b47a11befc41cf8b5113835628e46827ff655382a9b5fe802
-  data.tar.gz: f3c9aa7b5f78d9788801bc30513abf88b5b56643f79cb2ab2e76fcbdb1bd88d4baae76964c709550d701ba313aff775aa9b629f7c663cc2927543a528b3868d6
+  metadata.gz: 1cd5a582a8d7450f6f8b9cd8076a674e520c0782061871058371c998b4e06e77bb8e777cc27c0334db083d2f12ce0fefe9833571781ef0aae856046703869694
+  data.tar.gz: 1f0a3bf6e58cdbda7b84506032c1ba08c5ad69fc8edb145f84c06573341c4cb81345add496546cef26e42f215de8deeddf0eae6f9bab9046e42c49ce82c25292

data/lib/ruby3mf/model3mf.rb

@@ -34,7 +34,7 @@ class Model3mf
       end
 
       l.context "verifying requiredextensions" do |l|
-        model_doc.css("//model").map{|node| node.attributes["requiredextensions"]}.compact.each do |required_extension|
+        model_doc.css("//model").map { |node| node.attributes["requiredextensions"] }.compact.each do |required_extension|
           required_extension.value.split(" ").each do |ns|
             namespace_uri = model_doc.namespaces["xmlns:#{ns}"]
             l.error :missing_extension_namespace_uri, ns: ns unless namespace_uri
@@ -81,8 +81,11 @@ class Model3mf
 
       l.context "verifying build items" do |l|
 
-        l.error :build_with_other_item if model_doc.css('build/item').map { |x| x.attributes["objectid"].value }.map{ |id|  model_doc.search(".//xmlns:object[@id=$id][@type=$type]", nil, { :id => id, :type => 'other' } ) }.flatten.any?
+        build_items = model_doc.css('build/item')
+        object_ids = build_items.map { |x| x.attributes["objectid"].value }
+        other_build_items = object_ids.map { |id| find_model_object(model_doc, id, 'other') }.flatten
 
+        l.error :build_with_other_item if other_build_items.any?
       end
 
       l.context "checking metadata" do |l|
@@ -117,4 +120,10 @@ class Model3mf
     end
     model_doc
   end
+
+  def self.find_model_object(model_doc, id, type)
+    model_doc.css('model/resources/object').select do |item|
+      item.attributes['id'].to_s == id && item.attributes['type'] && item.attributes['type'].value == type
+    end
+  end
 end

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler