apphttp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4cb846a2215c4c862dd838caeb74ecb4af881c6f93b6a14228d9fb16df4bb38
-  data.tar.gz: 28ccc08e4bc6df11df826d6d294a6b6d6d19a7b8564da5bb98e0260c8403377e
+  metadata.gz: e0321c0751594a3b0ac3ea9ac982e4f81f8060edd0668ae4030af6a6556e3c4c
+  data.tar.gz: 2ea8fc4f3feda515b4f2c62e3882a9acaabd2ce78370caa1a433946abf126d4c
 SHA512:
-  metadata.gz: 0716725be6eac3ac5ce2ed7f5380dbf3ed82b35de5b54546c5cbd0ec121b92eca878e8f686c3e91843c8d3a9d20594a6e0e7423a8a43fa25c0afb985429b6c7a
-  data.tar.gz: f15ff123d1e6ba25acfc8273b18cb9f9d055b7443dc6e6de3dff2ce50fb842c98434bb62aae28b6ae0ab2cd54318a4aac59e620d7850fb9b8173435da30572f7
+  metadata.gz: 546ff95fa168993a9130feaa2cea49ef51494f3ce3a1d4b73ca38c4eb6e6533a9c079b2f781e1de1d7163345b05f43c85a302be7eb902be5e445d9ff8d941889
+  data.tar.gz: e81e5edc7e40d9ca5cb39d6b6e7d3513085d2fb91962c6905c3c711beb18d6640f4fe944fac0fc839743aeb25cf613bc3f1c2a5d857b3f89b225c70cf9874ef4

data/lib/apphttp.rb

@@ -6,12 +6,19 @@
 
 require 'socket'
 require 'json'
+require 'c32'
+require 'kramdown'
 
 
 class AppHttp
+  using ColouredText
 
-  def initialize(app, host: '0.0.0.0', port: '9232', debug: false)
+  def initialize(app, host: '0.0.0.0', port: '9232', filepath: '.', 
+                 headings: true, debug: false)
+    
     @app, @host, @port, @debug = app, host, port, debug
+    @filepath, @headings = filepath, headings
+    
   end
 
   def start
@@ -20,11 +27,13 @@ class AppHttp
 
     while (session = server.accept)
 
+
       raw_request = session.gets
       request = raw_request[/.[^\s]+(?= HTTP\/1\.\d)/].strip
 
-      result,content_type = get(request)
-      puts 'content_type: ' + content_type.inspect if @debug
+      puts ('request: ' + request.inspect).debug if @debug
+      result, content_type = get(request)
+      puts ('content_type: ' + content_type.inspect).debug if @debug
 
       if result then
         response = result
@@ -39,6 +48,7 @@ class AppHttp
       session.print "\r\n"
       session.print response
       session.close
+
     end
   end
 
@@ -46,6 +56,15 @@ class AppHttp
 
   def get(s)
 
+    if s == '/' then
+      
+      fp = File.join(@filepath, 'index.html')      
+      return (File.exists?(fp) ? File.read(fp) : default_index() )
+
+    end
+   
+    return [s.to_s, 'text/plain'] if s =~ /^\/\w+\.\w+/
+
     args = []
 
     if s.count('/') > 1 then
@@ -53,11 +72,12 @@ class AppHttp
       name, args = *s.split('/')[1..-1]
 
     else
-
+      puts ('s: ' + s.inspect).debug if @debug
       name, raw_params = s[/(?<=^\/).*/].split('?',2)
 
       if raw_params then
 
+        puts ('raw_params: ' + raw_params.inspect).debug if @debug
         raw_pairs = raw_params.split('&')
 
         h = raw_pairs.inject({}) do |r,x|
@@ -86,21 +106,107 @@ class AppHttp
     if @app.respond_to? name.to_sym then
 
       begin
-        r = @app.method(name.to_sym).call(*args)
+        
+        method = @app.method(name.to_sym)
+        
+        if method.arity > 0 and  args.length <= 0 then
+          r = "
+          <form action='#{name}'>
+            <input type='text' name='arg'></input>
+            <input type='submit'/>
+          </form>"
+        else
+          r = method.call(*args)
+        end
+
+        fp = File.join(@filepath, File.basename(name) + '.html')
+
+        content = if File.exists?(fp) then        
+          render_html(fp, r)
+        else
+
+          if @headings then
+            markdown = "
+# #{name.capitalize}          
+
+<output>#{r}</output>
+"
+
+            Kramdown::Document.new(markdown).to_html
+          else
+            
+            r
+          end
+
+
+        end
+
       rescue
-        r = ($!).inspect
+        content = ($!).inspect
       end
 
-      case r.class.to_s
+      case content.class.to_s
       when "String"
-        [r, 'text/plain']
+        media = content.lstrip[0] == '<' ? 'html' : 'plain'
+        [content, 'text/' + media]
       when "Hash"
-        [r.to_json,'application/json']
+        [content.to_json,'application/json']
       else
-        [r.to_s, 'text/plain']
+        [content.to_s, 'text/plain']
       end
     end
 
   end
+  
+  def default_index()
+    
+    a = (@app.public_methods - Object.public_methods).sort
+    s = a.map {|x| "* [%s](%s)" % [x,x]}.join("\n")
+
+    markdown = "
+<html>
+  <head>
+  <title>#{@app.class.to_s}</title>
+  <style>
+h1 {color: green}
+h2 {color: orange}
+div {height: 60%; overflow-y: auto; width: 200px; float: left}
+  </style>
+  </head>
+<body markdown='1'>
+
+# #{@app.class.to_s} Index
+
+## Public Methods
+
+<div markdown='1'>
+#{s}
+</div>
+<iframe name='i1'></iframe>
+<div style='clear: both' />
+<hr/>
+</body>
+</html>    
+    "    
+    #markdown = s
+    doc = Rexle.new(Kramdown::Document.new(markdown).to_html)
+    
+    doc.root.xpath('body/div/ul/li/a') do |link|
+      link.attributes[:target] = 'i1'
+    end
+    
+    [doc.xml(pretty: true), 'text/html']    
+  end
+  
+  def render_html(fp, s)
+    
+    doc = Rexle.new(File.read fp)
+    e = doc.root.element('//[@class="output"]')    
+    e.text = s
+    
+
+    doc.xml pretty: true    
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apphttp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,32 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTAzMjIzMTMxWhcN
-  MjAwOTAyMjIzMTMxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+oSh7
-  hdE7JV9vwvzzMaRIegnH2rAtqShRteD9HT+kLnCf1BA9xtiMbw7RzQ/Jjf4Yraxe
-  rv+6p6H/F7tJVU7e8Fk1iOdsWrjnmki4/CgTXRkzYCvzPfUljh8YPFTRnhEbCWQF
-  x1vlHa4JrW5YAn+oanQk0ERGIKhUpUwrhJUe9g4lv70ZsMMCda2/dF2ahZP3et3K
-  IvZhXsterFmnjmd/dj9dw0O0qID4BdHQq800Ef7tCxfUkHbKGtTOOJJAQYpDvLV5
-  Xj+QPmIPKZ04X3ahLppdh5dQnzC7RgqBRIQhFHHqbEpXBYm00e+YjqZyx5QWwoOp
-  niecdDuF9dmNez9Sh7yDTy2szFfozzBLIE0ZF4HMFHz2kAEA2JDPKLxsNOU+CdP7
-  xTmTzgywYAwWD0li/4Ue76u08m81tqRs+tj9s5ST8YMgp8WnVVeXUW0TNooomYlt
-  JhhLHREQ/eYYrEAHrLMsbrKKlb49mYasjj6LHDg9x8elpvnVlNMxBIdapEsCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUhQG1SHas
-  32352OSUufs4wfsIubAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAxMDI1MTgzMDUzWhcN
+  MjExMDI1MTgzMDUzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC5+2fd
+  4K5eB+6+qAvHIzaKzJkvA0MNAdF5FAmr6By7DzclqJ9OmNPT3s5NBdanJpdcGTrK
+  AF6tHxcV9lOu6k+0V/gOpwWtiFK/HwlVJ8SBeK7ENwefsIJm5gvW4jADFdHIppdm
+  dP6pXyimbtObR8+7Y0WPtt9oiJAnS7vkLuTpCWpqGYIWA3EK60y/JL3sLUe81X5Y
+  h4Zx5rRyJDLizG/ABi/Cs3BIzBGRd4TiNSQ+NJ0pFI5nGlWWpDVZQT2QP42JpDT6
+  laYbt0McLyOOCoorSNS2CnDfKp13Iu3i4cWhhxTMJIIlHPr8OYP5Iru4sCJSa88q
+  95h99b2Iyp8pqLlqeaj0+TDv+qbXL23A/tUbcIiBvn2yfc/V2MQeckVKuGklf8kq
+  wVIiOdrRMkgvXeoFdvTdmxFb5qXvBR2uprPIiWrpohBT5x2qwBK6yFIj0mVDiT9x
+  HX+63WBmVy1twFcS0WEo9KwBDin+y1ARAQRlsU+OkjbPK1vMkYM8eILJM0UCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOvljiW0g
+  aDf7izk6E9VwhS2VfYYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAWn71TPQhpAUPK9v5Qzy3L0EICAUqld9c1Ethx603
-  zJ82EQeX2+5MCkc4wrf+ZONogzO9wdxRshtRbom03XZ+fRM0N+nJGueevGQMIrUE
-  JbXadst7tOD60KLkhTrwAo28n09E0/gXrqcB5OvOAg+uqCuzDif3UBpZIZCPNAaf
-  jLf5KMYiSvUknSpCV8w/bS59aWtCgDjO+9subsyNODBlQaDWT2yu/plhzFRcEzx3
-  l8Oyw3F4csZEvUzQMEl4+SMgEzzQBlwHDT10gz7g5SmHAVz009ZckgG1L9aQdDx9
-  PnFaaP/XxRWmkF/elrq0JSHPet8jGAqrGaQTAGV1pPsbWwaoR+JyOZET6j7GtTbN
-  bJ+iJ3pIgiSIhTfzZ9J9RvOtWPZk2AKklX9KqF0I6JAzGgGiXehfhR1a39JBXC2S
-  T3+2ShaC/VvdBeBexhEAFVuJQhbgLRe7VGQLwJerumX7a5DpWRlBFfOCFuWl2yl/
-  NkzN8oYgB6CraruZ22EGLX8W
+  BgkqhkiG9w0BAQsFAAOCAYEAlVMbpeh8d7lpMY0Ar3/iBOJ/CLzPZxnQOO/L8hUx
+  9Y1rU3wrxbq6ZaJazal9FpH/+8TXs4Rk/sHcdYbNJ031gBQuXDnun5JVT++lRv3z
+  AcO+eEweQkY1QvQuQt8YJWM3kR/+iBZEJxZfhVKZ2LT+u7p5qy9PyDbLH3kQf4R+
+  NwTlXYUgqYMFPL6nrzu1gsXwwtjOMW7PV2G5o8zzW90rSJviq6b7h6n9qH1oCGab
+  /osxrMpUUvRl2qSw9DHHM7OgJYM0y4GaEqJxW3p4t4gTxsdBUc1sx4VxPCBWhME6
+  cEYKfr3lvkt7pd36ZrQDLh+e6bUMWosF67in6gkHqEHI+cxDs3bPjmMxO9pMDlLW
+  ET0FcDwN5GiQc5tl1FtwGt55M7s6AsLwIDGxQrxFNJwVQw0x9hfMBebLBtldy1sN
+  fhU7xyc9cI6elrvCBt5DlvbaQn1ZdmYHfPPe4BgcB7hg9ADcQubuuZJy+KvRZADs
+  h/GUx4K959hkyRunR+SmqC7C
   -----END CERTIFICATE-----
-date: 2019-09-03 00:00:00.000000000 Z
-dependencies: []
+date: 2020-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -63,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Makes it trivial to web enable a Ruby project.