lato 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97957e5c077e1eb2c5fc2f543ccd910e3c9e20c31a032f1caddf6d8f367f65d5
-  data.tar.gz: ff14d933bc169b717bc6383b384f5b88454d5d74149b3c2c8d35843f0d9e2c3b
+  metadata.gz: a06ea7d40cf529ec24e928cb3ad0ae2b897e4db4af3287526f8f3889e122e79f
+  data.tar.gz: 9fb8d0fd297e86acd19e70f9e26a41b1a4d032fec68895920d972e968147cc08
 SHA512:
-  metadata.gz: 3f07d0df90a8c54f90eb3f8a12410a4d226710eaaaca16a63a0a9329dee6fb09e13e2abf8258555a4f45abeffc914328f5aec8c70aacb7778e70b34cd2f8e43d
-  data.tar.gz: bcc45846cac8cf85cbe29cb2ffc5f7b90602148ab3a25f805d9d9f3414a2d6b6cce94167f57509d5e146d6df2887f7462e76bf3a0cbdcd75c71e837286e9814c
+  metadata.gz: 5ff61a9b5da01fc2f86e083a524ec9fa2f8d823632efd9a2d965a332130be08167940dbb8897661515d0416c2c9ed15a2392028d6ca6126e5dd978a3dc173f78
+  data.tar.gz: 6bc388648360531a63712342f708e25506b67313ef15a52b96b18405f9c7d076c552a305a6b8816a16fb93842343e0593a6b26efafb0bf8a1c1be8a21d8b5e2d

data/README.md

@@ -9,15 +9,11 @@ Add required dependencies to your application's Gemfile:
 gem "importmap-rails" # NOTE: Probably already installed in default rails 7 project
 
 # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
-gem "turbo-rails"
+gem "turbo-rails" # NOTE: Probably already installed in default rails 7 project
 
 # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
 gem "stimulus-rails" # NOTE: Probably already installed in default rails 7 project
 
-# Use Kredis as Redis interface [https://github.com/rails/kredis]
-# NOTE: Installation -> https://github.com/rails/kredis#installation
-gem "kredis"
-
 # Use Sass to process CSS
 gem "sassc-rails"
 
@@ -73,9 +69,19 @@ end
 
 ```
 
-## Development
+### Extra tasks
+Lato integrates by default a basic PWAs manifest and service worker. To re-generate them with all required assets follow these steps:
 
-Be sure to have Redis locally installed and running.
+1. Complete the configuration of lato on a custom initializer (see [configuration](https://github.com/lato-gam/lato/blob/main/lib/lato/config.rb) options for more details)
+2. Add an icon.png file on **public/icon.png** with minimum size of 512x512px
+3. Run the following commands:
+
+```bash
+$ rails lato:generate:favicon
+$ rails lato:generate:pwa
+```
+
+## Development
 
 Clone repository, install dependencies, run migrations and start:
 

data/app/assets/javascripts/lato/application.js

@@ -5,6 +5,20 @@ import "bootstrap"
 // Import controllers (stimulus rails)
 import "controllers"
 
+/**
+ * Include service worker
+ */
+
+if (navigator.serviceWorker) {
+  navigator.serviceWorker.register("/service-worker.js", { scope: "/" })
+  .then(() => navigator.serviceWorker.ready)
+  .then((registration) => {
+    const event = new CustomEvent("service-worker:ready", { detail: registration })
+    document.dispatchEvent(event)
+  })
+  .then(() => console.log("[App]", "Service worker registered! -> listen to 'service-worker:ready' document event to get the registration object"))
+}
+
 /**
  * Fix form inside turbo-frame tag with redirect
  * https://github.com/hotwired/turbo-rails/issues/440
@@ -22,15 +36,11 @@ document.addEventListener("turbo:frame-missing", event => {
 const PAGE_TRANSITION_TIME = 50
 
 document.addEventListener('DOMContentLoaded', () => {
-  console.log('DOMContentLoaded')
-
   // add is-loaded class
   document.body.classList.add('is-loaded')
 })
 
 document.addEventListener('turbo:load', () => {
-  console.log('turbo:load')
-
   setTimeout(() => {
     // add is-loaded class
     document.body.classList.add('is-loaded')

data/app/models/lato/invitation.rb

@@ -2,11 +2,6 @@ module Lato
   class Invitation < ApplicationRecord
     attr_accessor :actions
 
-    # Kredis
-    ##
-
-    kredis_boolean :email_invite_semaphore, expires_in: 2.minutes
-
     # Validations
     ##
 
@@ -64,7 +59,7 @@ module Lato
         return false
       end
 
-      if email_invite_semaphore.value
+      if c_email_invite_semaphore
         errors.add(:base, :email_sending_limit)
         return false
       end
@@ -75,9 +70,21 @@ module Lato
         return false
       end
 
-      email_invite_semaphore.value = true
+      c_email_invite_semaphore(true)
 
       true
     end
+
+
+    # Cache
+    ##
+
+    def c_email_invite_semaphore(value = nil)
+      cache_key = "Lato::Invitation/c_email_invite_semaphore/#{id}"
+      return Rails.cache.read(cache_key) if value.nil?
+
+      Rails.cache.write(cache_key, value, expires_in: 2.minutes)
+      value
+    end
   end
 end

data/app/models/lato/user.rb

@@ -4,13 +4,6 @@ module Lato
 
     has_secure_password
 
-    # Kredis
-    ##
-
-    kredis_boolean :email_verification_semaphore, expires_in: 2.minutes
-    kredis_string :email_verification_code, expires_in: 30.minutes
-    kredis_string :password_update_code, expires_in: 30.minutes
-
     # Validations
     ##
 
@@ -113,7 +106,7 @@ module Lato
     end
 
     def request_verify_email
-      if email_verification_semaphore.value
+      if c_email_verification_semaphore
         errors.add(:base, :email_verification_limit)
         return
       end
@@ -125,25 +118,27 @@ module Lato
         return
       end
 
-      email_verification_code.value = code
-      email_verification_semaphore.value = true
+      c_email_verification_code(code)
+      c_email_verification_semaphore(true)
 
       true
     end
 
     def verify_email(params)
-      unless email_verification_code.value
+      email_verification_code = c_email_verification_code
+
+      if email_verification_code.blank?
         errors.add(:base, :email_verification_code_expired)
         return
       end
 
-      unless email_verification_code.value == params[:code]
+      unless email_verification_code == params[:code]
         errors.add(:base, :email_verification_code_invalid)
         return
       end
 
-      email_verification_code.value = nil
-      email_verification_semaphore.value = nil
+      c_email_verification_code('')
+      c_email_verification_semaphore(false)
 
       update_column(:email_verified_at, Time.now)
       true
@@ -166,23 +161,25 @@ module Lato
       self.id = user.id
       reload
 
-      password_update_code.value = code
+      c_password_update_code(code)
 
       true
     end
 
     def update_password(params)
-      unless password_update_code.value
+      password_update_code = c_password_update_code
+
+      if password_update_code.blank?
         errors.add(:base, :password_update_code_expired)
         return
       end
 
-      unless password_update_code.value == params[:code]
+      unless password_update_code == params[:code]
         errors.add(:base, :password_update_code_invalid)
         return
       end
 
-      password_update_code.value = nil
+      c_password_update_code('')
 
       update(params.permit(:password, :password_confirmation))
     end
@@ -230,5 +227,32 @@ module Lato
         true
       end
     end
+
+    # Cache
+    ##
+
+    def c_email_verification_semaphore(value = nil)
+      cache_key = "Lato::User/c_email_verification_semaphore/#{id}"
+      return Rails.cache.read(cache_key) if value.nil?
+
+      Rails.cache.write(cache_key, value, expires_in: 2.minutes)
+      value
+    end
+
+    def c_email_verification_code(value = nil)
+      cache_key = "Lato::User/c_email_verification_code/#{id}"
+      return Rails.cache.read(cache_key) if value.nil?
+
+      Rails.cache.write(cache_key, value, expires_in: 30.minutes)
+      value
+    end
+
+    def c_password_update_code(value = nil)
+      cache_key = "Lato::User/c_password_update_code/#{id}"
+      return Rails.cache.read(cache_key) if value.nil?
+
+      Rails.cache.write(cache_key, value, expires_in: 30.minutes)
+      value
+    end
   end
 end

data/app/views/layouts/lato/_head_content.html.erb

@@ -1 +1,13 @@
+<meta name="application-name" content="<%= Lato.config.application_title %>">
+<meta name="theme-color" content="<%= Lato.config.application_brand_color %>">
+<meta name="full-screen" content="yes">
+<meta name="browsermode" content="application">
+<meta name="screen-orientation" content="portrait">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<meta name="apple-mobile-web-app-title" content="<%= Lato.config.application_title %>">
+
+<link rel="icon" href="/favicon.ico">
+<link rel="manifest" href="/manifest.json">
+
 <!-- Free for head tags -->

data/lib/lato/config.rb

@@ -4,7 +4,7 @@ module Lato
   ##
   class Config
     # Applicaction configs
-    attr_accessor :application_title, :application_version, :application_company_name, :application_company_url
+    attr_accessor :application_title, :application_version, :application_company_name, :application_company_url, :application_brand_color
 
     # Session configs
     attr_accessor :session_lifetime, :session_root_path
@@ -26,6 +26,7 @@ module Lato
       @application_version = '1.0.0'
       @application_company_name = 'Lato Team'
       @application_company_url = 'https://github.com/Lato-GAM'
+      @application_brand_color = '#03256c'
 
       @auth_disable_signup = false
       @auth_disable_recover_password = false

data/lib/lato/version.rb

@@ -1,3 +1,3 @@
 module Lato
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/tasks/lato_tasks.rake

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'json'
 
 namespace :lato do
   namespace :install do
@@ -33,6 +34,145 @@ namespace :lato do
       gem_concern_path = Lato::Engine.root.join('app', 'models', 'concerns', 'lato_user_application.rb').to_s
       app_concern_path = Rails.root.join('app', 'models', 'concerns', 'lato_user_application.rb').to_s
       FileUtils.copy(gem_concern_path, app_concern_path) unless File.exist? app_concern_path
+
+      # Generate sample manifest.json file in public folder
+      ##
+
+      manifest_path = Rails.root.join('public', 'manifest.json')
+      unless File.exist? manifest_path
+        manifest = {
+          name: "Application",
+          short_name: "Application",
+          start_url: "/",
+          scope: "/",
+          display: "standalone",
+          orientation: "portrait",
+          theme_color: "#000000",
+          background_color: "#000000",
+          icons: []
+        }
+        File.open(manifest_path, 'w') { |f| f.write(JSON.pretty_generate(manifest)) }
+      end
+
+      # Generate sample service-worker.js file in public folder
+      ##
+
+      service_worker_path = Rails.root.join('public', 'service-worker.js')
+      unless File.exist? service_worker_path
+        service_worker = <<-JS
+function onInstall(event) {
+  console.log('[Serviceworker]', "Installing!", event);
+}
+function onActivate(event) {
+  console.log('[Serviceworker]', "Activating!", event);
+}
+function onFetch(event) {
+  console.log('[Serviceworker]', "Fetching!", event);
+}
+self.addEventListener('install', onInstall);
+self.addEventListener('activate', onActivate);
+self.addEventListener('fetch', onFetch);
+        JS
+        File.open(service_worker_path, 'w') { |f| f.write(service_worker) }
+      end
+    end
+  end
+
+  namespace :generate do
+    desc "Generate PWA icons from a single icon.png file (512x512) that should be placed inside 'public' folder"
+    # Usage: rails lato:generate:pwa
+    task :pwa do
+      # check if icon.png exists
+      icon_path = Rails.root.join('public', 'icon.png')
+      unless File.exist? icon_path
+        puts 'ERROR: icon.png file not found inside public folder'
+        return
+      end
+
+      # check MiniMagick is installed
+      begin
+        require 'mini_magick'
+      rescue LoadError
+        puts 'ERROR: mini_magick gem not found, please add it to your Gemfile'
+        return
+      end
+
+      # be sure icon.png is min 512x512
+      image = MiniMagick::Image.open(icon_path)
+      if image.width < 512 || image.height < 512 || image.width != image.height
+        puts 'ERROR: icon.png image size is not valid, it should be square and min 512x512'
+        return
+      end
+
+      # create icons folder if not exists
+      icons_path = Rails.root.join('public', 'icons')
+      FileUtils.mkdir_p(icons_path) unless File.exist? icons_path
+
+      # create icons
+      sizes = [16, 32, 48, 72, 96, 144, 152, 192, 384, 512]
+      sizes.each do |size|
+        file_path = "#{icons_path}/icon_#{size}x#{size}.png"
+        file_image = MiniMagick::Image.open(icon_path)
+        FileUtils.rm(file_path) if File.exist? file_path
+        file_image.resize "#{size}x#{size}"
+        file_image.write file_path
+      end
+
+      # create manifest.json
+      manifest_path = Rails.root.join('public', 'manifest.json')
+      manifest = {
+        name: Lato.config.application_title,
+        short_name: Lato.config.application_title,
+        start_url: '/',
+        scope: '/',
+        display: 'standalone',
+        orientation: 'portrait',
+        theme_color: Lato.config.application_brand_color,
+        background_color: Lato.config.application_brand_color,
+        icons: []
+      }
+      sizes.each do |size|
+        manifest[:icons] << {
+          src: "/icons/icon_#{size}x#{size}.png",
+          sizes: "#{size}x#{size}",
+          type: 'image/png'
+        }
+      end
+      FileUtils.rm(manifest_path) if File.exist? manifest_path
+      File.open(manifest_path, 'w') { |f| f.write(JSON.pretty_generate(manifest)) }
+    end
+
+    desc "Generate favicon.ico from a single icon.png file (512x512) that should be placed inside 'public' folder"
+    # Usage: rails lato:generate:favicon
+    task :favicon do
+      # check if icon.png exists
+      icon_path = Rails.root.join('public', 'icon.png')
+      unless File.exist? icon_path
+        puts 'ERROR: icon.png file not found inside public folder'
+        return
+      end
+
+      # check MiniMagick is installed
+      begin
+        require 'mini_magick'
+      rescue LoadError
+        puts 'ERROR: mini_magick gem not found, please add it to your Gemfile'
+        return
+      end
+
+      # be sure icon.png is min 512x512
+      image = MiniMagick::Image.open(icon_path)
+      if image.width < 512 || image.height < 512 || image.width != image.height
+        puts 'ERROR: icon.png image size is not valid, it should be square and min 512x512'
+        return
+      end
+
+      # create favicon.ico
+      file_path = Rails.root.join('public', 'favicon.ico')
+      file_image = MiniMagick::Image.open(icon_path)
+      FileUtils.rm(file_path) if File.exist? file_path
+      file_image.resize '48x48'
+      file_image.write file_path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lato
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gregorio Galante
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails