mindwords 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d617b7606074c5392810716b83f5ea18a45bd2f9bcbc3cbd3c8264c4efda15
-  data.tar.gz: 77459002b1868120333d8d173ef7012db25e29b977a265dd60f85405825a377b
+  metadata.gz: 7e0812d6fb0ec5d2b09105de96160ed832007144ac15f036418e1e9207234b60
+  data.tar.gz: 1c121aae9d22bc87535fb0c8df0c41333530dfa180970bd9685488b49b209f9e
 SHA512:
-  metadata.gz: f9bafe174e81786a07e60e1665116f5c9fd0c966642322bddf5f9898f95ce5474d1a3ec80573ed6a0056751e63cbf1e13210610459db5d8b85d77865db0daa39
-  data.tar.gz: 6aedd18fb09a55aa78b3cc2c7c59db08edca77a2ed5e47c1049bb5bd069d34f1d4b5438fb36367d35a4ae9c91c5ec4970eb975eebfe3b0c286982f322b2b16b9
+  metadata.gz: 706128a061c541504d6214d0a0cd1bdf23aecb3794761c43d842c9cd24b34d704ae7c1fa70b9ddba67cb8a785b88a72e37f462fe4f6eb5f5c9bfb38c81471f57
+  data.tar.gz: ad5dce9ac225ba26711d6ab92c16d7fe7a2dcf906173ea52318fe7452437da685227340d3cdaf8061842f3ab5704cf7494a47f5fea9ec122f09cac930b3cd0a7

data/lib/mindwords.rb

@@ -44,27 +44,11 @@ class MindWords
     a = rexlize(h)
     doc = Rexle.new(['root', {}, '', *a])
 
-    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] #unless e2.has_elements?
-      end
-    end
-
-    duplicates.each do |path, oldpath| 
-      e = doc.element(path);
-      e2 = doc.element(oldpath);  
-      e2.parent.add e
-      e2.delete
-    end   
-
-    # remove redundant nodes
+    
+    # remove duplicates which appear in the same branch above the nested node
+    rm_duplicates(doc)
+    
+    # remove redundant nodes (outsiders)
     # a redundant node is where all children exist in existing nested nodes
 
     redundants = doc.root.elements.map do |e|
@@ -78,7 +62,8 @@ class MindWords
     end
 
     redundants.compact.each {|x| doc.element(x).delete }
-
+    rm_duplicates(doc)
+    
     @outline = treeize doc.root
     
   end
@@ -106,6 +91,30 @@ class MindWords
     end
 
   end
+  
+  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
+    end
+
+    duplicates.each do |path, oldpath| 
+      e = doc.element(path);
+      e2 = doc.element(oldpath);  
+      e2.parent.add e
+      e2.delete
+    end   
+
+  end
 
   def treeize(node, indent=0)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson