mindwords 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7510e9608c67e4af590bf024b9910a592c28c6f949d66d37499f940265b5e9d0
-  data.tar.gz: f982e7b27d1cd9d230d2f2783bf89a75d296ae0bcf6c32324aeb2d089fab113a
+  metadata.gz: 0d7be53f70e76eda32325d70cce4e3eb690799b1403440eaff8329929dc4082c
+  data.tar.gz: fa87c01d3bff8ff57506fbb0eb801ff7d881dc2aff607fbc0142e457e658b005
 SHA512:
-  metadata.gz: eb7c8532b2a5a46edace11d960f568b306b01ef3edd8c45557176451d158b42ae57e1ee3818c1df9ac202bdd17aefde8bbd2e036d913b40d57caed7d365749d1
-  data.tar.gz: d50c913670f4a5c567b5a9c81c0f1c3ef3c9293957a91128befb76196dc672e075b4f2db925a4e1156f269ab1963cbdf774192b739c9e8a4eb7b634640e969d8
+  metadata.gz: f01791819abc0b4a78b2573c2513b5dc929142a318bf30d0f3c052ea1b654e03d0462c3fddae891be170d23b03d5fa4512dedd5c85b678ac633481d3bdecd798
+  data.tar.gz: b99eec4aa8a9a47c3e73b690727cbcc7bf16a1c0f43699fb399f309c8a752d94c7eb5128c5df998679ea0fdc1eeca14d005954e5476a75e74b0d59ef8ac1181f

data/lib/mindwords.rb

@@ -3,7 +3,7 @@
 # file: mindwords.rb
 
 require 'rexle'
-require 'rxfhelper'
+require 'rxfreadwrite'
 require 'line-tree'
 
 module HashCopy
@@ -19,40 +19,16 @@ end
 class MindWords
   using ColouredText
   using HashCopy
+  include RXFReadWriteModule
 
+  attr_reader :words_missing
   attr_accessor :lines, :filepath
 
   def initialize(raws='', parent: nil, debug: false)
 
     @parent, @debug = parent, debug
 
-    s, type = RXFHelper.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\?>/
-
-    @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
+    import(raws) if raws.length > 1
 
   end
 
@@ -90,11 +66,42 @@ class MindWords
       found = search(title)
       found.hashtags() if found
     else
-      @parent.attributes[:hashtags].split if @parent
+      @parent.attributes[:hashtags].split if @parent and @parent.attributes[:hashtags]
     end
 
   end
 
+  def import(raws)
+
+    s, type = RXFHelper.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\?>/
+
+    @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
+
   # helpful when searching for a word itself using autosuggest
   #
   def lookup(s)
@@ -119,7 +126,7 @@ class MindWords
 
     puts 'before save' if @debug
 
-    File.write file, to_s()
+    FileX.write file, to_s()
 
   end
 
@@ -339,6 +346,7 @@ class MindWords
 
     a = rexlize(h)
     doc = Rexle.new(['root', {}, '', *a])
+    puts 'doc.xml: ' + doc.xml(pretty: true) if @debug
 
     # apply node nesting
 
