dyndoc-ruby 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331c3c5c280c6a6df854b0404466d34252d47889
-  data.tar.gz: 58aa269ffdf01e6868e25613fa1d8a78000fc349
+  metadata.gz: 65042ee656666efc391b0d149f34b18fe8b11eef
+  data.tar.gz: 10ef6ac6b795ffd07f2f9c28379fe0db1932cf4b
 SHA512:
-  metadata.gz: eaeb3aefee802d2b1a1a7f2e9e2e51d6b410a2716a3794fd8ba44f9fa3a006cf7d5fa4c1656a6b02a92159fb931b7a037d9744938ac69d8d99cbf15bf303cc1a
-  data.tar.gz: 55daab8dec69571791e481ea7ec95d1e4f91430690c1f9f45ac65adef0f30323165bef88b8a9820faae2b76edf34a5320602e301e2ba9ee80d51c500567c388e
+  metadata.gz: afd5d171236ee2e1a959ea9880440bdc7b62bf7e7c4954b9a9577e555c50d2172145e376a385c7c025e63fe6c606e0ebbc5a04b0f74a8c8f43485e1c93d906f3
+  data.tar.gz: 9634aa1e8630bd606b51ee2b00dbe9b7abd155b4813b9ba4375e21d60b1d22914723cd859702ad870f194b37fe9c9c9ceae367a0192e9a7ae0708b3461c3e299

data/bin/dyn-ctl

@@ -14,7 +14,7 @@ when "start"
     `#{srv} status`.empty?
   end
   if status.any?
-    message="at #{Time.now}: " + status.each_with_index.map { |e,i|  e ? SRVS[i] : nil}.compact.join("+") + " stopped and restarted!"
+    message="at #{Time.now}: " + status.each_with_index.map { |e,i|  e ? "["+SRVS[i]+"]" : nil}.compact.join("+") + " stopped and restarted!"
     if RUBY_PLATFORM =~ /darwin/
       ##p lint_error
       cmd_to_display="display notification \"#{message}\" with title \"dyn status\""

data/lib/dyndoc/srv/interactive-server.rb

@@ -1,5 +1,6 @@
 require 'socket'                # Get sockets from stdlib
 require "dyndoc-core"
+require 'dyndoc-converter'
 
 
 module Dyndoc
@@ -31,11 +32,26 @@ module Dyndoc
       end
     end
 
+    def post_process_from_format(content,fmt)
+      case fmt
+      when :rmd
+        ::Dyndoc::Converter.markdown(content)
+      when :adoc
+        ::Dyndoc::Converter.asciidoctor(content)
+      when :ttm
+        ::Dyndoc::Converter.ttm(content,"-e2 -r -y1 -L").gsub(/<mtable[^>]*>/,"<mtable>").gsub("\\ngtr","<mtext>&ngtr;</mtext>").gsub("\\nless","<mtext>&nless;</mtext>").gsub("&#232;","<mtext>&egrave;</mtext>")
+      end
+    end
+
 
     def process_dyndoc(content)
       ##Dyndoc.warn :process_dyndoc_content,content
       @content=@tmpl_mngr.parse(content)
       ##Dyndoc.warn :content, @content
+      ## depending on extension
+      if @tmpl_filename =~ /_(rmd|adoc|ttm)\.dyn$/
+        @content=post_process_from_format(@content,$1.to_sym)
+      end
       @tmpl_mngr.filterGlobal.envir["body.content"]=Dyndoc::Utils.protect_dyn_block_for_atom(@content)
       ##Dyndoc.warn :body_content,@tmpl_mngr.filterGlobal.envir["body.content"]
       if @tmpl_filename

data/lib/dyndoc-convert.rb

@@ -155,6 +155,8 @@ module Dyndoc
           if cfg["layout"][0] == "~"
             user,*pa=cfg["layout"][1..-1].split("/")
             cfg_tmp=File.join(sys_root,"public","users",user,"layout",pa)+".dyn"
+            cfg_tmp=File.join(sys_root,"public","users",user,pa[0...-1],"layout",pa[-1])+".dyn" unless File.exists? cfg_tmp
+            cfg_tmp=File.join(sys_root,"public","users",user,pa) unless File.exists? cfg_tmp
           else
             cfg_tmp=File.join(sys_root,"system","layout",cfg["layout"]+".dyn")
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.16
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb