dyndoc-ruby 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf80bf26d92a223aeee631d4e87e0cf0bad017c
-  data.tar.gz: f330edf27a8d24f8c25dd07880150ffd787f0d4a
+  metadata.gz: 4dfedad69700126ccd77aeef4244d560737ddcb2
+  data.tar.gz: 1f31a9a7794cad05d5b49a778f78bb7361d619b9
 SHA512:
-  metadata.gz: e774331cccf4435b40e985d464fd64aa69e152a69efcddff603964c6dfed3f8ab04b765342b8f29066117ae61b230a900df0b30877ea44fcf81aaffa2e493509
-  data.tar.gz: eb164d962341f0b21d7e75e99086a77f9dfebff67cb6ededa6054dc3fa3dd8d3fe073f1e6366db1e657edf6fb294bf29ca1d2055a938186d4ef0457889357445
+  metadata.gz: 2bb129b3141ba9667741b1905a97ac1162a07d065251974c93870920df6903492a4029b3b7103fd3f61cc2b7f9f890ea1461ce3b98436c5401f753bd1483a816
+  data.tar.gz: 544150c1a03c353c6196e369c8c87bfabf757cf2a05e2a223135832915f47f77c25e229287a03098653f6485052a886d73b4fd704099faef5fa6d70c0a63956f

data/lib/dyndoc-convert.rb

@@ -7,6 +7,22 @@ module Dyndoc
 
   @@dyndoc_tmpl_mngr=nil
 
+  def Dyndoc.process_html_file_from_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
+    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 html_file and Dir.exist? File.dirname(html_file)
+      File.open(html_file,"w") do |f|
+        f << cli.content
+      end
+    else
+      puts cli.content
+    end
+  end
+
   ## does notwork when called twice!!!! (ex: jekyll-dyndoc in mode dyndoc)
   def Dyndoc.convert(input,config={})
     unless @@dyndoc_tmpl_mngr
@@ -173,8 +189,8 @@ module Dyndoc
     	end
     	code += "\n" + dyn_post_code if dyn_post_code
       ## TO TEST!!!
-      Dyndoc.warn :cfg,cfg
-      Dyndoc.warn :page,page
+      ##Dyndoc.warn :cfg,cfg
+      ##Dyndoc.warn :page,page
       code = "[#rb<]require 'ostruct';cfg = OpenStruct.new(" + cfg.inspect + ");page = OpenStruct.new(" + page.inspect + ")[#>]" +code
       code = dyn_tags + code if dyn_tags
 
@@ -189,19 +205,15 @@ module Dyndoc
 
       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 html_file and Dir.exist? File.dirname(html_file)
-    		File.open(html_file,"w") do |f|
-    			f << cli.content
-    		end
-    	else
-    		puts cli.content
-    	end
+      unless opts[:doc_tag] == "__ALL_DOC_TAG__"
+        Dyndoc.process_html_file_from_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
+      else
+        html_files.keys[1..-1].each do |doc_tag|
+          html_file=File.join(html_root,["users",opts[:user]] || [],cfg_files[:urls][doc_tag])
+          p [:html_multi,doc_tag,html_file]
+          Dyndoc.process_html_file_from_dyn_file(code.gsub(/__ALL_DOC_TAG__/,doc_tag),html_file,dyn_file,dyn_layout,addr,dyndoc_start)
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb