dyndoc-ruby 0.7.4 → 0.7.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dyndoc-convert.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0971314969f85bd5626a1107f50a921ec7b909d3
|
|
4
|
+
data.tar.gz: 527bf1c98fcbea7243f7ba2a55381728b7aaf9d5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: efc4c245111ecd1caecc4f4280fadc3a54421eeb16c5ff4553ac891ee66f35e6d5dd74fc1cd6e354b152f6bade2c0a62473437063968f9bb74464b6a1fc5cf21
|
|
7
|
+
data.tar.gz: 180c7e7d7d1f283e3f0433bd0a288ce47c31a69cfda7fe3afd7f04e6566f00693cf11a849e51f38fe200f925e852ec4ec972b59d6d3cbf484ab7bb4e87b40752
|
data/lib/dyndoc-convert.rb
CHANGED
|
@@ -71,8 +71,8 @@ module Dyndoc
|
|
|
71
71
|
dyn_post_code=File.read(dyn_file[0...i]+"_post.dyn") if File.exist? dyn_file[0...i]+"_post.dyn"
|
|
72
72
|
|
|
73
73
|
|
|
74
|
-
if File.exist? dyn_file[0...i]+".dyn_cfg"
|
|
75
|
-
cfg.merge!
|
|
74
|
+
if File.exist? dyn_file[0...i]+".dyn_cfg" and (yml=YAML::load_file(dyn_file[0...i]+".dyn_cfg"))
|
|
75
|
+
cfg.merge!(yml)
|
|
76
76
|
else # try do find (in the Zope spirit) a config file in the nearest folder
|
|
77
77
|
end
|
|
78
78
|
|