mindwords 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0d833b4c7bb6f1226f6c6d5a8489fed1ba6c8d5a2410bbb6df2b61a9285bc4d
-  data.tar.gz: 0cc6c2b9ac7cb8e829b52ba224d04579ad0fb20eb15b8bcf8c39c2ba365c6a3c
+  metadata.gz: aa290828ca8b921917460e6f8958c8b21d461c269a060e63c6079f57090d7d3e
+  data.tar.gz: e719d8986ece5f93bc994682a02b8f9826f1b5554349b40402d2a699920ba40b
 SHA512:
-  metadata.gz: 6f2608e84d67e2303cc61a349a50147028b54f6f537aefb92bd0a6bf15dade2d5e418b84f3a9a543d545d0235fb65d171fd106ad24e9b6ca7239ecef131a961e
-  data.tar.gz: bd98ce9223b9343b1c827946f972f5ac1420c79484bf11e26e60f8fead39f42a4323682ed684fcee5e0cefa1239ffd9c387623fff31e99567d3ec7319ecd7e34
+  metadata.gz: 407b282223460ffb5585e15c5acaa1b377cefb17350b7626680cafd6d4f742a2ab1a0b19223385f74ca332f2830f5cc618e22fff93d6a704a0a3921b18dfb65c
+  data.tar.gz: 1f4c83f14c4e5c2ad51925445edb600a9e60a14482f7b4e057703b8ea980d8e631d5c901ebe49b034db3ce73e7ce0515ef936214e18ba138a93b0aee472f1b93

data.tar.gz.sig

@@ -1,4 +1,3 @@
-`X�_�ݪF�y�$.��u��P�ރE�N�@�� �O���#G��E���g�����
-���=˲�7{�ߤ����|�$��,
-YX9�qo�Pb��o�~���4�Q��w]v&�@�G��i�G��QFy��ܻs�<��rg}����I ���{AU	��Q���P��3i�,���ui�qf� Q��9���+�NT��ng��ļj��gۖF_v������2ySƧ��K��0�I���S
-f6R1��)�����w��:�O�0�K5�����IQ�����c��v�@���Z��d:�_`��Q|QN*���kn�]%ڧ1+������4D-���ZH/1�K�'T��3e�ٯ���$��
+p2ua�/&���8�ħ��5	�~m���-��N�r�%fj�O�Q���)
+��m�\���^ݹhd�^����L�2�H�nX�C�]�.��F1ڒ
����^rV���]S]fw�K�X���,{��luٲ�	8���hLT�����*���갑��u�5�*��.���}	"mM��4��0���5>&5B�|"�w&�s��@_"�#cw�ؗ~����5*W�
�������Z���M����9���>%OH%�h��YM/jf\ D�/�#��
��/�G��Y)��@��2F5�4l��뮇�\� wM\}9b4�~y���t�|�}���
+i*�Г���H��^3𓌗�T)'{�UM>

data/lib/mindwords.rb

@@ -29,14 +29,44 @@ 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
+    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
+  end
+  
   def breadcrumb()
     @parent.attributes[:breadcrumb].split(/ +\/ +/) if @parent
   end
+  
+  def headings()
+    breadcrumb[0..-2]
+  end
     
   
   def element(id)
@@ -53,12 +83,49 @@ class MindWords
 
   def save(file=@filepath)
     
+    return if @lines.empty?
+    
     puts 'before save' if @debug
     File.write file, to_s()
     
   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|
       
@@ -79,9 +146,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
+    #
     
-    MindWords.new(a2.join, parent: e, debug: @debug)
+    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
+    
+    if succinct then
+      MindWords.new(a2.uniq.join, parent: e, debug: @debug)
+    else
+      MindWords.new(a2.uniq.join,  debug: @debug)
+    end
     
   end
   
@@ -123,11 +213,20 @@ 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()
-    @h
+    to_a.to_h
   end
-  
+    
   def to_hashtags()
     @hashtags
   end
@@ -137,10 +236,12 @@ class MindWords
     sort ? a2tree(tree_sort(LineTree.new(@outline).to_a)) : @outline
   end
   
+  alias to_tree to_outline
+  
   def to_s(colour: false)
     
     header = "<?mindwords?>\n\n"
-    return header + @lines.join unless colour
+    return header + @lines.map(&:chomp).join("\n") unless colour
     
     body = @lines.map do |x|
         title, hashtags = x.split(/(?=#)/,2)
@@ -149,11 +250,24 @@ class MindWords
     
     header + body
     
-  end
+  end  
   
   def to_words()
-    to_outline.lines.map {|x| x[/\w[\w ]+/] }.uniq
-  end
+    
+    h = {}
+    
+    Rexle.new(to_xml).root.each_recursive do |e|
+      
+      h[e.attributes[:title]] = {
+        breadcrumb: e.attributes[:breadcrumb], 
+        hashtags: e.attributes[:hashtags]
+      }
+      
+    end
+    
+    h
+    
+  end  
   
   def to_xml()
     build() unless @xml
@@ -218,14 +332,29 @@ class MindWords
 
     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(/^_/,'')
+      
+    end    
+    
+    # ----
+    
     @outline = treeize node
     
     node.root.each_recursive do |e|
@@ -288,7 +417,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
       
@@ -334,3 +463,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.3
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
   3+574KQzs/gR9Y5a+iMcvHRN
   -----END CERTIFICATE-----
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-04-09 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