Merge branch 'rails' into prosemirror

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

Dockerfile

@@ -9,7 +9,6 @@ MAINTAINER "f <f@sutty.nl>"
 ARG RAILS_MASTER_KEY
 
 # Un entorno base
-ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1
 ENV SECRET_KEY_BASE solo_es_necesaria_para_correr_rake
 ENV RAILS_ENV production
 ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY
@@ -17,6 +16,8 @@ ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY
 RUN apk add --no-cache libxslt libxml2 tzdata ruby ruby-bundler ruby-json ruby-bigdecimal ruby-rake
 RUN apk add --no-cache postgresql-libs git yarn brotli libssh2 python
 
+RUN test "2.6.6" = `ruby -e 'puts RUBY_VERSION'`
+
 # https://github.com/rubygems/rubygems/issues/2918
 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808
 COPY ./rubygems-platform-musl.patch /tmp/
@@ -78,7 +79,7 @@ RUN apk add --no-cache libxslt libxml2 tzdata ruby ruby-bundler ruby-json ruby-b
 RUN apk add --no-cache postgresql-libs libssh2 file rsync git jpegoptim vips
 
 # Chequear que la versión de ruby sea la correcta
-RUN test "2.6.5" = `ruby -e 'puts RUBY_VERSION'`
+RUN test "2.6.6" = `ruby -e 'puts RUBY_VERSION'`
 
 # https://github.com/rubygems/rubygems/issues/2918
 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808

Gemfile

@@ -15,7 +15,7 @@ git_source(:github) do |repo_name|
 end
 
 # Cambiar en Dockerfile también
-ruby '2.6.5'
+ruby '2.6.6'
 
 gem 'dotenv-rails', require: 'dotenv/rails-now'
 
@@ -77,23 +77,20 @@ group :themes do
 end
 
 group :development, :test do
+  gem 'derailed_benchmarks'
   gem 'pry'
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '~> 2.13'
   gem 'selenium-webdriver'
   gem 'sqlite3'
+  gem 'stackprof'
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %>
-  # anywhere in the code.
-  gem 'bcrypt_pbkdf'
   gem 'brakeman'
-  gem 'ed25519'
   gem 'haml-lint', require: false
   gem 'letter_opener'
   gem 'listen', '>= 3.0.5', '< 3.2'
-  gem 'rbnacl', '< 5.0'
   gem 'rubocop-rails'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'

Gemfile.lock

@@ -77,7 +77,7 @@ GEM
     autoprefixer-rails (9.7.4)
       execjs
     bcrypt (3.1.13)
-    bcrypt_pbkdf (1.0.1)
+    benchmark-ips (2.7.2)
     bindex (0.8.1)
     blazer (2.2.1)
       activerecord (>= 5)
@@ -106,6 +106,15 @@ GEM
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     database_cleaner (1.8.3)
+    derailed_benchmarks (1.6.0)
+      benchmark-ips (~> 2)
+      get_process_mem (~> 0)
+      heapy (~> 0)
+      memory_profiler (~> 0)
+      rack (>= 1)
+      rake (> 10, < 14)
+      ruby-statistics (>= 2.1)
+      thor (>= 0.19, < 2)
     devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -121,7 +130,6 @@ GEM
     dotenv-rails (2.7.5)
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
-    ed25519 (1.2.4)
     editorial-autogestiva-jekyll-theme (0.2.2)
       jekyll (~> 4.0)
       jekyll-data (~> 1.1)
@@ -153,6 +161,8 @@ GEM
     forwardable-extended (2.6.0)
     friendly_id (5.3.0)
       activerecord (>= 4.0.0)
+    get_process_mem (0.2.5)
+      ffi (~> 1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.1.2)
@@ -174,6 +184,7 @@ GEM
       activesupport (>= 4.0.1)
       hamlit (>= 1.2.0)
       railties (>= 4.0.1)
+    heapy (0.1.4)
     hiredis (0.6.3)
     http_parser.rb (0.6.0)
     i18n (1.8.2)
@@ -237,6 +248,7 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    memory_profiler (0.9.14)
     mercenary (0.3.6)
     method_source (0.9.2)
     mimemagic (0.3.4)
@@ -266,7 +278,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     puma (4.3.3)
       nio4r (~> 2.0)
     pundit (2.1.0)
@@ -312,8 +324,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbnacl (4.0.2)
-      ffi
     redis (4.1.3)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
@@ -353,6 +363,7 @@ GEM
       i18n
     ruby-filemagic (0.7.2)
     ruby-progressbar (1.10.1)
+    ruby-statistics (2.1.2)
     ruby-vips (2.0.17)
       ffi (~> 1.9)
     ruby_dep (1.5.0)
@@ -386,9 +397,10 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
+    stackprof (0.2.15)
     sucker_punch (2.1.2)
       concurrent-ruby (~> 1.0)
-    sutty-jekyll-theme (0.1.0)
+    sutty-jekyll-theme (0.1.2)
       jekyll (~> 4.0)
       jekyll-feed (~> 0.9)
       jekyll-images (~> 0.2)
@@ -440,18 +452,17 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
-  bcrypt_pbkdf
   blazer
   bootstrap (~> 4)
   brakeman
   capybara (~> 2.13)
   commonmarker
   database_cleaner
+  derailed_benchmarks
   devise
   devise-i18n
   devise_invitable
   dotenv-rails
-  ed25519
   editorial-autogestiva-jekyll-theme
   email_address
   exception_notification
@@ -477,7 +488,6 @@ DEPENDENCIES
   rails (~> 6)
   rails-i18n
   rails_warden
-  rbnacl (< 5.0)
   redis
   redis-rails
   rubocop-rails
@@ -488,6 +498,7 @@ DEPENDENCIES
   spring
   spring-watcher-listen (~> 2.0.0)
   sqlite3
+  stackprof
   sucker_punch
   sutty-jekyll-theme
   terminal-table
@@ -500,7 +511,7 @@ DEPENDENCIES
   yaml_db!
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 2.6.6p146
 
 BUNDLED WITH
    2.1.4

app/jobs/deploy_job.rb

@@ -45,7 +45,7 @@ class DeployJob < ApplicationJob
   end
 
   def notify_usuaries
-    @site.roles.where(rol: 'usuarie', temporal: false).pluck(:usuaries_id).each do |usuarie|
+    @site.roles.where(rol: 'usuarie', temporal: false).pluck(:usuarie_id).each do |usuarie|
       DeployMailer.with(usuarie: usuarie, site: @site.id)
                   .deployed(@deployed)
                   .deliver_now

app/views/posts/_form.haml

@@ -19,7 +19,7 @@
   -# Botones de guardado
   = render 'posts/submit', site: site, post: post
 
-  = hidden_field_tag 'post[layout]', params[:layout] || 'post'
+  = hidden_field_tag 'post[layout]', post.layout.name
 
   -# Dibuja cada atributo
   - post.attributes.each do |attribute|

app/views/posts/index.haml

@@ -52,7 +52,7 @@
                     value: @posts.length - i, class: 'reorder'
                 %td
                   %small
-                    = link_to post.layout.name.to_s.humanize,
+                    = link_to @site.i18n.dig('layouts', post.layout.name.to_s) || post.layout.name.to_s.humanize,
                       site_posts_path(@site, layout: post.layout.name)
                   %br/
                   = link_to post.title.value,