dyndoc-ruby 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1bc9ee21c0b73f6ec34b2d9557d231d4f5c6a7
-  data.tar.gz: 34f971a6891594b7947d6bea3244b00c3cae9c7b
+  metadata.gz: 8f6d31d5bb2241eb1437d0d3d9523adb7e63cbc1
+  data.tar.gz: a5d2ce8ffbbfd05fc29b55e7c6a153aefd609a73
 SHA512:
-  metadata.gz: 7f744eb4bf0c12dd54f721ece3a10484c58c4cd331fe95be72cd7b405035a670ce5f94298c302b18cb879484faa76207947604c969ec605d6fedc28e8b8c3328
-  data.tar.gz: 765d193d39d43b2df85ccd3f9920f8d5602d9defc32b4edfbecc80bb39e00c672a7a887d2bc2c15bde10cdd13e8a6f9dcd353ad1430473ef0222d68cd4ca3cf5
+  metadata.gz: aae3e56ae474beab1e1c3f64c8be5b59720eaa61b9c0c17f3196583d998e8669480378c469abc466c767b3bc3e5a49629a1ab9bb2e32a1ffb4f31809418d9b5a
+  data.tar.gz: 1050cab499a6d104c170a84a9b7021a7abf0a07d3e2f16c5ac29ed528d10fe99c0be999e33b56d43875f72684a856c2ac386b7cc4116251733c8f6ed54fd6d02

data/lib/dyndoc-convert.rb

@@ -38,4 +38,59 @@ module Dyndoc
     return cli.content
   end
 
+  def Dyndoc.cli_convert_from_file(dyn_file,dyn_out_file)
+    addr="127.0.0.1"
+
+    dyn_libs=nil
+
+    if i=(dyn_file =~ /\_?(?:html)?\.dyn$/)
+
+      ## Dyn layout
+      dyn_layout=dyn_file[0...i]+"_layout.dyn" if File.exist? dyn_file[0...i]+"_layout.dyn"
+
+      ## Dyn pre
+      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"
+
+      if File.exist? dyn_file[0...i]+"_.dyn_cfg"
+        require 'yaml'
+        cfg=YAML::load_file(dyn_file[0...i]+"_.dyn_cfg")
+        dyn_layout=File.read(cfg["layout"]) if !dyn_layout and File.exist? cfg["layout"]
+        dyn_pre_code=File.read(cfg["pre"]) unless dyn_pre_code and File.exist? cfg["pre"]
+        dyn_post_code=File.read(cfg["post"]) unless dyn_post_code and File.exist? cfg["post"]
+        dyn_libs=File.read(cfg["libs"]).strip if File.exist? cfg["libs"]
+      end
+
+    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_tag_tmpl+code if dyn_tag_tmpl
+  	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
+  end
+
 end

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

@@ -33,17 +33,18 @@ module Dyndoc
 
 
     def process_dyndoc(content)
-      ##p [:process_dyndoc_content,content]
+      ##Dyndoc.warn :process_dyndoc_content,content
       @content=@tmpl_mngr.parse(content)
       ##Dyndoc.warn :content, @content
-      @tmpl_mngr.filterGlobal.envir["body.content"]=@content
+      @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
         @tmpl_mngr.filterGlobal.envir["_FILENAME_CURRENT_"]=@tmpl_filename.dup
         @tmpl_mngr.filterGlobal.envir["_FILENAME_"]=@tmpl_filename.dup #register name of template!!!
         @tmpl_mngr.filterGlobal.envir["_FILENAME_ORIG_"]=@tmpl_filename.dup #register name of template!!!
         @tmpl_mngr.filterGlobal.envir["_PWD_"]=File.dirname(@tmpl_filename)
       end
-      return @content
+      return Dyndoc::Utils.unprotect_dyn_block_for_atom(@content)
     end
 
     def init_server

metadata

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