dyndoc-ruby 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bfc797a312a3a089b6f924db267ee26edf38673
-  data.tar.gz: 4ef17f264140a4bdab76576a2ef49df142e06604
+  metadata.gz: 15ad72bbdd8efdd12d294aed2f6c69451b464f11
+  data.tar.gz: 6a5d10de569333b68187162a390d032d5a7f01e9
 SHA512:
-  metadata.gz: 4d1044101d8667e67414222a07b03e6e876f36c1eb05867b34c088f5dd0c0722b25db82d7e56e8199be594e32610b59f72c2e1895e48de9c5305d3d4f9a6788b
-  data.tar.gz: 722f19b3cdfab0826287df2f31b3be56e5b5dc93cde057e70776249de9c84a0cd419f424a34acfb57f5004e68d223a81fe1b81b6dcbb29aa0ffebb4abcb515c1
+  metadata.gz: b0ea96d8151951563bba60a93a866ddecf5a8a019c2916681be4064a0342573b8eedab01dc351283da06691602e99367c3489d6639671370452bb5f916488f34
+  data.tar.gz: 62b3fbc0143a32dabdf0b454da851044e6b1ccc01c477817919d74487fb927c01169e7366d92e23ff762175e2f528d181c1e913007dbb21eff0389d26f03e65f

data/lib/dyndoc-convert.rb

@@ -54,19 +54,25 @@ module Dyndoc
       ## Dyn post
       dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
 
-      if File.exist? dyn_file[0...i]+"_.dyn_cfg"
+      if File.exist? dyn_file[0...i]+".dyn_cfg"
         require 'yaml'
-        cfg=YAML::load_file(dyn_file[0...i]+"_.dyn_cfg")
-        dyn_root= cfg["root"] || File.expand_path("..",dyn_file)
-
-        cfg_tmp=File.join(dyn_root,cfg["layout"])
-        dyn_layout=File.read(cfg_tmp) if !dyn_layout and File.exist? cfg_tmp
+        cfg=YAML::load_file(dyn_file[0...i]+".dyn_cfg")
 
-        cfg_tmp=File.join(dyn_root,cfg["pre"])
-        dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
+        dyn_root= cfg["root"] || File.expand_path("..",dyn_file)
 
-        cfg_tmp=File.join(dyn_root,cfg["post"])
-        dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
+        if cfg["layout"]
+          cfg_tmp=File.join(dyn_root,cfg["layout"])
+          dyn_layout=File.read(cfg_tmp) if !dyn_layout and File.exist? cfg_tmp
+        end
+        if cfg["pre"]
+          cfg_tmp=File.join(dyn_root,cfg["pre"])
+          dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
+        end
+
+        if cfg["post"]
+          cfg_tmp=File.join(dyn_root,cfg["post"])
+          dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
+        end
 
         dyn_libs=File.read(cfg["libs"]).strip if File.exist? cfg["libs"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - CQLS