feat: ContentFor & YieldContent

Author: Olivier Bonnaure

.lua/arango_model.lua

@@ -6,7 +6,7 @@ function ArangoModel.new(data)
   self.filters = {}
   self.bindvars = {}
   self.sort = "doc._id ASC"
-  self.data = data
+  self.data = data or {}
   self.var_index = 0
   self.global_callbacks = {
     before_create = { "run_before_create_callback" },
@@ -198,7 +198,7 @@ function ArangoModel:validates_each(data)
         local default_error = I18n:t("models.errors.presence")
         if v == true then v = { message = default_error } end
         if v.message == nil then v.message = default_error end
-        if value == nil then
+        if value == nil or value == "" then
           self.errors = table.append(self.errors, {{ field = field, message = v.message }})
         end
       end
@@ -397,7 +397,7 @@ end
 -- collection
 
 function ArangoModel:create(data)
-  assert(self.data == nil, "create not allowed here")
+  assert(self.data._id == nil, "create not allowed here")
   local callbacks = table.append(self.global_callbacks.before_create, self.callbacks.before_create)
   for _, methodName in pairs(callbacks) do data = self[methodName](data) end
 
@@ -407,6 +407,8 @@ function ArangoModel:create(data)
     self.data = Adb.primary:CreateDocument(self.COLLECTION, data, "returnNew=true")["new"]
     callbacks = table.append(self.global_callbacks.after_create, self.callbacks.after_create)
     for _, methodName in pairs(callbacks) do self[methodName](self)  end
+  else
+    self.data = data
   end
   return self
 end

.lua/luaonbeans.lua

@@ -6,6 +6,8 @@ PGRest = {}
 Rest = {}
 Surreal = {}
 
+Blocks = {}
+
 function LoadViewsRecursively(path)
 	local dir = unix.opendir(path)
 	assert(dir ~= nil, "Error while opening path " .. path)
@@ -101,6 +103,22 @@ function Partial(partial, bindVars)
 	return Views["app/views/partials/" .. partial .. ".html.etlua"](bindVars)
 end
 
+---Helper method ContentFor
+---@param tag string name of the content
+---@param fn function the function to be executed
+---@return nil
+function ContentFor(tag, block)
+  Blocks[tag] = Blocks[tag] or {}
+  table.insert(Blocks[tag], block())
+end
+
+---Helper method YieldContent
+---@param tag string name of the content
+---@return string content
+function YieldContent(tag)
+  return table.concat(Blocks[tag], "\n")
+end
+
 local function assignRoute(method, name, options, value)
 	local path = string.split(name, "/")
 	Routes[method] = Routes[method] or {}
@@ -351,12 +369,13 @@ end
 
 function GetBodyParams()
 	local body_Params = {}
-	for i, data in pairs(Params) do
-		if type(data) == "table" then
+	for _, data in pairs(Params) do
+		if type(data) == "table" and #data > 1 then
 			body_Params[data[1]] = data[2]
 		end
 	end
 
+	Params = table.merge(Params, body_Params)
 	return body_Params
 end
 
@@ -404,14 +423,14 @@ function InitDB(db_config)
 			sqlite:exec([[PRAGMA journal_mode=WAL]])
 			sqlite:exec([[PRAGMA synchronous=NORMAL]])
 			sqlite:exec([[
-        CREATE TABLE IF NOT EXISTS "migrations"
-        (
-          id integer PRIMARY KEY,
-          filename VARCHAR
-        );
-
-        CREATE UNIQUE INDEX idx_migrations_filename ON migrations (filename);
-      ]])
+				CREATE TABLE IF NOT EXISTS "migrations"
+				(
+					id integer PRIMARY KEY,
+					filename VARCHAR
+				);
+
+				CREATE UNIQUE INDEX idx_migrations_filename ON migrations (filename);
+			]])
 		elseif config.engine == "surrealdb" then
 			local _Surreal = require("db.surrealdb")
 			Surreal[config.name] = _Surreal.new(config)
@@ -459,7 +478,10 @@ function LoadPublicAssetsRecursively(path)
 end
 
 RunCommand = function(command)
-	command = string.split(command)
+	if type(command) == "string" then
+		command = string.split(command)
+	end
+
 	local prog = assert(Unix.commandv(command[1]))
 
 	local output = ""
@@ -530,3 +552,39 @@ function RefreshPageForDevMode()
 	end
 end
 
+-- View form errors
+local function ExtractModelError(inputTable, allowedField)
+	local messages = {}
+
+	-- Collect messages for the allowed field
+	for _, v in ipairs(inputTable) do
+		if v.field == allowedField then
+			table.insert(messages, v.message)
+		end
+	end
+
+	return messages
+end
+
+local function DisplayErrorFor(model_errors, field, style)
+	style = style or "color:red"
+	local errors = ExtractModelError(model_errors, field)
+	if #errors > 0 then
+		for _, error in pairs(errors) do
+			return [[<div style="%s">%s</div>]] % { style, error }
+		end
+	else
+		return ""
+	end
+end
+
+function TextField(name, field, model, options)
+	options = options or {}
+	local value = options.novalue == true and "" or model.data[field]
+	local required = options.required == true and "required" or ""
+
+	return [[
+	<label class="font-bold" for="firstname">%s</label>
+	<input type="text" name="%s" value="%s" %s />%s
+	]] % { name, field, value or "", required, DisplayErrorFor(model.errors, field, options.error_style) }
+end

.lua/utilities/csrf.lua

@@ -1,26 +1,21 @@
-CSRFToken = EncodeBase64(GetRandomBytes(64))
-
 CheckCSRFToken = function()
   if GetMethod() == "POST" then
     local crypted_token = EncodeBase64(GetCryptoHash("SHA256", GetBodyParams()["authenticity_token"], ENV['SECRET_KEY']))
-    print(GetBodyParams()["authenticity_token"],crypted_token, GetCookie("_authenticity_token"))
-    assert(crypted_token == GetCookie("_authenticity_token"))
+    assert(crypted_token == GetCookie("_authenticity_token"), "Bad authenticity_token")
   end
 end
 
 AuthenticityTokenTag = function()
-  if GetCookie("_authenticity_token") == nil then
-    CSRFToken = EncodeBase64(GetRandomBytes(64))
-    print(CSRFToken, EncodeBase64(GetCryptoHash("SHA256", CSRFToken, ENV['SECRET_KEY'])))
-    SetCookie(
-      "_authenticity_token",
-      EncodeBase64(GetCryptoHash("SHA256", CSRFToken, ENV['SECRET_KEY'])),
-      {
-        HttpOnly = true,
-        MaxAge = 60 * 30,
-        SameSite = "Strict"
-      } -- available for 30 minutes
-    )
-  end
+  local CSRFToken = EncodeBase64(GetRandomBytes(64))
+  SetCookie(
+    "_authenticity_token",
+    EncodeBase64(GetCryptoHash("SHA256", CSRFToken, ENV['SECRET_KEY'])),
+    {
+      HttpOnly = true,
+      MaxAge = 60 * 30,
+      SameSite = "Strict",
+      Path="/"
+    } -- available for 30 minutes
+  )
   return '<input type="hidden" name="authenticity_token" value="' .. CSRFToken .. '" />'
 end

app/controllers/welcome_controller.lua

@@ -21,8 +21,8 @@ local app = {
 
     -- Add a page (default A4 size)
     pdf:addPage()
-    --pdf:addCustomFont("fonts/Helvetica.ttf", "helvetica", "normal")
-    --pdf:addCustomFont("fonts/Helvetica-Bold.ttf", "helvetica", "bold")
+    pdf:addCustomFont("fonts/Helvetica.ttf", "helvetica", "normal")
+    pdf:addCustomFont("fonts/Helvetica-Bold.ttf", "helvetica", "bold")
     pdf:addCustomFont("fonts/TitilliumWeb-Regular.ttf", "titillium", "normal")
     pdf:addCustomFont("fonts/TitilliumWeb-Bold.ttf", "titillium", "bold")
 
@@ -31,6 +31,8 @@ local app = {
 
     pdf:moveY(10)
 
+    --pdf:useFont("helveltica")
+
     -- Add some text
     pdf:addParagraph([[
       Morbi ultrices pharetra risus sed pellentesque. Integer id semper erat. Duis lobortis mollis erat, id commodo orci lobortis ut. Sed laoreet libero sed lorem sagittis, et lacinia arcu efficitur. Curabitur eu scelerisque elit. Aenean enim turpis, congue nec ipsum non, dapibus laoreet ex. Cras viverra congue tortor vitae rutrum.

beans.lua

@@ -99,7 +99,7 @@ CreateModel = function(model_name)
   print("✅ specs/models/" .. words.singular .. "_spec.lua created")
 end
 
-if arg[1] == "create" then
+if arg[1] == "create" or arg[1] == "g" then
   if arg[2] == "migration" then
     CreateMigration(arg[3])
   end
@@ -153,7 +153,7 @@ SetupArangoDB = function(env)
 end
 
 if arg[1] == "db:setup" then
-  if DBConfig["engine"] == "arangodb" then
+  if DBConfig[BeansEnv][1]["engine"] == "arangodb" then
     SetupArangoDB(BeansEnv)
   end
 end
@@ -205,16 +205,18 @@ Sqlite_DBMigrate = function()
 end
 
 if arg[1] == "db:migrate" then
-  if DBConfig["engine"] == "arangodb" then
+  if DBConfig[BeansEnv][1]["engine"] == "arangodb" then
+    SetupArangoDB(BeansEnv)
     ArangoDB_DBMigrate()
-  elseif DBConfig["engine"] == "sqlite" then
+  elseif DBConfig[BeansEnv][1]["engine"] == "sqlite" then
     Sqlite_DBMigrate()
   end
 end
 
 if arg[1] == "db:rollback" then
-  if DBConfig["engine"] == "arangodb" then
-    local latest_version = Adb.primary.Aql("FOR m IN migrations SORT TO_NUMBER(m._key) DESC LIMIT 1 RETURN m").result[1]
+  if DBConfig[BeansEnv][1]["engine"] == "arangodb" then
+    SetupArangoDB(BeansEnv)
+    local latest_version = Adb.primary:Aql("FOR m IN migrations SORT TO_NUMBER(m._key) DESC LIMIT 1 RETURN m").result[1]
     if latest_version.filename ~= "0" then
       print("Processing " .. latest_version.filename)
       local migration = require(string.gsub(latest_version.filename, ".lua", ""))
@@ -224,7 +226,7 @@ if arg[1] == "db:rollback" then
     else
       print("Nothing to rollback!")
     end
-  elseif DBConfig["engine"] == "sqlite" then
+  elseif DBConfig[BeansEnv][1]["engine"] == "sqlite" then
     local sqlite3 = require "lsqlite3"
     local db = sqlite3.open(DBConfig[BeansEnv]["db_name"] .. ".sqlite3")
     local latest_version = ""