wiki_md 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7dae25e868d52bfea1461356265ae5b03e61fd5c88eab4c1c777d5b5d7e8e00
-  data.tar.gz: 6915a2cbe47d1e4149c3382b1115b7e7381d139cc717090f35203bd045ae0cdc
+  metadata.gz: 23d30c7bf1b6a100c37547aa1c5ff9e65b8c15cfb764672ed234d02193c63cf2
+  data.tar.gz: aaa03a60bb5698f4973a1bc5482c05e351d23890e6a77c44569250e48ea49dd3
 SHA512:
-  metadata.gz: 1322e935d64b161170ba2954929c7997b5f02e07605b0b4672b3e9f62e81792cb3a2d5329ff908cf9bbee31677c6a718343ca99838cbd80b7c9ec0e8150516d9
-  data.tar.gz: dcf4f022352ca137e5c504237e45e1387913770206d08d5ce4e5be0c300bee7e8bb6e4a0bad65872c0f6ed9310fc98f0d727c78f41c94e61de9ae6da41275f9f
+  metadata.gz: ad6a1590ee1f11d6572aadcfc6e3125b98a0fee494ccf89dbdb38e162a70ea5a3ba7d9425ce0106e7e8979d26b2407c2a8bb338f8606701fbd34f6d2bedf3917
+  data.tar.gz: d955659c15fa48942c4c0cc5bffff1a4b9e1925957dc1f95ff1839ae6ef0ed20cde55f707b748cc4551463f63c2cbf32c8e8c60e579039304d42935cd270b306

data/lib/wiki_md.rb

@@ -21,16 +21,38 @@ class WikiMd
     if wiki then
       
       s, type = RXFHelper.read(wiki, auto: false)
-      @filename = wiki if type == :file or type == :dfs
-      puts ('s: ' + s.inspect).debug if @debug
-      @dxsx = DxSectionX.new s, debug: debug, autosave: true
       
-      @filepath = File.dirname @filename
+      if debug then
+        puts [
+          's: ' + s.inspect,
+          'type: ' + type.inspect,
+          's.lines.length: ' + s.lines.length.inspect]\
+          .join("\n").debug
+        puts ('file exists? ' + FileX.exists?(File.dirname(s)).inspect).debug
 
-      indexfile = File.join(@filepath, 'index.xml')
+      end
       
-      # check for the index.xml file      
-      @dx = load_index(indexfile)
+      if type == :unknown and s.lines.length == 1 and 
+          FileX.exists?(File.dirname(s)) then
+        puts 'before new_md()'.debug if debug
+        new_md()
+        @filename = wiki
+        
+      elsif type == :file or type == :dfs 
+        
+        @filename = wiki
+        
+        puts ('s: ' + s.inspect).debug if @debug
+        @dxsx = DxSectionX.new s, debug: debug, autosave: true
+        
+        @filepath = File.dirname @filename
+
+        indexfile = File.join(@filepath, 'index.xml')
+        
+        # check for the index.xml file      
+        @dx = load_index(indexfile)        
+        
+      end      
       
     else
       
@@ -63,23 +85,37 @@ class WikiMd
     
     @dxsx.create(x: s2)
     
-    @dx.create title: title + ' #' + tagline.lstrip.split.join(' #'), 
+    record = {title: title + ' #' + tagline.lstrip.split.join(' #'), 
         url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
-              URI.escape(title)].join('/')
+              URI.escape(title)].join('/')}
+    
+    @dx.create record
     FileX.write @filename, @dxsx.to_s if @filename
-    @dxtags.generate
+    @dxtags.add record
     
   end
   
   alias add_section create_section
   
   def delete_section(q)
+        
+    regex = q.is_a?(String) ? /#{q}/i : q
+    r = @dxsx.dx.all.find {|section| section.x.lines.first =~ regex }
     
-    r = find()
+    return unless r
     
-    return false unless r
+    r.delete
+    
+    rx = @dx.all.find {|x| x.title =~ regex}
+
+    return unless rx    
+    
+    title = rx.title    
+    rx.delete 
+    @dxtags.delete title
+    puts ('deleted title: ' + title.inspect).debug if @debug
     
-    r.delete 
+    :section_deleted
 
   end
   
@@ -87,8 +123,7 @@ class WikiMd
     
     puts ('WikiMd::find q: ' + q.inspect).debug if @debug
     return @dxsx.dx.find q if q =~ /^\d+$/
-    regex = q.is_a?(String) ? /#{q}/i : q
-    r = @dxsx.dx.all.find {|section| section.x.lines.first =~ regex }
+
     puts ('  r: ' + r.inspect).debug if @debug
     return unless r
     
@@ -107,6 +142,8 @@ class WikiMd
   
   def new_md(x=nil, title: 'MyWiki')
     
+    puts 'inside new_md'.debug if @debug
+    
     s = nil
     s, _ = RXFHelper.read(x) if x
     
@@ -251,10 +288,11 @@ EOF
       
       if title != @active_heading or tagline2 != tagline1 then
         
-        rx.update title: @active_heading + ' #' + tagline1.split.join(' #'), 
+        record = {title: @active_heading + ' #' + tagline1.split.join(' #'), 
             url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],
-                URI.escape(title)].join('/')
-        @dxtags.generate
+                URI.escape(title)].join('/')}
+        rx.update record
+        @dxtags.add record
         
       end
       
@@ -270,11 +308,12 @@ EOF
         a.length > 1 ? a.map(&:capitalize).join : a.first        
       end
 
-      @dx.create title: @active_heading + ' #' + newtagline, 
+      record = {title: @active_heading + ' #' + newtagline, 
           url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
-                URI.escape(@active_heading)].join('/')      
-      @dxtags.generate
-      
+                URI.escape(@active_heading)].join('/')}
+      @dx.create record
+      @dxtags.add record
+            
     end
     
   end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx
@@ -63,20 +63,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: 
 email: james@jamesrobertson.eu
 executables: []