mindwords 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4766e91a6c371e9d2e8849bafdd77cea548cf43d76630a9400f0ec3b2b778953
-  data.tar.gz: 3f17f99a76ea226ca636f7c8c3ecf24e0e1b8c79571fd299d5dfa00bc10f9d63
+  metadata.gz: aa290828ca8b921917460e6f8958c8b21d461c269a060e63c6079f57090d7d3e
+  data.tar.gz: e719d8986ece5f93bc994682a02b8f9826f1b5554349b40402d2a699920ba40b
 SHA512:
-  metadata.gz: 55c7625e72007789f37b6968271655a772d3d1696991b05f112a39f2ca4b437da71ce5795375887b0b908074bdbd3d2104f0a602aa37f46b518263e2eb2d07e7
-  data.tar.gz: 4d5174c595015db117857d1e9db0b8d211d541136f83cf27e08d84bd86768f0b34e53692579f6d12a5a0931fcf3cc9939ff4deac689276cbedc8c095c8a3bf55
+  metadata.gz: 407b282223460ffb5585e15c5acaa1b377cefb17350b7626680cafd6d4f742a2ab1a0b19223385f74ca332f2830f5cc618e22fff93d6a704a0a3921b18dfb65c
+  data.tar.gz: 1f4c83f14c4e5c2ad51925445edb600a9e60a14482f7b4e057703b8ea980d8e631d5c901ebe49b034db3ce73e7ce0515ef936214e18ba138a93b0aee472f1b93

data/lib/mindwords.rb

@@ -29,8 +29,30 @@ 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
   
@@ -41,6 +63,10 @@ class MindWords
   def breadcrumb()
     @parent.attributes[:breadcrumb].split(/ +\/ +/) if @parent
   end
+  
+  def headings()
+    breadcrumb[0..-2]
+  end
     
   
   def element(id)
@@ -99,7 +125,7 @@ class MindWords
     
   end
   
-  def search(keyword)
+  def search(keyword, succinct: true)
     
     a = @lines.grep(/#{keyword}/i).map do |line|
       
@@ -120,7 +146,7 @@ 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
     #
@@ -141,8 +167,11 @@ class MindWords
     puts 'a2: ' + a2.inspect if @debug
     a2.concat a3
     
-    MindWords.new(a2.uniq.join, parent: e, debug: @debug)
-    #MindWords.new(a2.uniq.join,  debug: @debug)
+    if succinct then
+      MindWords.new(a2.uniq.join, parent: e, debug: @debug)
+    else
+      MindWords.new(a2.uniq.join,  debug: @debug)
+    end
     
   end
   
@@ -310,6 +339,22 @@ class MindWords
       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|
@@ -372,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
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  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-04-07 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