wiki_md 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fff1d1320ddb7772ebc6ffbc60c499a28dc15e133e099fe5af3ade050ce8fe
-  data.tar.gz: 9b545bbe223a5835a094b37d969c301ca31f1a48452d897f835b04fec9a9ad4f
+  metadata.gz: c95067964e86163eae1475a060654f1bd517410f71f2fe6a02d80e37b1c85ffa
+  data.tar.gz: 3e7e8058cebf0018cd9968dac70c8fa06c3aaaab7f021530eb002cdf82fce09b
 SHA512:
-  metadata.gz: 7babfe509ca96d638f3fde08ed6397007b41187ac8d13f2e5f8f114d4ef5ed6acc781f678d6e4431bd2d24f8c0a7efb4d29c05a5ca7beb67f014894a9a1647a4
-  data.tar.gz: cd1174a5003adcd60ffea667e50b83cced57baab979fba4707e94ebf904e95587b1f8725c92cfa2c4ba23297c1c2a7d50e14dca6bf4009c4b35528b350f0516d
+  metadata.gz: 2891b0a0c4436df45336f42cc21e19bd16b208790a3eb33c1761cdbeeeb79a63cbb5044f7af84b5ba6e61973e2b35d35dd250fac5588af94a6f064e31ce248ff
+  data.tar.gz: 9a8b5212b36a698ba751d5eac14fc7763d7fb74068877de1ce3a847703276a7612780957627c18196845825d5b288f6807ae178d4ded0c40fb467812d909403b

data/lib/wiki_md.rb

@@ -7,24 +7,35 @@ require 'dxsectionx'
 
 
 class WikiMd
+  include RXFHelperModule
   
-  def initialize(wiki=nil)
+  attr_reader :active_heading
+  
+  def initialize(wiki=nil, debug: false)
+    
+    @debug = debug
     
     if wiki then
-      s, _ = RXFHelper.read(wiki)
-      @dxsx = DxSectionX.new s
+      s, type = RXFHelper.read(wiki, auto: false)
+      @filename = wiki if type == :file or type == :dfs
+      puts 's: ' + s.inspect if @debug
+      @dxsx = DxSectionX.new s, debug: debug
     else
       
       new_md()
       
-    end        
-    
+    end
+            
   end
   
+  
   def create_section(s)
+    @active_heading = s[/(?<=^# ).*/]
     @dxsx.create(x: s)
   end
   
+  alias add_section create_section
+  
   def delete_section(q)
     
     r = find()
@@ -37,11 +48,22 @@ class WikiMd
   
   def find(q)
     
+    puts 'WikiMd::find q: ' + q.inspect if @debug
     return @dxsx.dx.find q if q =~ /^\d+$/
     regex = q.is_a?(String) ? /#{q}/i : q
-    @dxsx.dx.all.find {|section| section.x =~ regex }
+    r = @dxsx.dx.all.find {|section| section.x.lines.first =~ regex }
+    puts '  r: ' + r.inspect if @debug
+    return unless r
+    
+    heading2 = r.x.lines.last[/(?<=redirect ).*/]
+    heading2 ? find(heading2) : r
+    
   end  
   
+  def headings()
+    @dxsx.dx.all.map {|section| section.x.lines.first.chomp[/(?<=# ).*/] }
+  end
+  
   def new_md(x=nil)
     
     s = nil
@@ -62,6 +84,15 @@ EOF
   
   alias import new_md 
   
+  def read_section(heading)
+    section = find heading
+    section.x if section
+  end
+  
+  def save(filename=@filename)
+    FileX.write filename, @dxsx.to_s
+  end
+  
   def title()
     @dxsx.dx.title()
   end
@@ -89,12 +120,20 @@ EOF
   
   def update_section(*args)
     
+    puts 'inside update_section' if @debug
+    
     val, raw_q = args.reverse
+    puts '  val: ' + val.inspect if @debug
+    puts '  raw_q: '  + raw_q.inspect if @debug
+    q = raw_q ? raw_q : val.lines.first[/(?<=^# ).*/]
     
-    q = raw_q ? raw_q : val.lines.first
+    puts '  q: ' + q.inspect if @debug
+    @section = r = find(q)
+    return false unless r
     
-    r = find(q)
-    r.x = val =~ /# / ? val : r.x.lines.first + "\n" + val
+    content = val =~ /# / ? val : r.x.lines.first + "\n" + val
+    @active_heading = content[/(?<=^# ).*/]
+    r.x = content
   end    
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx