lib/dyndoc-html-servers.rb in dyndoc-ruby-1.4.0 vs lib/dyndoc-html-servers.rb in dyndoc-ruby-1.4.1

@@ -246,10 +246,27 @@
       arg << "start"
       ##p [:arg,arg]
       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'
       require 'filewatcher'
       require 'dyndoc-linter'
@@ -308,33 +325,23 @@
 
                 html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
                 ##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
                     old_html_file = html_file
                     url=File.join(base_url,html_file)
                     ## p [:url,url]
                     Dyndoc::Browser.load(url)
                   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")
                     notify_file=notify_file[0..ind].join("/")
                     File.open(notify_file+"/notify.out","w") do |f|