dyndoc-ruby 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92dd84790be17ae6abe5454e242718b6e897cb75
-  data.tar.gz: d991845b13f47faff753fd0624c64408683498bf
+  metadata.gz: bfadfdc5ff9a771cb8bd843a041c96b8f1c33c0e
+  data.tar.gz: 1561fe45892386f94e8838b7686e853dd8629c99
 SHA512:
-  metadata.gz: ad5119617a092ac2a0cf6fe6bd7a34d470d46b8c50b9959f1df98d3c8da0c54fcd7cfe2dcc397aa1879bbbd83f268e533416b8ead65cdf0cef2627c363b0be73
-  data.tar.gz: 79b146e10822644c55814f98c020557384e63dd81ca427a49ab2bd6dfaaed543ef8c898844761063f26248e3e97685e83415cf908abf0ccb75d6008c6eea061d
+  metadata.gz: 0b19568d4e4d4ce2d1133aecea4fbac4c23031a20b9559ad97de7efc2e86cd610fa1f21bbb53140019ed5d78232e313ae28e6958d43a2b68f5d2038f7b361323
+  data.tar.gz: 75358580ac47c8815cb15043be4b39500de588c7e63bcf8b4be4f8a61804819616c6ae8cccb1d2dc6ec14baf1156a0923459d2be8398bf0564e5c7c44740832a

data/lib/dyndoc-convert.rb

@@ -38,7 +38,8 @@ module Dyndoc
     return cli.content
   end
 
-  def Dyndoc.cli_convert_from_file(dyn_file,dyn_out_file)
+  ## TODO: a config.yml file for the site
+  def Dyndoc.cli_convert_from_file(dyn_file,html_file,root={}) #ex: root={dyn: , html: }
     addr="127.0.0.1"
 
     dyn_libs,dyn_tags=nil,nil
@@ -54,59 +55,80 @@ 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")
+      end
 
-        dyn_root= cfg["root"] || File.expand_path("..",dyn_file)
+      ## code to evaluate
+      code=File.read(dyn_file)
 
-        if cfg["layout"]
-          cfg_tmp=File.join(dyn_root,cfg["layout"])
-          dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
-        end
-        if cfg["pre"]
-          cfg_tmp=File.join(dyn_root,cfg["pre"])
-          dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
-        end
+      page=nil
 
-        if cfg["post"]
-          cfg_tmp=File.join(dyn_root,cfg["post"])
-          dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
+      if code =~ /^\-{3}/
+        b=code.split(/^\-{3}/)
+        if b[0].empty?
+          require 'yaml'
+          page=YAML.load(b[1])
+          cfg.merge!(page)
+          code=b[2..-1].join("---")
         end
+      end
 
-        dyn_libs=cfg["libs"].strip if cfg["libs"]
+      # 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_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}" if cfg["tags"]
+      if cfg["layout"]
+        cfg_tmp=File.join(dyn_root,cfg["layout"])
+        dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
+      end
+      if cfg["pre"]
+        cfg_tmp=File.join(dyn_root,cfg["pre"])
+        dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
       end
 
-    end
+      if cfg["post"]
+        cfg_tmp=File.join(dyn_root,cfg["post"])
+        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"])
+      end
 
-    ## code to evaluate
-    code=File.read(dyn_file)
-  	if dyn_libs or dyn_pre_code
-  		code_pre = ""
-  		code_pre += dyn_pre_code + "\n" if dyn_pre_code
-  		code_pre += '[#require]'+"\n"+dyn_libs if dyn_libs
-  		code = code_pre + '[#main][#>]' + code
-  	end
-  	code += "\n" + dyn_post_code if dyn_post_code
-  	code = dyn_tags + code if dyn_tags
-  	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
-
-    cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)
-
-  	if dyn_layout
-  	 	cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
-  	end
-
-  	if dyn_out_file and Dir.exist? File.dirname(dyn_out_file)
-  		File.open(dyn_out_file,"w") do |f|
-  			f << cli.content
-  		end
-  	else
-  		puts cli.content
-  	end
+      dyn_libs=cfg["libs"].strip if cfg["libs"]
+
+      dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}" if cfg["tags"]
+
+    	if dyn_libs or dyn_pre_code
+    		code_pre = ""
+    		code_pre += dyn_pre_code + "\n" if dyn_pre_code
+    		code_pre += '[#require]'+"\n"+dyn_libs if dyn_libs
+    		code = code_pre + '[#main][#>]' + code
+    	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
+    	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
+
+      cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)
+
+    	if dyn_layout
+    	 	cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
+    	end
+
+    	if html_file and Dir.exist? File.dirname(html_file)
+    		File.open(html_file,"w") do |f|
+    			f << cli.content
+    		end
+    	else
+    		puts cli.content
+    	end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb