dyndoc-ruby 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435bd097c09c1f84c3563c140c1d2ddc0c1cefbe
-  data.tar.gz: dab182d72493fd9e57becbcf893d02d4946b0499
+  metadata.gz: dcf80bf26d92a223aeee631d4e87e0cf0bad017c
+  data.tar.gz: f330edf27a8d24f8c25dd07880150ffd787f0d4a
 SHA512:
-  metadata.gz: 67718adc452e2b60a4125e2ce4c4181f378f30e72e6eb9fa95e7ff29f9acb4ede9008fac4a1ea999b7c5c0b39b913fe22fbe4d150870d7ab5a855a040226452e
-  data.tar.gz: 73ec96e20978162b86e0e2738261f63ef0948e3aee0c70fbf3c7d5aac28af4ad94dc12986809073fa28c9c39a6741513d0dcbe2c8491c3f6f534c1d6fa50b44a
+  metadata.gz: e774331cccf4435b40e985d464fd64aa69e152a69efcddff603964c6dfed3f8ab04b765342b8f29066117ae61b230a900df0b30877ea44fcf81aaffa2e493509
+  data.tar.gz: eb164d962341f0b21d7e75e99086a77f9dfebff67cb6ededa6054dc3fa3dd8d3fe073f1e6366db1e657edf6fb294bf29ca1d2055a938186d4ef0457889357445

data/lib/dyndoc-convert.rb

@@ -118,8 +118,8 @@ module Dyndoc
       html_root= cfg["html_root"] || opts[:html_root] || File.expand_path("..",dyn_file)
 
       if cfg["layout"]
-        if cfg["layout"][0] == "%" #user mode
-          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["layout"][1..-1])
+        if cfg["layout"][0] == "~" #user mode
+          cfg_tmp=File.join(opts[:dyn_root],'users',cfg["layout"][1] == "/" ? File.join(opts[:user],cfg["layout"][1..-1]) : cfg["layout"][1..-1])
         else
           cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
         end
@@ -127,8 +127,8 @@ module Dyndoc
         dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
       end
       if cfg["pre"]
-        if cfg["pre"][0] == "%" #user mode
-          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["pre"][1..-1])
+        if cfg["pre"][0] == "~" #user mode
+          cfg_tmp=File.join(opts[:dyn_root],'users',cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["pre",cfg["pre"]])
         else
           #cfg_tmp=File.join(dyn_root,cfg["pre"])
           cfg_tmp=File.join(dyn_root,cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["preload",cfg["pre"]])
@@ -137,8 +137,8 @@ module Dyndoc
       end
 
       if cfg["post"]
-        if cfg["post"][0] == "%" #user mode
-          cfg_tmp=File.join(opts[:dyn_root],'users',opts[:user],cfg["post"][1..-1])
+        if cfg["post"][0] == "~" #user mode
+          cfg_tmp=File.join(opts[:dyn_root],'users',cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["post",cfg["post"]])
         else
           #cfg_tmp=File.join(dyn_root,cfg["post"])
           cfg_tmp=File.join(dyn_root,cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["postload",cfg["post"]])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb