femtows 1.5.0 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cb91e5bf92627376e1417d32a8c897ac196510f6
+  data.tar.gz: 5c1667b4230b70efbb72e565078765b1ccf6d0cd
+SHA512:
+  metadata.gz: f4ff73c70c9654078d76304b054662e06be080d230b64cec0c1fffdab2a425ba8c3beda4f6db170cc1c3608dd8d21ce23262c0665880154c201a96523c3e1764
+  data.tar.gz: 77732c765e07894cfa92f266d9a8109b126dce1fbf41b9b39a8cafbf0cb59263c3e2f3cbbfa352e94061a88c630c2cb24e0fd47745551ce03d90f840916508b0

data/bin/femtows.sh

@@ -1,2 +1,2 @@
-require 'femtows'
-cliweb((ARGV[1]||"./"),(ARGV[0]||"8080").to_i)
+require 'femtows'
+cliweb((ARGV[1]||"./"),(ARGV[0]||"8080").to_i)

data/gitc.bat

@@ -0,0 +1,20 @@
+@echo off
+IF DEFINED %1=="" (
+	call giti
+	ruby  -e "a=File.read('VERSION').split('.') ; a[-1]=(a.last.to_i+1).to_s; puts r=a.join('.'); File.open('VERSION','w') {|f| f.write(r)}"
+	echo %1 %2 %3 %4 %5 %6 %7 %8 %9 >> CHANGELOG.txt
+	git commit -a -m "%1 %2 %3 %4 %5 %6 %7 %8 %9"
+	git push
+	echo
+	echo call gitc.bat without args for make/post rubygem
+	goto :eof
+)
+:gem
+rem ==== no args, generate gem and push it to rubygems.org
+
+ruby  -e "a=File.read('VERSION').split('.');a.pop ; a[-1]=(a.last.to_i+1).to_s; puts r=(a+[0]).join('.'); File.open('VERSION','w') {|f| f.puts(r)}"
+cat VERSION >> CHANGELOG.txt
+
+ruby -e "Dir.glob('femtows*.gem').each {|f| File.delete(f) }"
+call gem build femtows.gemspec
+call gem push femtows*.gem

data/lib/femtows.rb

@@ -1,262 +1,263 @@
-# encoding: utf-8
-# FemtoWebServer : 232 LOC web server
-#
-#   $ws=WebserverRoot.new(port,"/home/www","femto ws",10,300)
-#   ws.serve "/FOO" do |params|
-#      data=params["HEAD-DATA"]|| ""
-#      puts "Recu data len=#{data.length} : <#{data[0..1000]}>" if data
-#      [200,".json",""]
-# end
-  
-  
-require 'thread'
-require 'socket'
-require 'timeout'
-
-#################### Tiny embeded webserver
-
-
-
-
-class WebserverAbstract
-  def logg(*args) 
-	if @cb_log then @cb_log.call(@name,*args) else puts(args.join(" ")) end
-  rescue
-   puts(args.join(" "))
-  end
-  def info(txt) ; logg("nw>i>",txt) ;  end
-  def error(txt) ; logg("nw>e>",txt) ; end
-  def unescape(string) ; string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2}))/n) { [$1.delete('%')].pack('H*') } ;  end
-  def escape(string) ; string.gsub(/([^ \/a-zA-Z0-9_.-]+)/) { '%' + $1.unpack('H2' * $1.size).join('%').upcase }.tr(' ', '+');  end
-  def hescape(string) ;  escape(string.gsub("/./","/").gsub("//","/")) ; end
-  def observe(sleeping,delta)
-	@tho=Thread.new do loop do
-	  sleep(sleeping) 
-	  nowDelta=Time.now-delta
-	  l=@th.select { |th,tm| (tm[0]<nowDelta) }
-	  l.each { |th,tm| info("killing thread") ; th.kill; @th.delete(th)  ; tm[1].close rescue nil }
-	end ; end
-  end
-  def initialize(port,root,name,cadence,timeout,options)
-	raise("tcp port illegal #{port}") unless port.to_i>=80
-	raise("root not exist #{root}") unless File.exists?(root)
-    @cb_log= options["logg"] 
-    @last_mtime=File.mtime(__FILE__)
-	@port=port.to_i
-	@root=root
-	@name=name
-	@rootd=root[-1,1]=="/" ? root : root+"/" 
-	@timeout=timeout
-	@th={}
-	@cb={}
-	@redirect={}
-	info(" serveur http #{port} on #{@rootd} ready!")
-	observe(cadence,timeout*2)
-        pool_create
-	@thm=Thread.new { 
-		loop { 
-			nbError=0
-			begin
-				session=nil
-				@server = TCPServer.new('0.0.0.0', @port)
-				@server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
-				while (session = @server.accept)
-					nbError=0
-					run(session)
-				end
-			rescue Exception => e
-			  nbError+=1
-			  error($!.to_s + "  " + $!.backtrace[0..2].join(" "))
-			  session.close rescue nil
-			  @server.close rescue nil
-			end
-			sleep(3); info("restart accept")
-		}
-	}
-  end
-  def pool_create
-    @queue=Queue.new
-    ici=self
-    100.times {  Thread.new { loop { 
-      param,bloc=@queue.pop
-      bloc.call(param)  rescue p $!
-    } } }
-  end
-  def pool_get(param,&block)
-     @queue.push([param,block])
-  end
-  def run(session)
-		pool_get(session) do |sess|
-		   @th[Thread.current]=[Time.now,sess]
-		   request(sess) 
-		   @th.delete(Thread.current) 
-		end
-  end
-  def serve(uri,&blk)
-	@cb[uri] = blk
-  end  
-  def request(session)
-	  request = session.gets
-	  uri = (request.split(/\s+/)+['','',''])[1] 
-	  #info uri
-	  service,param,*bidon=(uri+"?").split(/\?/)
-	  params=Hash[*(param.split(/#/)[0].split(/[=&]/))] rescue {}
-	  params.each { |k,v| params[k]=unescape(v) }
-	  uri=unescape(service)[1..-1].gsub(/\.\./,"")
-	  userpass=nil
-	  if (buri=uri.split(/@/)).size>1
-		uri=buri[1..-1].join("@")
-		userpass=buri[0].split(/:/)
-	  end
-	  read_header(session,params)
-	  do_service(session,request,uri,userpass,params)
-  rescue Exception => e
-	error("Error Web get on #{request}: \n #{$!.to_s} \n #{$!.backtrace.join("\n     ")}" ) rescue nil
-	session.write "HTTP/1.0 501 NOK\r\nContent-type: text/html\r\n\r\n<html><head><title>WS</title></head><body>Error : #{$!}" rescue nil
-  ensure
-	session.close rescue nil
-  end  
-  def read_header(session,params)
-	   head=session.gets("\r\n\r\n")
-	   head.split(/\r\n/m).each { |line| name,data=line.split(": ",2) ; params["HEAD-"+name.upcase]=data }
-	   if params["HEAD-CONTENT-LENGTH"]
-			len= params["HEAD-CONTENT-LENGTH"].split(/\s+/).last.to_i
-			params["HEAD-CONTENT-LENGTH"]=len
-			data=""
-			while len>0
-				d=session.read(len>64*1024 ? 64*1024 : len)
-				raise("closed") if !d
-				len -= d.length
-				data+=d
-			end	
-		    params["HEAD-DATA"]=data
-	   end
-  end
-  
-  def redirect(o,d)
-   @redirect[o]=d
-  end  
-  def do_service(session,request,service,user_passwd,params)
-	redir=@redirect["/"+service]
-	service=redir.gsub(/^\//,"") if @redirect[redir]
-	aservice=to_absolute(service)
-	if redir &&  ! @redirect[redir] 
-	  do_service(session,request,redir.gsub(/^\//,""),user_passwd,params)
-	elsif @cb["/"+service]
-	  begin
-	   code,type,data= @cb["/"+service].call(params)
-	   if code==0 && data != '/'+service
-		  do_service(session,request,data[1..-1],user_passwd,params)
-	   else
-		 code==200 ?  sendData(session,type,data) : sendError(session,code,data)
-	   end
-	  rescue
-	   logg session.peeraddr.last,"Error in get /#{service} : #{$!}"
-	   sendError(session,501,$!.to_s)
-	  end
-	elsif service =~ /^stop/ 
-	  sendData(session,".html","Stopping...");	   
-	  Thread.new() { sleep(0.1); stop_browser()  }
-	elsif File.directory?(aservice)
-	  sendData(session,".html",makeIndex(aservice))
-	elsif File.exists?(aservice)
-	  sendFile(session,aservice)
-	else
-	  info("unknown request serv=#{service} params=#{params.inspect} #{File.exists?(service)}")
-	  sendError(session,500,"unknown request serv=#{aservice} params=#{params.inspect} #{File.exists?(service)}");
-	end
-  end
-  def stop_browser
-	info "exit on web demand !"
-	[@tho,@thm].each { |th| th.kill }
-	@server.close rescue nil
-  end
-  def makeIndex(adir)
-    dir=to_relative(adir)
-	dirs,files=Dir.glob(adir==@rootd ? "#{@rootd}*" : "#{adir}/*").sort.partition { |f| File.directory?(f)}
-
-	updir = hescape(  dir.split(/\//)[0..-2].join("/")) 
-	updir="/" if updir.length==0
-	up=(dir!="/") ? "<input type='button' onclick='location.href=\"#{updir}\"' value='Parent'>" : ""
-	"<html><head><title>#{dir}</title></head>\n<body><h3><center>#{@name} : #{dir[0..-1]}</center></h3>\n<hr>#{up}<br>#{to_table(dirs.map {|s| " <a href='#{hescape(to_relative(s))}'>"+File.basename(s)+"/"+"</a>\n"})}<hr>#{to_tableb(files) {|f| [" <a href='#{hescape(to_relative(f))}'>"+File.basename(f)+"</a>",n3(File.size(f)),File.mtime(f).strftime("%d/%m/%Y %H:%M:%S")]}}</body></html>"
-  end  
-  def to_relative(f)  f.gsub(/^#{@rootd}/,"/") end
-  def to_absolute(f)  "#{@rootd}#{f.gsub(/^\//,'')}" end
-  def n3(n)
-     u=" B"
-     if n> 10000000
-	    n=n/(1024*1024)
-		u=" MB"
-     elsif n> 100000
-	    n=n/1024
-		u=" KB"
-	 end
-    "<div style='width:100px;text-align:right;'>#{(n.round.to_i.to_s.reverse.gsub(/(\d\d\d)(?=\d)/,'\1 ' ).reverse) +u} | </div>"
-  end
-  def to_table(l)
-	 "<table><tr>#{l.map {|s| "<td>#{s}</td>"}.join("</tr><tr>")}</tr></table>"
-  end 
-  def to_tableb(l,&bl)
-	 "<table><tr>#{l.map {|s| "<td>#{bl.call(s).join("</td><td>")}</td>"}.join("</tr><tr>")}</tr></table>"
-  end 
-  def sendError(sock,no,txt=nil) 
-	 if txt
-	   txt="<html><body><code><pre></pre>#{txt}</code></body></html>"
-	 end
-	sock.write "HTTP/1.0 #{no} NOK\r\nContent-type: #{mime(".html")}\r\n\r\n <html><p>Error #{no} : #{txt}</p></html>"
-  end
-  def sendData(sock,type,content)
-	sock.write "HTTP/1.0 200 OK\r\nContent-Type: #{mime(type)}\r\nContent-Length: #{content.size}\r\n\r\n"
-	sock.write(content)
-  end
-  def sendFile(sock,filename)
-  	s=File.size(filename)
-  	if s < 0 || s>60_000_000 || File.extname(filename).downcase==".lnk"
-		logg @name,"Error reading file/File not downloadable  #{File.basename(filename)} : (size=#{s})"
-  		sendError(sock,500,"Error reading file/File not downloadable  #{filename} : (size=#{s})" )
-  		return
-  	end
-	logg @name,filename," #{s/(1024*1024)} Mo" if s>10*1000_000
-	timeout([s/(512*1024),30.0].max.to_i) {
-		sock.write "HTTP/1.0 200 OK\r\nContent-Type: #{mime(filename)}\r\nContent-Length: #{File.size(filename)}\r\nLast-Modified: #{httpdate(File.mtime(filename))}\r\nDate: #{httpdate(Time.now)}\r\n\r\n"
-		File.open(filename,"rb") do |f| 
-		  f.binmode; sock.binmode; 
-		  ( sock.write(f.read(32*1024)) while (! f.eof? && ! sock.closed?) ) rescue nil
-		end
-	} 
-  end
-  def httpdate( aTime ); (aTime||Time.now).gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" ); end
-  def mime(string)
-	 MIME[string.split(/\./).last] || "application/octet-stream"
-  end
-  LICON="&#9728;&#9731;&#9742;&#9745;&#9745;&#9760;&#9763;&#9774;&#9786;&#9730;".split(/;/).map {|c| c+";"}
-  MIME={"png" => "image/png", "gif" => "image/gif", "html" => "text/html","htm" => "text/html",
-	"js" => "text/javascript" ,"css" => "text/css","jpeg" => "image/jpeg" ,"jpg" => "image/jpeg",
-	".json" => "applicatipon/json",
-	"pdf"=> "application/pdf"   , "svg" => "image/svg+xml","svgz" => "image/svg+xml",
-	"xml" => "text/xml"   ,"xsl" => "text/xml"   ,"bmp" => "image/bmp"  ,"txt" => "text/plain" ,
-	"rb"  => "text/plain" ,"pas" => "text/plain" ,"tcl" => "text/plain" ,"java" => "text/plain" ,
-	"c" => "text/plain" ,"h" => "text/plain" ,"cpp" => "text/plain", "xul" => "application/vnd.mozilla.xul+xml",
-	"doc" => "application/msword", "docx" => "application/msword","dot"=> "application/msword",
-	"xls" => "application/vnd.ms-excel","xla" => "application/vnd.ms-excel","xlt" => "application/vnd.ms-excel","xlsx" => "application/vnd.ms-excel",
-	"ppt" => "application/vnd.ms-powerpoint",	"pptx" => "application/vnd.ms-powerpoint"
-  } 
-end # 220 loc webserver :)
-
-class Webserver < WebserverAbstract
-  def initialize(port=7080,cadence=10,timeout=120)
-    super(port,Dir.getwd(),"",cadence,timeout)
-  end
-end 
-class WebserverRoot < WebserverAbstract
-  def initialize(port=7080,root=".",name="wwww",cadence=10,timeout=120,options={})
-    super(port,root,name,cadence,timeout,options)
-  end
-end 
-def cliweb(root=Dir.getwd,port=59999)
-	Thread.abort_on_exception = false
-	BasicSocket.do_not_reverse_lookup = true
-	$ws=WebserverRoot.new(port,root,'femto ws',10,300, {});
-	puts "Server root path #{root} with port #{port}"
-	sleep
-end
+# encoding: utf-8
+# FemtoWebServer : 232 LOC web server
+#
+#   $ws=WebserverRoot.new(port,"/home/www","femto ws",10,300)
+#   ws.serve "/FOO" do |params|
+#      data=params["HEAD-DATA"]|| ""
+#      puts "Recu data len=#{data.length} : <#{data[0..1000]}>" if data
+#      [200,".json",""]
+# end
+  
+  
+require 'thread'
+require 'socket'
+require 'timeout'
+
+#################### Tiny embeded webserver
+
+
+
+
+class WebserverAbstract
+  def logg(*args) 
+	if @cb_log then @cb_log.call(@name,*args) else puts(args.join(" ")) end
+  rescue
+   puts(args.join(" "))
+  end
+  def info(txt) ; logg("nw>i>",txt) ;  end
+  def error(txt) ; logg("nw>e>",txt) ; end
+  def unescape(string) ; string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2}))/n) { [$1.delete('%')].pack('H*') }   end
+  def escape(string) ; string.gsub(/([^ \/a-zA-Z0-9_.\-]+)/) { '%' + $1.unpack('H2' * $1.size).join('%').upcase }.tr(' ', '+')  end
+  def hescape(string) ;  escape(string.gsub("/./","/").gsub("//","/")) ; end
+  def observe(sleeping,delta)
+	@tho=Thread.new do loop do
+	  sleep(sleeping) 
+	  nowDelta=Time.now-delta
+	  l=@th.select { |th,tm| (tm[0]<nowDelta) }
+	  l.each { |th,tm| info("killing thread") ; th.kill; @th.delete(th)  ; tm[1].close rescue nil }
+	end ; end
+  end
+  def initialize(port,root,name,cadence,timeout,options)
+	raise("tcp port illegal #{port}") unless port.to_i>=80
+	raise("root not exist #{root}") unless File.exists?(root)
+    @cb_log= options["logg"] 
+    @last_mtime=File.mtime(__FILE__)
+	@port=port.to_i
+	@root=root
+	@name=name
+	@rootd=root[-1,1]=="/" ? root : root+"/" 
+	@timeout=timeout
+	@th={}
+	@cb={}
+	@redirect={}
+	info(" serveur http #{port} on #{@rootd} ready!")
+	observe(cadence,timeout*2)
+        pool_create
+	@thm=Thread.new { 
+		loop { 
+			nbError=0
+			begin
+				session=nil
+				@server = TCPServer.new('0.0.0.0', @port)
+				@server.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+				while (session = @server.accept)
+					nbError=0
+					run(session)
+				end
+			rescue Exception => e
+			  nbError+=1
+			  error($!.to_s + "  " + $!.backtrace[0..2].join(" "))
+			  session.close rescue nil
+			  @server.close rescue nil
+			end
+			sleep(3); info("restart accept")
+		}
+	}
+  end
+  def pool_create
+    @queue=Queue.new
+    ici=self
+    100.times {  Thread.new { loop { 
+      param,bloc=@queue.pop
+      bloc.call(param)  rescue p $!
+    } } }
+  end
+  def pool_get(param,&block)
+     @queue.push([param,block])
+  end
+  def run(session)
+		pool_get(session) do |sess|
+		   @th[Thread.current]=[Time.now,sess]
+		   request(sess) 
+		   @th.delete(Thread.current) 
+		end
+  end
+  def serve(uri,&blk)
+	@cb[uri] = blk
+  end  
+  def request(session)
+	  request = session.gets
+    return unless request
+	  uri = (request.split(/\s+/)+['','',''])[1] 
+	  #info uri
+	  service,param,*bidon=(uri+"?").split(/\?/)
+	  params=Hash[*(param.split(/#/)[0].split(/[=&]/))] rescue {}
+	  params.each { |k,v| params[k]=unescape(v) }
+	  uri=unescape(service)[1..-1].gsub(/\.\./,"")
+	  userpass=nil
+	  if (buri=uri.split(/@/)).size>1
+		uri=buri[1..-1].join("@")
+		userpass=buri[0].split(/:/)
+	  end
+	  read_header(session,params)
+	  do_service(session,request,uri,userpass,params)
+  rescue Exception => e
+	error("Error Web get on #{request}: \n #{$!.to_s} \n #{$!.backtrace.join("\n     ")}" ) rescue nil
+	session.write "HTTP/1.0 501 NOK\r\nContent-type: text/html\r\n\r\n<html><head><title>WS</title></head><body>Error : #{$!}" rescue nil
+  ensure
+	session.close rescue nil
+  end  
+  def read_header(session,params)
+	   head=session.gets("\r\n\r\n")
+	   head.split(/\r\n/m).each { |line| name,data=line.split(": ",2) ; params["HEAD-"+name.upcase]=data }
+	   if params["HEAD-CONTENT-LENGTH"]
+			len= params["HEAD-CONTENT-LENGTH"].split(/\s+/).last.to_i
+			params["HEAD-CONTENT-LENGTH"]=len
+			data=""
+			while len>0
+				d=session.read(len>64*1024 ? 64*1024 : len)
+				raise("closed") if !d
+				len -= d.length
+				data+=d
+			end	
+		    params["HEAD-DATA"]=data
+	   end
+  end
+  
+  def redirect(o,d)
+   @redirect[o]=d
+  end  
+  def do_service(session,request,service,user_passwd,params)
+	redir=@redirect["/"+service]
+	service=redir.gsub(/^\//,"") if @redirect[redir]
+	aservice=to_absolute(service)
+	if redir &&  ! @redirect[redir] 
+	  do_service(session,request,redir.gsub(/^\//,""),user_passwd,params)
+	elsif @cb["/"+service]
+	  begin
+	   code,type,data= @cb["/"+service].call(params)
+	   if code==0 && data != '/'+service
+		  do_service(session,request,data[1..-1],user_passwd,params)
+	   else
+		 code==200 ?  sendData(session,type,data) : sendError(session,code,data)
+	   end
+	  rescue
+	   logg session.peeraddr.last,"Error in get /#{service} : #{$!}"
+	   sendError(session,501,$!.to_s)
+	  end
+	elsif service =~ /^stop/ 
+	  sendData(session,".html","Stopping...");	   
+	  Thread.new() { sleep(0.1); stop_browser()  }
+	elsif File.directory?(aservice)
+	  sendData(session,".html",makeIndex(aservice))
+	elsif File.exists?(aservice)
+	  sendFile(session,aservice)
+	else
+	  info("unknown request serv=#{service} params=#{params.inspect} #{File.exists?(service)}")
+	  sendError(session,500,"unknown request serv=#{aservice} params=#{params.inspect} #{File.exists?(service)}");
+	end
+  end
+  def stop_browser
+	info "exit on web demand !"
+	[@tho,@thm].each { |th| th.kill }
+	@server.close rescue nil
+  end
+  def makeIndex(adir)
+    dir=to_relative(adir)
+	dirs,files=Dir.glob(adir==@rootd ? "#{@rootd}*" : "#{adir}/*").sort.partition { |f| File.directory?(f)}
+
+	updir = hescape(  dir.split(/\//)[0..-2].join("/")) 
+	updir="/" if updir.length==0
+	up=(dir!="/") ? "<input type='button' onclick='location.href=\"#{updir}\"' value='Parent'>" : ""
+	"<html><head><title>#{dir}</title></head>\n<body><h3><center>#{@name} : #{dir[0..-1]}</center></h3>\n<hr>#{up}<br>#{to_table(dirs.map {|s| " <a href='#{hescape(to_relative(s))}'>"+File.basename(s)+"/"+"</a>\n"})}<hr>#{to_tableb(files) {|f| [" <a href='#{hescape(to_relative(f))}'>"+File.basename(f)+"</a>",n3(File.size(f)),File.mtime(f).strftime("%d/%m/%Y %H:%M:%S")]}}</body></html>"
+  end  
+  def to_relative(f)  f.gsub(/^#{@rootd}/,"/") end
+  def to_absolute(f)  "#{@rootd}#{f.gsub(/^\//,'')}" end
+  def n3(n)
+     u=" B"
+     if n> 10000000
+	    n=n/(1024*1024)
+		u=" MB"
+     elsif n> 100000
+	    n=n/1024
+		u=" KB"
+	 end
+    "<div style='width:100px;text-align:right;'>#{(n.round.to_i.to_s.reverse.gsub(/(\d\d\d)(?=\d)/,'\1 ' ).reverse) +u} | </div>"
+  end
+  def to_table(l)
+	 "<table><tr>#{l.map {|s| "<td>#{s}</td>"}.join("</tr><tr>")}</tr></table>"
+  end 
+  def to_tableb(l,&bl)
+	 "<table><tr>#{l.map {|s| "<td>#{bl.call(s).join("</td><td>")}</td>"}.join("</tr><tr>")}</tr></table>"
+  end 
+  def sendError(sock,no,txt=nil) 
+	 if txt
+	   txt="<html><body><code><pre></pre>#{txt}</code></body></html>"
+	 end
+	sock.write "HTTP/1.0 #{no} NOK\r\nContent-type: #{mime(".html")}\r\n\r\n <html><p>Error #{no} : #{txt}</p></html>"
+  end
+  def sendData(sock,type,content)
+	sock.write "HTTP/1.0 200 OK\r\nContent-Type: #{mime(type)}\r\nContent-Length: #{content.size}\r\n\r\n"
+	sock.write(content)
+  end
+  def sendFile(sock,filename)
+  	s=File.size(filename)
+  	if s < 0 || s>60_000_000 || File.extname(filename).downcase==".lnk"
+		logg @name,"Error reading file/File not downloadable  #{File.basename(filename)} : (size=#{s})"
+  		sendError(sock,500,"Error reading file/File not downloadable  #{filename} : (size=#{s})" )
+  		return
+  	end
+	logg @name,filename," #{s/(1024*1024)} Mo" if s>10*1000_000
+	timeout([s/(512*1024),30.0].max.to_i) {
+		sock.write "HTTP/1.0 200 OK\r\nContent-Type: #{mime(filename)}\r\nContent-Length: #{File.size(filename)}\r\nLast-Modified: #{httpdate(File.mtime(filename))}\r\nDate: #{httpdate(Time.now)}\r\n\r\n"
+		File.open(filename,"rb") do |f| 
+		  f.binmode; sock.binmode; 
+		  ( sock.write(f.read(32*1024)) while (! f.eof? && ! sock.closed?) ) rescue nil
+		end
+	} 
+  end
+  def httpdate( aTime ); (aTime||Time.now).gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" ); end
+  def mime(string)
+	 MIME[string.split(/\./).last] || "application/octet-stream"
+  end
+  LICON="&#9728;&#9731;&#9742;&#9745;&#9745;&#9760;&#9763;&#9774;&#9786;&#9730;".split(/;/).map {|c| c+";"}
+  MIME={"png" => "image/png", "gif" => "image/gif", "html" => "text/html","htm" => "text/html",
+	"js" => "text/javascript" ,"css" => "text/css","jpeg" => "image/jpeg" ,"jpg" => "image/jpeg",
+	".json" => "applicatipon/json",
+	"pdf"=> "application/pdf"   , "svg" => "image/svg+xml","svgz" => "image/svg+xml",
+	"xml" => "text/xml"   ,"xsl" => "text/xml"   ,"bmp" => "image/bmp"  ,"txt" => "text/plain" ,
+	"rb"  => "text/plain" ,"pas" => "text/plain" ,"tcl" => "text/plain" ,"java" => "text/plain" ,
+	"c" => "text/plain" ,"h" => "text/plain" ,"cpp" => "text/plain", "xul" => "application/vnd.mozilla.xul+xml",
+	"doc" => "application/msword", "docx" => "application/msword","dot"=> "application/msword",
+	"xls" => "application/vnd.ms-excel","xla" => "application/vnd.ms-excel","xlt" => "application/vnd.ms-excel","xlsx" => "application/vnd.ms-excel",
+	"ppt" => "application/vnd.ms-powerpoint",	"pptx" => "application/vnd.ms-powerpoint"
+  } 
+end # 220 loc webserver :)
+
+class Webserver < WebserverAbstract
+  def initialize(port=7080,cadence=10,timeout=120)
+    super(port,Dir.getwd(),"",cadence,timeout)
+  end
+end 
+class WebserverRoot < WebserverAbstract
+  def initialize(port=7080,root=".",name="wwww",cadence=10,timeout=120,options={})
+    super(port,root,name,cadence,timeout,options)
+  end
+end 
+def cliweb(root=Dir.getwd,port=59999)
+	Thread.abort_on_exception = false
+	BasicSocket.do_not_reverse_lookup = true
+	$ws=WebserverRoot.new(port,root,'femto ws',10,300, {});
+	puts "Server root path #{root} with port #{port}"
+	sleep
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: femtows
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Glurp man
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies: []
-description: ! "a tiny web server, for local file transfert, \nembedded, http experimentations\n"
+description: "a tiny web server, for local file transfert, \nembedded, http experimentations\n"
 email: regis.aubarede@gmail.com
 executables:
 - femtows.bat
@@ -19,33 +18,33 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/femtows.bat
+- bin/femtows.sh
 - demo.rb
-- lib/femtows.rb
+- gitc.bat
 - guidemo.rb
-- bin/femtows.sh
-- bin/femtows.bat
+- lib/femtows.rb
 homepage: http://github.com/glurp/femtows
 licenses: []
-post_install_message: ! "-------------------------------------------------------------------------------\nHello,
+metadata: {}
+post_install_message: "-------------------------------------------------------------------------------\nHello,
   welcome to Femto Web Server....\n\n$ femtows [port,[root-directory] \n\n-------------------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: a tiny webserver