1 year ago · b669efdbd0
--- a/frameworks/Ruby/sinatra-sequel/Gemfile
+++ b/frameworks/Ruby/sinatra-sequel/Gemfile
@@ -5,7 +5,6 @@ gem 'passenger', '~> 6.0', :platforms=>[:ruby, :mswin], :require=>false
 
				 gem 'puma', '~> 6.4', :require=>false
			
 
				 gem 'sequel', '~> 5.0'
			
 
				 gem 'sinatra', '~> 3.0', :require=>'sinatra/base'
			
 
				-gem 'slim', '~> 3.0'
			
 
				 gem 'unicorn', '~> 6.1', :platforms=>[:ruby, :mswin], :require=>false
			
 
				 
			
 
				 group :mysql do
			
--- a/frameworks/Ruby/sinatra-sequel/hello_world.rb
+++ b/frameworks/Ruby/sinatra-sequel/hello_world.rb
@@ -1,8 +1,5 @@
 
				 # frozen_string_literal: true
			
 
				 
			
 
				-# Configure Slim templating engine
			
 
				-Slim::Engine.set_options :format=>:html, :sort_attrs=>false
			
 
				-
			
 
				 # Our Rack application to be executed by rackup
			
 
				 class HelloWorld < Sinatra::Base
			
 
				   configure do
			
@@ -73,7 +70,7 @@ class HelloWorld < Sinatra::Base
 
				     )
			
 
				     @fortunes.sort_by!(&:message)
			
 
				 
			
 
				-    slim :fortunes
			
 
				+    erb :fortunes, :layout=>true
			
 
				   end
			
 
				 
			
 
				   # Test type 5: Database updates
			
--- a/frameworks/Ruby/sinatra-sequel/views/fortunes.erb
+++ b/frameworks/Ruby/sinatra-sequel/views/fortunes.erb
@@ -0,0 +1,12 @@
 
				+<table>
			
 
				+<tr>
			
 
				+  <th>id</th>
			
 
				+  <th>message</th>
			
 
				+</tr>
			
 
				+<% @fortunes.each do |fortune| %>
			
 
				+<tr>
			
 
				+  <td><%= fortune.id %></td>
			
 
				+  <td><%= Rack::Utils.escape_html(fortune.message) %></td>
			
 
				+</tr>
			
 
				+<% end %>
			
 
				+</table>
			
--- a/frameworks/Ruby/sinatra-sequel/views/fortunes.slim
+++ b/frameworks/Ruby/sinatra-sequel/views/fortunes.slim
@@ -1,8 +0,0 @@
 
				-table
			
 
				-  tr
			
 
				-    th id
			
 
				-    th message
			
 
				-  - for fortune in @fortunes
			
 
				-    tr
			
 
				-      td =fortune.id
			
 
				-      td =fortune.message
			
--- a/frameworks/Ruby/sinatra-sequel/views/layout.erb
+++ b/frameworks/Ruby/sinatra-sequel/views/layout.erb
@@ -0,0 +1,11 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+  <title>Fortunes</title>
			
 
				+</head>
			
 
				+
			
 
				+<body>
			
 
				+<%= yield %>
			
 
				+</body>
			
 
				+
			
 
				+</html>
			
--- a/frameworks/Ruby/sinatra-sequel/views/layout.slim
+++ b/frameworks/Ruby/sinatra-sequel/views/layout.slim
@@ -1,6 +0,0 @@
 
				-doctype html
			
 
				-html
			
 
				-  head
			
 
				-    title Fortunes
			
 
				-  body
			
 
				-    == yield