dyndoc-ruby 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31af8e1e3758668e3a2a5cd0613b33570acc7fd
-  data.tar.gz: 52ca02ac196eeb546d425eb63cd414611e9157d1
+  metadata.gz: 81c02d76c3d7a0628adc49871638d2e419622b99
+  data.tar.gz: 1c1051d0f2b54122c406a1daeaffc8f8a6146827
 SHA512:
-  metadata.gz: af35cf8473a006d5655e0eb738c51faf6cff2eccc4f94857689939af4d9e2732a3d6e3dc8bcfd5a3b51cced440372e040cd5d6039a9099c4b6e160aa77d35043
-  data.tar.gz: 6fed11d065bf5df59474d4a62dc8b98a8c319eaa68584759d91f57bdd7d03cf1c4d5cdebac44f60167d650196d0c717baf8ca7cc641269697e8a4c97085f6f82
+  metadata.gz: 4743f46660df426d553d58fa46b62dceef26958212a95102846bf3b7ffd4c2f9cac571b0400d1dd334dcfb7317bd892fee1c987dbbe849fe4a350d0fd0dd6c1b
+  data.tar.gz: 40bdd38f506c189d7c3aad236b9476cc1165fef0c2edfa45f01fb878def08afd3ae987b0bd587b58aec84bed2fa9dc556f892a8d57850c2bc88c3ac654dfd90a

data/lib/dyndoc-convert.rb

@@ -23,7 +23,7 @@ module Dyndoc
     end
   end
 
-  ## does notwork when called twice!!!! (ex: jekyll-dyndoc in mode dyndoc)
+  ## does not work when called twice!!!! (ex: jekyll-dyndoc in mode dyndoc)
   def Dyndoc.convert(input,config={})
     unless @@dyndoc_tmpl_mngr
       Dyndoc.cfg_dyn['dyndoc_session']=:interactive
@@ -61,7 +61,7 @@ module Dyndoc
 
     return unless opts[:dyn_root]
 
-    dyn_libs,dyn_tags=nil,nil
+    dyn_libs,dyn_tags,dyn_layout,dyn_pre_code,dyn_post_code=nil,nil,nil,nil,nil
 
     ## requirement: dyn_file is provided relatively to the opts[:dyn_root] (for security reason too)
 
@@ -90,8 +90,15 @@ module Dyndoc
     if i=(dyn_file =~ /\_?(?:html)?\.dyn$/)
 
       cfg={}
+
       ## find the previous config.yml in the tree folder
       ## TODO: read all previous config.yml and merge them from root to current
+      ## The merge could be also to join the content when the key is the same.
+      ## Ex: semantic-ui (1st config.yml): css_message
+      ##    semantic-ui (2nd config.yml): css_icon
+      ##  becomes: semantic-ui: css_message, css_icon
+      ## NEEDS TO DECLARE the fields that behave like this in some other config file (keys.yml)
+
       cfg_yml_files=dyn_path.inject([""]) {|res,e| res + [(res[-1,1]+[e]).flatten]}.map{|pa| File.join(opts[:dyn_root],pa,"config.yml")}.reverse
       cfg_yml_file=cfg_yml_files.select{|c| File.exists? c}[0]
       cfg=YAML::load_file(cfg_yml_file) if cfg_yml_file
@@ -141,7 +148,8 @@ module Dyndoc
         else
           cfg_tmp=File.join(dyn_root,cfg["layout"][0] == "/" ? cfg["layout"][1..-1] : ["layout",cfg["layout"]])
         end
-        Dyndoc.warn :layout,cfg_tmp
+        cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
+        ##Dyndoc.warn :layout,cfg_tmp
         dyn_layout=cfg_tmp if !dyn_layout and File.exist? cfg_tmp
       end
       if cfg["pre"]
@@ -151,7 +159,8 @@ module Dyndoc
           #cfg_tmp=File.join(dyn_root,cfg["pre"])
           cfg_tmp=File.join(dyn_root,cfg["pre"][0] == "/" ? cfg["pre"][1..-1] : ["preload",cfg["pre"]])
         end
-        dyn_pre_code=File.read(cfg_tmp) unless dyn_pre_code and File.exist? cfg_tmp
+        cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
+        dyn_pre_code=File.read(cfg_tmp) if !dyn_pre_code and File.exist? cfg_tmp
       end
 
       if cfg["post"]
@@ -161,7 +170,8 @@ module Dyndoc
           #cfg_tmp=File.join(dyn_root,cfg["post"])
           cfg_tmp=File.join(dyn_root,cfg["post"][0] == "/" ? cfg["post"][1..-1] : ["postload",cfg["post"]])
         end
-        dyn_post_code=File.read(cfg_tmp) unless dyn_post_code and File.exist? cfg_tmp
+        cfg_tmp+= ".dyn" if File.extname(cfg_tmp).empty?
+        dyn_post_code=File.read(cfg_tmp) if !dyn_post_code and File.exist? cfg_tmp
       end
 
       ## deal with html_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb