dyndoc-ruby 0.7.4 → 0.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dyndoc-convert.rb +2 -2
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92aec761fb25501bdaa7c77b583627e1f18b2a8a
4
- data.tar.gz: a7edf41a3bda9d06afeb5f46daa76b387f103d4a
3
+ metadata.gz: 0971314969f85bd5626a1107f50a921ec7b909d3
4
+ data.tar.gz: 527bf1c98fcbea7243f7ba2a55381728b7aaf9d5
5
5
  SHA512:
6
- metadata.gz: bdbb1be0061c988046b91027312d7c54d649169395eab6440fe02e83f8561029d722fef771e25b0483c876cb3404a1b2d15ff28fb7aa96777113ed64a3e2fd2c
7
- data.tar.gz: 9838e9e865f98c9101b2b088d211c3be8596b0c0071b56e92268c8c879d7c399751b38d5183c6026d8f9d76a6ae32dcf67e08b823164199bc045833e2cecabc1
6
+ metadata.gz: efc4c245111ecd1caecc4f4280fadc3a54421eeb16c5ff4553ac891ee66f35e6d5dd74fc1cd6e354b152f6bade2c0a62473437063968f9bb74464b6a1fc5cf21
7
+ data.tar.gz: 180c7e7d7d1f283e3f0433bd0a288ce47c31a69cfda7fe3afd7f04e6566f00693cf11a849e51f38fe200f925e852ec4ec972b59d6d3cbf484ab7bb4e87b40752
@@ -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!{YAML::load_file(dyn_file[0...i]+".dyn_cfg")}
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
 
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.7.4
4
+ version: 0.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - CQLS