dyndoc-ruby 1.3.6 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1429abd256e9d0441df24744231a62ae8129a5274c3e8de413e700a81dfdc917
-  data.tar.gz: 21e08fa73d544abf8618461df13e40cdfc333a542e4c71185ae301ad12784ea7
+  metadata.gz: 8e134057e655c0154df49f4518d6964d373efd163adde55ac057f734649c677b
+  data.tar.gz: 6f92db285fbbb590d952480e9ba1b8a1fc099c6924861b87a548e097b1188e55
 SHA512:
-  metadata.gz: 1a02a9276665a3302bea5445e7d7b1f2b1129ae62ca5409464afc25180254ebf053046298cac9f46130a8e4b1d8ac282f5ddf01dd93066d29905942d8f1d534a
-  data.tar.gz: 3953bd8ce467a7e6dc5306085e0062152571af478634e3404eb057da0211d8d726091e88bf57e15ae0c3e854deeecef445c0d7c38df34f9f0fa5640f961e21b1
+  metadata.gz: 673b82c1efc5b4e1f6a16e9f394ff35cba499353050043351c13037ef49e6ee24be0a75acb1d1ef378ad6decf741859aa9b15920eee2f5936b78d6ab17e46417
+  data.tar.gz: d1b541c745c7dab4ee9c8372f71d9f7524c6b438ad8c0d101e5adf6de0a6581b4674f735dbf601daaf0af124cb0466abdb631440d0a708c84a36c298dbe22f60

data/lib/dyndoc-world.rb

@@ -1,11 +1,75 @@
+require 'yaml'
+
 module DyndocWorld
 
-	def DyndocWorld.yml?(prj,yml)
-			true
+	@@root=nil
+	@@public=nil
+
+	def DyndocWorld.root(root=nil)
+		@@root=root if root
+		return @@root
+	end
+
+	def DyndocWorld.public_root(public_root=nil)
+		@@public=public_root if public_root
+		return @@public
 	end
 
-	def DyndocWorld.prj_dir(prj,yml)
-			prj
+	def DyndocWorld.cfg(admin=nil)
+		cfg={}
+		secret = File.join(DyndocWorld.root,admin ? ".admin.yml" : ".secret.yml")
+		cfg = YAML::load_file(secret) if DyndocWorld.root and File.exists? secret
+		return cfg
 	end
 
+	## access ##
+	## prj is to give access for a user or a group of users
+	## if prj or prj/secret is undefined it is accessible
+	def DyndocWorld.yml?(prj,yml)
+		admin=(prj=="admin")
+		cfg=DyndocWorld.cfg(admin)
+		cfg=cfg[prj] unless admin
+		return true unless cfg
+		##DEBUG: p [:"yml?", cfg, yml, (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../"))]
+		return (cfg and yml and ((cfg["secret"] || "none") == (yml["secret"] || "none")) and yml["file"] and !(yml["file"].include? "../"))
+	end
+
+	## file ##
+	## from yml
+	## ex: public/<user>/<pathname>
+	##     edit/<user>/<pathname>
+	##     dynworld/<user>/<pathname>
+	def DyndocWorld.prj_file(yml,content)
+		success,prj_file=false,""
+		parts=yml["file"].split("/")
+		p [:parts,parts]
+		root=parts.shift
+		p [:root,root]
+		if ["public","edit","dynworld"].include? root
+			user=parts.shift
+			case root
+			when "public"
+				prj_file=File.join(DyndocWorld.public_root,"users",user)
+				prj_file=(Dir.exists? prj_file) ? File.join(prj_file,parts) : ""
+			when "edit"
+				prj_file=File.join(DyndocWorld.public_root,"users",user,".edit")
+				prj_file=(Dir.exists? prj_file) ? File.join(prj_file,parts) : ""
+			when "dynworld"
+				prj_file=File.join(DyndocWorld.root,user,parts)
+			end
+		end
+		p [:prj_file,prj_file]
+		unless prj_file.empty? 
+			FileUtils.mkdir_p File.dirname prj_file
+			File.open(prj_file,"w") {|f|
+				if root == "edit"
+					f << yml.to_yaml
+					f << "---\n"
+				end
+				f << content.strip
+			}
+			success=true
+		end
+		return success
+	end
 end

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

@@ -10,9 +10,10 @@ cfg.merge! YAML::load_file(cfg_yml) if File.exist? cfg_yml
 root = cfg["root"] || File.join(ENV["HOME"],"RCqls","RodaServer")
 $public_root = cfg["public_root"] || File.join(root ,"public")
 ##p [:public_root,$public_root]
-$dynworld_root=cfg["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world")
 
 require 'dyndoc-world'
+DyndocWorld.root(cfg["dynworld_root"] || File.join(ENV["HOME"],".dyndoc-world"))
+DyndocWorld.public_root($public_root)
 
 class App < Roda
   use Rack::Session::Cookie, :secret => (secret="Thanks like!")
@@ -42,24 +43,19 @@ class App < Roda
 
       r.post "file-save" do
         puts "file-save"
-        prj,yml,@file,@content=r['prj'].strip,r['yml'].strip,r['file'].strip,r['content']
-        p [prj,yml,@file,@content]
+        prj,yml,@content=r['prj'].strip,r['yml'].strip,r['content']
+        p [prj,yml,@content]
         success=false
         unless yml.empty?
           yml="---\n" + yml unless yml[0,4] == "---\n"
           yml=YAML::load(yml)
           p [:yml, yml]
           require 'fileutils'
-          if @file and !(@file.include? "../") and (DyndocWorld.yml?(prj,yml)) 
-            if Dir.exists? $dynworld_root
-              prj_dir=DyndocWorld.prj_dir(prj,yml)
-              dynworld_file=File.join($dynworld_root,prj_dir,@file)
-              FileUtils.mkdir_p File.dirname dynworld_file
-              File.open(dynworld_file,"w") {|f| f << @content.strip} 
-              success=true
-            end
+          if DyndocWorld.yml?(prj,yml)
+            success=DyndocWorld.prj_file(yml,@content)
           end
         end
+        p [:success, "{success: " + success.to_s + "}"]
         "{success: " + success.to_s + "}"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.9
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb