Implement the fourth assignment in ruby

jfahrer · jfahrer · commit 123c3e76c832 · 2018-05-04T17:32:28.000-07:00
[refs #b7400db79a80]
diff --git a/developing/examples/webapp/ruby/app.rb b/developing/examples/webapp/ruby/app.rb
@@ -9,6 +9,33 @@
                              ENV['POSTGRES_USER'], ENV['POSTGRES_PASSWORD'])
   sql = "INSERT INTO requests (ip, path, host, requested_at) VALUES ($1, $2, $3, $4)"
   res  = conn.exec(sql, [request.ip, '/', Socket.gethostname, Time.now])
+
+  sql = "SELECT ip, path, host, requested_at FROM requests ORDER BY id DESC LIMIT 25;"
+  res  = conn.exec(sql)
+
   conn.finish
-  'Hello, World!'
+
+  requests_table = res.map do |row|
+    values = row.map do |column|
+      "<td>#{column[1]}</td>"
+    end.join('')
+    "<tr>#{values}</tr>"
+  end.join('')
+
+  <<-BODY
+    <html>
+      <body>
+        <h1>The requests</h1>
+        <table style="width: 100%;" border="1">
+          <tr>
+            <th>IP</th>
+            <th>Path</th>
+            <th>Container</th>
+            <th>Timestamp</th>
+          </tr>
+          #{requests_table}
+        </table>
+      </body>
+    </html>
+  BODY
 end
diff --git a/developing/examples/webapp/ruby/docker-compose.yml b/developing/examples/webapp/ruby/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   app:
-    image: jfahrer/webapp-ruby:v3
+    image: jfahrer/webapp-ruby:v4
     build:
       context: .
     environment:
