dyndoc-ruby-core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61c9814fbee12e7690e969be05be1508045df8a
-  data.tar.gz: 894618eac5de35bb862ae6156ade8203da680907
+  metadata.gz: 19c3a0bb1d282d76f63c957e6700a3fd46156475
+  data.tar.gz: 051d7200700504fd0ee87a228fb1a7f09cc8b5cd
 SHA512:
-  metadata.gz: 754c502ef583d5da3e567ba0b64824e4cd3fff6a3b84ecca326ed562405495755df4ea2482d1001993d0e66cf7cd6415c469bbd9879ff2fe35520207c23900d3
-  data.tar.gz: 6783f7f70b01b0ed79ac6e1e65fca16fb92ba0ac6f2cc08fdc6e135f891e77e42be7085b8f94a438c786af1757996a981d588095b96046f0f36a849d4b436c0f
+  metadata.gz: ea70a95998f2df4846135b2e2471332384e19fda6cfb88bfda5904b9e053dcde65173ce73eb277a556d2fe5cae89d19e9ebf761e07da271af73f38ea2e119f80
+  data.tar.gz: 78eadace07933caa6fe65fecef6c1b8f2130c3a3ec838cbf012e9622d782cf8e4ddcf61d180750ba2bb996727a7b8d48d57b3261aaf0cf825ee03a2bd9f23863

data/dyndoc/Tools/Web/Html.dyn

@@ -47,13 +47,19 @@ require 'dyndoc/common/uv'
 syntax=File.join(Uv.syntax_path,syntax+".syntax")
 #end
 uv_code = (#{=file}.empty? ? nil : File.read(#{=file}))
-uv_code=((!(#{=code}.empty?) or #{=key}.empty?) ? #{=code} : CqlsDoc::Utils.dyndoc_raw_text(#{=key})).strip unless uv_code
+uv_code=((!(#{=code}.empty?) or #{=key}.empty?) ? #{=code} : Dyndoc::Utils.dyndoc_raw_text(#{=key})).strip unless uv_code
+uv_code = Dyndoc::Utils.unprotect_dyn_block_for_atom(uv_code) if Dyndoc::Ruby::TemplateManager.interactive
 #Dyndoc.warn "CODE",uv_code,#{lines}
 #Uv.parse(uv_code, "xhtml", syntax , #{lines}, render,true)
 #OLD: uv_res=CqlsDoc::AS_IS+Uv.parse(uv_code, "xhtml", #{=syntax}.downcase, true, #{=render})+CqlsDoc::AS_IS
 #Dyndoc.warn "titi"
+warn_level = $VERBOSE
+$VERBOSE = nil
 uv_res=Uv.parse(uv_code, "xhtml", syntax , #{lines}, render,false)
-uv_res = CqlsDoc::AS_IS+uv_res+CqlsDoc::AS_IS unless CqlsDoc::V3::TemplateManager.interactive
+$VERBOSE = warn_level
+## TODO: trouble with interactive????
+uv_res = Dyndoc::Utils.protect_dyn_block_for_atom(uv_res) if Dyndoc::Ruby::TemplateManager.interactive
+uv_res = Dyndoc::AS_IS+uv_res+Dyndoc::AS_IS unless Dyndoc::Ruby::TemplateManager.interactive
 #Dyndoc.warn "titi"
 #Dyndoc.warn "uv_res:", uv_res
 [#>][:{uv_res}<\n>]
@@ -62,7 +68,7 @@ uv_res = CqlsDoc::AS_IS+uv_res+CqlsDoc::AS_IS unless CqlsDoc::V3::TemplateManage
 [#def}
 
 {#def]rverbUV[#,]code[][#,]render[amy][#,]lines[false]
-[#?]CqlsDoc::V3::TemplateManager.interactive
+[#?]Dyndoc::Ruby::TemplateManager.interactive
 [#>]{#rverb]#{code}[#mode]raw[#rverb}
 [#?]else
 [#>]{#uv]{#rverb]#{code}[#mode]raw[#rverb}
@@ -88,11 +94,11 @@ function update_#{.ObjectName}_Switcher(choice) {
     var choices="#{.choices}".split(",");
         for(i in  choices) {
         //alert("lang="+langs[l]);
-                if(choices[i]==choice) { 
+                if(choices[i]==choice) {
                         $("[choice="+choices[i]+"]").show();
                 } else {
                         $("[choice="+choices[i]+"]").hide();
-                }       
+                }
         }
 };
 </script>
@@ -112,7 +118,7 @@ function update_#{.ObjectName}_Switcher(choice) {
 lang=#{=.lang}.split(",")
 lang2=lang.reverse
 [0,1].each {|i| #
-    {#>]<div lang=":{lang[i]}"><img alt=":{lang2[i]}" src="#{document.rsrcSrvUrl?}/images/common/:{lang2[i]}.gif" langSwitcher=":{lang2[i]}"/></div>[#>} 
+    {#>]<div lang=":{lang[i]}"><img alt=":{lang2[i]}" src="#{document.rsrcSrvUrl?}/images/common/:{lang2[i]}.gif" langSwitcher=":{lang2[i]}"/></div>[#>}
 }
 [#meth}
 
@@ -126,11 +132,11 @@ function updateLanguage(lang) {
     var langs="#{.lang}".split(",");
         for(l in  langs) {
         //alert("lang="+langs[l]);
-                if(langs[l]==lang) { 
+                if(langs[l]==lang) {
                         $("[lang="+langs[l]+"]").show();
                 } else {
                         $("[lang="+langs[l]+"]").hide();
-                }       
+                }
         }
     $.cookie("langSwitcher",lang)
 };
@@ -157,12 +163,12 @@ $(document).ready(function() {
 [#def}
 
 {#new]JQuerySwitchable[#of]JsLoader[#code]
-function showSwitched(type,key) { 
+function showSwitched(type,key) {
     $('.switchable[id="'+type+'"][switch="'+key+'"]').show();
     $('.switchable[id="'+type+'"][switch!="'+key+'"]').hide();
 };
 
-function activateSwitchedLink(type,key) { 
+function activateSwitchedLink(type,key) {
     $('a[id="'+type+'"][switch="'+key+'"]').toggleClass("active",true);
     $('a[id="'+type+'"][switch!="'+key+'"]').toggleClass("active",false);
 
@@ -201,7 +207,7 @@ function selectSwitchedPage(type,key) {
     end
 end
 [#rb<]Dyndoc.warn "AAAA: mainMenu" "mainMenu",#{=mainMenu};Dyndoc.warn "ZZZZZ: mainPages",#{=mainPages}
-[#=]::document.mainMenu[<div id="mainMenu"> 
+[#=]::document.mainMenu[<div id="mainMenu">
 <span class="lastMenuItem"></span><\n>#{mainMenu}<\n></div>]
 [#=]::document.mainPages[<div id="mainPages"><\n>#{mainPages}<\n></div>]
 [#}
@@ -215,7 +221,7 @@ end
 [#blck]:post
 [#=]subMenu[]
 [#=]subPages[]
-[#rb<]subMenu=@vars[blckName[-1]][:subMenu] 
+[#rb<]subMenu=@vars[blckName[-1]][:subMenu]
     Dyndoc.warn "blckName[-1]", @vars[blckName[-1]]
     subMenu.each_with_index do |menu,i| #
     {#<][#+]subMenu[<li class="here"><a id="subPage" switch=":{menu[:link]}" {#if]!menu[:subpage][#>]href=":{menu[:link]}"[#}{#if]i==@vars[blckName[-1]][:active][#>] class="select"[#if} {#if]menu[:subpage][#>]onclick='selectSwitchedPage("subPage",":{menu[:link]}");'[#}>:{menu[:title]}</a></li> <\n>][#<}
@@ -283,4 +289,4 @@ $(document).ready(function() {
     [#?]#{0?en}[#=]en[#{fr}][#?]end
     [#>]
     [<a id="mainPage" switch="#{link}"  onclick='selectSwitchedPage("mainPage","#{link}");'>{#fr]#{fr}[#en]#{en}[#}</a>]
-[#}
+[#}

data/lib/dyndoc/base/tmpl/parse_do.rb

@@ -593,7 +593,8 @@ p [vars,b2]
                   if @fmtContainer[1] and @fmtContainer[1]==@fmtContainer[0] #no need to convert!
                     tex << val
                   else #convert
-                    ## Dyndoc.warn "txtl formats",[@fmtContainer[0],@fmtOutput,@fmtContainer[1]]
+                    ##Dyndoc.warn "txtl formats",[@fmtContainer[0],@fmtOutput,@fmtContainer[1]]
+                    ##Dyndoc.warn :val, val
                     tex << Dyndoc::Converter.convert(val,@fmtContainer[0],@fmtOutput,@fmtContainer[1]) #last parameter: true means to protect
                   end
                   @curFmtContainer=@fmtContainer[0] unless @curFmtContainer
@@ -958,11 +959,12 @@ p [vars,b2]
       Utils.escape_delim!(code)
 #puts "do_eval2: code";p code
       mode=[]
-      while code=~/^(test|pre|last|raw)\|.*/
+      while code=~/^(atom|test|pre|last|raw)\|.*/
         code = code[($1.length+1)..-1]
         mode << $1.to_sym
       end
       code=Dyndoc::Utils.dyndoc_raw_text(code) if mode.include? :test
+      code=Dyndoc::Utils.unprotect_dyn_block_for_atom(code) if mode.include? :atom
       #puts "do_eval:mode";p mode;p code
       #PUT THE FOLLOWING IN THE DOCUMENTATION:
       #puts "WARNING: {#dyn] accept :last and :raw in this order!" unless (mode - [:last,:raw]).empty?

data/lib/dyndoc/base/utils.rb

@@ -61,12 +61,12 @@ module Dyndoc
     def Utils.escape!(str,chars_set)
       chars_set.each{|chars| str.gsub!(/#{Regexp.escape(chars[0])}/,chars[1]) }
     end
-    
+
     def Utils.escape_delim!(str,mode=:last)
       chars_set=(mode==:first ? CHARS_SET_FIRST : CHARS_SET_LAST )
       chars_set.each{|chars| str.gsub!(/#{Regexp.escape(chars[0])}/,chars[1]) }
       return str
-    end  
+    end
 
     def Utils.end_line(key,code)
       while key[-1,1]=="\\"
@@ -97,7 +97,7 @@ module Dyndoc
 #puts "unprotect blocktext";p str
       str.gsub(seq,"")
     end
-    
+
     def Utils.format_blocktext(str)
       str.gsub(/\n[ \t\r\f]*\|/,"\n").gsub(/\|\n/,"").gsub("<\\n>","\n").gsub("<\\t>","\t")
     end
@@ -218,11 +218,11 @@ module Dyndoc
           #puts "parse_raw_text:key added";p key
           code << key if type==">"
           if tmplMngr
-            ## puts inside global envir! 
+            ## puts inside global envir!
             envir=tmplMngr.filterGlobal.envir
             envir[lang+"."+name+".name"]=key
             envir[lang+"."+name+".code"]=@@raw_text[-1]
-            ## "content" would be the name of the result after evaluation and saved in <dyn_basename_file>.dyn_out/raw_code.dyn 
+            ## "content" would be the name of the result after evaluation and saved in <dyn_basename_file>.dyn_out/raw_code.dyn
           end
           @@raw_var_ls << lang+"."+name #
           txt2.shift #last close tag!
@@ -235,14 +235,14 @@ module Dyndoc
       ##OLD: @@raw_key_index=@@raw_key.map{|key| key=~/\_\_(.*)\|(.*)/ ? $1 : nil}.compact
       ##puts "code";p code
       txt.replace(code)
-      
+
     end
 
     def Utils.dyndoc_raw_var_ls
       @@raw_var_ls
     end
 
-    def Utils.dyndoc_raw_var_eval(var,tmplMngr=nil) #var differs from key since it is saved in filter! 
+    def Utils.dyndoc_raw_var_eval(var,tmplMngr=nil) #var differs from key since it is saved in filter!
       return "" unless tmplMngr
       #p var
       return ((@@raw_var_ls.include? var) ? tmplMngr.parse(tmplMngr.filterGlobal.envir[var+".code"]) : "" )
@@ -331,7 +331,7 @@ module Dyndoc
     def Utils.saved_content_get(var,tmplMngr=nil,force=nil)
       return unless tmplMngr
       if force
-        return (Utils.saved_content_to_be_recreated(tmplMngr).include? var) ? nil : tmplMngr.filterGlobal.envir[var]  
+        return (Utils.saved_content_to_be_recreated(tmplMngr).include? var) ? nil : tmplMngr.filterGlobal.envir[var]
       else
         return tmplMngr.filterGlobal.envir[var]
       end
@@ -339,7 +339,11 @@ module Dyndoc
 
     ## Added for atom
     def Utils.protect_dyn_block_for_atom(txt)
-      txt.gsub("#","__DIESE_ATOM__") # => since dyndoc command uses "#" this is very easy way to protect evaluation 
+      txt.gsub("#","<_DIESE_ATOM_>").gsub("@","<_AROBAS_ATOM_>").gsub(":","<_SEMICOLON_ATOM_>").gsub("|","<_BAR_ATOM_>").gsub("$>","<_RVAR_ATOM_>") # => since dyndoc command uses "#" this is very easy way to protect evaluation
+    end
+
+    def Utils.unprotect_dyn_block_for_atom(txt)
+      txt.gsub("<_DIESE_ATOM_>","#").gsub("<_AROBAS_ATOM_>","@").gsub("<_SEMICOLON_ATOM_>",":").gsub("<_BAR_ATOM_>","|").gsub("<_RVAR_ATOM_>","$>") # => since dyndoc command uses "#" this is very easy way to protect evaluation
     end
 
     def Utils.parse_dyn_block_for_interactive!(txt)
@@ -353,13 +357,13 @@ module Dyndoc
         if txt2[0]=="{#dyn>]" and txt2[1..-1].include? "[#dyn>}"
           start,tmp,stop=txt2.shift(3)
           ## protect the dyndoc code to delay the evaluation after unprotection (in javascript)
-          code << Utils.protect_dyn_block_for_atom(tmp.inspect) 
+          code << Utils.protect_dyn_block_for_atom(tmp) ##BIZARRE! .inspect)
         else
           code << txt2.shift
         end
       end
       code << txt2.join("") #the remaining code
-      #Dyndoc.warn "atom",code 
+      #Dyndoc.warn "atom",code
       txt.replace(code)
     end
 

data/share/julia/dyndoc.jl

@@ -1,20 +1,20 @@
 #cmd="a=1\n(a)\nfor i in 1:3\nprintln(i)\nend"
 
 # # Unused! See capture_julia
-# function capture_cmd(cmd::String)
-# 	add,cmd0=true,String[]
-# 	res=Any[] #Dict{String,Any}()
+# function capture_cmd(cmd::AbstractString)
+# 	add,cmd0=true,AbstractString[]
+# 	res=Any[] #Dict{AbstractString,Any}()
 # 	for l=split(cmd,"\n")
 # 		#println("l => ",l)
-# 		push!(cmd0,l) 
+# 		push!(cmd0,l)
 # 		pcmd0=Base.parse_input_line(join(cmd0,"\n"))
 # 		#print(join(cmd0,"\n")*":");println(pcmd0)
 # 		add = typeof(pcmd0)==Expr && pcmd0.head == :continue
-# 		if !add 
+# 		if !add
 # 			#print("ici:")
 # 			#println(Base.eval(pcmd0))
-# 			push!(res,(join(cmd0,"\n"),eval(pcmd0))) 
-# 			cmd0=String[] 
+# 			push!(res,(join(cmd0,"\n"),eval(pcmd0)))
+# 			cmd0=AbstractString[]
 # 		end
 # 		#println(res)
 # 	end
@@ -37,7 +37,7 @@ end
 
 function get_stdout_iobuffer()
 	#seek(DyndocSandbox.OUTPUT_STREAM, 0)
-	#jl4rb_out = 
+	#jl4rb_out =
 	takebuf_string(DyndocSandbox.OUTPUT_STREAM)
 	#truncate(DyndocSandbox.OUTPUT_STREAM, 0)
 	#jl4rb_out
@@ -53,14 +53,14 @@ end
 
 # export weave
 # module DyndocSandbox
-#     # Copied from Gadfly.jl/src/weave.jl 
+#     # Copied from Gadfly.jl/src/weave.jl
 #     # Replace OUTPUT_STREAM references so we can capture output.
 #     OUTPUT_STREAM = IOString()
 #     print(x) = Base.print(OUTPUT_STREAM, x)
 #     println(x) = Base.println(OUTPUT_STREAM, x)
 
 #     function eval(expr)
-#     	result = try 
+#     	result = try
 #             Base.eval(DyndocSandbox, expr)
 #             seek(DyndocSandbox.OUTPUT_STREAM, 0)
 #         	output = takebuf_string(DyndocSandbox.OUTPUT_STREAM)
@@ -78,21 +78,21 @@ end
 #     end
 # end
 
-function capture_julia(cmd::String)
-	add,cmd0=true,String[]
-	res=Any[] #Dict{String,Any}()
+function capture_julia(cmd::AbstractString)
+	add,cmd0=true,AbstractString[]
+	res=Any[] #Dict{AbstractString,Any}()
 	#println(cmd)
 	for l=split(cmd,"\n")
 		#println("l => ",l)
-		push!(cmd0,l) 
+		push!(cmd0,l)
 		pcmd0=Base.parse_input_line(join(cmd0,"\n"))
 		#print(join(cmd0,"\n")*":");println(pcmd0)
 		add = typeof(pcmd0)==Expr && pcmd0.head == :incomplete
-		if !add 
+		if !add
 			#print("ici:")
 			#println(Base.eval(pcmd0))
-			result,error = "","" 
-			try 
+			result,error = "",""
+			try
 				result=eval(DyndocSandbox, pcmd0)
 			catch e
 	            #io = IOBuffer()
@@ -101,10 +101,10 @@ function capture_julia(cmd::String)
 	            error = "Error: $(string(e))"
 	            #close(io)
 	        end
-			push!(res,(join(cmd0,"\n"),string(result),get_stdout_iobuffer(),error,get_stderr_iobuffer())) 
-			cmd0=String[] 
+			push!(res,(join(cmd0,"\n"),string(result),get_stdout_iobuffer(),error,get_stderr_iobuffer()))
+			cmd0=AbstractString[]
 		end
 		#println(res)
 	end
 	res
-end
+end

data/share/julia/ruby.jl

@@ -2,27 +2,30 @@
 
 module Ruby
 
-	librb=dlopen("libruby") 
+	if "JULIA_RUBYLIB_PATH" in keys(ENV)
+		push!(Libdl.DL_LOAD_PATH, ENV["JULIA_RUBYLIB_PATH"])
+	end
+	librb=Libdl.dlopen("libruby")
 
 	export start,stop,run,alive
 
 	global ruby_alive=false
 
 	function start()
-		ccall(dlsym(librb,:ruby_init),Void,())
-		ccall(dlsym(librb,:ruby_init_loadpath),Void,())
+		ccall(Libdl.dlsym(librb,:ruby_init),Void,())
+		ccall(Libdl.dlsym(librb,:ruby_init_loadpath),Void,())
 		ruby_alive=true
 	end
 
 	function stop()
-		ccall(dlsym(librb,:ruby_finalize),Void,())
+		ccall(Libdl.dlsym(librb,:ruby_finalize),Void,())
 		ruby_alive=false
 	end
 
-	function run(code::String)
+	function run(code::AbstractString)
 		state=1 #not modified then
 		##println(code)
-		res=ccall(dlsym(librb,:rb_eval_string_protect),Ptr{Uint64},(Ptr{Uint8},Ptr{Uint32}),bytestring(code),&state)
+		res=ccall(Libdl.dlsym(librb,:rb_eval_string_protect),Ptr{UInt64},(Ptr{UInt8},Ptr{UInt32}),bytestring(code),&state)
 	 	return nothing
 	end
 
@@ -34,4 +37,4 @@ module Ruby
 		ruby_alive
 	end
 
-end
+end

metadata

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