dyndoc-ruby 0.6.8 → 0.6.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dyndoc-convert.rb +12 -3
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 29561ddc0cea1f2b1eef747a95daefd13aab8a67
4
- data.tar.gz: e17a12b9210e6a126a35571460287391405de93e
3
+ metadata.gz: 4bfc797a312a3a089b6f924db267ee26edf38673
4
+ data.tar.gz: 4ef17f264140a4bdab76576a2ef49df142e06604
5
5
  SHA512:
6
- metadata.gz: 1cd29041e4e6b41fb71bf54e3aeba2a8abd5f1b9083bd994786be1c5a2d0d5fc9dc579b8356b0a4587fa156953d12ffdd2293eaa0ea78c8f9f5697bc36a31a35
7
- data.tar.gz: 9e5d506761a650705773f3c5439e174d6703fb19acccdaa37a53aa6d2d84b65d8bec688a55b877917a51be9e187720cceda717959a70e37c3c8e0cd901e7f769
6
+ metadata.gz: 4d1044101d8667e67414222a07b03e6e876f36c1eb05867b34c088f5dd0c0722b25db82d7e56e8199be594e32610b59f72c2e1895e48de9c5305d3d4f9a6788b
7
+ data.tar.gz: 722f19b3cdfab0826287df2f31b3be56e5b5dc93cde057e70776249de9c84a0cd419f424a34acfb57f5004e68d223a81fe1b81b6dcbb29aa0ffebb4abcb515c1
@@ -57,10 +57,19 @@ module Dyndoc
57
57
  if File.exist? dyn_file[0...i]+"_.dyn_cfg"
58
58
  require 'yaml'
59
59
  cfg=YAML::load_file(dyn_file[0...i]+"_.dyn_cfg")
60
- dyn_layout=File.read(cfg["layout"]) if !dyn_layout and File.exist? cfg["layout"]
61
- dyn_pre_code=File.read(cfg["pre"]) unless dyn_pre_code and File.exist? cfg["pre"]
62
- dyn_post_code=File.read(cfg["post"]) unless dyn_post_code and File.exist? cfg["post"]
60
+ dyn_root= cfg["root"] || File.expand_path("..",dyn_file)
61
+
62
+ cfg_tmp=File.join(dyn_root,cfg["layout"])
63
+ dyn_layout=File.read(cfg_tmp) if !dyn_layout and File.exist? cfg_tmp
64
+
65
+ cfg_tmp=File.join(dyn_root,cfg["pre"])
66
+ dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
67
+
68
+ cfg_tmp=File.join(dyn_root,cfg["post"])
69
+ dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
70
+
63
71
  dyn_libs=File.read(cfg["libs"]).strip if File.exist? cfg["libs"]
72
+
64
73
  dyn_tags="[#<]{#opt]"+cfg["tags"].strip+"[#opt}" if File.exist? cfg["tags"]
65
74
  end
66
75
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dyndoc-ruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.8
4
+ version: 0.6.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - CQLS