mindwords 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4070b252c0702dbfa6cb778a8717e75e60cf5de4454f1e475f496bec0bd4328d
-  data.tar.gz: 52493b20e6b137e396136b58a8c9a89e45650bff9d44caa73c9a78bfa86c8174
+  metadata.gz: c0d833b4c7bb6f1226f6c6d5a8489fed1ba6c8d5a2410bbb6df2b61a9285bc4d
+  data.tar.gz: 0cc6c2b9ac7cb8e829b52ba224d04579ad0fb20eb15b8bcf8c39c2ba365c6a3c
 SHA512:
-  metadata.gz: e7576fde49c1d5fccc4ce87ae583e0648c4511a0637afbce67265bc57812ec8fe74a9237db6664e03632a11d95289ab14a08343392ead7a685a7afec2fe20a07
-  data.tar.gz: df0d3b1b29866892eaa111e579da3a6e906266a524954b98ef9d5665d192c665f5bf5eaec15cef1708cc39fc2499ddf48774400e449ef868cc8f5dbfe1bfde2c
+  metadata.gz: 6f2608e84d67e2303cc61a349a50147028b54f6f537aefb92bd0a6bf15dade2d5e418b84f3a9a543d545d0235fb65d171fd106ad24e9b6ca7239ecef131a961e
+  data.tar.gz: bd98ce9223b9343b1c827946f972f5ac1420c79484bf11e26e60f8fead39f42a4323682ed684fcee5e0cefa1239ffd9c387623fff31e99567d3ec7319ecd7e34

data.tar.gz.sig

@@ -1,3 +1,4 @@
-:���@yƲ+M�7�>C������
�~_ �Х�btj��~��6Ӿ�N��u�S�T�27}7���)C�K�i[Q:�L�5��+���%w�?�t�PnJ
-�s@0vH�`C%��䴮�QC�C;�㕑+�Js�>�Ly YU��ybZ�����}M���-��r
-DA3*վ������=�`78�͎L���
+`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�ٯ���$��

data/lib/mindwords.rb

@@ -3,6 +3,7 @@
 # file: mindwords.rb
 
 require 'rexle'
+require 'rxfhelper'
 require 'line-tree'
 
 module HashCopy
@@ -19,112 +20,47 @@ class MindWords
   using ColouredText
   using HashCopy
   
+  attr_accessor :lines, :filepath
   
-  def initialize(s, parent: nil, debug: false)
+  def initialize(raws='', parent: nil, debug: false)
 
-    @debug = debug
-    @a = s.strip.gsub(/^\n/,'').lines
-    @a.shift if @a.first =~ /<\?mindwords\?>/
-    
-    lines = @a.map do |line|
-
-      word = line.split(/ (?=#)/,2)
-
-    end
-    
-    h = {}
-    @hashtags = {}
-
-    lines.each do |title, rawtags|
-
-      rawtags.scan(/#(\w+)/).flatten(1).each do |rawtag|
-        tag = rawtag.gsub(/ +/, '_')
-        h[tag] ||= []
-        h[tag] << title
-      end
-
-    end
-    
-    @hashtags = h.deep_clone.sort.map {|tag, fields| [tag, fields.sort]}.to_h
-
-    
-    a = rexlize(h)
-    doc = Rexle.new(['root', {}, '', *a])
-
-    # apply node nesting
-
-    doc.root.elements.each do |e|
-      
-      doc.root.xpath('//' + e.name).each do |e2|
+    @parent, @debug = parent, debug
         
-        next if e2 === e
-        
-        e2.parent.add e
-        e2.delete
-        
-      end
-      
-    end
-
+    s, type = RXFHelper.read raws
     
-    # remove duplicates which appear in the same branch above the nested node
-    rm_duplicates(doc)
-    
-    # remove redundant nodes (outsiders)
-    # a redundant node is where all children exist in existing nested nodes
-
-    redundants = doc.root.elements.map do |e|
-
-      r = e.elements.all? {|x| !x.has_elements?}
-      puts "%s %s" % [e.name, r] if @debug
-      dups = e.elements.all? {|x| doc.root.xpath('//' + x.name).length > 1}
-      puts 'dups: ' + dups.inspect if @debug
-      e.backtrack.to_s if dups
-
-    end
-
-    redundants.compact.each {|x| doc.element(x).delete }
- 
-    
-    node = if parent then
-      found = doc.root.element('//' + parent)
-      found ? found : doc.root
-    else
-      doc.root
-    end
-    
-    @outline = treeize node
-    
-    node.root.each_recursive do |e|
-    
-      e.attributes[:id] = e.attributes[:title].downcase.gsub(/ +/,'-')      
-      
-      s = e.parent.attributes[:breadcrumb] ? \
-          e.parent.attributes[:breadcrumb].to_s  + ' / ' : ''
-      e.attributes[:breadcrumb] = s +  e.value.strip
-      
-      r = @a.grep(/^#{e.attributes[:title]} #/i)
-      next unless r.any?
-      e.attributes[:hashtags] = r[0].scan(/(?<=#)\w+/).join(' ')
-
-      
-    end
-    
-    @xml = node.xml pretty: true
+    @filepath = raws if type == :file or type == :dfs
+    @lines = s.strip.gsub(/^\n/,'').lines
+    @lines.shift if @lines.first =~ /<\?mindwords\?>/
     
   end
   
+  def breadcrumb()
+    @parent.attributes[:breadcrumb].split(/ +\/ +/) if @parent
+  end
+    
+  
   def element(id)
     
-    doc = Rexle.new(@xml)
+    doc = Rexle.new(to_xml())
     e =  doc.root.element("//*[@id='#{id}']")
     #e.attributes[:breadcrumb].to_s if e
     
-  end  
+  end
+  
+  def hashtags()
+    @parent.attributes[:hashtags].split if @parent
+  end
+
+  def save(file=@filepath)
+    
+    puts 'before save' if @debug
+    File.write file, to_s()
+    
+  end
   
   def search(keyword)
     
-    a = @a.grep(/#{keyword}/i).map do |line|
+    a = @lines.grep(/#{keyword}/i).map do |line|
       
       puts 'line: ' + line.inspect if @debug
       
@@ -141,12 +77,16 @@ class MindWords
 
     a2 = a.sort_by(&:last).map(&:first)
     puts 'a2: ' + a2.inspect if @debug
-    MindWords.new(a2.join, parent: keyword, debug: @debug)
+    e = element(keyword.downcase.gsub(/ +/,'-'))
+    
+    return nil if e.nil?
+    
+    MindWords.new(a2.join, parent: e, debug: @debug)
     
   end
   
   def sort()
-    s = @a.sort.join
+    s = @lines.sort.join
     
     def s.to_s()
       self.lines.map do |x|
@@ -159,13 +99,13 @@ class MindWords
   end
   
   def sort!()
-    @a = sort().lines
+    @lines = sort().lines
     self
   end
   
   def tag_sort()
     
-    h = @a.group_by  {|x| x[/#\w+/]}    
+    h = @lines.group_by  {|x| x[/#\w+/]}    
     s = h.sort.map {|key, value| value.sort }.join
     
     def s.to_s()
@@ -180,7 +120,7 @@ class MindWords
   end
   
   def tag_sort!()
-    @a = tag_sort().lines
+    @lines = tag_sort().lines
     self
   end
   
@@ -193,15 +133,16 @@ class MindWords
   end
 
   def to_outline(sort: true)
+    build()
     sort ? a2tree(tree_sort(LineTree.new(@outline).to_a)) : @outline
   end
   
   def to_s(colour: false)
     
     header = "<?mindwords?>\n\n"
-    return header + @a.join unless colour
+    return header + @lines.join unless colour
     
-    body = @a.map do |x|
+    body = @lines.map do |x|
         title, hashtags = x.split(/(?=#)/,2)
         title + hashtags.chomp.brown
     end.join("\n")
@@ -211,15 +152,101 @@ class MindWords
   end
   
   def to_words()
-    to_outline.lines.map {|x| x[/\w[\w ]+/] }
+    to_outline.lines.map {|x| x[/\w[\w ]+/] }.uniq
   end
   
   def to_xml()
+    build() unless @xml
     @xml
   end
 
   private
 
+  def build()
+    
+    h = {}
+
+    @lines.each do |line|
+
+      title, rawtags = line.split(/ (?=#)/,2)
+      
+      rawtags.scan(/#(\w+)/).flatten(1).each do |rawtag|
+        tag = rawtag.gsub(/ +/, '_')
+        h[tag] ||= []
+        h[tag] << title
+      end
+
+    end
+    
+    @hashtags = h.deep_clone.sort.map {|tag, fields| [tag, fields.sort]}.to_h
+
+    
+    a = rexlize(h)
+    doc = Rexle.new(['root', {}, '', *a])
+
+    # apply node nesting
+
+    doc.root.elements.each do |e|
+      
+      doc.root.xpath('//' + e.name).each do |e2|
+        
+        next if e2 === e
+        
+        e2.parent.add e
+        e2.delete
+        
+      end
+      
+    end
+
+    
+    # remove duplicates which appear in the same branch above the nested node
+    rm_duplicates(doc)
+    
+    # remove redundant nodes (outsiders)
+    # a redundant node is where all children exist in existing nested nodes
+
+    redundants = doc.root.elements.map do |e|
+
+      r = e.elements.all? {|x| !x.has_elements?}
+      puts "%s %s" % [e.name, r] if @debug
+      dups = e.elements.all? {|x| doc.root.xpath('//' + x.name).length > 1}
+      puts 'dups: ' + dups.inspect if @debug
+      e.backtrack.to_s if dups
+
+    end
+
+    redundants.compact.each {|x| doc.element(x).delete }
+ 
+    
+    node = if @parent then
+      found = doc.root.element('//' + @parent.name)
+      found ? found : doc.root
+    else
+      doc.root
+    end
+    
+    @outline = treeize node
+    
+    node.root.each_recursive do |e|
+    
+      e.attributes[:id] = e.attributes[:title].downcase.gsub(/ +/,'-')      
+      
+      s = e.parent.attributes[:breadcrumb] ? \
+          e.parent.attributes[:breadcrumb].to_s  + ' / ' : ''
+      e.attributes[:breadcrumb] = s +  e.value.strip
+      
+      r = @lines.grep(/^#{e.attributes[:title]} #/i)
+      next unless r.any?
+      e.attributes[:hashtags] = r[0].scan(/(?<=#)\w+/).join(' ')
+
+      
+    end
+    
+    @xml = node.xml pretty: true
+
+  end
+  
   def rexlize(a)
     
     a.map do |x|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindwords
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   aWH7D2AmhOpqNwWnPHzWR/yzpigAVTrvpHfRxZleQj6Z/090nIH2KR0RdioMmPFq
   3+574KQzs/gR9Y5a+iMcvHRN
   -----END CERTIFICATE-----
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rxfhelper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []