mindwords 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cff4e2c8dbff0eee0e0e4fa8fe0411d84d772e4348aca0eef1585e64887a4c2
-  data.tar.gz: 434d7757907e356ce733a1ab1f81a185677bd580ac9bb56c288b821adac2508c
+  metadata.gz: 318da7a9e4daf9a4f4d69d4315d062fab0f4b2876c3a0302a86d4d1b40909a32
+  data.tar.gz: cd0336cf0a70c0e90fec5964f5a987cbad0abb9e295fc96ddf54a6999832af91
 SHA512:
-  metadata.gz: 2443f5089c5b27b799a0c9d9c059a8157817f16bc82ffe2e868c60fa3b55c1fdf27778e8a064b4d48e8a8bf671845010ab3ab08d5481d924626f38b2861ba369
-  data.tar.gz: daac6e6f0b0a4be3dbd664eb9c1e2e489b29b1435b4ec0e507fd35f4224d51d7b79073d2ca21e5ed836a1c7fd4886ef28b2883cf515bf9789bedbb7c171dcdfb
+  metadata.gz: 1eb530ac7ff6db8b68e2827c51a7ad4ed0ed7244340e842b6ff967c2da1f32a777fff8fc2ddc91d3d04380d0e045cb9d468eba883bf064c8dd00f4686af064e2
+  data.tar.gz: 41708695837cfdc20e091889d88bb1d4e1d8a8c564855f5dbd75f640fc773ffd080353c30f073e4bbb8f76ff5e2ebefccc99a7272d55992358e22f4c8e9984ed

data/lib/mindwords.rb

@@ -3,6 +3,7 @@
 # file: mindwords.rb
 
 require 'rexle'
+require 'rxfhelper'
 require 'line-tree'
 
 module HashCopy
@@ -20,9 +21,11 @@ class MindWords
   using HashCopy
   
   
-  def initialize(s, parent: nil, debug: false)
+  def initialize(raws, parent: nil, debug: false)
 
     @debug = debug
+    
+    s, _ = RXFHelper.read raws
     @a = s.strip.gsub(/^\n/,'').lines
     @a.shift if @a.first =~ /<\?mindwords\?>/
     
@@ -47,24 +50,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 +87,7 @@ class MindWords
     end
 
     redundants.compact.each {|x| doc.element(x).delete }
-    rm_duplicates(doc)
+ 
     
     node = if parent then
       found = doc.root.element('//' + parent)
@@ -95,6 +99,8 @@ class MindWords
     @outline = treeize node
     
     node.root.each_recursive do |e|
+    
+      e.attributes[:id] = e.attributes[:title].downcase.gsub(/ +/,'-')      
       
       s = e.parent.attributes[:breadcrumb] ? \
           e.parent.attributes[:breadcrumb].to_s  + ' / ' : ''
@@ -103,7 +109,7 @@ class MindWords
       r = @a.grep(/^#{e.attributes[:title]} #/i)
       next unless r.any?
       e.attributes[:hashtags] = r[0].scan(/(?<=#)\w+/).join(' ')
-      e.attributes[:id] = e.attributes[:title].downcase.gsub(/ +/,'-')
+
       
     end
     
@@ -208,7 +214,7 @@ class MindWords
   end
   
   def to_words()
-    to_outline.lines.map {|x| x[/\w[\w ]+/] }
+    to_outline.lines.map {|x| x[/\w[\w ]+/] }.uniq
   end
   
   def to_xml()
@@ -225,16 +231,19 @@ class MindWords
 
       case x
       when String
-        [x.gsub(/ +/,'_'),  {title: x}, x]
+        [x.downcase.gsub(/ +/,''),  {title: x}, x]
       when Hash
         [
-          x.keys.first.gsub(/_/,' '), 
+          x.keys.first.downcase.gsub(/_/,' '), 
           {title: x.keys.first}, 
           x.keys.first,
          *rexlize(x.values.first)
         ]
       when Array
-        [x.first.gsub(/_/,' '), {title: x.first}, x.first, *rexlize(x.last)]
+        [
+          x.first.downcase.gsub(/_/,' '), 
+          {title: x.first}, x.first, *rexlize(x.last)
+        ]
       end
     end
 
@@ -243,24 +252,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.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-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rxfhelper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []