minimal-http-ruby 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ad76ce1c928006b7809051a82ac5af630103e2
-  data.tar.gz: 673cfbbdd403bc840100a36174c755f35f2339cb
+  metadata.gz: 7e1af06230f27d9602d5958050d5970d7e424bdb
+  data.tar.gz: ee352828ef7ca87f4163532674f993d390bb2247
 SHA512:
-  metadata.gz: 87bfb7b69275bde6e33ad3fdee12e0799ee47a0f68f9a7542b726d7799ab66d3c9ffe3d161f8316e9f41278fc72dedfdfbb14feccea7f1ddf153eed856b515c2
-  data.tar.gz: 31a90eacb753a430e1780ad121999c20a1600b3e24b0030d2cb3a051fc0382f3f0bd4dae8cd6c0376c0a7cb86f5f2928b6da91b945536bf87e7a543b9573642a
+  metadata.gz: d70a82b930defb1738e0a7b47b11deaba5227524707770eac65ff289707c520ca3470d512089ccd3d44642fbd7d9a748874bcc6724352fcc55159f9513cce78e
+  data.tar.gz: 02f9b14c38bd16f14c9a9796c73ef4530caafd7778a38a4be00a18e70deb2f9ef436e736ce38df1bc7b29990c68d9908337b6d1d46111ceceb709104fa6eb43e

data/bin/minimal-http-init.rb

@@ -2,30 +2,25 @@
 # encode: UTF-8
 
 require "fileutils"
+require "rubygems"
+require 'minimal-http-ruby'
 
 
 puts "minimal-http-ruby Initializer"
-if File.directory? "./http"
-  puts "Error: ./http Already Exists -- Cannot create!"
+
+target=ARGV[0]||"./http"
+
+if File.directory? target
+  puts "Error: #{target} Already Exists -- Cannot create!"
   exit(-1)
 end
-Dir.mkdir "./http"
-if File.directory? "./http"
-  Dir.mkdir "./http/coffee"
-  Dir.mkdir "./http/css"
-  Dir.mkdir "./http/haml"
-  Dir.mkdir "./http/json"
-  File.open("./http/haml/index.haml", 'w') do |file|
-  file.write <<END
-!!!
-%body
-  %h1 Congratulations!
-  %hr
-  You have installed minimal-http-ruby
-  %hr
-  Next, please edit file: #{Dir.pwd}/http/haml to get started!
 
-END
-  end
+Dir.mkdir target
+if File.directory? target
+  puts "Copying Files..."
+  path=File.join( Gem.loaded_specs['minimal-http-ruby'].full_gem_path, 'http/')
+  FileUtils.cp_r "#{path}/.", "#{target}"
   puts "Created OK!"
+  puts "Next, please edit file: #{target}/haml/index.haml to get started!"
+  system "tree #{target}"
 end

data/bin/minimal-http.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'minimal-http-ruby'
+require 'optparse'
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely; creates protocol log on console (false)") do |v|
+    options[:verbose] = v
+  end
+
+  options[:http_port]=8088
+  opts.on("-p", "--http_port port", "Local port to listen (8088)") do |v|
+    options[:http_port] = v.to_i
+  end
+  options[:http_path]="./http/"
+  opts.on("-d", "--http_path path", "Location of http files to serve (./http/)") do |v|
+    options[:http_path] = v
+  end
+end.parse!
+
+puts "ok"
+pp options
+minimal_http_server options
+
+loop do #or whatever you need to do
+    sleep 1
+end

data/http/coffee/script.coffee

@@ -0,0 +1,43 @@
+
+now=0
+xx=123
+
+sse_data = (data) ->
+  console.log "sse:",data
+  $(".data").html(data.now)
+
+ajax_data = (data) ->
+  console.log "ajax:",data
+  $(".adata").html(data.now)
+
+
+@ajax = (obj) ->
+  console.log "doin ajax"
+  $.ajax
+    url: "/demo.json"
+    type: "GET"
+    dataType: "json",
+    contentType: "application/json; charset=utf-8",
+    success: (data) ->
+      ajax_data(data)
+      setTimeout (->
+        ajax()
+        return
+      ), 3000
+      return
+    error: (xhr, ajaxOptions, thrownError) ->
+      alert thrownError
+      return
+
+
+$ ->
+  console.log "Script Starts..."
+  ajax()
+  stream = new EventSource("/sse_demo.json")
+  stream.addEventListener "message", (event) ->
+    sse_data($.parseJSON(event.data))
+    return
+
+
+
+

data/http/css/style.css

@@ -0,0 +1,3 @@
+body {
+    background-color: #b0c4de;
+}

data/http/haml/index.haml

@@ -1,4 +1,27 @@
+!!!
+%head
+  %title minimal-http-ruby
+  %meta{:charset => "utf-8"}/
+  %link{:href => "/css/style.css", :rel => "stylesheet", :type => "text/css"}
+  %script{:src => "https://code.jquery.com/jquery-2.1.1.min.js"}
+  %script{:src => "/script.js"}
 
-okei
+%body
+  %h1 Congratulations!
+  %hr
+  You have installed minimal-http-ruby
+  %hr
+  Next, please edit file: haml/index.haml to get started!
+  %br
+  And for css: css/style.css to get started!
+  %br
+  And for coffeescript: coffee/script.coffee to get started!
+  %hr
+  Epoch Clock from minimal-http-ruby with AJAX:
+  %span.adata
+    [this should be updated with AJAX]
+  %hr
+  Epoch Clock from minimal-http-ruby with SSE:
+  %span.data
+    [this should be updated with SSE]
 
-#{123}

data/http/json/demo.rb

@@ -1,9 +1,8 @@
 # encode: UTF-8
 
 def json_demo request,args,session,event
-  puts "OKxxxxxxxxxxx"
   data={
     now:Time.now.to_i,
   }
   return ["text/json",data]
-end 
+end

data/lib/minimal-http-ruby.rb

@@ -30,6 +30,9 @@ def minimal_http_server options={}
   else
     $http_dir = File.join( Gem.loaded_specs['minimal-http-ruby'].full_gem_path, 'http/')
   end
+  if not File.directory? $http_dir
+    puts "Warning: Http-path does not exist? -- Please create and populate!\nYou can use utility 'minimal-http-init.rb'"
+  end
   puts "Serving pages from home directory: '#{$http_dir}'"
   statuses={ "200" => "OK", "404" => "Not Found", "500" => "Internal Server Error"}
   Thread.new(options[:http_port],options[:app_name]) do |http_port,http_app|
@@ -44,7 +47,7 @@ def minimal_http_server options={}
           client_ip= client.peeraddr[2]
           raw=client.gets
           if not raw
-            puts "#{client_ip}:#{client_port} #{Time.now.iso8601} ?? nil request?"
+            puts "#{client_ip}:#{client_port} #{Time.now.iso8601} ?? nil request?" if options[:verbose]
             client.close
             next
           end
@@ -84,7 +87,7 @@ def minimal_http_server options={}
               response=cache[fn]
             end
           elsif req[/^\/(.+)\.json$/] and File.file?(fn="#{$http_dir}json#{req.gsub('.json','.rb')}")
-            req[/\/(.+).json$/] 
+            req[/\/(.+).json$/]
             act=$1
             t=File.mtime(fn)
             if not prev_t[fn] or prev_t[fn]<t
@@ -130,14 +133,13 @@ def minimal_http_server options={}
             client.print "Content-Length: #{response.bytesize}\r\n"
             client.print "Connection: close\r\n"
             client.print "\r\n"
-            client.print response 
+            client.print response
           else
             client.print "Expires: -1\r\n"
             client.print "\r\n"
             begin
               my_session=client.peeraddr[1]
               if not @http_sessions[my_session]
-                #puts "**************** new port #{my_session}"
                 @http_sessions[my_session]={client_port:client.peeraddr[1],client_ip:client.peeraddr[2] , log_position:0 }
               end
               my_event=0
@@ -150,7 +152,7 @@ def minimal_http_server options={}
                   puts "#{e.backtrace[0..2]}"
                   pp e.backtrace
                   response=[{act: :error, msg:"Error executing JSON",alert: "Syntax error '#{e}' in '#{fn}'"}].to_json
-                end 
+                end
                 if not response or response==[] or response=={}
                 else
                   client.print  "retry: 1000\n"
@@ -159,13 +161,15 @@ def minimal_http_server options={}
                 sleep 1
                 break if my_event>100
               end
+            rescue Errno::EPIPE
+              #quite normal ;)
             rescue => e
               puts "stream #{client} died #{e}"
               pp e.backtrace
             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}"
+          puts "#{client_ip}:#{client_port} #{Time.now.iso8601} \"#{method} #{req}\" #{status} #{response.bytesize} \"#{type}\" #{dur}" if options[:verbose]
           client.close
         rescue Exception =>e
           response="Error '#{e}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimal-http-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Ari Siitonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -55,15 +55,16 @@ description: 'Minimal Http Server Class with Ryby: Haml & Coffeescript & SSE & A
 email: jalopuuverstas@gmail.com
 executables:
 - minimal-http-init.rb
+- minimal-http.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/minimal-http-init.rb
+- bin/minimal-http.rb
 - examples/server.rb
-- http/coffee/test.coffee
-- http/css/test.css
+- http/coffee/script.coffee
+- http/css/style.css
 - http/haml/index.haml
-- http/index.html
 - http/json/demo.rb
 - http/json/sse_demo.rb
 - lib/minimal-http-ruby.rb

data/http/coffee/test.coffee

@@ -1,113 +0,0 @@
-
-now=0
-xx=123
-
-update_status = (data) ->
-  console.log data.jes
-  console.log data.clients
-  #console.log data.logpos
-  now=data.now
-  html="<table><tr><th>uri</th><th>state</th><th>stamp</th><th>last_send</th><th>counter_send</th><th>last_recv</th><th>counter_recv</th></tr>"
-  for k,v of data.clients
-    html+="<tr>"
-    html+="<td>#{k}</td>"
-    html+="<td>#{v.state}</td>"
-    html+="<td>#{now-v.stamp}</td>"
-
-
-
-    if v.last_send
-      html+="<td>#{now-v.last_send}</td>"
-    else
-      html+="<td></td>"
-    html+="<td>#{v.counter_send}</td>"
-
-    if v.last_recv
-      html+="<td>#{now-v.last_recv}</td>"
-    else
-      html+="<td></td>"
-    html+="<td>#{v.counter_recv}</td>"
-
-    html+="</tr>"
-  html+="</table>"
-  #console.log html
-  $(".clients").html(html)
-    
-  html="<table><tr><th>gw_id</th><th>uri</th><th>source</th><th>stamp</th><th>last_use</th><th>last_ping</th><th>last_send</th><th>counter_send</th><th>last_recv</th><th>counter_recv</th></tr>"
-  for k,v of data.gateways
-    k=parseInt(k,10)
-    col="white"
-    if data.active_gw_id== k
-      col="#d0ffd0" 
-    html+="<tr bgcolor='#{col}'>"
-    html+="<td>#{k}</td>"
-    html+="<td>#{v.uri}</td>"
-    html+="<td>#{v.source}</td>"
-    html+="<td>#{now-v.stamp}</td>"
-    if v.last_use
-      html+="<td>#{now-v.last_use}</td>"
-    else
-      html+="<td></td>"
-    if v.last_ping
-      html+="<td>#{now-v.last_ping}</td>"
-    else
-      html+="<td></td>"
-      
-    if v.last_send
-      html+="<td>#{now-v.last_send}</td>"
-    else
-      html+="<td></td>"
-    html+="<td>#{v.counter_send}</td>"
-
-    if v.last_recv
-      html+="<td>#{now-v.last_recv}</td>"
-    else
-      html+="<td></td>"
-    html+="<td>#{v.counter_recv}</td>"
-    html+="</tr>"
-  if data.jes[1]==0
-    $(".log").html("")
-  for l in data.loglines
-    #console.log l
-    $(".log").prepend(l.text+"\n")  
-  html+="</table>"
-  #console.log html
-  $(".data").html(html)
-  $(".info").html("State: #{data.state}, gw: #{data.active_gw_id}, app: #{data.options.app_name}, ")
-  
-
-@ajax = (obj) ->
-  console.log "doin ajax"
-  form=$(obj).closest("form")
-  key=form.attr('id')
-  q=$( form ).serialize()
-  console.log q
-  $.ajax
-    url: "/action.json?#{q}"
-    type: "GET"
-    processData: false
-    contentType: false
-    success: (data) ->
-      console.log "ajax returns: ", data
-      
-      return
-    error: (xhr, ajaxOptions, thrownError) ->
-      alert thrownError
-      return
-
-
-$ ->
-  console.log "tadaa"
-  #update_gw()
-  #setInterval(->
-  #  update_gw()
-  #  return
-  #, 200000)
-  stream = new EventSource("/gateways.json")
-  stream.addEventListener "message", (event) ->
-    update_status($.parseJSON(event.data))
-    return
-  
-
-
-  

data/http/index.html

@@ -1 +0,0 @@
-oukei