md_edit 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546abacabfcd21d682abb75886ec1d7c3b51f7d7
-  data.tar.gz: 4c7e4d6c504182140095af692cba1fded5f8da82
+  metadata.gz: 47045b90019ff71705e40bb300f6a14acc4c4ec0
+  data.tar.gz: ba10aac7d1d29fa69a7b589a13d7e464c35c6cc3
 SHA512:
-  metadata.gz: f3f7c3d5cd4a7c529784d253ba1c69f08266d38cfb1f3eaaa16112e5f7f93227d004e94911e56b165d85a18e926b417a885d5decff3b73a4e9477a4b3bf7a276
-  data.tar.gz: 2cdb3fbc4f67e924bae4552178fbf911c7d897aee9ed2dfd0d4537a8dccaec6704140e4db139afb0d922806985d9707dba3a861563584333ab9e97510663124d
+  metadata.gz: 0d13ae45845fd8f982284abb6078414d4d92ce269c64b072dbdd4788a574ef6aa82207032bc82ff60c1b2096a1a71c4ebef537783ad25d66c5648a0686c18490
+  data.tar.gz: 96be01978e1caeae144d73d9bb021bf6f062d46d8093934932ea43ce1421102002189fff4a42d91fbe56d1f3b4c506820ded6625c7347d123aec6fcbc5a08177

data/lib/md_edit.rb

@@ -13,13 +13,13 @@ class MdEdit
   
   # pass in a Markdown document or a Markdown filename
   #
-  def initialize(md, debug: false)
+  def initialize(md, debug: false, root: 'Thoughts')
     
     @debug = debug
     
     s, @filename = if md.lines.length == 1 then
 
-      File.write(md, "# Thoughts\n\n") unless File.exists? md 
+      File.write(md, "# #{root}\n\n") unless File.exists? md 
       File.exists?(md) ? [File.read(md), md] : md
 
     else
@@ -48,7 +48,8 @@ class MdEdit
     
     key = @sections.keys.grep(/#{s.downcase}/i).first
     old_value = @sections[key].flatten.join
-    old_section =  key + old_value
+    heading = last_heading(key)
+    old_section =  heading + old_value
     
     @s.sub!(old_section, '')    
     load_sections(@s)        
@@ -63,13 +64,17 @@ class MdEdit
     
     value = raw_value.gsub(/\r/,'')
 
-    title = heading ? heading : value.lines.first.chomp
+    title = (heading ? heading : value.lines.first.chomp)[/#+ +(.*)/,1]
+
     key = @sections.keys.grep(/#{title.downcase}/i).first
+
     return unless key
 
     old_value = @sections[key].flatten.join
     puts 'old_value: ' + old_value.inspect if @debug
-    old_section =  value =~ /^#+/ ? key + old_value : old_value 
+
+    heading = last_heading(key)
+    old_section =  value =~ /^#+/ ? heading + old_value : old_value 
     puts 'old_section: ' + old_section.inspect if @debug
 
     @s.sub!(old_section, value)
@@ -85,9 +90,14 @@ class MdEdit
   alias edit update
 
   def find(s, heading: true)
-    key = @sections.keys.reverse.grep(/#{s.downcase}/i).first
+    
+    key = @sections.keys.grep(/#{s.downcase}/i).first
     return unless key
-    a = [key, @sections[key].join]
+    
+    headings = key.lines.first.split(/ > /)
+    title = "%s %s" % ['#' * headings.length, headings.last]
+    a = [title, @sections[key].join]
+    
     heading ? a.join : a
   end
     
@@ -100,6 +110,14 @@ class MdEdit
   def to_h()
     @h
   end
+  
+  def to_outline(bullets: false)
+    
+    a = indentor(@s.scan(/^#+ [^\n]+/).join("\n"))
+                        .lines.map {|x| x.sub(/#+ +/,'')}
+    bullets ? a.map{|x| x.sub(/\b/,'- ')} : a.join
+    
+  end
 
   def to_s()
     @s
@@ -107,6 +125,29 @@ class MdEdit
   
   private
   
+  def indentor(s)
+    
+    a = s.split(/(?<=\n)(?=#+)/)
+
+    a.map.with_index do |x, i|
+
+      # get the indentation level
+      indent = x[/^#+/].count('#') - 1
+
+      lines = x.lines
+      lines.first.prepend('  ' * indent) +
+        lines[1..-1].map {|y| ('  ' * indent) + '  ' + y}.join 
+    end.join
+    
+  end
+  
+  def last_heading(key)
+    
+    a = key.lines.first.split(/ > /)
+    "%s %s" % ['#' * a.length, a.last]
+    
+  end
+  
   def load_sections(raw_s)
     
     # strip out any new lines gaps which are greater than 1    
@@ -123,25 +164,14 @@ class MdEdit
     
   end
     
-  def parse(s)
+  def parse(markdown)
     
-    a = s.split(/(?<=\n)(?=#+)/)
-
-    a2 = a.map.with_index do |x, i|
-
-      # get the indentation level
-      indent = x[/^#+/].count('#') - 1
-
-      lines = x.lines
-      lines.first.prepend('  ' * indent) +
-        lines[1..-1].map {|y| ('  ' * indent) + '  ' + y}.join 
-    end
-
-    puts "a2.join: \n" + a2.join if @debug
-    a3 = LineTree.new(a2.join, ignore_blank_lines: false, ignore_newline: false).to_a
-    puts 'a3: ' + a3.inspect if @debug
+    s = indentor(markdown)
+    puts "s: \n" + s if @debug
+    a = LineTree.new(s, ignore_blank_lines: false, ignore_newline: false).to_a
+    puts 'a: ' + a.inspect if @debug
     h = {}
-    a4 = scan a3, h
+    scan a, h
 
     return h  
     
@@ -151,22 +181,25 @@ class MdEdit
     File.write @filename, @s if @filename
   end
  
-  def scan(a, h={})
+  def scan(a, h={}, trail=[])
     
     a.map do |x|
 
-      head = x.first
+      raw_head = x.first
+
+      if raw_head =~ /^#/ then
 
-      if head =~ /^#/ then
-                
-        r = scan(x[1..-1], h)
+        head = raw_head[/^[^\n]+/]              
         
-        h[head[/^[^\n]+/]] =  ["\n"] + r
+        fullkey = trail + [head[/#+ +(.*)/,1]]
+        key = fullkey.join(" > ")
+        h[key] = nil
+        r = scan(x[1..-1], h, fullkey)      
+
+        h[key] =  ["\n"] + r
 
         [head, r]
 
-      elsif x.length > 1
-        [head] + scan(x[1..-1])
       else
         x.flatten.join
       end
@@ -175,4 +208,5 @@ class MdEdit
 
   end  
 
+
 end

data.tar.gz.sig

@@ -1 +1,4 @@
-?4�Q��lt�)�
t0�u�5���}����Q��t�KeIs�0_�4���45���0��	�]t3����Ķ�།÷�i�2����y�@RӃܘ�`�-����M��a[i����)7���}:���f~���Ӂ�yfI�b��.w�'�G��� SIn��lAG@j�E[� hd/G��?�d�v�9�����|�ҙ�vBJ�	��-�ҙ���l���j��d[�$m�lo�?ĸ���P�I�e
+EX�G�����_�w��<��T�)��kbF^���9�	C��΀2����"��잽�X��Щ�����ڞ
#[X�섽c��z�i�i�a]/X7�ܹ#
+]E7�ڀ�y͖���>v�z:/&���u<x��SH��}�jdz^?�Z
+I�-��/ܔ�H9$e�7�
+�n�+Y���+�d/�B��X�����

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_edit
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   R5r1JjTBaaHOaqI14bIkwUSY5q1cO4Wl7HWly80kX2AD8o/tPHvyF9Tx3pBvaboU
   etnSPHbQwmBvFQ==
   -----END CERTIFICATE-----
-date: 2017-12-24 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree