dyndoc-ruby 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfadfdc5ff9a771cb8bd843a041c96b8f1c33c0e
-  data.tar.gz: 1561fe45892386f94e8838b7686e853dd8629c99
+  metadata.gz: 92aec761fb25501bdaa7c77b583627e1f18b2a8a
+  data.tar.gz: a7edf41a3bda9d06afeb5f46daa76b387f103d4a
 SHA512:
-  metadata.gz: 0b19568d4e4d4ce2d1133aecea4fbac4c23031a20b9559ad97de7efc2e86cd610fa1f21bbb53140019ed5d78232e313ae28e6958d43a2b68f5d2038f7b361323
-  data.tar.gz: 75358580ac47c8815cb15043be4b39500de588c7e63bcf8b4be4f8a61804819616c6ae8cccb1d2dc6ec14baf1156a0923459d2be8398bf0564e5c7c44740832a
+  metadata.gz: bdbb1be0061c988046b91027312d7c54d649169395eab6440fe02e83f8561029d722fef771e25b0483c876cb3404a1b2d15ff28fb7aa96777113ed64a3e2fd2c
+  data.tar.gz: 9838e9e865f98c9101b2b088d211c3be8596b0c0071b56e92268c8c879d7c399751b38d5183c6026d8f9d76a6ae32dcf67e08b823164199bc045833e2cecabc1

data/bin/dyn

@@ -59,6 +59,10 @@ OptionParser.new do |opts|
     Settings["cfg_dyn.cmd_doc"] = [:list]
   end
 
+  opts.on("-j", "--jl", "import julia") do
+    Settings["cfg_dyn.langs"] << :jl
+  end
+
   # opts.on("-r", "--remote", "pandoc or pdflatex (dyn)task performed remotely") do
   #   Settings["cfg_dyn.remote_dyntask"] = true
   # end

data/lib/dyndoc-convert.rb

@@ -1,5 +1,6 @@
 require "dyndoc-core"
 require 'dyndoc/cli/interactive-client.rb'
+require 'yaml'
 
 
 module Dyndoc
@@ -42,10 +43,24 @@ module Dyndoc
   def Dyndoc.cli_convert_from_file(dyn_file,html_file,root={}) #ex: root={dyn: , html: }
     addr="127.0.0.1"
 
+    return unless root[:dyn]
+
     dyn_libs,dyn_tags=nil,nil
 
+    ## requirement: dyn_file is provided relatively to the root[:dyn] (for security reason too)
+
+    dyn_path=dyn_file.split(File::Separator)
+
+    dyn_file=File.join(root[:dyn],dyn_file) unless dyn_file[0]=="/"
+
     if i=(dyn_file =~ /\_?(?:html)?\.dyn$/)
 
+      cfg={}
+      ## find the previous config.yml in the tree folder
+      cfg_yml_files=dyn_path.inject([""]) {|res,e| res + [(res[-1,1]+[e]).flatten]}.map{|pa| File.join(root[:dyn],pa,"config.yml")}.reverse
+      cfg_yml_file=cfg_yml_files.select{|c| File.exists? c}[0]
+      cfg=YAML::load_file(cfg_yml_file) if cfg_yml_file
+
       ## Dyn layout
       dyn_layout=dyn_file[0...i]+"_layout.dyn" if File.exist? dyn_file[0...i]+"_layout.dyn"
 
@@ -55,11 +70,10 @@ module Dyndoc
       ## Dyn post
       dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
 
-      cfg={}
 
       if File.exist? dyn_file[0...i]+".dyn_cfg"
-        require 'yaml'
-        cfg=YAML::load_file(dyn_file[0...i]+".dyn_cfg")
+        cfg.merge!{YAML::load_file(dyn_file[0...i]+".dyn_cfg")}
+      else # try do find (in the Zope spirit) a config file in the nearest folder
       end
 
       ## code to evaluate
@@ -82,7 +96,7 @@ module Dyndoc
       html_root= cfg["html_root"] || root[:html] || File.expand_path("..",dyn_file)
 
       if cfg["layout"]
-        cfg_tmp=File.join(dyn_root,cfg["layout"])
+        cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
         dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
       end
       if cfg["pre"]
@@ -95,13 +109,17 @@ module Dyndoc
         dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
       end
 
-      if cfg["html_file"] #relative path from (dyn_)root
-        html_file=File.join(html_root,cfg["html_file"])
+      ## deal with html_file
+      html_file=File.join(html_root,cfg["html_file"] || html_file)
+      unless File.exist? html_file
+        dirname=File.dirname(html_file)
+        require 'fileutils'
+        FileUtils.mkdir_p dirname
       end
 
       dyn_libs=cfg["libs"].strip if cfg["libs"]
 
-      dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}" if cfg["tags"]
+      dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}[#>]" if cfg["tags"]
 
     	if dyn_libs or dyn_pre_code
     		code_pre = ""
@@ -111,8 +129,8 @@ module Dyndoc
     	end
     	code += "\n" + dyn_post_code if dyn_post_code
       ## TO TEST!!!
-    	code = dyn_tags + code if dyn_tags
       code = "[#rb<]page = " + page.inspect + "[#>]" +code if page
+      code = dyn_tags + code if dyn_tags
     	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
 
       cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)

data/share/dyndoc.yml/README.md

@@ -0,0 +1 @@
+rename `example.dyndoc.yml` `~/.dyndoc.yml` to activate both `R` and `julia`

data/share/dyndoc.yml/example.dyndoc.yml

@@ -0,0 +1,4 @@
+:cfg_dyn:
+  :langs:
+    - R
+    - jl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -113,6 +113,8 @@ files:
 - share/demo/testBeamer.dyn
 - share/demo/testBeamer_lib.dyn
 - share/demo/test_atom.dyn
+- share/dyndoc.yml/README.md
+- share/dyndoc.yml/example.dyndoc.yml
 - share/etc/alias
 - share/etc/dyn-cli/dyn_layout
 - share/etc/dyn-cli/layout/default.dyn