dyndoc-ruby 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65042ee656666efc391b0d149f34b18fe8b11eef
-  data.tar.gz: 10ef6ac6b795ffd07f2f9c28379fe0db1932cf4b
+  metadata.gz: 7cc121c259fd5163b90033b2435068a99ddaf71f
+  data.tar.gz: 5aa20262aa934934b5bb3859a99d11e3cbbc88a0
 SHA512:
-  metadata.gz: afd5d171236ee2e1a959ea9880440bdc7b62bf7e7c4954b9a9577e555c50d2172145e376a385c7c025e63fe6c606e0ebbc5a04b0f74a8c8f43485e1c93d906f3
-  data.tar.gz: 9634aa1e8630bd606b51ee2b00dbe9b7abd155b4813b9ba4375e21d60b1d22914723cd859702ad870f194b37fe9c9c9ceae367a0192e9a7ae0708b3461c3e299
+  metadata.gz: 6337908a9e9ffba759dfcb407501237e53e9ff9b7fe62fc5e95a18e436add7ba71304885c9348bd14da492eaa5deb2620a2254bcd98a1182ca76afa51f64f066
+  data.tar.gz: 39035a910109d0742fe2d5c4526ac80f0a200694ab2c1277dbb1adedd23620cf0b03352158382e15c33c8b34f625aa75da5303dd5f20c1ff28c93e931a48428e

data/lib/dyndoc-convert.rb

@@ -14,6 +14,11 @@ module Dyndoc
       cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
     end
 
+    ## fix html_file for _rmd, _adoc and _ttm
+    if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
+      html_file = $1+".html"
+    end
+
     if html_file and Dir.exist? File.dirname(html_file)
       File.open(html_file,"w") do |f|
         f << cli.content
@@ -128,7 +133,8 @@ module Dyndoc
         if b[0].empty? and b.length>4
           require 'yaml'
           page=YAML.load(b[2])
-          cfg.merge!(page)
+          ##p [:page,page]
+          cfg.merge!(page) if page
           code=b[4..-1].join("")
         end
       end
@@ -137,6 +143,9 @@ module Dyndoc
       dyn_root= cfg["dyn_root"] || opts[:dyn_root] || File.expand_path("..",dyn_file)
       html_root= cfg["html_root"] || opts[:html_root] || File.expand_path("..",dyn_file)
       sys_root = cfg["sys_root"] ||  opts[:sys_root] || File.expand_path('..',dyn_root)
+      cfg["dyn_root"] = dyn_root
+      cfg["html_root"] = html_root
+      cfg["sys_root"] = sys_root
       ##p [:sys_root,dyn_root,sys_root]
 
       ## Dyn Model: generally helps to define a style (layout, preload, postload)
@@ -243,8 +252,7 @@ module Dyndoc
     	end
     	code += "\n" + dyn_post_code if dyn_post_code
       ## TO TEST!!!
-      ##
-      Dyndoc.warn :cfg,cfg
+      ##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
@@ -259,6 +267,7 @@ module Dyndoc
       code_path << "\n" << File.join(sys_root,'system','dynlib')
       code_path << "\n" << File.join(opts[:dyn_root],'dynlib')
       code_path << "\n" << opts[:dyn_root] << "\n"
+      code_path << "\n" << "[#require]RodaSrvCore" << "\n"
       code_path << "[#main][#<]\n"
       code = code_path + code
 
@@ -380,6 +389,7 @@ module Dyndoc
       # dyn_root can be overwritten by cfg
       # defines the root of relative predefined dyn (pre, post, ...) files
       dyn_root= cfg["dyn_root"] || opts[:dyn_root] || File.expand_path("..",dyn_file)
+      cfg["dyn_root"] = dyn_root
 
       cfg["layout"] = cfg["pre"] = cfg["post"] = cfg["model"] if cfg["model"]
 
@@ -456,7 +466,8 @@ module Dyndoc
       code_path << "[#main][#<]\n"
       code = code_path + code
 
-      ### Dyndoc.warn :code,code
+      ###
+      Dyndoc.warn :code,code
 
       dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
 

data/lib/dyndoc-html-servers.rb

@@ -78,7 +78,11 @@ module Dyndoc
               html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
               ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
               Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-              puts dyn_file[1..-1]+" processed!"
+              ## fix html_file for _rmd, _adoc and _ttm
+              if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
+                html_file = $1+".html"
+              end
+              puts dyn_file[1..-1]+" processed => "+html_file+" created!"
               if RUBY_PLATFORM =~ /darwin/
                 options[:first] = html_file != old_html_file
                 if html_file != old_html_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - RCqls