wiki_md 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38973a10f21192f8544110548615d754d018e988a12feba21e4bb1e67a3cc23e
-  data.tar.gz: ae0624231185e275069de171bfa4ab23b67eb7ff14d6210107399a62b2006c12
+  metadata.gz: 530d021b34044f9b6c7c898aa12ad389ddb51ed46fa0daedf203d6c5a0daf2a3
+  data.tar.gz: 770507b1927a1f58ddb7927d9a4f4e381f84a85ac25093f9c2efc38714e047a4
 SHA512:
-  metadata.gz: 9b14eae599801501a44c0b02f3a67a1a0160511254f2f938b65c04730d31c5aa474b5763cffab98f3b32994241da7202ae71f35f430ea7ee6f6d96ef05ea0d70
-  data.tar.gz: aa5693cc2fd3ee12620e24705ecfa0a47e10c17e5bdb24a80fb68ad0b87e9aea75126ab0db98da721a9f2732802f0e8fdcfe053f69ef9386e225dd726661fac3
+  metadata.gz: 9b335fde528b54db2da43e56744ea19f90ea9f240c8b6dc82e87874d7c136b4aa85ade7b0cdbd3110df7f717575d5b93a152726b1a4aeadb6445aa7978f0fa15
+  data.tar.gz: 6053f8a680cadd4861cf1630a837301530b8d04b18d10f9c59de2d14da42aa2caf6725aeee87eab8aa3109a0d6c0b835e78d4b5246bf39a4b56133d95b62bfb3

data/lib/wiki_md.rb

@@ -129,7 +129,7 @@ class WikiMd
 
   
   def create_section(s)
-
+    
     @active_heading = title = s[/(?<=^# ).*/]
 
     tagline = s.rstrip.lines.last[/(?<=^\+\s).*/]
@@ -185,12 +185,23 @@ class WikiMd
   end
   
 
-  def find(q)
+  def find(q, exact_match: false)
     
     puts ('WikiMd::find q: ' + q.inspect).debug if @debug
     return Entry.new(@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 }
+    
+    regex = if q.is_a?(String) then      
+      exact_match ? /#{q}$/i : /#{q}/i
+    else
+      q
+    end
+    
+    r = @dxsx.dx.all.find do |section|
+      
+      section.x.lines.first =~ regex
+      
+    end
+    
     puts ('  r: ' + r.inspect).debug if @debug
     return unless r
     
@@ -234,8 +245,37 @@ EOF
     section = find heading
     
     if section then
+
+      # find any newly created links which now have a destination page
       
-      r = section.x 
+      sectionx = section.x.lines.map do |x|
+
+        link = x[/\?([^\?]+)\?/,1]
+
+        if link then
+
+          a = link.split
+          r = a.last =~ /\// 
+
+          if not r then
+            
+            heading = a[0..2].join
+            
+            if find heading then
+              x.sub!(/\?[^\?]+\?/, "[%s](%s)" % [heading, a.last])
+            end
+          end
+
+        end
+
+        x
+      end.join
+      
+      puts ('sectionx: ' + sectionx.inspect).debug if @debug
+
+      section.x = sectionx unless section.x == sectionx
+
+      r = section 
       
       puts ('@domain: ' + @domain.inspect).debug if @debug
       r.instance_variable_set(:@domain, @domain)
@@ -244,7 +284,7 @@ EOF
       
       def r.to_html()
         
-        lines = self.lines
+        lines = self.x.lines
         last_line = lines.last
         
         content, tags = if last_line[0] == '+' then
@@ -255,11 +295,13 @@ EOF
           
         else
           
-          [self, []]
+          [self.x, []]
           
         end
         
-        html = Martile.new(content, ignore_domainlabel: @domain).to_html
+        s = block_given? ? yield(content) : content
+        
+        html = Martile.new(s, ignore_domainlabel: @domain).to_html
         tags_html = Kramdown::Document.new(tags.join("\n")).to_html\
             .sub('<ul>','<ul id="tags">')
         html + "\n\n" + tags_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dynarex-tags
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: 'Designed for maintaining many wiki entries within a single document in Markdown