dyndoc-ruby 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 924b89b50653dbfe111d045a381220e6242f386b
-  data.tar.gz: 5dab533e64644c5ee9097b385c1e7ec237dca6a0
+  metadata.gz: 5c1bc9ee21c0b73f6ec34b2d9557d231d4f5c6a7
+  data.tar.gz: 34f971a6891594b7947d6bea3244b00c3cae9c7b
 SHA512:
-  metadata.gz: 90a134b56456b65ede72253241af3b6879df9fb5ff28e380828f7398a743c9e274bb2b6caf493de7d7379cec090f00bde019f1828e38b92402900af5e6a40285
-  data.tar.gz: 058174b025cd0f6c0f336b1109c7aa376731c6b5a755d0c82048bc41743e405f02207f0cc62ec01bf2759dc58cb7982ce03ace32f36bbaff79ad9534f24c26b6
+  metadata.gz: 7f744eb4bf0c12dd54f721ece3a10484c58c4cd331fe95be72cd7b405035a670ce5f94298c302b18cb879484faa76207947604c969ec605d6fedc28e8b8c3328
+  data.tar.gz: 765d193d39d43b2df85ccd3f9920f8d5602d9defc32b4edfbecc80bb39e00c672a7a887d2bc2c15bde10cdd13e8a6f9dcd353ad1430473ef0222d68cd4ca3cf5

data/bin/dyn-cli

@@ -1,86 +1,6 @@
 #!/usr/bin/env ruby
 
-require "socket"
-
-module Dyndoc
-
-	class Client
-
-		attr_reader :content
-
-		@@end_token="__[[END_TOKEN]]__"
-
-		## reinit is an array
-		def initialize(cmd,tmpl_filename,addr="127.0.0.1",reinit=[],port=7777)
-
-			@addr,@port,@cmd,@tmpl_filename=addr,port,cmd,tmpl_filename
-			##p [:tmpl_filename,@tmpl_filename,@cmd]
-			## The layout needs to be reintailized for new dyndoc file but not for the layout (of course)!
-			dyndoc_cmd="dyndoc"
-			dyndoc_cmd += "_with_tag_tmpl" if reinit.include? :dyndoc_tag_tmpl
-			dyndoc_cmd += "_with_libs_reinit" if reinit.include? :dyndoc_libs
-			dyndoc_cmd += "_with_layout_reinit" if reinit.include? :dyndoc_layout
-
-#p [:addr,@addr]
-			Socket.tcp(@addr, @port) {|sock|
-					msg='__send_cmd__[['+dyndoc_cmd+'|'+@tmpl_filename+']]__' + @cmd + @@end_token
-					#p msg
-  				sock.print msg
-					#sleep 1
-  				sock.close_write
-  				@result=sock.read
-			}
-
-			data=@result.split(@@end_token,-1)
-			last=data.pop
-			resCmd=decode_cmd(data.join(""))
-			##p [:resCmd,resCmd]
-			if resCmd and resCmd[:cmd] != "windows_platform"
-				@content=resCmd[:content]
-			end
-		end
-
-		def decode_cmd(res)
-		  if res =~ /^__send_cmd__\[\[([a-zA-Z0-9_]*)\]\]__([\s\S]*)/m
-		  	return {cmd: $1, content: $2}
-		  end
-		end
-
-		# def listen
-		# 	##@response = Thread.new do
-		# 	result=""
-		# 	@content=nil
-		# 	msg=""
-		# 	loop {
-		# 		msg=@server.recv(1024)
-		# 		##p msg
-		# 		if msg
-		# 			msg.chomp!
-		# 			##puts "#{msg}"
-		# 			data=msg.split(@@end_token,-1)
-		# 			##p data
-		# 			last=data.pop
-		# 			result += data.join("")
-		# 			#p "last:<<"+last+">>"
-		# 			if last == ""
-		# 				#console.log("<<"+result+">>")
-		# 				resCmd = decode_cmd(result)
-		# 				##p resCmd
-		# 				if resCmd[:cmd] != "windows_platform"
-		# 					#console.log("data: "+resCmd["content"])
-		# 					@content=resCmd[:content]
-		# 					@server.close
-		# 					break
-		# 				end
-		# 			else
-		# 				result += last if last
-		# 			end
-		# 		end
-		# 	}
-		# 	#end
-		# end
-	end
-end
+require 'dyndoc/cli/interactive-client.rb'
 
 # USAGE:
 # dyndoc-ruby-client.rb|dyn-cli test.dyn[@127.0.0.1] [output_filename.html]
@@ -186,11 +106,11 @@ if dyn_file
 	code=File.read(dyn_file)
 	if dyn_libs or dyn_pre_code
 		code_pre = ""
-		code_pre += dyn_pre_code + '\n' if dyn_pre_code
-		code_pre += '[#require]\n'+dyn_libs if dyn_libs
+		code_pre += dyn_pre_code + "\n" if dyn_pre_code
+		code_pre += '[#require]'+"\n"+dyn_libs if dyn_libs
 		code = code_pre + '[#main][#>]' + code
 	end
-	code += '\n' + dyn_post_code if dyn_post_code
+	code += "\n" + dyn_post_code if dyn_post_code
 	code = dyn_tag_tmpl+code if dyn_tag_tmpl
 	dyndoc_start=[:dyndoc_libs,:dyndoc_layout]
 	## tag tmpl attempt to communicate to the server
@@ -199,10 +119,10 @@ if dyn_file
 		## but also to dyndoc-server-simple.rb
 	end
 
-	cli=Dyndoc::Client.new(code,File.expand_path(dyn_file),addr,dyndoc_start)
+	cli=Dyndoc::InteractiveClient.new(code,File.expand_path(dyn_file),addr,dyndoc_start)
 
 	if dyn_layout
-	 	cli=Dyndoc::Client.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
+	 	cli=Dyndoc::InteractiveClient.new(File.read(dyn_layout),"",addr) #File.expand_path(dyn_layout),addr)
 	end
 
 	if dyn_output and Dir.exist? File.dirname(dyn_output)

data/lib/dyndoc-convert.rb

@@ -0,0 +1,41 @@
+require "dyndoc-core"
+require 'dyndoc/cli/interactive-client.rb'
+
+
+module Dyndoc
+
+  @@dyndoc_tmpl_mngr=nil
+
+  ## does notwork when called twice!!!! (ex: jekyll-dyndoc in mode dyndoc)
+  def Dyndoc.convert(input,config={})
+    unless @@dyndoc_tmpl_mngr
+      Dyndoc.cfg_dyn['dyndoc_session']=:interactive
+      @@dyndoc_tmpl_mngr = Dyndoc::Ruby::TemplateManager.new({})
+      ##is it really well-suited for interactive mode???
+      @@dyndoc_tmpl_mngr.init_doc({:format_output=> "html"})
+      @@dyndoc_tmpl_mngr.require_dyndoc_libs("DyndocWebTools")
+      puts "InteractiveServer (re)initialized!\n"
+      @@dyndoc_tmpl_mngr.as_default_tmpl_mngr! #=> Dyndoc.tmpl_mngr activated!
+    end
+    Dyndoc.warn :input, input
+    output=@@dyndoc_tmpl_mngr.parse(input)
+    ##
+    Dyndoc.warn :output, output
+    @@dyndoc_tmpl_mngr.filterGlobal.envir["body.content"]=output
+    if config['tmpl_filename']
+      @@dyndoc_tmpl_mngr.filterGlobal.envir["_FILENAME_CURRENT_"]=config['tmpl_filename'].dup
+      @@dyndoc_tmpl_mngr.filterGlobal.envir["_FILENAME_"]=config['tmpl_filename'].dup #register name of template!!!
+      @@dyndoc_tmpl_mngr.filterGlobal.envir["_FILENAME_ORIG_"]=config['tmpl_filename'].dup #register name of template!!!
+      @@dyndoc_tmpl_mngr.filterGlobal.envir["_PWD_"]=File.dirname(config['tmpl_filename'])
+    end
+    return output
+  end
+
+  def Dyndoc.cli_convert(input,config={})
+    addr="127.0.0.1"
+    dyndoc_start=[:dyndoc_libs]
+    cli=Dyndoc::InteractiveClient.new(input,"",addr,dyndoc_start)
+    return cli.content
+  end
+
+end

data/lib/dyndoc/cli/interactive-client.rb

@@ -0,0 +1,81 @@
+require "socket"
+
+module Dyndoc
+
+	class InteractiveClient
+
+		attr_reader :content
+
+		@@end_token="__[[END_TOKEN]]__"
+
+		## reinit is an array
+		def initialize(cmd,tmpl_filename,addr="127.0.0.1",reinit=[],port=7777)
+
+			@addr,@port,@cmd,@tmpl_filename=addr,port,cmd,tmpl_filename
+			##p [:tmpl_filename,@tmpl_filename,@cmd]
+			## The layout needs to be reintailized for new dyndoc file but not for the layout (of course)!
+			dyndoc_cmd="dyndoc"
+			dyndoc_cmd += "_with_tag_tmpl" if reinit.include? :dyndoc_tag_tmpl
+			dyndoc_cmd += "_with_libs_reinit" if reinit.include? :dyndoc_libs
+			dyndoc_cmd += "_with_layout_reinit" if reinit.include? :dyndoc_layout
+
+#p [:addr,@addr]
+			Socket.tcp(@addr, @port) {|sock|
+					msg='__send_cmd__[['+dyndoc_cmd+'|'+@tmpl_filename+']]__' + @cmd + @@end_token
+					#p msg
+  				sock.print msg
+					#sleep 1
+  				sock.close_write
+  				@result=sock.read
+			}
+
+			data=@result.split(@@end_token,-1)
+			last=data.pop
+			resCmd=decode_cmd(data.join(""))
+			##p [:resCmd,resCmd]
+			if resCmd and resCmd[:cmd] != "windows_platform"
+				@content=resCmd[:content]
+			end
+		end
+
+		def decode_cmd(res)
+		  if res =~ /^__send_cmd__\[\[([a-zA-Z0-9_]*)\]\]__([\s\S]*)/m
+		  	return {cmd: $1, content: $2}
+		  end
+		end
+
+		# def listen
+		# 	##@response = Thread.new do
+		# 	result=""
+		# 	@content=nil
+		# 	msg=""
+		# 	loop {
+		# 		msg=@server.recv(1024)
+		# 		##p msg
+		# 		if msg
+		# 			msg.chomp!
+		# 			##puts "#{msg}"
+		# 			data=msg.split(@@end_token,-1)
+		# 			##p data
+		# 			last=data.pop
+		# 			result += data.join("")
+		# 			#p "last:<<"+last+">>"
+		# 			if last == ""
+		# 				#console.log("<<"+result+">>")
+		# 				resCmd = decode_cmd(result)
+		# 				##p resCmd
+		# 				if resCmd[:cmd] != "windows_platform"
+		# 					#console.log("data: "+resCmd["content"])
+		# 					@content=resCmd[:content]
+		# 					@server.close
+		# 					break
+		# 				end
+		# 			else
+		# 				result += last if last
+		# 			end
+		# 		end
+		# 	}
+		# 	#end
+		# end
+	end
+end

data/lib/dyndoc/srv/interactive-server.rb

@@ -55,7 +55,12 @@ module Dyndoc
   		loop {
   			socket = @server.accept
 
-  			b=socket.read #recv(100000)
+        ## Rmk: I can't remember the whole story but I started with recv and then need read (but did not notice that the atom-plugin did not work anymore). gets() seems to be the solution.
+        ## read and gets are blocking and recv is not
+        b=socket.gets("__[[END_TOKEN]]__")
+  			#b=socket.read
+        #b=socket.recv(100000)
+
   			##p [:b,b]
   			data=b.to_s.strip
   			##p [:data,data]

data/lib/dyndoc/srv/tilt.rb

@@ -0,0 +1,88 @@
+require 'tilt' #this allows the use of any other template
+require 'tilt/template' #for creating the dyndoc one
+require 'redcloth'
+
+## This version relies on dyn-srv!
+
+
+module Tilt
+
+  class DynCliTemplate < Template
+
+    attr_reader :content
+
+		@@end_token="__[[END_TOKEN]]__"
+
+    def DynCliTemplate.init(libs=nil)
+    end
+
+
+		## reinit is an array
+		def send_dyndoc(code)
+
+      addr,port="127.0.0.1",7777
+
+
+#p [:addr,@addr]
+			Socket.tcp(addr, port) {|sock|
+					msg='__send_cmd__[['+@dyndoc_cmd+']]__' + code + @@end_token
+					#p msg
+  				sock.print msg
+					#sleep 1
+  				sock.close_write
+  				@result=sock.read
+			}
+
+			data=@result.split(@@end_token,-1)
+			last=data.pop
+			resCmd=decode_cmd(data.join(""))
+			##p [:resCmd,resCmd]
+			if resCmd and resCmd[:cmd] != "windows_platform"
+				@content=resCmd[:content]
+			end
+		end
+
+		def decode_cmd(res)
+		  if res =~ /^__send_cmd__\[\[([a-zA-Z0-9_]*)\]\]__([\s\S]*)/m
+		  	return {cmd: $1, content: $2}
+		  end
+		end
+
+    def self.engine_initialized?
+      defined? ::DynDoc
+    end
+
+    def initialize_engine
+    	DynCliTemplate.init
+    end
+
+    def prepare; end
+
+
+    def prepare_output
+      send_dyndoc(data)
+		  return @content
+    end
+
+    def evaluate(scope, locals, &block)
+      if locals.keys.include? :reinit and locals[:reinit]
+        ## The layout needs to be reintailized for new dyndoc file but not for the layout (of course)!
+        @dyndoc_cmd="dyndoc"
+        @dyndoc_cmd += "_with_tag_tmpl" if locals[:reinit].include? :dyndoc_tag_tmpl
+        @dyndoc_cmd += "_with_libs_reinit" if locals[:reinit].include? :dyndoc_libs
+        @dyndoc_cmd += "_with_layout_reinit" if locals[:reinit].include? :dyndoc_layout
+        locals.delete :reinit
+      end
+
+    	@output=prepare_output
+    	#puts @output
+    	#@output
+    end
+
+  end
+
+end
+
+
+Tilt.register Tilt::DynCliTemplate,   '_html.dyn'
+#puts "dyn registered in tilt!"

data/share/etc/dyn-cli/dyn_layout

@@ -0,0 +1 @@
+default

data/share/etc/dyn-cli/layout/default.dyn

@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+[#=]::layout.title?[Dyndoc Project]
+[#>]
+<title>#{layout.title}</title>
+{#LayoutHeader#}
+</head>
+<body>
+
+	#{body.content}
+
+{#LayoutPostJS#}
+</body>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.6
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -100,7 +100,10 @@ files:
 - bin/dyn-forever
 - bin/dyn-init
 - bin/dyn-srv
+- lib/dyndoc-convert.rb
+- lib/dyndoc/cli/interactive-client.rb
 - lib/dyndoc/srv/interactive-server.rb
+- lib/dyndoc/srv/tilt.rb
 - share/demo/first.dyn
 - share/demo/firstAsciidoc.dyn
 - share/demo/second.dyn
@@ -111,6 +114,8 @@ files:
 - share/demo/testBeamer_lib.dyn
 - share/demo/test_atom.dyn
 - share/etc/alias
+- share/etc/dyn-cli/dyn_layout
+- share/etc/dyn-cli/layout/default.dyn
 - share/etc/dyndoc_library_path
 - share/etc/helpers
 - share/etc/uv/render/README