dyndoc-ruby-core 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b302bae638dbe8908415fc844db0b81321c5cbbd3b07307d84d13c6ece678a6c
-  data.tar.gz: f72741abff2e5aee2568dbef254fa683eb3edd352838b10cc185bbd242dcdb2f
+  metadata.gz: d8db5b8dba56f6bc0ed9ac32ee525033c577e49e4771e76a96dcb0e7c28654d5
+  data.tar.gz: 7dd78c1167b23734ce93a6ca4e125ae106006e7b621eebc7c97dbca5fea9c30f
 SHA512:
-  metadata.gz: 45a49451d506304d9ff93149507eb7da54122923d62b2fcd6af9fa7604c341f1c95eeac9521c18f4e123ac67df2d65b6c3850898942ac6d3989d9f7b42b109ea
-  data.tar.gz: ea013b177b66156fe1fc9c262e9d8d812db0e71987b696d022a0f485a78ec3bbfe23ba9f1c4d5b5e153e4e881bf2f2839ba8d842de2a5abd965b76d145f9310e
+  metadata.gz: 549db27aa7991171c22c203caccdc28653b6b2ccb7b9e275565f79e5f4c8a239d4996c97bcad7c4324d802bcbf0f907b7183a388f1644d21e547e9d41d1f3fb3
+  data.tar.gz: fc5c2afdbe9c859940452f246d4dfa8c59d1fc7645ec87a321b86c64edfee0062d3df252cf9f5cfe33acadf05e49c7890eb2baac45ee45abee8e7ce21e058548

data/lib/dyndoc-core.rb

@@ -30,6 +30,8 @@ Settings.define 'cfg_dyn.cmd_pandoc_options', :type => Array, :default => []
 Settings.define 'cfg_dyn.options.pdflatex_nb_pass', :type => Integer, :default => 1
 Settings.define 'cfg_dyn.options.pdflatex_echo', :type => :boolean, :default => false
 Settings.define 'cfg_dyn.debug', :type => :boolean, :default => false
+Settings.define 'cfg_dyn.parse_rescue', :type => :boolean, :default => true
+Settings.define 'cfg_dyn.parse_rescue_mode', :type => Symbol, :default => :simple
 Settings.define 'cfg_dyn.ruby_only', :type => :boolean, :default => false
 
 Settings.define 'cfg_dyn.dyndoc_session', :type => Symbol, :default => :normal #or :interactive
@@ -40,6 +42,7 @@ Settings.define 'cfg_dyn.working_dir', :type => String, :default => ""
 Settings.define 'cfg_dyn.root_doc', :type => String, :default => ""
 Settings.define 'cfg_dyn.nbChar_error', :type => Integer, :default => 300
 Settings.define 'cfg_dyn.langs', :type => Array, :default => ["R"]
+Settings.define 'cfg_dyn.require_first', :type => Array, :default => [""]
 
 Settings.define 'cfg_dyn.devel_mode', :type=> Symbol, :default=> :none
 Settings.define 'cfg_dyn.ruby_debug', :type=> Symbol, :default=> :none

data/lib/dyndoc/base/filter/filter_mngr.rb

@@ -395,7 +395,7 @@ module Dyndoc
       when "@"
         return txt if  @mode==:pre
         res=CallFilter.output(txt,self)
-      when "#","##"
+      when "#","##","%"
 #p @envir
         #p @envir.output(txt,@mode,@escape)
         #p @envir.output(in_type+"{"+txt2+"}",@mode,@escape)
@@ -575,7 +575,7 @@ module Dyndoc
         else
           res.to_s
         end
-      when "=","@=","#=","##=" ,"none="
+      when "=","@=","#=","%=","##=" ,"none="
 #puts "convert [=]";p res
         if res.is_a? Array
           res.join(",")
@@ -587,7 +587,7 @@ module Dyndoc
             "%Q{"+res2+"}"
           end
         end
-      when "","@","#","##","none","#F"
+      when "","@","#","%","##","none","#F"
         if res.is_a? Array
           res.join(",")
         else

data/lib/dyndoc/base/filter/server.rb

@@ -93,7 +93,9 @@ module Dyndoc
 	        end
 
 	    rescue SyntaxError
-	        puts "RbServer syntax error in: "+code
+			
+			$outRbError="RbServer syntax error in: "+code
+			puts $outRbError
 	        raise SystemError if Dyndoc.cfg_dyn[:dyndoc_mode]==:normal and  Dyndoc.cfg_dyn[:ruby_debug]!=:none
 	        if Dyndoc.cfg_dyn[:dyndoc_mode]!=:normal
 	        	$dyn_logger.write("\nERROR Ruby Syntax:\n"+code+"\n")
@@ -829,8 +831,8 @@ module Dyndoc
 
 	def JLServer.initVerb
 		Julia << "Base.include(@__MODULE__,\""+File.join(Dyndoc.cfg_dir[:gem_path],"share","julia","dyndoc.jl")+"\")"
-    Julia << "push!(Libdl.DL_LOAD_PATH,\"/usr/lib\");push!(Libdl.DL_LOAD_PATH,\"/usr/local/lib\")"
-  	@@initVerb=true
+		Julia << "push!(Libdl.DL_LOAD_PATH,\"/usr/lib\");push!(Libdl.DL_LOAD_PATH,\"/usr/local/lib\")"
+		@@initVerb=true
 	end
 
 	def JLServer.inputsAndOutputs(code,hash=true)

data/lib/dyndoc/base/scanner.rb

@@ -232,7 +232,7 @@ module Dyndoc
   class CallScanner < Scanner
 
     @@type[:call]={
-          :start=>/\\?(?:\#|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb|\:jl|#jl)?\{/,
+          :start=>/\\?(?:\#|\%|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb|\:jl|#jl)?\{/,
           :stop=>     /\\?\}/,
           :mode=>{:start=>-1,:stop=>0,:length=>1},
           :escape_start=>['\{'], #doivent être parsable dans start
@@ -257,11 +257,11 @@ module Dyndoc
         }
 =end
       @@type[:dtag] = {
-          :start=>'\{[\#\@]([\w\:\|-]*[<>]?[=?!><]?(\.\w*)?)\]',
-          :stop=>  '\[[\#\@]([\w\:\|-]*[<>]?[=?!><]?)\}',
-          :atom=>{:match=>/(\{[\#\@][\w\:\|]*)([\#\@]\})/,:replace=>{2=>"][#}"}},
+          :start=>'\{[\#\@\%]([\w\:\|-]*[<>]?[=?!><]?(\.\w*)?)\]',
+          :stop=>  '\[[\#\@\%]([\w\:\|-]*[<>]?[=?!><]?)\}',
+          :atom=>{:match=>/(\{[\#\@\%][\w\:\|]*)([\#\@\%]\})/,:replace=>{2=>"][#}"}},
           :block=> '\]', #no longer |
-          :keyword=>['\[[\#\@]','\]'],
+          :keyword=>['\[[\#\%\@]','\]'],
           :mode=>{:start=>0,:stop=>-1,:length=>1}
         }
 
@@ -621,11 +621,12 @@ module Dyndoc
 	        end
 ##Dyndoc.warn "to scan", @scan.string[@scan.pos..-1]
 ##Dyndoc.warn "tag_reg",[blocktag_reg,tag_reg]
+##p ["tag_reg",[blocktag_reg,tag_reg]]
 	      end
         if (tag_keyword and (@scan.check_until(blocktag_reg))) #or (!@named_tags.empty? and check_until_for_named_tags)
 	        check_until_for_named_tags unless @named_tags.empty?
           key=@scan[2]
-##Dyndoc.warn "keyword",[key,@scan[0],@scan[1],@scan[2]]
+##Dyndoc.warn p ["keyword",[key.scan(tag_reg),key.scan(tag_reg)[-1],key,@scan[0],@scan[1],@scan[2]]]
 ##Dyndoc.warn "pre_math,tag_selected",[@scan.pre_match,@tag_selected] if key=="[#tag]"
           res << find_text(from,key,inside)
           @is_arg=false if @is_arg
@@ -635,7 +636,7 @@ module Dyndoc
 	          res << (key=@tag_selected)
 	        else
 	    #key=tag_reg.match(key)[0]
-	          key= key.scan(tag_reg)[0]
+	          key= key.scan(tag_reg)[-1]
 ##Dyndoc.warn "key(AP)",key if key=="tag"
 	          res << (key=key.to_sym) if key and !key.empty?
 	        end

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

@@ -201,13 +201,15 @@ module Dyndoc
 #p input
 =end
       	  # REPLACEMENT of  ABOVE!
-      	  unless @libs.keys.include? tmpl
-      	    input=Dyndoc.read_content_file(tmpl)
-      	    @libs[tmpl]=input
-      	    filter.envir["_FILENAME_"]=tmpl.dup #register name of template!!!
-      	    filter.envir["_FILENAME_ORIG_"]=tmpl_orig.dup #register name of template!!!
-      	    filter.envir["_PWD_"]=File.dirname(tmpl) #register name of template!!!
-      	    txt=parse(@libs[tmpl],filter,tags)
+          unless @libs.keys.include? tmpl
+            if tmpl and File.exists? tmpl
+              input=Dyndoc.read_content_file(tmpl)
+              @libs[tmpl]=input
+              filter.envir["_FILENAME_"]=tmpl.dup #register name of template!!!
+              filter.envir["_FILENAME_ORIG_"]=tmpl_orig.dup #register name of template!!!
+              filter.envir["_PWD_"]=File.dirname(tmpl) #register name of template!!!
+              txt=parse(@libs[tmpl],filter,tags)
+            end
       	  end
         }
       end 

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

@@ -151,6 +151,9 @@ module Dyndoc
     ## equivalent to :pre_doc for not interactive document
     def require_first
       require_dyndoc_libs("Dyn/Base")
+      Dyndoc.cfg_dyn[:require_first].each do |libs|
+        require_dyndoc_libs(libs)
+      end
     end
 
     def require_dyndoc_libs(libs)

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

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'securerandom'
+
 ## TODO: .force_encoding("utf-8") needs to be added (see server.rb)
 module Dyndoc
 
@@ -26,6 +28,7 @@ module Dyndoc
   class TemplateManager
 
     @@depth=0
+    @@outError=""
 
     @@cmd=["newBlck","input","require","def","func","meth","new","super","blck","do","if","for","case", "loop","r","renv","rverb","rbverb","jlverb","rout","rb","var","set","hide","format","txt","code","<","<<",">","eval","ifndef","tags","keys","opt","document","yield","get","part","style"]
     ## Alias
@@ -87,7 +90,7 @@ module Dyndoc
       @vars,varsOld=filterLoc.envir,@vars
       Dyndoc.vars=@vars
       @filter=filterLoc unless @filter ##root filter
-      out=""
+      out,$outError ="",""
 #p texblock
       texblock.map{|b|
 #p b
@@ -96,33 +99,49 @@ module Dyndoc
         cmd=@@cmdAlias[cmd] if @@cmdAlias.keys.include? cmd
 #Dyndoc.warn "parse:cmd,b",[cmd,b]
         @@depth+=1
-        ###TO temporarily AVOID RESCUE MODE:
-        ###
-        if true; method("do_"+cmd).call(out,b,filterLoc); else
-        begin
-          ## Dyndoc.warn "cmd",[cmd,b]
-          method("do_"+cmd).call(out,b,filterLoc)
-          ## Dyndoc.warn [:out,out] if cmd=="eval"
-        rescue
-          puts "=> Leaving block depth #{@@depth}: "
-          codeText=b.inspect
-          ##Dyndoc.warn "codeText",codeText
-          nbChar=(Dyndoc.cfg_dyn[:nbChar_error]) ? Dyndoc.cfg_dyn[:nbChar_error] : 80
-          if codeText.length > nbChar
-            codeText=codeText[0..((nbChar*2/3).to_int)]+" ...... "+codeText[(-(nbChar/3).to_int)..-1]
-          end
-          puts codeText
-          if @@depth==1
-            puts "=> Exiting abnormally!\n"
-            raise SystemExit
-          else
-            raise RuntimeError, "Dyn Runtime Error"
+        ## To deactivate, put it inside ~/.dyndoc.yml
+        if Dyndoc.cfg_dyn[:parse_rescue]
+          begin
+            ## Dyndoc.warn "cmd",[cmd,b]
+            method("do_"+cmd).call(out,b,filterLoc)
+            ## Dyndoc.warn [:out,out] if cmd=="eval"
+          rescue
+            $outError << "=> Leaving block depth #{@@depth}: " << "\n"
+            codeText = b.inspect
+            ##Dyndoc.warn "codeText",codeText
+            nbChar=(Dyndoc.cfg_dyn[:nbChar_error]) ? Dyndoc.cfg_dyn[:nbChar_error] : 80
+            if codeText.length > nbChar
+              codeText=codeText[0..((nbChar*2/3).to_int)]+" ...... "+codeText[(-(nbChar/3).to_int)..-1]
+            end
+            $outError << codeText << "\n"
+            if $outRbError && !$outRbError.empty? 
+              $outError << $outRbError << "\n"
+              $outRbError = ""
+            end
+            if @@depth==1
+              $outError << "=> Exiting abnormally!</code>" << "\n"
+              @@outError << "<pre style='background-color: #EBECE4;'><code>"+$outError+"</code></pre>" << "\n"
+              puts "@@outError: \n"+@@outError
+              #raise SystemExit
+              out << @@outError
+              @@outError=""
+            else
+              @@outError << "<pre style='background-color: #EBECE4;'><code>Dyn Runtime Error\n"+$outError+"</code></pre>"
+              $outError=""
+              if Dyndoc.cfg_dyn[:parse_rescue_mode]==:simple 
+                out << @@outError
+                @@outError=""
+              else
+                raise RuntimeError, "Dyn Runtime Error"
+              end
+            end
+            Dyndoc.warn "out #{@@depth} :",$outError
+
+          ensure
+            @@depth -= 1
           end
-        ensure
-          @@depth -= 1
-        end
-        ###TO temporarily AVOID RESCUE MODE:
-        ###
+        else
+          method("do_"+cmd).call(out,b,filterLoc)
         end
       }
       ##restore old partTag and vars
@@ -404,7 +423,7 @@ p [vars,b2]
         if @@newBlcks.keys.include? @blckDepth[-1]
           @blckName ||= []
           tmp=blck[1][1].strip
-          @blckName << (tmp.empty? ? `uuidgen`.strip : tmp)
+          @blckName << (tmp.empty? ? SecureRandom.uuid.strip : tmp)
           #puts "blckNAME";p @blckName
         end
 

data/lib/dyndoc/base/utils.rb

@@ -119,7 +119,7 @@ module Dyndoc
     end
 
     def Utils.protect_extraction(str)
-      str.gsub(/(?:\#|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb)+\{/) {|e| "\\"+e}
+      str.gsub(/(?:\#|\:dyn|\#\#|@|#F|#R|#r|\:R|\:r|#Rb|#rb|\:|\:Rb|\:rb)+\{/) {|e| "\\"+e}
     end
 
     ## the scanner converts automatically  {#toto#} in {#toto][#} and   {@toto@} in {@toto][#}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - CQLS
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -34,22 +34,22 @@ dependencies:
   name: ultraviolet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: "  Provide templating in text document.\n"
 email: rdrouilh@gmail.com
 executables: []
@@ -193,12 +193,12 @@ files:
 - share/julia/dyndocOLD.jl
 - share/julia/dynreport.jl
 - share/julia/ruby.jl
-homepage: http://cqls.upmf-grenoble.fr
+homepage: http://cqls.dyndoc.fr
 licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: R and Ruby in text document
 test_files: []