mindwords 0.1.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979c08954b01240d160226705d4d6fd2735bda65542d137766f8448154168d96
-  data.tar.gz: 38b5068bc8094f08b9225ab5b370274ef80abad45b5acbd1c73ac0dac774b605
+  metadata.gz: 4070b252c0702dbfa6cb778a8717e75e60cf5de4454f1e475f496bec0bd4328d
+  data.tar.gz: 52493b20e6b137e396136b58a8c9a89e45650bff9d44caa73c9a78bfa86c8174
 SHA512:
-  metadata.gz: 53bec0cce041880c0daa73fab6a82afa58902f48eabcfef80e7f43d150bd45fb6cae895945f50b90b24532f2acdc6be3962775295ed8446d34b27550ce25f5c5
-  data.tar.gz: 1c92d7835762bf2b9f2e25fd7d52dc8d159963ad7a950cf3c6f6eb45fc426ba5cde51fa54950335503efe1cf094855b59c2cc0917412b1f176a8951d2cad5feb
+  metadata.gz: e7576fde49c1d5fccc4ce87ae583e0648c4511a0637afbce67265bc57812ec8fe74a9237db6664e03632a11d95289ab14a08343392ead7a685a7afec2fe20a07
+  data.tar.gz: df0d3b1b29866892eaa111e579da3a6e906266a524954b98ef9d5665d192c665f5bf5eaec15cef1708cc39fc2499ddf48774400e449ef868cc8f5dbfe1bfde2c

data/lib/mindwords.rb

@@ -3,51 +3,69 @@
 # file: mindwords.rb
 
 require 'rexle'
+require 'line-tree'
+
+module HashCopy
+  refine Hash do
+    
+    def deep_clone()
+      Marshal.load(Marshal.dump(self))
+    end
+    
+  end
+end
 
 class MindWords
   using ColouredText
+  using HashCopy
+  
   
-  def initialize(s, debug: false)
+  def initialize(s, parent: nil, debug: false)
 
     @debug = debug
-    @a = s.strip.lines
+    @a = s.strip.gsub(/^\n/,'').lines
+    @a.shift if @a.first =~ /<\?mindwords\?>/
     
     lines = @a.map do |line|
 
       word = line.split(/ (?=#)/,2)
 
     end
-
+    
     h = {}
+    @hashtags = {}
 
-    lines.each do |x|
+    lines.each do |title, rawtags|
 
-      x.last.scan(/#(\w+)/).flatten(1).each do |rawtag|
+      rawtags.scan(/#(\w+)/).flatten(1).each do |rawtag|
         tag = rawtag.gsub(/ +/, '_')
         h[tag] ||= []
-        h[tag] << x.first
+        h[tag] << title
       end
 
     end
+    
+    @hashtags = h.deep_clone.sort.map {|tag, fields| [tag, fields.sort]}.to_h
 
-    # does the key exist as a field?
-
-    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)
@@ -66,17 +84,50 @@ class MindWords
     end
 
     redundants.compact.each {|x| doc.element(x).delete }
-    rm_duplicates(doc)
+ 
+    
+    node = if parent then
+      found = doc.root.element('//' + parent)
+      found ? found : doc.root
+    else
+      doc.root
+    end
     
-    @xml = doc.root.xml pretty: true
-    @outline = treeize doc.root
+    @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  + ' / ' : ''
+      e.attributes[:breadcrumb] = s +  e.value.strip
+      
+      r = @a.grep(/^#{e.attributes[:title]} #/i)
+      next unless r.any?
+      e.attributes[:hashtags] = r[0].scan(/(?<=#)\w+/).join(' ')
+
+      
+    end
+    
+    @xml = node.xml pretty: true
     
   end
   
+  def element(id)
+    
+    doc = Rexle.new(@xml)
+    e =  doc.root.element("//*[@id='#{id}']")
+    #e.attributes[:breadcrumb].to_s if e
+    
+  end  
+  
   def search(keyword)
     
     a = @a.grep(/#{keyword}/i).map do |line|
       
+      puts 'line: ' + line.inspect if @debug
+      
       words = line.split
       r = words.grep /#{keyword}/i
       i = words.index r[0]
@@ -89,7 +140,8 @@ class MindWords
     #return a[0][0] if a.length < 2
 
     a2 = a.sort_by(&:last).map(&:first)
-    MindWords.new(a2.join)
+    puts 'a2: ' + a2.inspect if @debug
+    MindWords.new(a2.join, parent: keyword, debug: @debug)
     
   end
   
@@ -135,6 +187,10 @@ class MindWords
   def to_h()
     @h
   end
+  
+  def to_hashtags()
+    @hashtags
+  end
 
   def to_outline(sort: true)
     sort ? a2tree(tree_sort(LineTree.new(@outline).to_a)) : @outline
@@ -142,12 +198,20 @@ class MindWords
   
   def to_s(colour: false)
     
-    return @a.join unless colour
+    header = "<?mindwords?>\n\n"
+    return header + @a.join unless colour
     
-    @a.map do |x|
+    body = @a.map do |x|
         title, hashtags = x.split(/(?=#)/,2)
         title + hashtags.chomp.brown
     end.join("\n")
+    
+    header + body
+    
+  end
+  
+  def to_words()
+    to_outline.lines.map {|x| x[/\w[\w ]+/] }
   end
   
   def to_xml()
@@ -164,11 +228,19 @@ class MindWords
 
       case x
       when String
-        [x.gsub(/ +/,'_'),  {}, x]
+        [x.downcase.gsub(/ +/,''),  {title: x}, x]
       when Hash
-        [x.keys.first, {}, x.keys.first.gsub(/_/,' '), *rexlize(x.values.first)]
+        [
+          x.keys.first.downcase.gsub(/_/,' '), 
+          {title: x.keys.first}, 
+          x.keys.first,
+         *rexlize(x.values.first)
+        ]
       when Array
-        [x.first, {}, x.first.gsub(/_/,' '), *rexlize(x.last)]
+        [
+          x.first.downcase.gsub(/_/,' '), 
+          {title: x.first}, x.first, *rexlize(x.last)
+        ]
       end
     end
 
@@ -177,23 +249,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);  
-      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
@@ -235,3 +306,4 @@ class MindWords
   end  
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
   3+574KQzs/gR9Y5a+iMcvHRN
   -----END CERTIFICATE-----
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rexle
+  name: line-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 0.9.1
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Helps get what's in your mind into a structure using words and hashtags.