mindwords 0.6.7 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d489cc248683b435ca0ba18e673b7aa75aa23395a73235df19ac355e928dae4
-  data.tar.gz: c8276a4a42198bae89ab48af00ec48b491e5a55761e9c3ed47e20524121dbc11
+  metadata.gz: b7201b9f1950ecacaf5bac313bf8dd0c7485efe308829fa8bc73d5fa442cca5e
+  data.tar.gz: e61b0229f2c75c11c71f68ba6c0139bd6f5ed8110a78c66da5d66aa6144e84c3
 SHA512:
-  metadata.gz: 0f059026fe87db1dec7cd710093ccca7129817b4c461ae0f17d27aba822dce298b3a1948b8ce6c17493a802d39d0ded59edd2651b3d56c763ba455a2e68f9dd0
-  data.tar.gz: 3ee4096a398584ef5207fe2902d0e73806cee0791030461220b129f3169c62525c56a78cb288b9f19788813decc341ccb1e26bb6997affd68d6e0af70cd98118
+  metadata.gz: 5db0ccb709a730e47bdf753aa82956cce15d662f6fa35a8921b6580ecf2624b64b1187b4ce5eaaf5cb63e1e3b437a114097ed85b6945e8a8877451a5706ac4e0
+  data.tar.gz: 64826bf627e098697d504116ea6cadd7b93daee1314ebb98506af685d4b600e6e5b990200d8c380ee49d9b1b59b44565aec6feba631b310dcee0db1afec11824

data/lib/mindwords.rb

@@ -3,8 +3,10 @@
 # file: mindwords.rb
 
 require 'rexle'
-require 'rxfhelper'
+require 'rxfreadwrite'
 require 'line-tree'
+require 'polyrex'
+
 
 module HashCopy
   refine Hash do
@@ -19,8 +21,9 @@ end
 class MindWords
   using ColouredText
   using HashCopy
-  include RXFHelperModule
+  include RXFReadWriteModule
 
+  attr_reader :words_missing
   attr_accessor :lines, :filepath
 
   def initialize(raws='', parent: nil, debug: false)
@@ -72,13 +75,57 @@ class MindWords
 
   def import(raws)
 
-    s, type = RXFHelper.read raws
+    s, type = RXFReader.read raws
 
     @filepath = raws if type == :file or type == :dfs
-    lines = (s.strip.gsub(/(^\n|\r)/,'') + "\n").lines.uniq
-    lines.shift if lines.first =~ /<\?mindwords\?>/
+    rawlines = (s.strip.gsub(/(^\n|\r)/,'') + "\n").lines.uniq
+    rawlines.shift if rawlines.first =~ /<\?mindwords\?>/
+
+    # remove mindwords lines which don't have a hashtag
+    lines = rawlines.reject do |line|
+
+      found = line[/^\w+[^#]+$/]
+
+      if found then
+        puts ('no hashtag found on this line -> ' + line).warn
+      end
+
+      found
+
+    end
+
+    #--- handle indented text, indicated there are *groups* of words
+
+    s2 = lines.join.gsub(/\n\s*$/,'')
+    puts s2 if @debug
+    a = s2.strip.split(/(?=^\w+)/)
+    a2 = a.inject([]) do |r,x|
+
+      if x =~ /\n\s+/ then
 
-    @lines = lines.inject([]) do |r,line|
+        a4 = x.lines[1..-1].map do |line|
+
+          puts 'x.lines[0]: ' + x.lines[0].inspect if @debug
+          hashtag = if x.lines[0][/ /] then
+            x.lines[0].gsub(/\b\w/) {|x| x.upcase}.gsub(/ /,'')
+          else
+            x.lines[0]
+          end
+
+          "%s #%s" % [line.strip, hashtag]
+        end
+
+        r.concat a4
+
+      else
+        r << x
+      end
+
+    end
+
+    #-- end of indented text handler
+
+    @lines = a2.inject([]) do |r,line|
 
       # the following does 2 things:
       #      1. splits words separated by a bar (|) onto their own line
@@ -345,6 +392,7 @@ class MindWords
 
     a = rexlize(h)
     doc = Rexle.new(['root', {}, '', *a])
+    puts 'doc.xml: ' + doc.xml(pretty: true) if @debug
 
     # apply node nesting
 
@@ -361,6 +409,7 @@ class MindWords
 
     end
 
+    puts 'after nesting; doc.xml: ' + doc.xml(pretty: true) if @debug
 
     # remove duplicates which appear in the same branch above the nested node
     rm_duplicates(doc)
@@ -408,6 +457,45 @@ class MindWords
 
     @outline = treeize node
 
+    # ----
+
+    # It's common for words to be missing from the outline, either because
+    # they have erroneously been flagged as redundant or lack specific hashtag
+    # context. Below, we attempt to identify the missing words with a
+    # suggestion on how to fix it.
+
+    words = @outline.lines.map(&:strip)
+    orig_words = to_s().lines.map {|x| x[/^[^#]+(?= #)/]}.compact
+    @words_missing = orig_words - words
+
+    if @words_missing.any? then
+
+      tags = []
+      @words_missing.inject(tags) do |r,word|
+
+        found = to_s().lines.grep(/#{word}/)
+
+        if found then
+          r << found.first.scan(/#\w+/).map {|x| x[1..-1]}
+        else
+          r
+        end
+
+      end
+
+      add_sugg = tags.uniq.map do |atag|
+        ("%s #%s" % [atag[0], atag[1]]).bg_black
+      end
+
+      puts ('@words_missing: ' + @words_missing.join(', ') ).warn
+      puts "suggestion: try adding the following:".info
+      puts add_sugg.join("\n")
+      puts
+
+    end
+
+    # ----
+
     node.root.each_recursive do |e|
 
       e.attributes[:id] = e.attributes[:title].downcase.gsub(/ +/,'-')
@@ -536,3 +624,99 @@ EOF
   end
 
 end
+
+class MindWordsPlus
+
+  attr_reader :to_px
+
+  def initialize(s, fields: %w(title content), debug: false)
+
+    lt = LineTree.new(s)
+    h = lt.to_h
+
+    mw = MindWords.new(h.keys.join("\n"))
+    outline = mw.to_outline
+
+    out = outline.lines.map do |line|
+
+      word = line[/\w[^$]+/]
+
+      found = h.keys.find do |key, value|
+
+        if debug then
+          puts 'key2: ' + key[/^[^#]+(?= #)/].inspect
+          puts 'word: ' + word.chomp.inspect
+        end
+
+        word.chomp == key[/^[^#]+(?= #)/]
+      end
+
+      puts 'found: ' + found.inspect if debug
+
+      if found and h[found][:body] then
+        puts '***' + h[found][:body].keys.inspect  if debug
+        line.chomp + ' # ' + h[found][:body].keys.join('<br/>') + "\n"
+      else
+        line
+      end
+
+    end
+
+    puts out.join if debug
+
+    px = Polyrex.new(schema: "entries[title]/entry[#{fields.join(', ')}]",
+                     delimiter: ' # ')
+    px.import out.join
+    @px = px
+
+  end
+
+  def to_ph()
+
+    lines = []
+
+    @px.each_recursive do |x, parent, level|
+
+      if level.to_i < 3 then
+        line = ("\n" + '#' * (level.to_i + 1)) + ' ' + x.title + "\n\n"
+      else
+        line = '*' + ' ' + x.title + "\n"
+      end
+
+      if x.content.length >= 1 then
+        txt = '- ' + x.content.gsub('&lt;','<').gsub('&gt;','>')
+        line += "\n" + txt.gsub('<br/>',"\n- ") + "\n"
+      end
+
+      lines << line
+
+    end
+
+    lines.join.gsub(/\n\n\n/,"\n\n")
+  end
+
+  def to_px()
+    @px
+  end
+
+  def to_tree()
+
+    lines = []
+    @px.each_recursive do |x, parent, level|
+
+      line = ('  ' * level) + x.title
+
+      if x.content.length >= 1 then
+        txt = x.content.gsub('&lt;','<').gsub('&gt;','>')
+        indent = '  ' * (level+1) + '* '
+        line += "\n" + indent +  txt.gsub('<br/>',"\n" + indent)
+      end
+
+      lines << line
+    end
+
+    lines.join("\n")
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.8.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,28 @@ cert_chain:
   eUqhPOSrxIRLebVebvo/SHN6+ed3Q1tXowsbLGCT9QwqbaZ5MZ7zks92mIWeJvsA
   JdpabIXfcOANNKd0ha4NO+Yu
   -----END CERTIFICATE-----
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: line-tree
+  name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rxfhelper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.4.1
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Helps get what's in your mind into a structure using words and hashtags.

metadata.gz.sig

@@ -1,3 +1,3 @@
-2��nܦO�aK?��V�� �J$�J����9��/�
-���W�O5;fl�3.��%D��P�Ӈ|V��RՁV�N螴�
>�i�.^�r=�(`n�0>�TX���P�ڥ��gQ�{��P�^�)�R��1�0�
-Y�S2��P�&P��Y"s����ĶE��t\3a����3�r2��}�%Y�k�h!/�`��eţx��rǍ�eK��{�0���y�A�/����9׷U�X}?�+.��_smkh�P�`F�f��/6��jO��N��47�n���m�H$�����j���ܻ-��\�ra|���N��l|�#������G���`Ϣ����ڼER�V���Z2EԷj��^�6m��3��fא����,�n٣��U
+T6&�'`sV����>�䟂�є�Yx���^F=f���mq�2pf�o6ܢ3�8��f�.!c"�)�&.�Yj�������g�v�]h|
+�ij�|�_A򡃭*��˱�F�G��0P�(�
+��ǚ�K��a��W���}�s�W��zv��	��d