wiki_md 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a314fa02253872441fd68c16c6d8158745401fe6e58ef5fdd8657421a88577e9
-  data.tar.gz: b4f20db2f094e64b9b43a7fbcf2eefb6b040f9b60b7382da94ba930272b7caff
+  metadata.gz: d7dae25e868d52bfea1461356265ae5b03e61fd5c88eab4c1c777d5b5d7e8e00
+  data.tar.gz: 6915a2cbe47d1e4149c3382b1115b7e7381d139cc717090f35203bd045ae0cdc
 SHA512:
-  metadata.gz: 1f9bf04cb1e0ec4daa637148acdea9158e8d078684dfa7d7e6338144e07b32da4e4ff16ace51d1e1ae349f19dd15f58ad00fb617b90489467e42fea8d5b05ad4
-  data.tar.gz: 0dc5efff3dcfb9380ed01e9018a4d5a045b4f7311050bc90021e7d6e173105a33df12d1443c34c8c1a72da75043573c551cd51eca272e7c58f3a3799e5d68adf
+  metadata.gz: 1322e935d64b161170ba2954929c7997b5f02e07605b0b4672b3e9f62e81792cb3a2d5329ff908cf9bbee31677c6a718343ca99838cbd80b7c9ec0e8150516d9
+  data.tar.gz: dcf4f022352ca137e5c504237e45e1387913770206d08d5ce4e5be0c300bee7e8bb6e4a0bad65872c0f6ed9310fc98f0d727c78f41c94e61de9ae6da41275f9f

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-j��4뇫q�;j�Аd��ڌ��ޓ�h�\2�É��K�C:�i;��>#��Q��o�}�p{1����2li�Ƴ֤�Š�i�<Z\�Q�y8r=6|H$wۉ'-�i��M��`�O�7�#���M�K�͓�$	�O�
-l�� �d`6�#f*
-�Z�㗟N�^V���%�<y��W�
�5r�cR0��Xw��oW�1���R�:<��-x܏��]9"��n�+|�בI��fnv`�;~�S1Z�j�%BB6�F#�
+�9��O��p솰	��87^L�<j�r�n��.��ݙʗy����I��Ğ���Z;�ɾ�l������
+���.4�s���(�v��*�J�����g��i�g���D��p-�q��lB��������7�7�

data/lib/wiki_md.rb

@@ -3,10 +3,12 @@
 # file: wiki_md.rb
 
 require 'dxsectionx'
+require 'dynarex-tags'
 
 
 class WikiMd
   include RXFHelperModule
+  using ColouredText
   
   attr_reader :active_heading, :filename, :dx
   
@@ -20,7 +22,7 @@ class WikiMd
       
       s, type = RXFHelper.read(wiki, auto: false)
       @filename = wiki if type == :file or type == :dfs
-      puts 's: ' + s.inspect if @debug
+      puts ('s: ' + s.inspect).debug if @debug
       @dxsx = DxSectionX.new s, debug: debug, autosave: true
       
       @filepath = File.dirname @filename
@@ -40,7 +42,7 @@ class WikiMd
     
     @filepath ||= '.'
     
-    @dxtags = DynarexTags.new(@filepath)
+    @dxtags = DynarexTags.new(@filepath, debug: debug)
             
   end
 
@@ -83,11 +85,11 @@ class WikiMd
   
   def find(q)
     
-    puts 'WikiMd::find q: ' + q.inspect if @debug
+    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 if @debug
+    puts ('  r: ' + r.inspect).debug if @debug
     return unless r
     
     heading2 = r.x.lines.last[/(?<=redirect ).*/]
@@ -131,7 +133,7 @@ EOF
       
       r = section.x 
       
-      puts '@domain: ' + @domain.inspect if @debug
+      puts ('@domain: ' + @domain.inspect).debug if @debug
       r.instance_variable_set(:@domain, @domain)
       r.instance_variable_set(:@tag_url, "%s/%s" % [@tag_base_url, 
                                 File.basename(@filename)[/.*(?=\.\w+$)/]])
@@ -171,7 +173,7 @@ EOF
     @filepath = File.dirname(@filename)
     FileX.write @filename=filename, @dxsx.to_s
     
-    puts 'before @dxsx save' if @debug
+    puts ('before @dxsx save').debug if @debug
     @dxsx.save filename.sub(/\.md$/, '.xml')
     @dx = new_index(File.join(@filepath, 'index.xml')) unless @dx
     
@@ -210,7 +212,7 @@ EOF
   
   def update_section(*args)
     
-    puts 'inside update_section' if @debug
+    puts 'inside update_section'.debug if @debug
     
     val, raw_q = args.reverse
     puts '  val: ' + val.inspect if @debug
@@ -222,11 +224,23 @@ EOF
     return false unless r
     
     content = val =~ /# / ? val : r.x.lines.first + "\n" + val
-    @active_heading = content[/(?<=^# ).*/]
-    r.x = content
+    @active_heading = title = content[/(?<=^# ).*/]
+
     
     rx = @dx.all.find {|x| x.title =~ /#{q}/}
     tagline1 = content.lines.last[/^\+\s+(.*)/,1]    
+    
+    puts 'tagline1: ' + tagline1.inspect if @debug
+    
+    s2 = if tagline1 then
+      content
+    else
+      a = title.split      
+      tagline1 = a.length > 1 ? a.map(&:capitalize).join : a.first    
+      content + "\n\n+ " + tagline1
+    end    
+    
+    r.x = s2
 
     if rx then
       
@@ -257,8 +271,10 @@ EOF
       end
 
       @dx.create title: @active_heading + ' #' + newtagline, 
-          url: [@base_url, File.basename(@filename),  
+          url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
                 URI.escape(@active_heading)].join('/')      
+      @dxtags.generate
+      
     end
     
   end    
@@ -269,8 +285,8 @@ EOF
     
     if FileX.exists? indexfile then
 
-      puts 'file found: ' + indexfile.inspect if @debug
-      Dynarex.new indexfile, autosave: true
+      puts ('file found: ' + indexfile.inspect).debug if @debug
+      Dynarex.new indexfile, autosave: true, debug: @debug
 
     else
 

data.tar.gz.sig

@@ -1,5 +1,5 @@
-T�
-��S��0²Ad�_�!����c{B��k��TJW.Ȣ�y=�ԃ���d;<M�C
-n���[!���?
�����""�����~�
-�;''V�x��V��Se,�\0���~�@�����<��^��zE_���U����������3z=Gk�w;��Bm�n�M���H\��Hoʋ����]�[�R�4�*�/[�u�SS�rS�H�[�o�ST�v�t9s��rP���V��"��C3.ϋ��
-���y���D�׍+�A.\
�Y���k�ly0��Z�UD��9�H���^��.�#�+�x�Te��N���j�U�+��Ƶ�ЎF��
+jeR�a����ؖ7T\��4�$��o/t�j+�o��24�Sd
+	NU�\,�����q���L�
+��v��|���Y��1ą"�%����x
+�v��Mܞ�(��GKnAM�?®���
+�`���f��X�euC��;

metadata

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