mindwords 0.5.5 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dce3985e118c20bf9564d5d5d80b471cfb1422387d02a9b2faedaa29ee6b847
-  data.tar.gz: c74d01bae140212eb3e3d8f6a65fed89a1fde92920fd4924f4f32b15cc8fd901
+  metadata.gz: 18ab26d7ab5ff288172a06294982093e97db2b22998cb627ce5f7201dac62a6f
+  data.tar.gz: b717eb9f9b9c99d88ed27b33913834f361ceb5715fd9e4e7bdff3bcf7abf9089
 SHA512:
-  metadata.gz: 7867fb1ac1224ec7d5f4515b450182d01344fe95cd4002409fe45eeb59a6cedaa7ba07074c1f22030d332fe3a09e4290c1aa0243e5033575898b098328aa160c
-  data.tar.gz: 0c10f58552946d28c0a81fca5e1ce078575ec8c7402e2b64bc8c56e1b24c0979053356898af377f036d7bdabfd9e4957bc87e970eded50a7ee3d94703ab75b88
+  metadata.gz: ab92bd3423e50ad635cfd986d817a874db78b2fb7d57db01300400ce4dd5d267d706e1e642442c6bf4d9b5a84448d8be0fe0c13684cf3cfb160523e67da251d0
+  data.tar.gz: b7b6e3e7971d76f3cd42989a2b69fb6e1d5a933c80f5bcfa61fc65542819ecc2d9b711f7d4af8d77ad8a9d3f4cf7e8a310cd1ce68574d511fbfa2e73af020c13

data/lib/mindwords.rb

@@ -29,18 +29,46 @@ class MindWords
     s, type = RXFHelper.read raws
     
     @filepath = raws if type == :file or type == :dfs
-    @lines = s.strip.gsub(/^\n/,'').lines
-    @lines.shift if @lines.first =~ /<\?mindwords\?>/
+    lines = s.strip.gsub(/^\n/,'').lines.uniq
+    lines.shift if lines.first =~ /<\?mindwords\?>/       
+    
+    @lines = lines.inject([]) do |r,line|
+      
+      # the following does 2 things:
+      #      1. splits words separated by a bar (|) onto their own line
+      #      2. prefixes a word with an underscore if the word is the 
+      #         same as the hashtag. That way it's not removed by the 
+      #         redundancy checker
+
+      raw_words, raw_hashtags = line.split(/(?= #)/,2)
+      words = raw_words.split(/ *\| */)
+      hashtags = raw_hashtags.scan(/(?<=#)\w+/)
+      
+      words.each do |word| 
+        
+        linex = (word +  raw_hashtags)
+        r << (hashtags.include?(word) ? linex.sub!(/\b#{word}\b/, '_\0') \
+              : linex)
+      end
+
+      r
+    end
     
   end
   
-  def add(line)
-    @lines << line
+  def add(s)
+    
+    @lines.concat s.strip.lines
+    
   end
   
   def breadcrumb()
     @parent.attributes[:breadcrumb].split(/ +\/ +/) if @parent
   end
+  
+  def headings()
+    breadcrumb[0..-2]
+  end
     
   
   def element(id)
@@ -54,17 +82,75 @@ class MindWords
   def hashtags()
     @parent.attributes[:hashtags].split if @parent
   end
+  
+  # helpful when searching for a word itself using autosuggest
+  #
+  def lookup(s)
+    self.to_words.keys.sort.grep /^#{s}/i
+  end    
+  
+  # same as #lines but inludes the breadcrumb path; Helpful to identify 
+  # which words don't have a breadcrumb path.
+  #
+  def linesplus()
+    
+    to_a.map do |word, _|
+      r = search word
+      r ? [word, r.breadcrumb] : [r, nil]
+    end
+    
+  end
 
   def save(file=@filepath)
     
     return if @lines.empty?
     
     puts 'before save' if @debug
-    File.write file, to_s()
+    
+    if File.exists? file then
+      File.write file, to_s()
+    else
+      raise 'Filepath not given'
+    end
+    
+  end
+
+  # Accepts a list of words with the aim of returning a MindWords document 
+  # using matched words with hashtags from the existing MindWords document.
+  #
+  def reflect(raws)
+    
+    h = to_h
+    
+    missing_words = []
+    
+    # add the tags from the main list
+    a = raws.strip.lines.map do |x| 
+      if h[x.chomp] then
+        [x.chomp, h[x.chomp]]
+      else
+        missing_words << x
+        nil
+      end
+    end.compact
+
+    # add any linkage words from the tags
+    #
+    a.map(&:last).flatten(1).each do |s|
+
+      a << [s, h[s]] if h[s]
+
+    end
+
+    # remove suplicates lines and transform it into a raw mindwords format
+    #
+    raws3 = a.uniq.map {|s,tags| [s, tags.map {|x| '#' + x }.join(' ')].join(' ') }.join("\n")
+
+    [MindWords.new(raws3), missing_words]
     
   end
   
-  def search(keyword)
+  def search(keyword, succinct: true)
     
     a = @lines.grep(/#{keyword}/i).map do |line|
       
@@ -85,9 +171,32 @@ class MindWords
     puts 'a2: ' + a2.inspect if @debug
     e = element(keyword.downcase.gsub(/ +/,'-'))
     
-    return nil if e.nil?
+    return MindWords.new(a2.uniq.join,  debug: @debug) if e.nil?
+
+    # find and add any linkage support lines
+    #
+    
+    a3 = []
+
+    a2.each do |line|
+      
+      line.chomp.scan(/#[^ ]+/).each do |hashtag|
+        
+        puts 'hashtag: ' + hashtag.inspect  if @debug
+        r2 = @lines.grep(/^#{hashtag[1..-1]} #/)
+        a3 << r2.first if r2        
+        
+      end
+    end
+
+    puts 'a2: ' + a2.inspect if @debug
+    a2.concat a3
     
-    MindWords.new(a2.join, parent: e, debug: @debug)
+    if succinct then
+      MindWords.new(a2.uniq.join, parent: e, debug: @debug)
+    else
+      MindWords.new(a2.uniq.join,  debug: @debug)
+    end
     
   end
   
@@ -129,16 +238,40 @@ class MindWords
     @lines = tag_sort().lines
     self
   end
+
+  def to_a()
+    
+    @lines.map do |x| 
+      s, rawtags = x.split(/(?= #)/,2)
+      [s, rawtags.scan(/(?<=#)\w+/)]
+    end
+    
+  end
+  
+  def to_h()
+    to_a.to_h
+  end
     
   def to_hashtags()
     @hashtags
   end
 
   def to_outline(sort: true)
+    
     build()
-    sort ? a2tree(tree_sort(LineTree.new(@outline).to_a)) : @outline
+    
+    if sort then
+      a = LineTree.new(@outline).to_a
+      puts ('a: ' + a.inspect).debug if @debug 
+      a2tree(tree_sort(a))
+    else
+      @outline
+    end
+    
   end
   
+  alias to_tree to_outline
+  
   def to_s(colour: false)
     
     header = "<?mindwords?>\n\n"
@@ -183,12 +316,12 @@ class MindWords
 
     @lines.each do |line|
 
-      title, rawtags = line.split(/ (?=#)/,2)
+      title, rawtags = line.split(/(?= #)/,2)
       
       rawtags.scan(/#(\w+)/).flatten(1).each do |rawtag|
         tag = rawtag.gsub(/ +/, '_')
         h[tag] ||= []
-        h[tag] << title
+        h[tag] << title.strip
       end
 
     end
@@ -230,17 +363,35 @@ class MindWords
       e.backtrack.to_s if dups
 
     end
+    
+    puts 'redundants: ' + redundants.inspect if @debug
 
     redundants.compact.each {|x| doc.element(x).delete }
  
-    
     node = if @parent then
       found = doc.root.element('//' + @parent.name)
-      found ? found : doc.root
+      found ? found.parent : doc.root
     else
       doc.root
     end
     
+    # the following removes any undescore prefix from words which were the 
+    # same as the hashtag
+    
+    node.root.each_recursive do |e|
+
+      next unless e
+      puts 'e: ' + e.inspect if @debug
+      
+      e.attributes[:id] = e.attributes[:id].sub(/^_/,'') if e.attributes[:id]
+      e.attributes[:title] = e.attributes[:title].sub(/^_/,'') if e.attributes[:title]
+      e.value = e.value.sub(/^_/,'')
+      e.name = e.name.sub(/^_/,'')
+      
+    end    
+    
+    # ----
+    
     @outline = treeize node
     
     node.root.each_recursive do |e|
@@ -303,7 +454,7 @@ class MindWords
 
     duplicates.each do |path|
       
-      puts 'path: ' + path.inspect if @debug
+      puts 'pathx: ' + path.inspect if @debug
       e = doc.element(path)
       e.delete if e
       
@@ -349,3 +500,25 @@ class MindWords
 
 end
 
+class MindWordsWidget
+
+  def initialize()
+
+  end
+
+  
+  # can be used for main entries or a words list
+  #
+  def input(content: '', action: 'mwupdate', target: 'icontent')
+
+<<EOF
+<form action='#{action}' method='post' target='#{target}'>
+  <textarea name='content' cols='30' rows='19'>
+#{content}
+  </textarea>
+  <input type='submit' value='Submit'/>
+</form>
+EOF
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
   3+574KQzs/gR9Y5a+iMcvHRN
   -----END CERTIFICATE-----
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -46,7 +46,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement