dyndoc-ruby-core 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63739b8d4b4b0a76036cc7c60ce7dae2f02d53b
-  data.tar.gz: 6e03518f5b3ff4311b24c575be2e574e475bb635
+  metadata.gz: 7ae79ca38d95e8cbca20c77964c32562632aa1d0
+  data.tar.gz: d80a75b15083c95c30b330f39077312b643a741c
 SHA512:
-  metadata.gz: 76b7afd64d4d0547c5a65d59c77b757a34161f1224430387bbb69bdee16318f46bda32b90b85c0fdf0316052e1c0bda5b888b198adf6daadbbc4d9dc6fdd1946
-  data.tar.gz: 209bd6f3b33ddf78d26c786a989c65fdfaad780ceed4371a4b38ff11e1d22230656b13599ccdaa0fd0a208e1a19e8ed3b76c124381deaa00c6a513d2b3647195
+  metadata.gz: 1853d4d83db83858c5a65f3a97043b01a364b4eedc9c8f83abbe81e505aed78d1b68996ac5b7601df3630b4f222fc7e51754981273cf469747873b73de97e5a3
+  data.tar.gz: 4460712f1c09b496e9595b61b8b089b40bea046e22ca5e735e5291411a4c809a3d90e0ebad6f98df991ef328e696bf834710cd8bb837f1ac4ca2b294d934b9a0

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

@@ -11,6 +11,16 @@ module Dyndoc
     @@vars
   end
 
+  @@user_root_doc=nil
+
+  def Dyndoc.user_root_doc=(user_root_doc)
+    @@user_root_doc=user_root_doc
+  end
+
+  def Dyndoc.user_root_doc
+    @@user_root_doc
+  end
+
   module Ruby
 
   class TemplateManager
@@ -1528,31 +1538,33 @@ p call
           when :helpers
             eval_LOAD_HELPERS(res.strip.split("\n"),filter)
 	        when :path
-#puts "document:path";p res
-	          unless res.strip.empty?
-	            paths=res.strip.split("\n").map{|e| e.strip unless e.strip.empty?}.compact
-#p paths
-              @tmpl_cfg[:rootDoc]="" unless @tmpl_cfg[:rootDoc]
-#Dyndoc.warn "rootDoc",@tmpl_cfg[:rootDoc]
-	            rootpaths=@tmpl_cfg[:rootDoc].split(Dyndoc::PATH_SEP)
-#Dyndoc.warn "rootpaths",rootpaths
-	            newpaths=[]
-	            paths.each{|e|
-		            #if File.exist?(e)
-		            #  newpaths << e
-		            #els
-                if e[0,1]=="-" and File.exist?(e[1..-1])
-		              rootpaths.delete(e[1..-1])
-		            elsif (ind=e.to_i)<0
-		              rootpaths.delete_at(-ind-1)
-                else
-                  newpaths << e
-		            end
-	            }
-	            rootpaths=newpaths+rootpaths
-#p rootpaths
-	            @tmpl_cfg[:rootDoc]=rootpaths.join(Dyndoc::PATH_SEP)
-	          end
+#Dyndoc.warn "document:path",res
+            Dyndoc.user_root_doc=res.strip.split("\n").map{|e| e.strip unless e.strip.empty?}.compact.join(Dyndoc::PATH_SEP) unless res.strip.empty?
+
+#### OBSOLETE from 27/09/2016!!!
+### TODO: - operation possibly in init/config.rb
+#           unless res.strip.empty?
+# #p paths
+# #Dyndoc.warn "root_doc",@tmpl_cfg[:root_doc]
+# 	            rootpaths=@tmpl_cfg[:root_doc].split(Dyndoc::PATH_SEP)
+# #Dyndoc.warn "rootpaths",rootpaths
+# 	            newpaths=[]
+# 	            paths.each{|e|
+# 		            #if File.exist?(e)
+# 		            #  newpaths << e
+# 		            #els
+#                 if e[0,1]=="-" and File.exist?(e[1..-1])
+# 		              rootpaths.delete(e[1..-1])
+# 		            elsif (ind=e.to_i)<0
+# 		              rootpaths.delete_at(-ind-1)
+#                 else
+#                   newpaths << e
+# 		            end
+# 	            }
+# 	            rootpaths=newpaths+rootpaths
+# #Dyndoc.warn :last, rootpaths
+# 	            @tmpl_cfg[:root_doc]=rootpaths.join(Dyndoc::PATH_SEP)
+#	          end
 	        when :first
 	          Dyndoc.dyn_block[:first]=[] unless Dyndoc.dyn_block[:first]
 	          Dyndoc.dyn_block[:first]+=b2

data/lib/dyndoc/init/config.rb

@@ -214,6 +214,7 @@ module Dyndoc
     pathenv =  Dyndoc.init_pathenv
     pathenv += PATH_SEP + File.join(@@dyn_gem_path,"dyndoc") + PATH_SEP + File.join(@@dyn_gem_path,"dyndoc","Std") if File.exists? File.join(@@dyn_gem_path,"dyndoc")
     # high level of priority since provided by user
+    pathenv += PATH_SEP + Dyndoc.user_root_doc  if Dyndoc.user_root_doc
     pathenv += PATH_SEP + ENV["DYNDOC_LIBRARY_PATH"] if ENV["DYNDOC_LIBRARY_PATH"] and !ENV["DYNDOC_LIBRARY_PATH"].empty?
     pathenv += PATH_SEP + File.join(Dyndoc.cfg_dir[:root_path],"library") if File.exists? File.join(@@cfg_dir[:root_path],"library")
     pathenv += PATH_SEP + @@cfg_dir[:current_doc_path] if with_currentRoot and !@@cfg_dir[:current_doc_path].empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby-core
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere