dyndoc-ruby 0.7.6 → 0.7.7
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.
- checksums.yaml +4 -4
- data/lib/dyndoc-convert.rb +18 -3
- metadata +16 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c735f02d2467683edb8b01726297f83ec532a335
|
|
4
|
+
data.tar.gz: 2d91e69c41b210872b082a7471dfed2f7de77b5a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ca1178d1207decf26e2ce351f05c54f9a34f05915c92d9b3c685598c8c1b66b3cadaa18f1254ce3aa33b1204ae4a90023afebb4d75e3c8581ec1e686a6de631f
|
|
7
|
+
data.tar.gz: daa9d46c3a45f878a1d2e6495abb8dae57482f90dd5e26921bbf8f9c886b3c853160cd8bda26d0af4749371d824cfd310f4fff1915a7afd3a7829e2c459a278d
|
data/lib/dyndoc-convert.rb
CHANGED
|
@@ -57,6 +57,7 @@ module Dyndoc
|
|
|
57
57
|
|
|
58
58
|
cfg={}
|
|
59
59
|
## find the previous config.yml in the tree folder
|
|
60
|
+
## TODO: read all previous config.yml and merge them from root to current
|
|
60
61
|
cfg_yml_files=dyn_path.inject([""]) {|res,e| res + [(res[-1,1]+[e]).flatten]}.map{|pa| File.join(root[:dyn],pa,"config.yml")}.reverse
|
|
61
62
|
cfg_yml_file=cfg_yml_files.select{|c| File.exists? c}[0]
|
|
62
63
|
cfg=YAML::load_file(cfg_yml_file) if cfg_yml_file
|
|
@@ -96,16 +97,30 @@ module Dyndoc
|
|
|
96
97
|
html_root= cfg["html_root"] || root[:html] || File.expand_path("..",dyn_file)
|
|
97
98
|
|
|
98
99
|
if cfg["layout"]
|
|
99
|
-
|
|
100
|
+
if cfg["layout"][0] == "%" #user mode
|
|
101
|
+
cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["layout"][1..-1])
|
|
102
|
+
else
|
|
103
|
+
cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
|
|
104
|
+
end
|
|
100
105
|
dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
|
|
101
106
|
end
|
|
102
107
|
if cfg["pre"]
|
|
103
|
-
|
|
108
|
+
if cfg["pre"][0] == "%" #user mode
|
|
109
|
+
cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["pre"][1..-1])
|
|
110
|
+
else
|
|
111
|
+
#cfg_tmp=File.join(dyn_root,cfg["pre"])
|
|
112
|
+
cfg_tmp=File.join(dyn_root,cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["preload",cfg["pre"]])
|
|
113
|
+
end
|
|
104
114
|
dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
|
|
105
115
|
end
|
|
106
116
|
|
|
107
117
|
if cfg["post"]
|
|
108
|
-
|
|
118
|
+
if cfg["post"][0] == "%" #user mode
|
|
119
|
+
cfg_tmp=File.join(root[:dyn],'users',root[:user],cfg["post"][1..-1])
|
|
120
|
+
else
|
|
121
|
+
#cfg_tmp=File.join(dyn_root,cfg["post"])
|
|
122
|
+
cfg_tmp=File.join(dyn_root,cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["postload",cfg["post"]])
|
|
123
|
+
end
|
|
109
124
|
dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
|
|
110
125
|
end
|
|
111
126
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dyndoc-ruby
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- CQLS
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-09-
|
|
11
|
+
date: 2016-09-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: R4rb
|
|
@@ -80,6 +80,20 @@ dependencies:
|
|
|
80
80
|
- - '>='
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
82
|
version: 1.5.3
|
|
83
|
+
- !ruby/object:Gem::Dependency
|
|
84
|
+
name: redcarpet
|
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
|
86
|
+
requirements:
|
|
87
|
+
- - '>='
|
|
88
|
+
- !ruby/object:Gem::Version
|
|
89
|
+
version: 3.3.4
|
|
90
|
+
type: :runtime
|
|
91
|
+
prerelease: false
|
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
93
|
+
requirements:
|
|
94
|
+
- - '>='
|
|
95
|
+
- !ruby/object:Gem::Version
|
|
96
|
+
version: 3.3.4
|
|
83
97
|
description: |2
|
|
84
98
|
Provide templating in text document.
|
|
85
99
|
email: rdrouilh@gmail.com
|
|
@@ -87,7 +101,6 @@ executables:
|
|
|
87
101
|
- dyn
|
|
88
102
|
- dyn-cli
|
|
89
103
|
- dyn-srv
|
|
90
|
-
- dyn-forever
|
|
91
104
|
- dpm
|
|
92
105
|
- dyn-init
|
|
93
106
|
extensions: []
|