twb 4.9.3 → 4.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1318b29ac726c493fb15c1f54450ad844f7cf97e862880867f996ae3d5dcfd
-  data.tar.gz: 1f88c06ef393116011cd94f33b2ff2fb0fbca8a68e3a41bcf87b7d8c4ee2e0a1
+  metadata.gz: 9bf5871fe93aaf4afc19f4c4b789d18db29545c43f77c6ae1d2c901dc23cd142
+  data.tar.gz: e529613db65063341cde12d6393201765f3a53b680e4fbc7fe21707b9ff83681
 SHA512:
-  metadata.gz: 3ebe4361d4efe8633fde54d5a9c13b43da3e1758ce3e385f7c3bcfc69fb5e0308cafbba034ebe287bd35319c1f5390eb04aafe0742cc95237f576fc4990854a1
-  data.tar.gz: c42aa93d3133b8c5773bd23b8b36c98c121dd04a62e9652e909cdef252fb4101ff3e6c74fd84cb947ec367123aab868e8e009b026167d9e1fd734064a7dcfedd
+  metadata.gz: 7fb310fd663173d925df07488ec1f8d147651ca6588b725f03acaa99e88cfbcc07bb5aed2b797a8e70afd57143466a06ca0857bab0e4bdad99fda42423093652
+  data.tar.gz: 460b6aee7fe9bf62baa9611a350dc3b7fe671ae18c03b8943431506a43bf0598247e92e784604cf35450bdc1f3dc09c04380ae43ff35c33344877885f16ca191

data/lib/twb.rb

@@ -80,5 +80,5 @@ require_relative 'twb/analysis/sheets/sheetsintooltipanalyzer'
 # Represents Tableau Workbooks, their contents, and classes that analyze and manipulate them.
 #
 module Twb
-  VERSION = '4.9.3'
+  VERSION = '4.9.4'
 end

data/lib/twb/util/cypher.rb

@@ -26,18 +26,20 @@ module Util
 
 #====================================================================
 
-    attr_accessor :nodes, :edges, :fileName, :fileName
+    attr_accessor :nodes, :edges, :fileName, :mode
     attr_accessor :cleanup
 
     def initialize
       emit "Cypher.initialize"
       @fileName  = 'Neo4jCommands'
+      @mode      = :create
       @nodes     = []
       @edges     = []
       @cleanup   = false
     end
 
     def render
+      puts "Cypher.render"
       @file = File.open(docFile("#{@fileName}.cypher"),'w')
       renderNodes
       renderEdges
@@ -46,6 +48,7 @@ module Util
     end
 
     def renderNodes
+      puts "Cypher def renderNodes @nodes:#{@nodes}"
       csv = CSV.open(docFile("#{@fileName}.nodes.csv"),'w')
       csv << ['Type','Name','UUID']
       nodesCSV = Set.new
@@ -53,7 +56,7 @@ module Util
       nodesByType = Hash.new { |type,nodes| type[nodes] = [] }
       @nodes.each do |node|
         nodesCSV << [node.type, node.name, node.uuid]
-        nodeCmds << encode('MERGE','node',node,';')
+        nodeCmds << encode(node,';')
         nodesByType[node.type] << node
       end
       if @cleanup
@@ -93,8 +96,12 @@ module Util
       csv.close
     end
 
-    def encode command, varName, node, terminator=''
-      "%-8s (%s:%s { name:'%s', uuid: '%s' } ) %s" % [command, varName, node.type, node.name, node.uuid, terminator ]
+    def encode node, terminator=''
+      puts "def encode node: #{node}  "
+      case @mode
+      when :merge  then "MERGE (%s:%s { name:'%s', uuid: '%s' } ) %s" % [node.uuid, varName, node.type, node.name, terminator ]
+      when :create then "CREATE (#{node.uuid}:#{node.type} {} )"
+      end
     end
 
     def encodeEdge command, varName, node, terminator=''

data/lib/twb/util/graphnode.rb

@@ -118,7 +118,7 @@ module Util
     end
 
     def <=>(other)
-      uuid <=> other.uuid
+      hash <=> other.hash
     end
 
   end # class Graphnode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 4.9.3
+  version: 4.9.4
 platform: ruby
 authors:
 - Chris Gerrard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek