From 0bd8a2243e88db85da363ad2101056c9361aeec2 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 11 Aug 2021 10:25:05 -0300
Subject: [PATCH 01/24] Solo permitir URLs web al sanitizar

fixes #2382
---
 app/models/metadata_content.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_content.rb b/app/models/metadata_content.rb
index 437a0dd9..9d3a1040 100644
--- a/app/models/metadata_content.rb
+++ b/app/models/metadata_content.rb
@@ -56,7 +56,7 @@ class MetadataContent < MetadataTemplate
         uri = URI element['src']
 
         # No permitimos recursos externos
-        element.remove unless uri.hostname.end_with? Site.domain
+        element.remove unless uri.scheme == 'https' && uri.hostname.end_with?(Site.domain)
       rescue URI::Error
         element.remove
       end

From 1623ab73dea22fbc63abf759245627926b2a5b63 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 11 Sep 2021 17:00:28 -0300
Subject: [PATCH 02/24] Soportar un campo con una lista de valores predefinidos
 y elegir uno

---
 app/models/metadata_predefined_value.rb       | 24 +++++++++++++++++++
 .../posts/attribute_ro/_predefined_value.haml |  3 +++
 .../posts/attributes/_predefined_value.haml   |  7 ++++++
 3 files changed, 34 insertions(+)
 create mode 100644 app/models/metadata_predefined_value.rb
 create mode 100644 app/views/posts/attribute_ro/_predefined_value.haml
 create mode 100644 app/views/posts/attributes/_predefined_value.haml

diff --git a/app/models/metadata_predefined_value.rb b/app/models/metadata_predefined_value.rb
new file mode 100644
index 00000000..9cf36382
--- /dev/null
+++ b/app/models/metadata_predefined_value.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Un campo de texto seleccionado de una lista de valores posibles
+class MetadataPredefinedValue < MetadataString
+  # Obtiene todos los valores desde el layout, en un formato compatible
+  # con options_for_select.
+  #
+  # @return [Hash]
+  def values
+    @values ||= layout.dig(:metadata, name, 'values', I18n.locale.to_s)&.invert || {}
+  end
+
+  private
+
+  # Solo permite almacenar los valores predefinidos.
+  #
+  # @return [String]
+  def sanitize(string)
+    v = super string
+    return '' unless values.values.include? v
+
+    v
+  end
+end
diff --git a/app/views/posts/attribute_ro/_predefined_value.haml b/app/views/posts/attribute_ro/_predefined_value.haml
new file mode 100644
index 00000000..67642e2c
--- /dev/null
+++ b/app/views/posts/attribute_ro/_predefined_value.haml
@@ -0,0 +1,3 @@
+%tr{ id: attribute }
+  %th= post_label_t(attribute, post: post)
+  %td{ dir: dir, lang: locale }= metadata.value
diff --git a/app/views/posts/attributes/_predefined_value.haml b/app/views/posts/attributes/_predefined_value.haml
new file mode 100644
index 00000000..b0d21f35
--- /dev/null
+++ b/app/views/posts/attributes/_predefined_value.haml
@@ -0,0 +1,7 @@
+.form-group
+  = label_tag "#{base}_#{attribute}", post_label_t(attribute, post: post)
+  = select_tag(plain_field_name_for(base, attribute),
+    options_for_select(metadata.values, metadata.value),
+    **field_options(attribute, metadata), include_blank: t('.empty'))
+  = render 'posts/attribute_feedback',
+    post: post, attribute: attribute, metadata: metadata

From 9b8c09cb004581d2add73638edb3e1b5f7825eda Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 11 Sep 2021 17:06:27 -0300
Subject: [PATCH 03/24] =?UTF-8?q?Soportar=20campos=20n=C3=BAmericos=20con?=
 =?UTF-8?q?=20decimales?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/metadata_float.rb             | 31 ++++++++++++++++++++++++
 app/views/posts/attribute_ro/_float.haml |  3 +++
 app/views/posts/attributes/_float.haml   |  6 +++++
 3 files changed, 40 insertions(+)
 create mode 100644 app/models/metadata_float.rb
 create mode 100644 app/views/posts/attribute_ro/_float.haml
 create mode 100644 app/views/posts/attributes/_float.haml

diff --git a/app/models/metadata_float.rb b/app/models/metadata_float.rb
new file mode 100644
index 00000000..b4288a3b
--- /dev/null
+++ b/app/models/metadata_float.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Un campo numérico de punto flotante
+class MetadataFloat < MetadataTemplate
+  # Nada
+  def default_value
+    super || nil
+  end
+
+  def save
+    return true unless changed?
+
+    self[:value] = value.to_f
+    self[:value] = encrypt(value) if private?
+
+    true
+  end
+
+  # Indicarle al navegador que acepte números decimales
+  #
+  # @return [Float]
+  def step
+    0.05
+  end
+
+  private
+
+  def decrypt(value)
+    super(value).to_f
+  end
+end
diff --git a/app/views/posts/attribute_ro/_float.haml b/app/views/posts/attribute_ro/_float.haml
new file mode 100644
index 00000000..67642e2c
--- /dev/null
+++ b/app/views/posts/attribute_ro/_float.haml
@@ -0,0 +1,3 @@
+%tr{ id: attribute }
+  %th= post_label_t(attribute, post: post)
+  %td{ dir: dir, lang: locale }= metadata.value
diff --git a/app/views/posts/attributes/_float.haml b/app/views/posts/attributes/_float.haml
new file mode 100644
index 00000000..6239c613
--- /dev/null
+++ b/app/views/posts/attributes/_float.haml
@@ -0,0 +1,6 @@
+.form-group
+  = label_tag "#{base}_#{attribute}", post_label_t(attribute, post: post)
+  = number_field base, attribute, value: metadata.value, step: metadata.step,
+    **field_options(attribute, metadata)
+  = render 'posts/attribute_feedback',
+    post: post, attribute: attribute, metadata: metadata

From a242ceee68c7058ca55fa35eb3721b2cb104b364 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 11 Sep 2021 17:26:44 -0300
Subject: [PATCH 04/24] Siempre guardar el valor de los campos booleanos

---
 app/models/metadata_boolean.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/metadata_boolean.rb b/app/models/metadata_boolean.rb
index 5e4b456f..53a763fd 100644
--- a/app/models/metadata_boolean.rb
+++ b/app/models/metadata_boolean.rb
@@ -31,6 +31,11 @@ class MetadataBoolean < MetadataTemplate
     self[:value] = true_values.include? self[:value]
   end
 
+  # Siempre guardar el valor de este campo a menos que sea nulo
+  def empty?
+    !value.nil?
+  end
+
   private
 
   # Los valores que evalúan a verdadero

From 47096f20b7dd8c96aaa8cdf334e3698d92d10f37 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 11 Sep 2021 19:43:27 -0300
Subject: [PATCH 05/24] =?UTF-8?q?Traducci=C3=B3n=20de=20valores=20vac?=
 =?UTF-8?q?=C3=ADos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 2 ++
 config/locales/es.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc194eab..058456b1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -413,6 +413,8 @@ en:
         destroy: Remove image
       belongs_to:
         empty: "(Empty)"
+      predefined_value:
+        empty: "(Empty)"
       draft:
         label: Draft
     reorder:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e8185391..f5c13c8b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -421,6 +421,8 @@ es:
         destroy: 'Eliminar imagen'
       belongs_to:
         empty: "(Vacío)"
+      predefined_value:
+        empty: "(Vacío)"
       draft:
         label: Borrador
     reorder:

From c601845a27c5f1a7244c4b88b3736cd115b498ff Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 19:50:24 -0300
Subject: [PATCH 06/24] Garantizar que todas las lecturas se hacen dentro del
 directorio del sitio

fixes ##2667

fixes ##2655

fixes ##2640

fixes #2675

fixes #2653

fixes #2635

fixes #2624

fixes #2626

fixes #2627

fixes #2629

fixes #2634

fixes #2636

fixes #2637

fixes #2641

fixes #2642

fixes #2643

fixes #2644

fixes #2645

fixes #2646

fixes #2648

fixes #2649

fixes #2650

fixes #2651

fixes #2654

fixes #2657

fixes #2672

fixes #2676

fixes #2677

fixes #2678

fixes #2681

fixes #2682

fixes #2687

fixes #2688

fixes #2689

fixes #2691

fixes #2692

fixes #2693
---
 app/models/site.rb | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 58f20745..ddfe2bc9 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -65,9 +65,6 @@ class Site < ApplicationRecord
 
   accepts_nested_attributes_for :deploys, allow_destroy: true
 
-  # El sitio en Jekyll
-  attr_reader :jekyll
-
   # XXX: Es importante incluir luego de los callbacks de :load_jekyll
   include Site::Index
 
@@ -180,29 +177,28 @@ class Site < ApplicationRecord
 
   # Trae los datos del directorio _data dentro del sitio
   def data
-    unless @jekyll.data.present?
-      @jekyll.reader.read_data
-
-      # Define los valores por defecto según la llave buscada
-      @jekyll.data.default_proc = proc do |data, key|
-        data[key] = case key
-                    when 'layout' then {}
-                    end
+    unless jekyll.data.present?
+      run_in_path do
+        jekyll.reader.read_data
+        jekyll.data['layouts'] ||= {}
       end
     end
 
-    @jekyll.data
+    jekyll.data
   end
 
   # Traer las colecciones.  Todos los artículos van a estar dentro de
   # colecciones.
   def collections
     unless @read
-      @jekyll.reader.read_collections
+      run_in_path do
+        jekyll.reader.read_collections
+      end
+
       @read = true
     end
 
-    @jekyll.collections
+    jekyll.collections
   end
 
   # Traer la configuración de forma modificable
@@ -290,7 +286,9 @@ class Site < ApplicationRecord
   #
   # @return [Hash]
   def theme_layouts
-    @jekyll.reader.read_layouts
+    run_in_path do
+      jekyll.reader.read_layouts
+    end
   end
 
   # Trae todos los valores disponibles para un campo
@@ -332,6 +330,12 @@ class Site < ApplicationRecord
     status == 'building'
   end
 
+  def jekyll
+    run_in_path do
+      @jekyll ||= Jekyll::Site.new(configuration)
+    end
+  end
+
   # Cargar el sitio Jekyll
   #
   # TODO: En lugar de leer todo junto de una vez, extraer la carga de
@@ -345,10 +349,7 @@ class Site < ApplicationRecord
 
   def reload_jekyll!
     reset
-
-    Dir.chdir(path) do
-      @jekyll = Jekyll::Site.new(configuration)
-    end
+    jekyll
   end
 
   def reload
@@ -526,4 +527,8 @@ class Site < ApplicationRecord
     errors.add(:design_id,
                I18n.t('activerecord.errors.models.site.attributes.design_id.layout_incompatible.error'))
   end
+
+  def run_in_path(&block)
+    Dir.chdir path, &block
+  end
 end

From 5a324ae71f29616b4661c6b364ee5a3282a5dd14 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 21:00:10 -0300
Subject: [PATCH 07/24] No cortar las columnas

---
 app/views/posts/index.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 8b776590..c00d59af 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -112,11 +112,11 @@
                             %span{ lang: post.locale, dir: dir }= category
                           = '/' unless post.front_matter['categories'].last == category
 
-                  %td
+                  %td.text-nowrap
                     = post.created_at.strftime('%F')
                     %br/
                     = post.order
-                  %td
+                  %td.text-nowrap
                     - if @usuarie || policy(post).edit?
                       = link_to t('posts.edit'), edit_site_post_path(@site, post.path), class: 'btn btn-block'
                     - if @usuarie || policy(post).destroy?

From 859b8518c0f722cfd06aaab0bc59259870c67609 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 21:00:48 -0300
Subject: [PATCH 08/24] =?UTF-8?q?Mostrar=20el=20tipo=20de=20art=C3=ADculo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/posts/index.haml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index c00d59af..5c47f679 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -104,13 +104,13 @@
                       %span{ lang: post.locale, dir: dir }= post.title
                     - if post.front_matter['draft'].present?
                       %span.badge.badge-primary= I18n.t('posts.attributes.draft.label')
-                    - if post.front_matter['categories'].present?
-                      %br
-                      %small
-                        - post.front_matter['categories'].each do |category|
-                          = link_to site_posts_path(@site, **@filter_params.merge(category: category)) do
-                            %span{ lang: post.locale, dir: dir }= category
-                          = '/' unless post.front_matter['categories'].last == category
+                    %br
+                    %small
+                      = link_to @site.layouts[post.layout].humanized_name, site_posts_path(@site, **@filter_params.merge(layout: post.layout))
+                      - post.front_matter['categories']&.each do |category|
+                        = link_to site_posts_path(@site, **@filter_params.merge(category: category)) do
+                          %span{ lang: post.locale, dir: dir }= category
+                        = '/' unless post.front_matter['categories'].last == category
 
                   %td.text-nowrap
                     = post.created_at.strftime('%F')

From 8e1f5c5558627efa0721703591d940aa288f9b85 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 21:02:09 -0300
Subject: [PATCH 09/24] =?UTF-8?q?Paginaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                             |  1 +
 Gemfile.lock                        | 17 ++++++++++++++++-
 app/controllers/posts_controller.rb |  4 ++--
 config/routes.rb                    |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4256e307..db06827d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,6 +67,7 @@ gem 'terminal-table'
 gem 'validates_hostname'
 gem 'webpacker'
 gem 'yaml_db', git: 'https://0xacab.org/sutty/yaml_db.git'
+gem 'kaminari'
 
 # database
 gem 'hairtrigger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 33fba3a0..e08bcb05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,6 +309,18 @@ GEM
     jekyll-write-and-commit-changes (0.1.2)
       jekyll (~> 4)
       rugged (~> 1)
+    kaminari (1.2.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
+      actionview
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
+      activerecord
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -345,6 +357,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
@@ -357,7 +370,8 @@ GEM
     net-ssh (6.1.0)
     netaddr (2.0.4)
     nio4r (2.5.7-x86_64-linux-musl)
-    nokogiri (1.11.7-x86_64-linux)
+    nokogiri (1.11.7-x86_64-linux-musl)
+      mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.20.1)
@@ -667,6 +681,7 @@ DEPENDENCIES
   jekyll-data!
   jekyll-images
   jekyll-include-cache
+  kaminari
   letter_opener
   listen (>= 3.0.5, < 3.2)
   loaf
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 3ef26720..05ae2736 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -24,7 +24,7 @@ class PostsController < ApplicationController
     # más simple saber si hubo cambios.
     if stale?([current_usuarie, site, filter_params])
       # Todos los artículos de este sitio para el idioma actual
-      @posts = site.indexed_posts.where(locale: locale)
+      @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
       # De este tipo
       @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
       # Que estén dentro de la categoría
@@ -154,7 +154,7 @@ class PostsController < ApplicationController
   #
   # @return [Hash]
   def filter_params
-    @filter_params ||= params.permit(:q, :category, :layout).to_h.select { |_, v| v.present? }
+    @filter_params ||= params.permit(:q, :category, :layout, :page).to_h.select { |_, v| v.present? }
   end
 
   def site
diff --git a/config/routes.rb b/config/routes.rb
index 2c5f1c60..15ee4150 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -60,6 +60,7 @@ Rails.application.routes.draw do
       scope '(:locale)' do
         post :'posts/reorder', to: 'posts#reorder'
         resources :posts do
+          get 'p/:page', action: :index, on: :collection
           get :preview, to: 'posts#preview'
         end
       end

From f90c92dc26ff5e69385153ee1547c461d44210a1 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 21:03:07 -0300
Subject: [PATCH 10/24] =?UTF-8?q?Poder=20navegar=20p=C3=A1ginas=20en=20la?=
 =?UTF-8?q?=20lista=20de=20art=C3=ADculos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/posts/index.haml | 22 ++++++++++++++--------
 config/locales/en.yml      |  2 ++
 config/locales/es.yml      |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 5c47f679..654210f2 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -72,14 +72,20 @@
           %thead
             %tr
               %th.border-0.background-white.position-sticky{ style: 'top: 0; z-index: 2', colspan: '4' }
-                = submit_tag t('posts.reorder.submit'), class: 'btn'
-                %button.btn{ data: { action: 'reorder#unselect' } }
-                  = t('posts.reorder.unselect')
-                  %span.badge{ data: { target: 'reorder.counter' } } 0
-                %button.btn{ data: { action: 'reorder#up' } }= t('posts.reorder.up')
-                %button.btn{ data: { action: 'reorder#down' } }= t('posts.reorder.down')
-                %button.btn{ data: { action: 'reorder#top' } }= t('posts.reorder.top')
-                %button.btn{ data: { action: 'reorder#bottom' } }= t('posts.reorder.bottom')
+                .d-flex.flex-row.justify-content-between
+                  %div
+                    = submit_tag t('posts.reorder.submit'), class: 'btn'
+                    %button.btn{ data: { action: 'reorder#unselect' } }
+                      = t('posts.reorder.unselect')
+                      %span.badge{ data: { target: 'reorder.counter' } } 0
+                    %button.btn{ data: { action: 'reorder#up' } }= t('posts.reorder.up')
+                    %button.btn{ data: { action: 'reorder#down' } }= t('posts.reorder.down')
+                    %button.btn{ data: { action: 'reorder#top' } }= t('posts.reorder.top')
+                    %button.btn{ data: { action: 'reorder#bottom' } }= t('posts.reorder.bottom')
+
+                  %div
+                    = link_to_prev_page @posts, t('posts.prev'), class: 'btn'
+                    = link_to_next_page @posts, t('posts.next'), class: 'btn'
           %tbody
             - dir = t("locales.#{@locale}.dir")
             - size = @posts.size
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc194eab..e950fc32 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -376,6 +376,8 @@ en:
     en: 'English'
     ar: 'Arabic'
   posts:
+    prev: Previous page
+    next: Next page
     empty: "There are no results for those search parameters."
     caption: Post list
     attribute_ro:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e8185391..459d643b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -384,6 +384,8 @@ es:
     en: 'inglés'
     ar: 'árabe'
   posts:
+    prev: Página anterior
+    next: Página siguiente
     empty: No hay artículos con estos parámetros de búsqueda.
     caption: Lista de artículos
     attribute_ro:

From 0dece732aadc407b10674158fd86a4460e42e622 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 15 Sep 2021 21:03:28 -0300
Subject: [PATCH 11/24] =?UTF-8?q?Al=20buscar=20eliminar=20la=20paginaci?=
 =?UTF-8?q?=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/posts/index.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 654210f2..90e30966 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -40,7 +40,7 @@
   %section.col
     = render 'layouts/flash'
     .d-flex.justify-content-between.align-items-center.pl-2-plus.pr-2-plus.mb-2
-      %form
+      %form{ action: site_posts_path }
         - @filter_params.each do |param, value|
           - next if param == 'q'
           %input{ type: 'hidden', name: param, value: value }

From 5c2e5fd62ee217880f8881f338a2db8130d37b06 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sun, 26 Sep 2021 19:29:03 -0300
Subject: [PATCH 12/24] =?UTF-8?q?Agregar=20=C3=ADndices=20=C3=BAnicos=20qu?=
 =?UTF-8?q?e=20pens=C3=A1bamos=20que=20ten=C3=ADamos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`unique: true` es un parámetro de `add_index` no de `add_column`.
---
 db/migrate/20210926205448_add_uniqueness.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 db/migrate/20210926205448_add_uniqueness.rb

diff --git a/db/migrate/20210926205448_add_uniqueness.rb b/db/migrate/20210926205448_add_uniqueness.rb
new file mode 100644
index 00000000..7399ba4c
--- /dev/null
+++ b/db/migrate/20210926205448_add_uniqueness.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Agrega índices únicos que pensábamos que ya existían.
+class AddUniqueness < ActiveRecord::Migration[6.1]
+  def change
+    add_index :designs, :name, unique: true
+    add_index :designs, :gem, unique: true
+    add_index :licencias, :name, unique: true
+  end
+end

From f8b1752c04f08e6599ffd461d6cce3e0f33e1643 Mon Sep 17 00:00:00 2001
From: Maki <makiniqa@riseup.net>
Date: Mon, 4 Oct 2021 14:49:14 -0300
Subject: [PATCH 13/24] cambio texto cerrar sesion #2896

---
 config/locales/en.yml | 2 +-
 config/locales/es.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc194eab..28678b2f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -163,7 +163,7 @@ en:
       signature: 'With love, Sutty'
     breadcrumb:
       title: 'Your location in Sutty'
-      logout: Exit
+      logout: Log out 
       mutual_aid: Mutual aid
   collaborations:
     collaborate:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e8185391..ee55d9e7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -163,7 +163,7 @@ es:
       signature: 'Con cariño, Sutty'
     breadcrumb:
       title: 'Tu ubicación en Sutty'
-      logout: Salir
+      logout: Cerrar sesión 
       mutual_aid: Ayuda mutua
   collaborations:
     collaborate:

From 090b6305251ecb068620eb0558659c4551d97d52 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 10:47:32 -0300
Subject: [PATCH 14/24] =?UTF-8?q?la=20l=C3=B3gica=20estaba=20invertida=20y?=
 =?UTF-8?q?=20los=20valores=20nunca=20llegaban=20al=20archivo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/metadata_boolean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_boolean.rb b/app/models/metadata_boolean.rb
index 53a763fd..ed27ea92 100644
--- a/app/models/metadata_boolean.rb
+++ b/app/models/metadata_boolean.rb
@@ -33,7 +33,7 @@ class MetadataBoolean < MetadataTemplate
 
   # Siempre guardar el valor de este campo a menos que sea nulo
   def empty?
-    !value.nil?
+    value.nil?
   end
 
   private

From d67d43ff1ea19f5acfb31d615cd4e0db97f98b5f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 10:48:34 -0300
Subject: [PATCH 15/24] =?UTF-8?q?hacer=20m=C3=A1s=20claro=20el=20c=C3=B3di?=
 =?UTF-8?q?go?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/metadata_boolean.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/metadata_boolean.rb b/app/models/metadata_boolean.rb
index ed27ea92..90c002a7 100644
--- a/app/models/metadata_boolean.rb
+++ b/app/models/metadata_boolean.rb
@@ -25,10 +25,14 @@ class MetadataBoolean < MetadataTemplate
   # * false
   # * true
   def value
-    return document.data.fetch(name.to_s, default_value) if self[:value].nil?
-    return self[:value] unless self[:value].is_a? String
-
-    self[:value] = true_values.include? self[:value]
+    case self[:value]
+    when NilClass
+      document.data.fetch(name.to_s, default_value)
+    when String
+      true_values.include? self[:value]
+    else
+      self[:value]
+    end
   end
 
   # Siempre guardar el valor de este campo a menos que sea nulo

From 08e0a0ca9d7fe9ca76332e5ad895f155c7103803 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 10:49:02 -0300
Subject: [PATCH 16/24] traducir correctamente

---
 config/locales/en.yml | 4 ++--
 config/locales/es.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f224ab6..43ab0d0a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -19,8 +19,8 @@ en:
     remember_me: 'Keeps session open for %{remember_for}'
   actions:
     sr-help: "After this form you'll find links to recover your account and other actions."
-  _true: Yes
-  _false: No
+  _true: 'Yes'
+  _false: 'No'
   svg:
     sutty:
       title: Sutty
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ebf4da62..880b9e7c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -19,8 +19,8 @@ es:
     remember_me: 'Mantiene la sesión abierta por %{remember_for}'
   actions:
     sr-help: 'Después del formulario encontrarás vínculos para recuperar tu cuenta, entre otras acciones.'
-  _true: Sí
-  _false: No
+  _true: 'Sí'
+  _false: 'No'
   svg:
     sutty:
       title: Sutty

From 6349fd7b407a3f4c260ba061d8cbaf4bf63743cd Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 13:23:35 -0300
Subject: [PATCH 17/24] los url helpers necesitan hashes o params

y params.to_h devuelve un hashwithindifferentaccess, lo que rompia las
urls con locale
---
 app/controllers/posts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 05ae2736..6b69fd6a 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -154,7 +154,7 @@ class PostsController < ApplicationController
   #
   # @return [Hash]
   def filter_params
-    @filter_params ||= params.permit(:q, :category, :layout, :page).to_h.select { |_, v| v.present? }
+    @filter_params ||= params.permit(:q, :category, :layout, :page).to_hash.select { |_, v| v.present? }
   end
 
   def site

From 3335d0d9eb3c75f20b48c427c2dd7a59b52c22dd Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 13:25:05 -0300
Subject: [PATCH 18/24] usar una guard como sugiere rubocop

---
 app/controllers/posts_controller.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 6b69fd6a..9d0ff8a8 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -22,21 +22,21 @@ class PostsController < ApplicationController
 
     # XXX: Cada vez que cambiamos un Post tocamos el sitio con lo que es
     # más simple saber si hubo cambios.
-    if stale?([current_usuarie, site, filter_params])
-      # Todos los artículos de este sitio para el idioma actual
-      @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
-      # De este tipo
-      @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
-      # Que estén dentro de la categoría
-      @posts = @posts.in_category(filter_params[:category]) if filter_params[:category]
-      # Aplicar los parámetros de búsqueda
-      @posts = @posts.search(locale, filter_params[:q]) if filter_params[:q].present?
-      # A los que este usuarie tiene acceso
-      @posts = PostPolicy::Scope.new(current_usuarie, @posts).resolve
+    return unless stale?([current_usuarie, site, filter_params])
 
-      # Filtrar los posts que les invitades no pueden ver
-      @usuarie = site.usuarie? current_usuarie
-    end
+    # Todos los artículos de este sitio para el idioma actual
+    @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
+    # De este tipo
+    @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
+    # Que estén dentro de la categoría
+    @posts = @posts.in_category(filter_params[:category]) if filter_params[:category]
+    # Aplicar los parámetros de búsqueda
+    @posts = @posts.search(locale, filter_params[:q]) if filter_params[:q].present?
+    # A los que este usuarie tiene acceso
+    @posts = PostPolicy::Scope.new(current_usuarie, @posts).resolve
+
+    # Filtrar los posts que les invitades no pueden ver
+    @usuarie = site.usuarie? current_usuarie
   end
 
   def show

From e3d2213afc0f97852df6ee40c42d70f47596f34f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 13:44:34 -0300
Subject: [PATCH 19/24] especificar el idioma de un post nuevo

---
 app/controllers/posts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 9d0ff8a8..9820d71d 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -54,7 +54,7 @@ class PostsController < ApplicationController
 
   def new
     authorize Post
-    @post = site.posts.build(lang: locale, layout: params[:layout])
+    @post = site.posts(lang: locale).build(layout: params[:layout])
 
     breadcrumb I18n.t('loaf.breadcrumbs.posts.new', layout: @post.layout.humanized_name.downcase), ''
   end

From 883182ffe2413b76c9f9756ddc8ad29cfca0c9ba Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 13:45:34 -0300
Subject: [PATCH 20/24] =?UTF-8?q?rutas=20m=C3=A1s=20espec=C3=ADficas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 15ee4150..5e172cda 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,7 +57,7 @@ Rails.application.routes.draw do
 
     # Gestionar artículos según idioma
     nested do
-      scope '(:locale)' do
+      scope '/(:locale)', constraint: /[a-z]{2}/ do
         post :'posts/reorder', to: 'posts#reorder'
         resources :posts do
           get 'p/:page', action: :index, on: :collection

From 69ef571bdb4a4768c37865907fb07629fc017487 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 14:25:05 -0300
Subject: [PATCH 21/24] garantizar que sea una hash de simbolos

---
 app/controllers/posts_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 9820d71d..f3bc8aac 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -154,7 +154,9 @@ class PostsController < ApplicationController
   #
   # @return [Hash]
   def filter_params
-    @filter_params ||= params.permit(:q, :category, :layout, :page).to_hash.select { |_, v| v.present? }
+    @filter_params ||= params.permit(:q, :category, :layout, :page).to_hash.select do |_, v|
+      v.present?
+    end.transform_keys(&:to_sym)
   end
 
   def site

From 9c4a0a86f3eeec8f578e3872096896a710e01632 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 14:40:55 -0300
Subject: [PATCH 22/24] deshabilitar el paginado temporalmente

no permite mover posts entre paginas!
---
 app/controllers/posts_controller.rb | 4 ++--
 app/views/posts/index.haml          | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index f3bc8aac..dbdd4d0a 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -25,7 +25,7 @@ class PostsController < ApplicationController
     return unless stale?([current_usuarie, site, filter_params])
 
     # Todos los artículos de este sitio para el idioma actual
-    @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
+    @posts = site.indexed_posts.where(locale: locale)
     # De este tipo
     @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
     # Que estén dentro de la categoría
@@ -154,7 +154,7 @@ class PostsController < ApplicationController
   #
   # @return [Hash]
   def filter_params
-    @filter_params ||= params.permit(:q, :category, :layout, :page).to_hash.select do |_, v|
+    @filter_params ||= params.permit(:q, :category, :layout).to_hash.select do |_, v|
       v.present?
     end.transform_keys(&:to_sym)
   end
diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 90e30966..5f613e3a 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -84,8 +84,6 @@
                     %button.btn{ data: { action: 'reorder#bottom' } }= t('posts.reorder.bottom')
 
                   %div
-                    = link_to_prev_page @posts, t('posts.prev'), class: 'btn'
-                    = link_to_next_page @posts, t('posts.next'), class: 'btn'
           %tbody
             - dir = t("locales.#{@locale}.dir")
             - size = @posts.size

From 4456deff9c8eef185f370a57dac519ad0d8801b6 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 21 Oct 2021 15:02:07 -0300
Subject: [PATCH 23/24] =?UTF-8?q?usar=20la=20traducci=C3=B3n=20del=20idiom?=
 =?UTF-8?q?a=20que=20viene=20del=20sitio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/posts/index.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 5f613e3a..ad07b9dc 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -51,7 +51,7 @@
       - if @site.locales.size > 1
         %nav#locales
           - @site.locales.each do |locale|
-            = link_to t("locales.#{locale}.name"), site_posts_path(@site, **@filter_params.merge(locale: locale)),
+            = link_to @site.data.dig(locale.to_s, 'locale') || locale, site_posts_path(@site, **@filter_params.merge(locale: locale)),
               class: "mr-2 mt-2 mb-2 #{locale == @locale ? 'active font-weight-bold' : ''}"
     .pl-2-plus
       - @filter_params.each do |param, value|

From 8bebe155f4bd355087fb6685b47f55709a2df48b Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 22 Oct 2021 17:06:34 -0300
Subject: [PATCH 24/24] no hace falta subir los parches dos veces

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 36139d7a..592592bd 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,6 @@ ota-js: assets ## Actualizar Javascript en el nodo delegado
 
 ota: ## Actualizar Rails en el nodo delegado
 	umask 022; git format-patch $(commit)
-	scp ./0*.patch $(delegate):/tmp/
 	ssh $(delegate) mkdir -p /tmp/patches-$(commit)/
 	scp ./0*.patch $(delegate):/tmp/patches-$(commit)/
 	scp ./ota.sh $(delegate):/tmp/