From 71436d3be49cb3d0cdde8e37338369f10fdaf81f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 4 Aug 2021 12:17:49 -0300
Subject: [PATCH] =?UTF-8?q?Usar=20el=20sistema=20de=20autorizaci=C3=B3n=20?=
 =?UTF-8?q?de=20Sutty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Y eliminar código sin utilizar.
---
 app/controllers/application_controller.rb   |  9 ++++-----
 app/controllers/posts_controller.rb         |  3 ---
 app/controllers/private_controller.rb       |  2 --
 app/controllers/sites_controller.rb         |  3 ---
 app/controllers/stats_controller.rb         | 18 ------------------
 app/models/{site_stat.rb => site_blazer.rb} |  2 +-
 app/policies/site_blazer_policy.rb          | 10 ++++++++++
 app/policies/site_stat_policy.rb            | 15 ---------------
 8 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 app/controllers/stats_controller.rb
 rename app/models/{site_stat.rb => site_blazer.rb} (50%)
 create mode 100644 app/policies/site_blazer_policy.rb
 delete mode 100644 app/policies/site_stat_policy.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c9e5a999..d8498218 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,7 @@
 # Forma de ingreso a Sutty
 class ApplicationController < ActionController::Base
   include ExceptionHandler
+  include Pundit
 
   protect_from_forgery with: :null_session, prepend: true
 
@@ -10,6 +11,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   around_action :set_locale
 
+  rescue_from Pundit::NilPolicyError, with: :page_not_found
   rescue_from ActionController::RoutingError, with: :page_not_found
   rescue_from ActionController::ParameterMissing, with: :page_not_found
 
@@ -33,7 +35,7 @@ class ApplicationController < ActionController::Base
   def find_site
     id = params[:site_id] || params[:id]
 
-    unless (site = current_usuarie.sites.find_by_name(id))
+    unless (site = current_usuarie&.sites&.find_by_name(id))
       raise SiteNotFound
     end
 
@@ -66,10 +68,7 @@ class ApplicationController < ActionController::Base
   # sitio pueden acceder al panel.
   def require_usuarie
     site = find_site
-    unless site.usuarie? current_usuarie
-      redirect_to root_path
-      return
-    end
+    authorize SiteBlazer.new(site)
 
     # Necesario para los breadcrumbs.
     ActionView::Base.include Loaf::ViewExtensions unless ActionView::Base.included_modules.include? Loaf::ViewExtensions
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 3ef26720..448592de 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -2,9 +2,6 @@
 
 # Controlador para artículos
 class PostsController < ApplicationController
-  include Pundit
-  rescue_from Pundit::NilPolicyError, with: :page_not_found
-
   before_action :authenticate_usuarie!
 
   # TODO: Traer los comunes desde ApplicationController
diff --git a/app/controllers/private_controller.rb b/app/controllers/private_controller.rb
index bb4d782d..01b6888c 100644
--- a/app/controllers/private_controller.rb
+++ b/app/controllers/private_controller.rb
@@ -6,8 +6,6 @@ class PrivateController < ApplicationController
   # XXX: Permite ejecutar JS
   skip_forgery_protection
 
-  include Pundit
-
   # Enviar el archivo si existe, agregar una / al final siempre para no
   # romper las direcciones relativas.
   def show
diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
index bdaa9011..b4826226 100644
--- a/app/controllers/sites_controller.rb
+++ b/app/controllers/sites_controller.rb
@@ -2,9 +2,6 @@
 
 # Controlador de sitios
 class SitesController < ApplicationController
-  include Pundit
-  rescue_from Pundit::NilPolicyError, with: :page_not_found
-
   before_action :authenticate_usuarie!
 
   breadcrumb -> { current_usuarie.email }, :edit_usuarie_registration_path
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
deleted file mode 100644
index 07baaf1a..00000000
--- a/app/controllers/stats_controller.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-# Estadísticas del sitio
-class StatsController < ApplicationController
-  include Pundit
-  before_action :authenticate_usuarie!
-
-  def index
-    @site = find_site
-    authorize SiteStat.new(@site)
-
-    # Solo queremos el promedio de tiempo de compilación, no de
-    # instalación de dependencias.
-    stats = @site.build_stats.jekyll
-    @build_avg = stats.average(:seconds).to_f.round(2)
-    @build_max = stats.maximum(:seconds).to_f.round(2)
-  end
-end
diff --git a/app/models/site_stat.rb b/app/models/site_blazer.rb
similarity index 50%
rename from app/models/site_stat.rb
rename to app/models/site_blazer.rb
index 73503aca..76dee12a 100644
--- a/app/models/site_stat.rb
+++ b/app/models/site_blazer.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-SiteStat = Struct.new(:site)
+SiteBlazer = Struct.new(:site)
diff --git a/app/policies/site_blazer_policy.rb b/app/policies/site_blazer_policy.rb
new file mode 100644
index 00000000..a6ea01b7
--- /dev/null
+++ b/app/policies/site_blazer_policy.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Les invitades no pueden ver las estadísticas (aun)
+SiteBlazerPolicy = Struct.new(:usuarie, :site_blazer) do
+  def home?
+    site_blazer&.site&.usuarie? usuarie
+  end
+
+  alias_method :show?, :home?
+end
diff --git a/app/policies/site_stat_policy.rb b/app/policies/site_stat_policy.rb
deleted file mode 100644
index a797034c..00000000
--- a/app/policies/site_stat_policy.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Política de acceso a las estadísticas
-class SiteStatPolicy
-  attr_reader :site_stat, :usuarie
-
-  def initialize(usuarie, site_stat)
-    @usuarie = usuarie
-    @site_stat = site_stat
-  end
-
-  def index?
-    site_stat.site.usuarie? usuarie
-  end
-end