mindwords 0.4.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a5b9cc65b6f4b77a2f2c7984b08ca9920a24d86a453da41ca4be53c4c91685
-  data.tar.gz: ce841b83126de0ce431d2b8ea779aa04185b4204f20b19399159e9ccf1187310
+  metadata.gz: 14ea1cb6b906664113ef2137b3cad143b365d37c9eb0612df38a0b9e2cfdfeac
+  data.tar.gz: 8d4a298c78f32c500a941699791b1f6b952075c15b67fb088392c8860fb01fa7
 SHA512:
-  metadata.gz: 321d8a1b0c5dc421cdce55835689f18bfb9d3a74b4fd3af7eaacf99178c736889914f6eaa16a88b861e89c090cdd0fb23c326a64f5b20693a3c581a6d2c96ebb
-  data.tar.gz: 201fcae140e7f6f1a0e2e32e3e2119722a46cd0d306fc4641e06f641b4dbce4ddc5f352138258c437990e31bf7a33f484bce4d894b9e77b4fe8f5f902fdb6053
+  metadata.gz: 87afa7b5bd0b7f2cf225177259df456021e90155f57d40712042b13a37105bf879fcea494ce0b05f2b53911717dbf3cebaf6a6b9cfff6d7f3fb1056b6d59e945
+  data.tar.gz: a1c42b7e6b6de6c12e25b0de57d0ca980b8f9cc6ec1cefd71e1851f4426795285106802e6ae22c9f95539573f72abaf8b1f0432ce9b706cac86962725b73dbc7

data/lib/mindwords.rb

@@ -3,6 +3,7 @@
 # file: mindwords.rb
 
 require 'rexle'
+require 'rxfhelper'
 require 'line-tree'
 
 module HashCopy
@@ -19,112 +20,53 @@ 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
-
-    
-    # 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 }
- 
+    s, type = RXFHelper.read raws
     
-    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 add(line)
+    @lines << line
+  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)
+    
+    return if @lines.empty?
+    
+    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 +83,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 +105,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 +126,7 @@ class MindWords
   end
   
   def tag_sort!()
-    @a = tag_sort().lines
+    @lines = tag_sort().lines
     self
   end
   
@@ -193,15 +139,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.map(&:chomp).join("\n") unless colour
     
-    body = @a.map do |x|
+    body = @lines.map do |x|
         title, hashtags = x.split(/(?=#)/,2)
         title + hashtags.chomp.brown
     end.join("\n")
@@ -215,11 +162,97 @@ class MindWords
   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.2
+  version: 0.5.4
 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-29 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: []