mindwords 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6221b29c92e35c56991faead9b0065df928bb5ce5664f9511ad36a41b9382e9c
-  data.tar.gz: 9aefdce231368e36caf338567b5b8063a12e12c5468a5bd92c7395db04ff28bc
+  metadata.gz: 85426d79852d7306a24090b6c4fca89929b8004d4c084e60e2a19e6cd684d43d
+  data.tar.gz: ae8b9179bc0d486a75c12ccc5a241e52ed58e82cd32919957925f26a68d91527
 SHA512:
-  metadata.gz: cf7874e88c03ae3148102bf2ad8ecc539502c16bd620208303f54ea750262b9041de7c97b4c5bbf90b0aaf33a381f935b03be9228b1131be467c314bbd6b8344
-  data.tar.gz: d98408eab67356ef1312e3464ec671a381d149e7d2584ab63df6c87e4098d22c59e032dc360cd819fca2cd74d94071a5a8e400f4f87616e058f6f59a4b467c25
+  metadata.gz: bf8ef8f8031725781221f97f0779e9660f03a193354d62e5206302b2cfe54cb4296d5360d093e70b6e5835164d3e9dbcf18d486b33dcb85b084f7872db5e0280
+  data.tar.gz: 507bf3d566e2f3d8377efe32ff559e2d8fcc832ade715bbb33aa305c7a20e0d4355da90eed7513066159aa821864e38ee5f959ddb9bb4a85ce38a2e896f94022

data/lib/mindwords.rb

@@ -47,24 +47,25 @@ class MindWords
     
     @hashtags = h.deep_clone.sort.map {|tag, fields| [tag, fields.sort]}.to_h
 
-    # does the key exist as a field? Nesting of hash object is performed here.
-
-    h.keys.each do |key|
-
-      r = h.detect {|_, value| value.include? key}
-      next unless r
-      h[r.first].delete key
-      h[r.first] << {key => h[key]}
-      #puts r.inspect
-      h.delete key
-
-    end
-
-    @h = h
     
     a = rexlize(h)
     doc = Rexle.new(['root', {}, '', *a])
 
+    # apply node nesting
+
+    doc.root.elements.each do |e|
+      
+      doc.root.xpath('//' + e.name).each do |e2|
+        
+        next if e2 === e
+        
+        e2.parent.add e
+        e2.delete
+        
+      end
+      
+    end
+
     
     # remove duplicates which appear in the same branch above the nested node
     rm_duplicates(doc)
@@ -83,7 +84,7 @@ class MindWords
     end
 
     redundants.compact.each {|x| doc.element(x).delete }
-    rm_duplicates(doc)
+ 
     
     node = if parent then
       found = doc.root.element('//' + parent)
@@ -245,24 +246,22 @@ class MindWords
   def rm_duplicates(doc)
     
     duplicates = []
+    
     doc.root.each_recursive do |e|
 
-      puts 'e: ' + e.name.inspect if @debug
       rows = e.parent.xpath('//' + e.name)
       next if rows.length < 2
 
-      rows[1..-1].each do |e2|
-        puts 'e2: ' + e2.name.inspect if @debug
-        duplicates << [e.backtrack.to_s, e2.backtrack.to_s]
-      end
+      rows[0..-2].each {|e2| duplicates << e.backtrack.to_s }
+    
     end
 
-    duplicates.each do |path, oldpath| 
-      e = doc.element(path);
-      e2 = doc.element(oldpath);  
-      next unless e2
-      e2.parent.add e
-      e2.delete
+    duplicates.each do |path|
+      
+      puts 'path: ' + path.inspect if @debug
+      e = doc.element(path)
+      e.delete if e
+      
     end   
 
   end
@@ -304,4 +303,3 @@ class MindWords
   end  
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
   3+574KQzs/gR9Y5a+iMcvHRN
   -----END CERTIFICATE-----
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree