dyndoc-ruby-core 1.4.3 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f4ae2cf223f7b913754b9f4e4d7419186fab3189d55523036fb2fa3f93392b
-  data.tar.gz: b1ec775ce41e3540dcae8a91fb1814fe6cf97dbabc65041e2c959057e654057b
+  metadata.gz: b0f4236705f48cc9db8e234489a77303b4213389b1dbf4f4d5681851cb1f8a7c
+  data.tar.gz: 04423ca31ef550ea3e30d5fddc86cb5027064b8ac68aefe733da9a13f6444130
 SHA512:
-  metadata.gz: 363228915e236ec025ac27bdbc977d5be92926e4002a96331d807cb3865d76cbd8203484a847d015f9e17e2669c3821995bae78db97c56850c8617f8cd51235a
-  data.tar.gz: b8a11d916555bf616b02c7abd1c355682f1297fc1ea5b0f9b8257ca31acbe8d4e856d94eefa6ab8ed2d7b8b6ef860762341023f4eaf158eda41b3efb104291a4
+  metadata.gz: be41ec047d2d52b9d3963e23f664989b2bb6eed24c4ee1e0df7737b9f4a0814026f04fac7cf8341c7af79e27a63e2f244cfbed87cedf2dfa24232de8970cd0fe
+  data.tar.gz: 9f482b734d270328b608ee7ec6bfcbde417df4ee65f0f48a42384c78c62c15ed7736479992c5a9f2313c223e19003f523512e9837d8ef6867ada8a3f339df5a5

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

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")

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

@@ -28,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
@@ -89,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
@@ -98,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.8
 platform: ruby
 authors:
 - CQLS
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -198,7 +198,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: R and Ruby in text document
 test_files: []