dyndoc-ruby 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874ff2bfd3cfd0a3cbc30680e7ddadb68be8a3c417d85582e05c699855a96cec
-  data.tar.gz: c47643d6023b0c525a23944127f578eb4c519cc19d35302deb7fdc4724f248f7
+  metadata.gz: 8723bdb859aae5e91938015ec532b9fb896f20acef9ffa6e035e54e48debd7f3
+  data.tar.gz: e3e6db01504a19b2b50318ad7ce985711eebee860f8b3dfd7875216eee4fb04c
 SHA512:
-  metadata.gz: 43fc0de9ab39f1dbee93acd2d3bedc272b21b154227dfe5a3c2c943816ae3f23a0e1b8372b2fd773181c5bd033d022d681900baf88c3c1ab64d686ca8ad698ad
-  data.tar.gz: 0ead492497f229e9b37b04196336e3910db2611c1af3bd9d8fcf23a2943c7703b3e9def436ede1b3c0753e32670931dd7c0bc08bbb7eda3db40b3c39abbbd301
+  metadata.gz: 0cd8c4aa4ec42053a1c1227fad45122d77f96780f6b853998c63565f090cb99a6e2e470a89c016dcae1db250c00618e1fad3b52493267e73847bc33a1df2c20a
+  data.tar.gz: 235cabc8a20637344b9ae44960e6a55f8292bd8739167919cebcc2c31a8667ad95199719af12006af7e3b9d76a2e7b2eeda2b9e56ec2a967662e8f2bc76a8686

data/lib/dyndoc-html-servers.rb

@@ -248,6 +248,23 @@ module Dyndoc
       Thin::Runner.new(arg).run!
     end
 
+    def HtmlServers.create_html_page(dyn_file,html_file,opts,pages_root)
+
+      Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+      ## fix html_file for _rmd, _adoc and _ttm
+      if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
+        html_file = $1+".html"
+      end
+      if html_file =~ /^(.*)_erb\.html$/
+        erb_page=File.join(pages_root,$1)
+        if File.exists? erb_page+"_erb.html"
+          FileUtils.mv erb_page+"_erb.html",erb_page+".erb"
+        end
+        html_file = "erb"+$1
+      end
+    
+    end
+
     def HtmlServers.dyn_html_filewatcher(cfg={}) #cfg
       require 'dyndoc-convert'
       require 'dyndoc-edit'
@@ -310,18 +327,8 @@ module Dyndoc
                 ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
                 state=""
                 begin
-                  Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-                  ## fix html_file for _rmd, _adoc and _ttm
-                  if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
-                    html_file = $1+".html"
-                  end
-                  if html_file =~ /^(.*)_erb\.html$/
-                    erb_page=File.join(pages_root,$1)
-                    if File.exists? erb_page+"_erb.html"
-                      FileUtils.mv erb_page+"_erb.html",erb_page+".erb"
-                    end
-                    html_file = "erb"+$1
-                  end
+                  HtmlServers.create_html_page(dyn_file,html_file,opts,pages_root)
+
                   puts dyn_file[1..-1]+(dyn_public_edit_file.empty? ? "" : "*")+" processed => "+html_file+" created!"
                   options[:first] = html_file != old_html_file
                   if html_file != old_html_file
@@ -332,8 +339,8 @@ module Dyndoc
                   else
                     Dyndoc::Browser.reload
                   end
-                rescue
-                  state="error: "
+                rescue => e
+                  state="error: #{e.message} =>"
                 ensure
                   notify_file=filename.split("/")
                   if (ind=notify_file.index ".edit")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb