RubyGems - femtows - Versions diffs - 1.6.0 → 2.0.0 - Mend

femtows 1.6.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb91e5bf92627376e1417d32a8c897ac196510f6
-  data.tar.gz: 5c1667b4230b70efbb72e565078765b1ccf6d0cd
+  metadata.gz: 7e446685cf3d269110e6758dfed9ed0ef1512c7a
+  data.tar.gz: 17d06da5c51fabc47474e0bc26441fbbd649377c
 SHA512:
-  metadata.gz: f4ff73c70c9654078d76304b054662e06be080d230b64cec0c1fffdab2a425ba8c3beda4f6db170cc1c3608dd8d21ce23262c0665880154c201a96523c3e1764
-  data.tar.gz: 77732c765e07894cfa92f266d9a8109b126dce1fbf41b9b39a8cafbf0cb59263c3e2f3cbbfa352e94061a88c630c2cb24e0fd47745551ce03d90f840916508b0
+  metadata.gz: 6f67a10a904e8f73d9b75adf196d6b398a8445f0498f9e0fb906d84fa9d75e26d13e1439d97bc71b1598007c258013d991b95f85d913fb21264045651ef49031
+  data.tar.gz: feeff779208483049174bf9d8fcadeb71563a94dd1fa2ca513664dc1d25c932e2fd2eace167fa178b1fe21cdcfb37bbd8e486701767a9424d5e62509f09ff7c4

data/demo2.rb ADDED

@@ -0,0 +1,13 @@
+require_relative "lib/femtows.rb"
+class App < Fem
+  def get_app_html(p)
+      "<html><body><h2><center>Hello</center></h2><hr><p>#{content}</p><hr><center>[femtows]</center></body>"
+  end
+  def content
+    to_tableb(Dir.glob("*.rb")) {|f| [f,File.size(f),File.mtime(f)]}
+  end
+end
+App.new(ARGV[0].to_i)
+sleep

data/lib/femtows.rb CHANGED

@@ -38,23 +38,22 @@ class WebserverAbstract
 	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)
+    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 {
+    @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 { sleep(0.1); loop {
 			nbError=0
 			begin
 				session=nil
@@ -71,8 +70,7 @@ class WebserverAbstract
 			  @server.close rescue nil
 			end
 			sleep(3); info("restart accept")
-		}
-	}
+		}	}
   end
   def pool_create
     @queue=Queue.new
@@ -93,7 +91,8 @@ class WebserverAbstract
 		end
   end
   def serve(uri,&blk)
-	@cb[uri] = blk
+    @cb[uri] = blk
+    puts(" registered #{uri}")
   end
   def request(session)
 	  request = session.gets
@@ -138,34 +137,34 @@ class WebserverAbstract
    @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
+    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,"#{$!} : at #{$!.backtrace.first}")
+      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 !"
@@ -226,7 +225,7 @@ class WebserverAbstract
 		end
 	}
   end
-  def httpdate( aTime ); (aTime||Time.now).gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" ); end
+  def httpdate( aTime=nil ); (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
@@ -261,3 +260,17 @@ def cliweb(root=Dir.getwd,port=59999)
 	puts "Server root path #{root} with port #{port}"
 	sleep
 end
+###################### another api
+class Fem < WebserverAbstract
+  def initialize(port=7080,root=".",name="wwww",cadence=10,timeout=120)
+    super(port,root,name,cadence,timeout,{})
+    introspect
+  end
+  def introspect()
+    exp=/^(get|post)_(\w[\w\d]*)_(\w+)$/
+    methods.grep(exp).each { |name|
+      all,method,key,mime= exp.match(name).to_a
+      serve("/#{key}") { |par| [200,".#{mime}",self.send(all,par)] }
+    }
+  end
+end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: femtows
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Glurp man
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies: []
 description: "a tiny web server, for local file transfert, \nembedded, http experimentations\n"
 email: regis.aubarede@gmail.com
@@ -21,6 +21,7 @@ files:
 - bin/femtows.bat
 - bin/femtows.sh
 - demo.rb
+- demo2.rb
 - gitc.bat
 - guidemo.rb
 - lib/femtows.rb
@@ -28,7 +29,8 @@ homepage: http://github.com/glurp/femtows
 licenses: []
 metadata: {}
 post_install_message: "-------------------------------------------------------------------------------\nHello,
-  welcome to Femto Web Server....\n\n$ femtows [port,[root-directory] \n\n-------------------------------------------------------------------------------\n"
+  welcome to Femto Web Server....\n\n$ femtows.sh [port,[root-directory] \nor\n$ femtows.bat
+  [port,[root-directory] \n\n-------------------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib