dyndoc-ruby 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c735f02d2467683edb8b01726297f83ec532a335
-  data.tar.gz: 2d91e69c41b210872b082a7471dfed2f7de77b5a
+  metadata.gz: 6dfa98b7f4b1e4e0f2e24a0e1a14f0c606652c70
+  data.tar.gz: db99310de0352bed9ede3996f38507afae4e9b06
 SHA512:
-  metadata.gz: ca1178d1207decf26e2ce351f05c54f9a34f05915c92d9b3c685598c8c1b66b3cadaa18f1254ce3aa33b1204ae4a90023afebb4d75e3c8581ec1e686a6de631f
-  data.tar.gz: daa9d46c3a45f878a1d2e6495abb8dae57482f90dd5e26921bbf8f9c886b3c853160cd8bda26d0af4749371d824cfd310f4fff1915a7afd3a7829e2c459a278d
+  metadata.gz: 61d509f0b744936f553afafcd46c57d6c6f61fdabdae4859d81c3ecf1af8328e4dd4ee77abf182a67aa349c722f3293b68180a857ad966d057e40d0b2c43a1dc
+  data.tar.gz: 2959605938ad254875a139fb6d4d697e4e5b5040efa73ca55902d2d495b01d6a2f4c48f677951e5cf20a3fbb91494402d852ad8f99b83f4211a41eaab7c761c5

data/lib/dyndoc-convert.rb

@@ -40,25 +40,25 @@ module Dyndoc
   end
 
   ## TODO: a config.yml file for the site
-  def Dyndoc.cli_convert_from_file(dyn_file,html_file,root={}) #ex: root={dyn: , html: }
+  def Dyndoc.cli_convert_from_file(dyn_file,html_file,opts={}) #ex: opts={dyn_root: , html_root:, user: , doc_tag: }
     addr="127.0.0.1"
 
-    return unless root[:dyn]
+    return unless opts[:dyn_root]
 
     dyn_libs,dyn_tags=nil,nil
 
-    ## requirement: dyn_file is provided relatively to the root[:dyn] (for security reason too)
+    ## requirement: dyn_file is provided relatively to the opts[:dyn_root] (for security reason too)
 
     dyn_path=dyn_file.split(File::Separator)
 
-    dyn_file=File.join(root[:dyn],dyn_file) unless dyn_file[0]=="/"
+    dyn_file=File.join(opts[:dyn_root],dyn_file) unless dyn_file[0]=="/"
 
     if i=(dyn_file =~ /\_?(?:html)?\.dyn$/)
 
       cfg={}
       ## find the previous config.yml in the tree folder
       ## TODO: read all previous config.yml and merge them from root to current
-      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_files=dyn_path.inject([""]) {|res,e| res + [(res[-1,1]+[e]).flatten]}.map{|pa| File.join(opts[:dyn_root],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
 
@@ -83,22 +83,22 @@ module Dyndoc
       page=nil
 
       if code =~ /^\-{3}/
-        b=code.split(/^\-{3}/)
-        if b[0].empty?
+        b=code.split(/^(\-{3,})/,-1)
+        if b[0].empty? and b.length>4
           require 'yaml'
-          page=YAML.load(b[1])
+          page=YAML.load(b[2])
           cfg.merge!(page)
-          code=b[2..-1].join("---")
+          code=b[4..-1].join("")
         end
       end
 
       # dyn_root can be overwritten by cfg
-      dyn_root= cfg["dyn_root"] || root[:dyn] || File.expand_path("..",dyn_file)
-      html_root= cfg["html_root"] || root[:html] || File.expand_path("..",dyn_file)
+      dyn_root= cfg["dyn_root"] || opts[:dyn_root] || File.expand_path("..",dyn_file)
+      html_root= cfg["html_root"] || opts[:html_root] || File.expand_path("..",dyn_file)
 
       if cfg["layout"]
         if cfg["layout"][0] == "%" #user mode
-          cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["layout"][1..-1])
+          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["layout"][1..-1])
         else
           cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
         end
@@ -106,7 +106,7 @@ module Dyndoc
       end
       if cfg["pre"]
         if cfg["pre"][0] == "%" #user mode
-          cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["pre"][1..-1])
+          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["pre"][1..-1])
         else
           #cfg_tmp=File.join(dyn_root,cfg["pre"])
           cfg_tmp=File.join(dyn_root,cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["preload",cfg["pre"]])
@@ -116,7 +116,7 @@ module Dyndoc
 
       if cfg["post"]
         if cfg["post"][0] == "%" #user mode
-          cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["post"][1..-1])
+          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["post"][1..-1])
         else
           #cfg_tmp=File.join(dyn_root,cfg["post"])
           cfg_tmp=File.join(dyn_root,cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["postload",cfg["post"]])
@@ -124,8 +124,6 @@ module Dyndoc
         dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
       end
 
-
-
       ## deal with html_file
       html_file=File.join(html_root,cfg["html_file"] || html_file)
       unless File.exist? html_file
@@ -136,7 +134,14 @@ module Dyndoc
 
       dyn_libs=cfg["libs"].strip if cfg["libs"]
 
-      dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}[#>]" if cfg["tags"]
+      ## mode multi-documents
+      docs_tags=[]
+      docs_tags << opts[:doc_tag] if opts[:doc_tag]
+      ## complete docs_tags with cfg["tags"]
+      docs_tags += (cfg["tags"]||"").split(",").map{|e| e.strip}
+      dyn_tags="[#<]{#opt]"+docs_tags.join(",")+"[#opt}[#>]" unless docs_tags.empty?
+
+      Dyndoc.warn  :dyn_tags,[docs_tags,dyn_tags]
 
     	if dyn_libs or dyn_pre_code
     		code_pre = ""
@@ -149,7 +154,18 @@ module Dyndoc
       code = "[#rb<]require 'ostruct';cfg = OpenStruct.new(" + cfg.inspect + ")[#>]" +code
       code = "[#rb<]page = " + page.inspect + "[#>]" +code if page
       code = dyn_tags + code if dyn_tags
-    	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
+
+      ## add path for user
+      code_path = "[#path]"+File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
+      code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      code_path << "\n" << opts[:dyn_root] << "\n"
+      code_path << "[#main][#<]\n"
+      code = code_path + code
+
+      ###
+      Dyndoc.warn :code,code
+
+      dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
 
       cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb