lib/dyndoc-convert.rb in dyndoc-ruby-0.7.2 vs lib/dyndoc-convert.rb in dyndoc-ruby-0.7.3

@@ -36,11 +36,12 @@
     dyndoc_start=[:dyndoc_libs]
     cli=Dyndoc::InteractiveClient.new(input,"",addr,dyndoc_start)
     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
 
     if i=(dyn_file =~ /\_?(?:html)?\.dyn$/)
@@ -52,61 +53,82 @@
       dyn_pre_code=File.read(dyn_file[0...i]+"_pre.dyn") if File.exist? dyn_file[0...i]+"_pre.dyn"
 
       ## 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]
+      dyn_libs=cfg["libs"].strip if cfg["libs"]
 
-    cli=Dyndoc::InteractiveClient.new(code,dyn_file,addr,dyndoc_start)
+      dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}" if cfg["tags"]
 
-  	if dyn_layout
-  	 	cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
-  	end
+    	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]
 
-  	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
+      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