spina 2.12.0 → 2.13.0

data/app/controllers/spina/admin/pages_controller.rb

@@ -6,8 +6,8 @@ module Spina
       before_action :set_tabs
 
       def index
-        add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
-        
+        add_breadcrumb I18n.t("spina.website.pages"), spina.admin_pages_path
+
         if params[:resource_id]
           @resource = Resource.find(params[:resource_id])
           @page_templates = Spina::Current.theme.new_page_templates(resource: @resource)
@@ -51,33 +51,33 @@ module Spina
         Mobility.locale = @locale
         if @page.update(page_params)
           if @page.saved_change_to_draft? && @page.live?
-            flash[:confetti] = t('spina.pages.published')
+            flash[:confetti] = t("spina.pages.published")
           else
-            flash[:success] = t('spina.pages.saved')
+            flash[:success] = t("spina.pages.saved")
           end
-          
+
           redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale})
         else
           add_index_breadcrumb
           Mobility.locale = I18n.locale
           add_breadcrumb @page.title
-          flash.now[:error] = t('spina.pages.couldnt_be_saved')
+          flash.now[:error] = t("spina.pages.couldnt_be_saved")
           render :edit, status: :unprocessable_entity
         end
       end
 
       def sort
-        params[:ids].each.with_index do |id, index| 
+        params[:ids].each.with_index do |id, index|
           Page.where(id: id).update_all(position: index + 1)
         end
-        
+
         flash.now[:info] = t("spina.pages.sorting_saved")
         render_flash
       end
-      
+
       def sort_one
         current_position = @page.position
-        
+
         if params[:direction] == "up"
           @bottom_page = @page
           @top_page = @target_page = @page.siblings.where(resource_id: @page.resource_id).sorted.where("position < ?", current_position).last
@@ -85,7 +85,7 @@ module Spina
           @bottom_page = @target_page = @page.siblings.where(resource_id: @page.resource_id).sorted.where("position > ?", current_position).first
           @top_page = @page
         end
-        
+
         if @target_page
           @page.transaction do
             @page.update(position: @target_page.position)
@@ -103,37 +103,37 @@ module Spina
       end
 
       def destroy
-        flash[:info] = t('spina.pages.deleted')    
+        flash[:info] = t("spina.pages.deleted")
         @page.destroy
-        redirect_to spina.admin_pages_url
+
+        redirect_to spina.admin_pages_url(resource_id: @page.resource_id)
       end
 
       private
 
-        def set_locale
-          @locale = params[:locale] || I18n.default_locale
-        end
-  
-        def add_index_breadcrumb
-          if @page.resource
-            add_breadcrumb @page.resource.label, spina.admin_pages_path(resource_id: @page.resource_id), class: 'text-gray-400'
-          else
-            add_breadcrumb t('spina.website.pages'), spina.admin_pages_path, class: 'text-gray-400'
-          end
-        end
-  
-        def page_params
-          params.require(:page).permit!
-        end
-  
-        def set_page
-          @page = Page.find(params[:id])
-        end
+      def set_locale
+        @locale = params[:locale] || I18n.default_locale
+      end
 
-        def set_tabs
-          @tabs = %w[page_content search_engines advanced]
+      def add_index_breadcrumb
+        if @page.resource
+          add_breadcrumb @page.resource.label, spina.admin_pages_path(resource_id: @page.resource_id), class: "text-gray-400"
+        else
+          add_breadcrumb t("spina.website.pages"), spina.admin_pages_path, class: "text-gray-400"
         end
+      end
 
+      def page_params
+        params.require(:page).permit!
+      end
+
+      def set_page
+        @page = Page.find(params[:id])
+      end
+
+      def set_tabs
+        @tabs = %w[page_content search_engines advanced]
+      end
     end
   end
 end

data/app/controllers/spina/admin/parent_pages_controller.rb

@@ -1,10 +1,8 @@
 module Spina::Admin
   class ParentPagesController < AdminController
-    
     def index
       @resource = Spina::Resource.find_by(id: params[:resource_id])
       @pages = Spina::Page.where(resource: @resource).sorted.includes(:translations)
     end
-    
   end
-end
+end

data/app/controllers/spina/admin/password_resets_controller.rb

@@ -13,9 +13,9 @@ module Spina
 
         if user&.reset_passord!
           UserMailer.forgot_password(user, request.user_agent).deliver_later
-          redirect_to admin_login_path, flash: {success: t('spina.forgot_password.instructions_sent')}
+          redirect_to admin_login_path, flash: {success: t("spina.forgot_password.instructions_sent")}
         else
-          flash.now[:alert] = t('spina.forgot_password.unknown_user')
+          flash.now[:alert] = t("spina.forgot_password.unknown_user")
           render :new, status: :unprocessable_entity
         end
       end
@@ -28,9 +28,9 @@ module Spina
         @user = User.find_by(password_reset_token: params[:id])
 
         if @user.password_reset_sent_at < 2.hours.ago
-          redirect_to new_admin_password_reset_path, flash: {alert: t('spina.forgot_password.expired')}
+          redirect_to new_admin_password_reset_path, flash: {alert: t("spina.forgot_password.expired")}
         elsif @user.update(user_params)
-          redirect_to admin_login_path, flash: {success: t('spina.forgot_password.success')}
+          redirect_to admin_login_path, flash: {success: t("spina.forgot_password.success")}
         else
           render :edit, status: :unprocessable_entity
         end
@@ -38,10 +38,9 @@ module Spina
 
       private
 
-        def user_params
-          params.require(:user).permit(:password, :password_confirmation)
-        end
-
+      def user_params
+        params.require(:user).permit(:password, :password_confirmation)
+      end
     end
   end
-end
+end

data/app/controllers/spina/admin/resources_controller.rb

@@ -4,14 +4,14 @@ module Spina
       before_action :set_locale
       before_action :set_resource, only: [:edit, :update]
 
-      def edit        
-        add_breadcrumb @resource.label, spina.admin_pages_path(resource_id: @resource.id), class: 'text-gray-400'
-        add_breadcrumb t('spina.edit')
+      def edit
+        add_breadcrumb @resource.label, spina.admin_pages_path(resource_id: @resource.id), class: "text-gray-400"
+        add_breadcrumb t("spina.edit")
       end
 
       def update
         if Mobility.with_locale(@locale) { @resource.update(resource_params) }
-          flash[:success] = t('spina.resources.saved')
+          flash[:success] = t("spina.resources.saved")
           redirect_to spina.admin_pages_path(resource_id: @resource.id)
         else
           render :edit
@@ -20,18 +20,17 @@ module Spina
 
       private
 
-        def resource_params
-          params.require(:resource).permit(:label, :slug, :view_template, :order_by, :parent_page_id)
-        end
-
-        def set_resource
-          @resource = Resource.find(params[:id])          
-        end
+      def resource_params
+        params.require(:resource).permit(:label, :slug, :view_template, :order_by, :parent_page_id)
+      end
 
-        def set_locale
-          @locale = params[:locale] || I18n.default_locale
-        end
+      def set_resource
+        @resource = Resource.find(params[:id])
+      end
 
+      def set_locale
+        @locale = params[:locale] || I18n.default_locale
+      end
     end
   end
-end
+end

data/app/controllers/spina/admin/sessions_controller.rb

@@ -8,12 +8,12 @@ module Spina
 
       def create
         user = User.where(email: params[:email]).first
-        if user && user.authenticate(params[:password])
+        if user&.authenticate(params[:password])
           session[:spina_user_id] = user.id
           user.touch(:last_logged_in)
           redirect_to spina.admin_root_url
         else
-          flash.now[:alert] = I18n.t('spina.notifications.wrong_username_or_password')
+          flash.now[:alert] = I18n.t("spina.notifications.wrong_username_or_password")
           render "new", status: :unprocessable_entity
         end
       end

data/app/controllers/spina/admin/settings_controller.rb

@@ -1,9 +1,9 @@
 module Spina
   module Admin
-    class SettingsController < AdminController      
+    class SettingsController < AdminController
       before_action :find_or_set_settings
       before_action :set_breadcrumbs
-      
+
       admin_section :settings
 
       def edit
@@ -21,37 +21,36 @@ module Spina
 
       private
 
-        def setting_class
-          "spina/#{plugin.namespace}/setting".classify.constantize
-        end
-  
-        def plugin
-          Spina::Plugin.find_by(namespace: params[:plugin])
-        end
-        helper_method :plugin
-  
-        def find_or_set_settings
-          @setting = setting_class.first_or_create do |setting|
-            plugin.settings.each do |attribute, type|
-              setting.send("#{attribute}=", (type.is_a?(Hash) ? type.first.last : nil))
-            end
-          end
-          plugin.settings.keys.reject do |x|
-            @setting.preferences.keys.map(&:to_sym).include? x
-          end.each do |key|
-            value = plugin.settings[key].is_a?(Hash) ? plugin.settings[key].first.last : nil
-            @setting.send("#{key}=", value)
+      def setting_class
+        "spina/#{plugin.namespace}/setting".classify.constantize
+      end
+
+      def plugin
+        Spina::Plugin.find_by(namespace: params[:plugin])
+      end
+      helper_method :plugin
+
+      def find_or_set_settings
+        @setting = setting_class.first_or_create do |setting|
+          plugin.settings.each do |attribute, type|
+            setting.send("#{attribute}=", (type.is_a?(Hash) ? type.first.last : nil))
           end
         end
-  
-        def set_breadcrumbs
-          add_breadcrumb t('spina.settings.title')
-        end
-  
-        def settings_params
-          params.require(:setting).permit(plugin.settings.keys)
+        plugin.settings.keys.reject do |x|
+          @setting.preferences.keys.map(&:to_sym).include? x
+        end.each do |key|
+          value = plugin.settings[key].is_a?(Hash) ? plugin.settings[key].first.last : nil
+          @setting.send("#{key}=", value)
         end
+      end
 
+      def set_breadcrumbs
+        add_breadcrumb t("spina.settings.title")
+      end
+
+      def settings_params
+        params.require(:setting).permit(plugin.settings.keys)
+      end
     end
   end
 end

data/app/controllers/spina/admin/theme_controller.rb

@@ -2,22 +2,21 @@ module Spina
   module Admin
     class ThemeController < AdminController
       admin_section :settings
-      
+
       def edit
-        add_breadcrumb t('spina.theme.theme')
+        add_breadcrumb t("spina.theme.theme")
       end
-      
+
       def update
         Spina::Current.account.update(theme_params)
-        redirect_to spina.edit_admin_theme_path, flash: {success: t('spina.theme.saved')}
+        redirect_to spina.edit_admin_theme_path, flash: {success: t("spina.theme.saved")}
       end
-      
+
       private
-      
-        def theme_params
-          params.require(:account).permit(:theme)
-        end
-      
+
+      def theme_params
+        params.require(:account).permit(:theme)
+      end
     end
   end
-end
+end

data/app/controllers/spina/admin/users_controller.rb

@@ -4,18 +4,18 @@ module Spina
       before_action :authorize_authentication_module
       before_action :authorize_admin, except: [:index]
       before_action :set_user, only: [:edit, :update, :destroy]
-      
+
       admin_section :settings
 
       def index
         @users = User.order(:name)
-        add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
+        add_breadcrumb I18n.t("spina.preferences.users"), spina.admin_users_path
       end
 
       def new
         @user = User.new
         add_index_breadcrumb
-        add_breadcrumb I18n.t('spina.users.new')
+        add_breadcrumb I18n.t("spina.users.new")
       end
 
       def create
@@ -23,59 +23,58 @@ module Spina
         if @user.save
           redirect_to admin_users_url
         else
-          flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
+          flash.now[:alert] = I18n.t("spina.users.cannot_be_created")
           add_index_breadcrumb
-          add_breadcrumb I18n.t('spina.users.new')
+          add_breadcrumb I18n.t("spina.users.new")
           render :new, status: :unprocessable_entity
         end
       end
 
       def edit
         add_index_breadcrumb
-        add_breadcrumb "#{@user}"
+        add_breadcrumb @user.to_s
       end
 
       def update
         if @user.update(user_params)
-          flash[:success] = t('spina.users.saved')
+          flash[:success] = t("spina.users.saved")
           redirect_to spina.admin_users_url
         else
-          flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
+          flash.now[:alert] = I18n.t("spina.users.cannot_be_created")
           add_index_breadcrumb
-          add_breadcrumb "#{@user}"
+          add_breadcrumb @user.to_s
           render :edit, status: :unprocessable_entity
         end
       end
 
       def destroy
         if @user != current_spina_user
-          @user.destroy 
-          redirect_to spina.admin_users_url, flash: {success: t('spina.users.deleted')}
+          @user.destroy
+          redirect_to spina.admin_users_url, flash: {success: t("spina.users.deleted")}
         end
       end
 
       private
 
-        def add_index_breadcrumb
-          add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path, class: 'text-gray-400'
-        end
+      def add_index_breadcrumb
+        add_breadcrumb I18n.t("spina.preferences.users"), spina.admin_users_path, class: "text-gray-400"
+      end
 
-        def user_params
-          params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
-        end
+      def user_params
+        params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
+      end
 
-        def set_user
-          @user = User.find(params[:id])
-        end
-        
-        def authorize_authentication_module
-          render status: 401 unless Spina.config.authentication == "Spina::Authentication::Sessions"
-        end
-        
-        def authorize_admin
-          render status: 401 unless current_spina_user.admin?
-        end
-        
+      def set_user
+        @user = User.find(params[:id])
+      end
+
+      def authorize_authentication_module
+        render status: 401 unless Spina.config.authentication == "Spina::Authentication::Sessions"
+      end
+
+      def authorize_admin
+        render status: 401 unless current_spina_user.admin?
+      end
     end
   end
 end

data/app/controllers/spina/api/api_controller.rb

@@ -1,29 +1,29 @@
 module Spina
   module Api
     class ApiController < ActionController::Base
-      include Spina::CurrentSpinaAccount, Spina::CurrentTheme
-      
+      include Spina::CurrentTheme
+      include Spina::CurrentSpinaAccount
+
       protect_from_forgery unless: -> { request.format.json? }
-      
+
       rescue_from ActiveRecord::RecordNotFound, with: :render_404
-      
+
       TOKEN = Spina.config.api_key
-      
+
       before_action :authenticate_api
-      
+
       private
-      
-        def render_404
-          render json: {error: "Not Found"}, status: :not_found
-        end
 
-        def authenticate_api
-          head :not_found and return if TOKEN.blank?
-          authenticate_or_request_with_http_token do |token, options|
-            ActiveSupport::SecurityUtils.secure_compare(token, TOKEN)
-          end
+      def render_404
+        render json: {error: "Not Found"}, status: :not_found
+      end
+
+      def authenticate_api
+        head :not_found and return if TOKEN.blank?
+        authenticate_or_request_with_http_token do |token, options|
+          ActiveSupport::SecurityUtils.secure_compare(token, TOKEN)
         end
-      
+      end
     end
   end
-end
+end

data/app/controllers/spina/api/images_controller.rb

@@ -1,12 +1,10 @@
 module Spina
   module Api
     class ImagesController < ApiController
-      
       def show
         @image = Spina::Image.find(params[:id])
         render json: Spina::Api::ImageSerializer.new(@image, {params: {view_context: view_context}}).serializable_hash.to_json
       end
-      
     end
   end
-end
+end

data/app/controllers/spina/api/navigations_controller.rb

@@ -2,19 +2,17 @@ module Spina
   module Api
     class NavigationsController < ApiController
       include Paginable
-      
+
       def index
         navigations = Navigation.order(:id)
         paginated = pagination(navigations)
         render json: Spina::Api::NavigationSerializer.new(paginated.first, paginated.last.merge(fields: {navigation: [:name, :label]})).serializable_hash.to_json
       end
-      
+
       def show
         @navigation = Navigation.find(params[:id])
         render json: Spina::Api::NavigationSerializer.new(@navigation).serializable_hash.to_json
       end
-      
     end
   end
 end
-      

data/app/controllers/spina/api/pages_controller.rb

@@ -2,25 +2,24 @@ module Spina
   module Api
     class PagesController < ApiController
       include Paginable
-      
+
       before_action :set_resource
-      
+
       def index
         pages = Page.live.includes(:translations).where(resource: @resource).order(:created_at)
         render json: Spina::Api::PageSerializer.new(*pagination(pages)).serializable_hash.to_json
       end
-      
+
       def show
         @page = Page.live.where(resource: @resource).find(params[:id])
         render json: Spina::Api::PageSerializer.new(@page).serializable_hash.to_json
       end
-      
+
       private
-      
-        def set_resource
-          @resource = Spina::Resource.find(params[:resource_id]) if params[:resource_id].present?
-        end
 
+      def set_resource
+        @resource = Spina::Resource.find(params[:resource_id]) if params[:resource_id].present?
+      end
     end
   end
-end
+end

data/app/controllers/spina/api/resources_controller.rb

@@ -2,18 +2,16 @@ module Spina
   module Api
     class ResourcesController < ApiController
       include Paginable
-      
+
       def index
         resources = Resource.order(:id)
         render json: Spina::Api::ResourceSerializer.new(*pagination(resources)).serializable_hash.to_json
       end
-      
+
       def show
         @resource = Resource.find(params[:id])
         render json: Spina::Api::ResourceSerializer.new(@resource).serializable_hash.to_json
       end
-      
     end
   end
 end
-      

data/app/controllers/spina/application_controller.rb

@@ -1,8 +1,9 @@
 class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
   include Spina.config.authentication.constantize
-  include Spina::CurrentSpinaAccount, Spina::CurrentTheme
-  
+  include Spina::CurrentTheme
+  include Spina::CurrentSpinaAccount
+
   helper Spina::Engine.helpers
-  
+
   protect_from_forgery with: :exception
 end

data/app/controllers/spina/pages_controller.rb

@@ -8,11 +8,10 @@ class Spina::PagesController < Spina::ApplicationController
   def homepage
     render_with_template(page)
   end
-  
+
   private
-  
-    def authorize_page
-      raise ActiveRecord::RecordNotFound unless page.live? || logged_in?
-    end
 
+  def authorize_page
+    raise ActiveRecord::RecordNotFound unless page.live? || logged_in?
+  end
 end

data/app/controllers/spina/sitemaps_controller.rb

@@ -1,8 +1,6 @@
 class Spina::SitemapsController < Spina::ApplicationController
-  
   def show
     I18n.locale = I18n.default_locale
     @pages = Spina::Page.live.sorted
   end
-  
 end