@@ -355,6 +363,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)
@@ -402,6 +411,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(/ +/,'-')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMTA2MDAzNzI2WhcN
-  MjIwMTA2MDAzNzI2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCnNKTu
-  gn/UJQjyq6a2T4UUemzEz8RnPLYDFkt+iM4mXm7dqSkZ5EdSEHdJ26r2P07yZjyB
-  wg/WciIAG2tStBa9Kz3JLe4PveWMTlWDy0SruFAlUYVo8xaZjJmn7eAYFQz9mvVM
-  6HYp0ov8hDtYiDuhcmJ9tlVciusDcGuF9J9XoG3wH75EgRCVbxVXPTufhJNxAfmg
-  Z8Z6pGm6gVRZ4YJ50+14vwTyyTjB3uFmJtjIn4UhDmAP3l1YUEQq0RCqEgdigzu7
-  k1gX0A5Fs+5BKqK9kTlpZuceDH4Hqcmm4DPZ+asiXIYoRetlYaw/QJMpVpgOQ4tU
-  PP0ZGl/QUSmrru/5uK+P4xOUL07O1dd+K6tyR8SC3Gh4Wzow8rUtyh7cXPz58bGY
-  RtZaWPTWgz8FZs3S7NcIBdGU0Hlj8Z5QL26LatKIRsJz1yNaV8dRWZbhU9ML6RRJ
-  7T2avgjLyj1WWyx3Sg8afxxZ0Odp5wBc1LiqdqI+OybheGZdR1z17k/Xyj8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWkD96lfk
-  uPyGnc/MJwjZ5vZICwEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTI3MTQ1NDM4WhcN
+  MjMwMTI3MTQ1NDM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC5j1vd
+  M1N+azakESYbM6MEesfRhcOCklUmUNk5LlHcrtoySInNFd9ky7EMilTg8hRPrf5m
+  YgEx9+6V4iAGhRrkmyPdjGbNvgjyGqPjzouwtElA1SIh6geIaiDr3GAQQ4Amez/g
+  jM0bh1xybLIhBxUJ+QDB/MCyWX7c6Lf2mmbWpKJJi9DxdgZT19nD5VrjLE989UwN
+  XOt/jc8s9zc3RFNadSTqVAWXXUb8F9Uh0zrkNwJD0jhmpHEyg7uZ6cHrxD9zZbLf
+  YLJFU+QgPCSUkJX3KUcLbpwHJbmwVbaRwHz16AanbyvBa3jHBOTLoRywpvjPQuec
+  vr+4cUzHHad9G329gwk9F/3VY0KMtvjxwsRKJ6R+0QacNNG/uyzDirlPfx2N9qy/
+  +vxoLS8NDLDG7lxa+vSXqBhfBlUGUTV+N3g7zwUQOfLetAza48Mzlhbtom/7GhXW
+  RLyW+RLWrNZmyxzmcTzIXMJknJcdh1lErfqlK4xJoFjoOz+Ezt91yfqo7pcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUsko1pK7R
+  6H51ylxgR7A2RLZ7B6UwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAbe9+Fvsl1/YO5V70fwm9KI6qDR8TBYVSgFBBHnBb
-  vua8Qp+neqsLq/NVF/MAgBa8klFOw0LLPjKphKLSbJd7pb34etJytsIWcF2WLCGG
-  s9JBtt3URieOcvKVyCnjAA4aQ3YGvgaM3t94y/LaoSQZEgu8385NczGI8GCFSEV5
-  0pv/71aTh42DuIbFrF5Qf7XMncgMzxZuVWaWuU25Nh4bK6swzSV8Pba89c8LhVj2
-  WUxqYCA9Lrgw2H/RWxQIXS1xQ+zXLHc+ExzJ/qEDef7wsz3wIYRoGHbhciXxLHce
-  +0EOblxngt+AdCB4PmQlVA5LdFSRzxMv84tGrnhAGefjGPe1KzegthuN7sl0yugD
-  tiF/wCtUE7D7XQOINuJSGP2e+9XU3GmTZQvrdEuOO3LcTSU9jfn04leXaQ4pwv2M
-  aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
-  3+574KQzs/gR9Y5a+iMcvHRN
+  BgkqhkiG9w0BAQsFAAOCAYEAR1wfQlkrJf5zvVkq5Cl2fcXYKRnhk8N9lxUZPA2Z
+  nXfHed/9gdLpGLQHV91Q0W2taDFDnOpRj3e2dZxdihrJ4qJJ55w9cUgGcpqTjmgE
+  p/5Pxgy25wdHte0URJvy4fnIB0NjVe+pTLENGLhk9O+ktKxfI5b+3ImOHLirfsiM
+  Nt1J9bxPr++9WzOnvOBNpt+dSZE42/mEAoVHCLGp06XSCuj3TRE93TetO5K8Rqrz
+  Gr2rktYjmK75ckHc2Owb7k5q4MhENXDF0w+boTHKwhZ3YZ23ORWBAAe6EWZ5CJif
+  ACsKYTamTZJ1XtnSuwfZJ66HujeZDeDeU4Jn0IWl0Ocpuf5cGdgZdQ/jlA02M4Ev
+  1IAsJkbXAdPHh9mLKUSeH2E1qJ8tg7MFVdBZMkvG4PNXXEk5fzijsrxrXbpY4IgW
+  eUqhPOSrxIRLebVebvo/SHN6+ed3Q1tXowsbLGCT9QwqbaZ5MZ7zks92mIWeJvsA
+  JdpabIXfcOANNKd0ha4NO+Yu
   -----END CERTIFICATE-----
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -58,25 +58,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: rxfhelper
+  name: rxfreadwrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.2.5
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +103,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.