dyndoc-ruby 0.9.12 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b521fb0e195336e4655811606b2db0dbfadf7304
-  data.tar.gz: 39675c51acf5d462806dc98edf8342a345f78731
+  metadata.gz: 331c3c5c280c6a6df854b0404466d34252d47889
+  data.tar.gz: 58aa269ffdf01e6868e25613fa1d8a78000fc349
 SHA512:
-  metadata.gz: 5cd340b92b6bde1373fa311495b4644e49b53e5ccc7ffc64769e53a6653a4daefa570539fdb9a295519906679072215f31199dc0817114bfda3e776225d94084
-  data.tar.gz: 4ff34548e8446d36ed38a9d13a3de25d282a461db22bee7f52048373fb495a96148f123744cc385b106aa105737ff0999c171985a0231be50205a409dfd98676
+  metadata.gz: eaeb3aefee802d2b1a1a7f2e9e2e51d6b410a2716a3794fd8ba44f9fa3a006cf7d5fa4c1656a6b02a92159fb931b7a037d9744938ac69d8d99cbf15bf303cc1a
+  data.tar.gz: 55daab8dec69571791e481ea7ec95d1e4f91430690c1f9f45ac65adef0f30323165bef88b8a9820faae2b76edf34a5320602e301e2ba9ee80d51c500567c388e

data/bin/dyn-ctl

@@ -27,6 +27,9 @@ when "start"
 when "stop"
     SRVS.each {|srv| `#{srv} stop`}
 
+when "status"
+    SRVS.each {|srv| puts srv+(`#{srv} status`.empty? ? "stopped" : "running")}
+
 when "new"
 
   if RUBY_PLATFORM =~ /darwin/

data/lib/dyndoc-convert.rb

@@ -248,8 +248,11 @@ module Dyndoc
       code = dyn_tags + code if dyn_tags
 
       ## add path for user
-      code_path = "[#path]"+File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
-      code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      code_path = "[#path]"
+      if opts[:user]
+        code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user],"dynlib")
+        code_path << "\n" << File.join(opts[:dyn_root],'users',opts[:user])
+      end
       code_path << "\n" << File.join(sys_root,'public','users')
       code_path << "\n" << File.join(sys_root,'system','dynlib')
       code_path << "\n" << File.join(opts[:dyn_root],'dynlib')
@@ -265,7 +268,7 @@ module Dyndoc
         Dyndoc.process_html_file_from_dyn_file(code,html_file,dyn_file,dyn_layout,addr,dyndoc_start)
       else
         (opts[:current_tags] || html_files.keys[1..-1]).each do |doc_tag|
-          html_file=File.join(html_root,["users",opts[:user]] || [],cfg_files[:urls][doc_tag])
+          html_file=File.join(html_root,(opts[:user] ? ["users",opts[:user]] : []),cfg_files[:urls][doc_tag])
           ##p [:html_multi,doc_tag,html_file] #,code.gsub(/__ALL_DOC_TAG__/,doc_tag)]
           Dyndoc.process_html_file_from_dyn_file(code.gsub(/__ALL_DOC_TAG__/,doc_tag),html_file,dyn_file,dyn_layout,addr,dyndoc_start)
         end

data/lib/dyndoc-html-servers.rb

@@ -57,7 +57,7 @@ module Dyndoc
       opts = {
         dyn_root: dyn_root,
         html_root: pages_root,
-        user: current_email
+        user: nil #current_email
       }
 
       puts "watching "+ dyn_root
@@ -67,24 +67,26 @@ module Dyndoc
         if [:changed,:new].include? event and File.extname(filename) == ".dyn"
           ##p [:filename_event,event,filename]
           if (lint_error=Dyndoc::Linter.check_file(filename)).empty?
-            ## find dyn_file (relative path from root)
-            dyn_file="/"+Pathname(filename).relative_path_from(Pathname(dyn_root)).to_s
-            opts_doc=Dyndoc::FileWatcher.get_dyn_html_info(filename,dyn_file,opts[:user])
-            opts.merge! opts_doc
-            ##p [:html_files,html_files]
+            ## do not process preload, postload, lib and layout files
+            unless filename =~ /(?:_pre|_post|_lib|_layout)\.dyn$/
+              ## find dyn_file (relative path from root)
+              dyn_file="/"+Pathname(filename).relative_path_from(Pathname(dyn_root)).to_s
+              opts_doc=Dyndoc::FileWatcher.get_dyn_html_info(filename,dyn_file,opts[:user])
+              opts.merge! opts_doc
+              ##p [:html_files,html_files]
 
-            html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
-            ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
-            Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-            puts dyn_file[1..-1]+" processed!"
-            if RUBY_PLATFORM =~ /darwin/
-              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)
-                cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+url+'"'
-                `osascript -e '#{cmd_to_open}'`
-              else
+              html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
+              ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
+              Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+              puts dyn_file[1..-1]+" processed!"
+              if RUBY_PLATFORM =~ /darwin/
+                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)
+                  cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+url+'"'
+                  `osascript -e '#{cmd_to_open}'`
+                else
 %x{osascript<<ENDREFRESH
 tell app "Safari" to activate
 tell application "System Events"
@@ -92,6 +94,7 @@ tell application "System Events"
 end tell
 ENDREFRESH
 }
+                end
               end
             end
           else

data/share/html-srv/dyn-html-srv.ru

@@ -25,69 +25,6 @@ class App < Roda
     :escape=>true,
     :check_paths=>true,
     :allowed_paths=>[File.expand_path("../views",__FILE__),$public_root]
-  # plugin :csrf,
-  #   :skip => [
-  #     "POST:/edit/dyn",
-  #     "POST:/edit/save",
-  #     "POST:/edit/change-all-dyn-files",
-  #     "POST:/edit/add_delete_dyn_file",
-  #     "POST:/edit/add_delete_user",
-  #     "POST:/edit/add_user_dyn_file",
-  #     "POST:/edit/delete_user_dyn_file",
-  #     "POST:/edit/update_doc_tags_info"
-  #   ],
-  #   :skip_if => lambda{|req| req.env['CONTENT_TYPE'] =~ /application\/json/}
-
-  # plugin :rodauth, :name=>:editor, :json=>true do
-  #   db DB
-  #   enable :login, :logout
-  #   account_password_hash_column :ph
-  #   session_key :user_id
-  #   login_label 'Email'
-  #   password_label 'Mot de passe'
-  #   login_redirect "/editor"
-  # end
-
-  # plugin :rodauth, :name=>:compte,  :json=>true do
-  #   db DB
-  #   enable :change_login, :change_password, :close_account, :create_account,
-  #          :lockout, :login, :logout #, :remember, :reset_password,
-  #          #:verify_account,
-  #          #:otp, :recovery_codes, :sms_codes,
-  #          :password_complexity #,
-  #          #:disallow_password_reuse, :password_expiration, :password_grace_period,
-  #          #:account_expiration,
-  #          #:single_session,
-  #          #:jwt, :session_expiration,
-  #          #:verify_account_grace_period, :verify_change_login
-  #   create_account_link  do
-  #    "<p><a href=\"/compte/create-account\">Créer un nouveau compte</a></p>"
-  #   end
-  #   login_redirect "/editor"
-  #   after_login do
-  #     puts session[:user_id]
-  #   end
-  #   logout_redirect "/editor"
-  #   create_account_redirect "/compte"
-  #   session_key :user_id
-  #   login_label "Email"
-  #   password_label "Mot de passe"
-  #   login_confirm_label "Confirme Email"
-  #   password_confirm_label "Confirme Mot de passe"
-  #   create_account_button "Création compte"
-  #   max_invalid_logins 2
-  #   #allow_password_change_after 60
-  #   #verify_account_grace_period 300
-  #   account_password_hash_column :ph
-  #   title_instance_variable :@page_title
-  #   delete_account_on_close? true
-  #   #only_json? false
-  #   #jwt_secret secret
-  #   # sms_send do |phone_number, message|
-  #   #   MUTEX.synchronize{SMS[session_value] = "Would have sent the following SMS to #{phone_number}: #{message}"}
-  #   # end
-  # end
-
 
   route do |r|
 
@@ -123,7 +60,8 @@ class App < Roda
       end
     end
 
-    r.on "get" do
+=begin
+    r.on "get" do ## useless because of static above???
       rsrc=r.remaining_path
       #p [:get,rsrc]
       static_root=File.join($public_root,"tools")
@@ -137,13 +75,18 @@ class App < Roda
       end
       "No resource #{rsrc} to serve!"
     end
+=end
 
     r.get do
       page=r.remaining_path
       static_root=File.join($public_root,"pages")
       ##p [:page,File.join(static_root,"**",page+".html")]
-      pattern=(page=~/[^\.]*\.(?:R|Rmd|css|js|html|html|rb|red|r|jpeg|jpg|png|gif)/) ? page : page+".html"
+      pattern=(page=~/[^\.]*\.(?:R|Rmd|css|js|htm|html|rb|red|r|jpeg|jpg|png|gif|pdf)/) ? page : page+".html"
       html_files=Dir[File.join(static_root,"**",pattern)]
+
+      ## try index.html in directory
+      html_files=Dir[File.join(static_root,"**",page,"index.html")] if html_files.empty?
+
       ##p html_files
       unless html_files.empty?
         html_file="pages/"+Pathname(html_files[0]).relative_path_from(Pathname(static_root)).to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.14
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb