ruby3mf 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0005d2dc2997eb363b5ddf6843fa2e67f51b0e3e
-  data.tar.gz: c0a75099c98df0e7dc9ed4f73b5c67d20ee333ba
+  metadata.gz: 28365afa35fee85496d68bd42bce1b2f2c8c9881
+  data.tar.gz: abb54781a8012d7526662ff118502f5ee55fa0f1
 SHA512:
-  metadata.gz: 4aa121c5851a4b579aa261eda32712d0f3532b4529d95108b33ce4ff49e93fc43a1b33a9a0305d7b9912eaf1d6059cd7648abed1655cb40f78fc5b69ade391ae
-  data.tar.gz: eb813c2f3f33a70bff2a38979ce0a46babc95f5365ee0dc2c55560eb17bed2d9d66e31bcc228278882d799de5f9b255edec8e8cbaa9b7dd65f2150763520fe00
+  metadata.gz: 73d47d9de40fda1e701f11452c6feab4c479a59798a23d439045ec7810fba6b43a2aa639b9f48c7c475d061524b8d71b0b3a316de851f9c3d8f2a24e8c82137a
+  data.tar.gz: ffd4f47c393311dba9c00d3aa78fb5aa1eaf2e128af72d28d4d724569064631e162409925fc9691c46045ba4cad402ab779ca4695e66d1bc9a0108daf4122e66

data/lib/ruby3mf.rb

@@ -2,7 +2,6 @@ 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"

data/lib/ruby3mf/log3mf.rb

@@ -17,7 +17,7 @@ require 'singleton'
 #   end
 # end
 #
-# Log3mf.pp
+# Log3mf.to_json
 
 
 class Log3mf
@@ -100,39 +100,24 @@ class Log3mf
     "#{doc_urls[spec]}#page=#{page}"
   end
 
-  def to_json
+  def to_hash
     @log_list.collect { |ent|
       h = { context: ent[0], severity: ent[1], message: ent[2] }
       h[:spec_ref] = spec_link(ent[3][:spec], ent[3][:page]) if (ent[3] && ent[3][:page])
       h
-    }.to_json
+    }
   end
 
-  def self.to_json
-    Log3mf.instance.to_json
+  def self.to_hash
+    Log3mf.instance.to_hash
   end
 
-  # Pretty print our errors!
-  def to_pp
-    s = []
-    s << "<i>Listing #{@log_list.size} log lines:</i>"
-    longest_context = @log_list.collect { |logline| logline[0].size }.max
-    longest_severity = @log_list.collect { |logline| logline[1].size }.max
-
-    @log_list.each do |logline|
-      msg = logline[2]
-      if logline[3] && logline[3][:page]
-        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
-    s << "<br/>"
-    s.map! { |row| row.include?("ERROR") ? "<b>#{row}</b>" : row }
-    s.join("<br/>")
+  def to_json
+    to_hash.to_json
   end
 
-  def self.to_pp
-    Log3mf.instance.to_pp
+  def self.to_json
+    Log3mf.instance.to_json
   end
 end
 

data/lib/ruby3mf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,6 @@ files:
 - lib/ruby3mf.rb
 - lib/ruby3mf/content_types.rb
 - lib/ruby3mf/document.rb
-- lib/ruby3mf/hash.rb
 - lib/ruby3mf/log3mf.rb
 - lib/ruby3mf/model3mf.rb
 - lib/ruby3mf/relationships.rb

data/lib/ruby3mf/hash.rb

@@ -1,58 +0,0 @@
-# https://gist.github.com/huy/819999
-require 'nokogiri'
-
-class Hash
-  class << self
-    def from_xml(xml_doc)
-      begin
-        return { xml_doc.root.name.to_sym => xml_node_to_hash(xml_doc.root)}
-      rescue Exception => e
-        # raise your custom exception here
-      end
-    end
-
-    def xml_node_to_hash(node)
-      # If we are at the root of the document, start the hash
-      if node.element?
-        result_hash = {}
-        if node.attributes != {}
-          attributes = {}
-          node.attributes.keys.each do |key|
-            attributes[node.attributes[key].name.to_sym] = node.attributes[key].value
-          end
-        end
-        if node.children.size > 0
-          node.children.each do |child|
-            result = xml_node_to_hash(child)
-
-            if child.name == "text"
-              unless child.next_sibling || child.previous_sibling
-                return result unless attributes
-                result_hash[child.name.to_sym] = result
-              end
-            elsif result_hash[child.name.to_sym]
-
-              if result_hash[child.name.to_sym].is_a?(Object::Array)
-                 result_hash[child.name.to_sym] << result
-              else
-                 result_hash[child.name.to_sym] = [result_hash[child.name.to_sym]] << result
-              end
-            else
-              result_hash[child.name.to_sym] = result
-            end
-          end
-          if attributes
-             #add code to remove non-data attributes e.g. xml schema, namespace here
-             #if there is a collision then node content supersets attributes
-             result_hash = attributes.merge(result_hash)
-          end
-          return result_hash
-        else
-          return attributes
-        end
-      else
-        return node.content.to_s
-      end
-    end
-  end
-end