minimal-http-ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe16f76d580d9bff3e82b1ac503a37644144f509
-  data.tar.gz: 65d05b793d48dc0fc8b054ac98d5f11357385c20
+  metadata.gz: eef69bbeb0cfad8e22dcbafca9716c671772002c
+  data.tar.gz: 8ca4da27082de1966273176c016db7e2578dd95e
 SHA512:
-  metadata.gz: a16194c52214a15b2a11003ef9bfbf5abba7f3d251d9a965f3fde5eea32ba9c806aa9a23175240984b43638847c5ac77c78dbd75fdb3fea9e311ce5d874aaf74
-  data.tar.gz: 846b5f85c71792c637f63302640cd39aa4f2bcfc6f77e0fecaa79460898f217dd545fdc1960426a843edb84bafe8ff3dfbe58e0f2cc81c6f4a2d40e0eb25b585
+  metadata.gz: 0bf337dfcf3e152f2d1c89176aef70fb7626a799271f5f185ee16118844bd57bf932e98719e156cbceed95c19c860ef0313391750bf22958f7b3d139aff85fce
+  data.tar.gz: 37eca392caa5f0a1766496aaaabe69263dc679f31ec4f66e2ece79373ad8d362ea97059d69843dc80a2d0e87b2a98986c4fd5b1899dc5213d818f5e2f93544fa

data/lib/minimal-http-ruby.rb

@@ -11,8 +11,9 @@ require 'ipaddr'
 require 'time'
 require 'thread'
 require 'mimemagic'
-require "fcntl"
+require 'cgi'
 
+$sessions={}
 
 def minimal_http_server options={}
   prev_t={}
@@ -54,8 +55,8 @@ def minimal_http_server options={}
           end
           raw=raw.chop
           method,req,http_proto = raw.split " "
-          puts "method:#{method}"
-          pp req
+          #puts "method:#{method}"
+          #pp req
           status="200"
           type="text/html"
           req="/#{http_app||'index'}.html" if req=="/" or req=="/index.htm" or req=="/index.html"
@@ -70,15 +71,37 @@ def minimal_http_server options={}
               len=$1.to_i  if line[/Content-Length: (\d+)/]
               break if line=="\r\n"
             end
-            argss=client.readpartial(len)
+            argss=""
+            while argss.size<len
+              argss+=client.readpartial(len-argss.size)
+              puts argss
+            end
+            #argss=URI.decode(argss)
+            puts argss
           end
           if argss
             argss.split("&").each do |a|
+              #puts ">>><found '#{a}'"
               if a
-                k,v=URI.decode(a).force_encoding("UTF-8").split "="
-                args[k]=v
+                k,v=a.split "="
+                next if not v
+                next if not k
+                k=CGI.unescape(k).force_encoding("UTF-8")
+                v=CGI.unescape(v).force_encoding("UTF-8")
+                #args[k]=CGI.unescape(CGI.unescape(v)) #.force_encoding("UTF-8")
+                if k[/(.+)\[\]$/]
+                  #puts "IS ARRAY--------------------- #{k} #{$1}"
+                  args[$1]=[] if not args[$1]
+                  args[$1]<<v
+                else
+                  args[k]=v #CGI.unescape(v) #.force_encoding("UTF-8")
+                end
+                #puts "'#{v}' --> #{args[k]}"
               end
             end
+            #puts "args:"
+            #pp args
+            #puts "------"
           end
           if req[/\.html$/] and File.file?(fn="#{$http_dir}haml#{req.gsub('.html','.haml')}")
             contents = File.read(fn) # never cached -- may be dynamically generated
@@ -89,10 +112,12 @@ def minimal_http_server options={}
             if not prev_t[fn] or prev_t[fn]<t
               contents = File.read(fn)
               begin
-                response=CoffeeScript.compile contents
+                response=CoffeeScript.compile contents.force_encoding("UTF-8")
                 prev_t[fn]=t
                 cache[fn]=response
               rescue => e
+                puts "**** COFFEE #{fn} failed:  #{e}"
+                pp e.backtrace
                 type="text/html"
                 status="500"
                 response="Coffee Compile error: #{e}"
@@ -119,13 +144,13 @@ def minimal_http_server options={}
             if type!="text/event-stream" and status=="200"
               begin
                 type,response=eval "json_#{act} [method,req,http_proto],args,0,0"  #event handlers get called with zero session => init :)
+                response=response.to_json
               rescue => e
                 puts "**** AJAX EXEC #{fn} failed:  #{e}"
                 pp e.backtrace
                 response=[{act: :error, msg:"Error executing JSON",alert: "Syntax error '#{e}' in '#{fn}'"}].to_json
                 type="application/json"
               end
-              response=response.to_json
              end
           elsif File.file?(fnc="#{$http_dir}#{req}")
             type=MimeMagic.by_path(req)
@@ -146,16 +171,20 @@ def minimal_http_server options={}
           if type!="text/event-stream"
             client.print "Content-Length: #{response.bytesize}\r\n"
             client.print "Connection: close\r\n"
+            client.print "Access-Control-Allow-Origin: *\r\n"
             client.print "\r\n"
             client.print response
           else
             client.print "Expires: -1\r\n"
+            client.print "Access-Control-Allow-Origin: *\r\n"
             client.print "\r\n"
+            my_session=nil
             begin
               my_session=client.peeraddr[1]
               if not @http_sessions[my_session]
                 @http_sessions[my_session]={client_port:client.peeraddr[1],client_ip:client.peeraddr[2] , log_position:0 }
               end
+              $sessions[my_session]={}
               my_event=0
               loop do
                 begin
@@ -172,8 +201,8 @@ def minimal_http_server options={}
                   client.print  "retry: 1000\n"
                   client.print  "data: #{response.to_json}\n\n"
                 end
-                sleep 1
-                break if my_event>100
+                sleep 0.001
+                break if my_event>10000
               end
             rescue Errno::EPIPE
               #quite normal ;)
@@ -181,6 +210,10 @@ def minimal_http_server options={}
               puts "stream #{client} died #{e}"
               pp e.backtrace
             end
+            if my_session and $sessions[my_session] and $sessions[my_session][:thread] and $sessions[my_session][:thread].status
+              puts "HEY SOMETHING WAS RUNNING"
+              $sessions[my_session][:thread].kill
+            end
           end
           dur=sprintf "%.2f",(Time.now.to_f-@start.to_f)
           puts "#{client_ip}:#{client_port} #{Time.now.iso8601} \"#{method} #{req}\" #{status} #{response.bytesize} \"#{type}\" #{dur}" if options[:verbose]
@@ -194,6 +227,7 @@ def minimal_http_server options={}
           client.print "HTTP/1.1 #{status} #{statuses[status]||'???'}\r\nContent-Type: #{type}\r\n\r\n"
           client.print response
           client.close
+          puts e
           pp e.backtrace
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimal-http-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ari Siitonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml