spina 2.11.0 → 2.13.0

data/app/controllers/concerns/spina/frontend.rb

@@ -6,10 +6,10 @@ module Spina
       rescue_from ActiveRecord::RecordNotFound, with: :redirect_or_render_404
 
       helper Spina::PagesHelper
-      
+
       before_action :set_locale
       before_action :set_current_page
-      before_action :set_current_account
+      before_action :set_current_spina_account
     end
 
     def show
@@ -24,62 +24,76 @@ module Spina
 
     private
 
-      def set_locale
-        I18n.locale = params[:locale] || I18n.default_locale
-      end
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+    end
 
-      def set_current_page
-        Spina::Current.page = page
-        Spina::Current.page.view_context = view_context
-      end
+    def set_current_page
+      Spina::Current.page = page
+      Spina::Current.page.view_context = view_context
+    end
 
-      def set_current_account
-        Spina::Current.account = Spina::Account.first
-        Spina::Current.account.view_context = view_context
-      end
+    def set_current_spina_account
+      Spina::Current.account = Spina::Account.first
+      Spina::Current.account.view_context = view_context
+    end
 
-      def page_by_locale(locale)
-        I18n.with_locale(locale) do
-          Page.i18n.find_by!(materialized_path: spina_request_path)
-        end
+    def page_by_locale(locale)
+      I18n.with_locale(locale) do
+        Page.i18n.find_by!(materialized_path: spina_request_path)
       end
+    end
 
-      def page
-        @page = if action_name == 'homepage'
-          Page.find_by!(name: 'homepage')
-        else 
-          page_by_locale(I18n.locale) || page_by_locale(I18n.default_locale)
-        end
+    def page
+      @page = if action_name == "homepage"
+        Page.find_by!(name: "homepage")
+      else
+        page_by_locale(I18n.locale) || page_by_locale(I18n.default_locale)
       end
+    end
 
-      def spina_request_path
-        segments = [Spina.mounted_at, params[:locale], params[:id]].compact
-        File.join(*segments)
-      end
+    def spina_request_path
+      segments = [Spina.mounted_at, params[:locale], params[:id]].compact
+      File.join(*segments)
+    end
 
-      def should_skip_to_first_child?
-        Spina::Current.page.skip_to_first_child && first_live_child
-      end
+    def should_skip_to_first_child?
+      Spina::Current.page.skip_to_first_child && first_live_child
+    end
 
-      def first_live_child
-        Spina::Current.page.children.sorted.live.first
-      end
+    def first_live_child
+      Spina::Current.page.children.sorted.live.first
+    end
 
-      def redirect_or_render_404
-        if rule = RewriteRule.find_by(old_path: spina_request_path)
-          redirect_to rule.new_path, status: :moved_permanently
-        else
-          render_404
-        end
+    def redirect_or_render_404
+      if (rule = RewriteRule.find_by(old_path: spina_request_path))
+        redirect_to rule.new_path, status: :moved_permanently
+      else
+        render_404
       end
+    end
 
-      def render_404
-        render file: "#{Rails.root}/public/404.html", status: 404, layout: false
-      end
+    def render_with_template(page)
+      render layout: "#{current_theme.name.parameterize.underscore}/#{layout_template_for_page(page)}", template: "#{current_theme.name.parameterize.underscore}/pages/#{view_template_for_page(page)}"
+    end
 
-      def render_with_template(page)
-        render layout: "#{current_theme.name.parameterize.underscore}/#{page.layout_template || 'application'}", template: "#{current_theme.name.parameterize.underscore}/pages/#{Spina::Current.page.view_template || 'show'}"
+    def view_template_for_page(page)
+      page.view_template.presence || "show"
+    end
+
+    def layout_template_for_page(page)
+      return page.layout_template if page.layout_template.present?
+      view_template_config(page)[:layout].presence || "application"
+    end
+
+    def view_template_config(page)
+      current_theme.view_templates.find do |template|
+        template[:name] == view_template_for_page(page)
       end
+    end
 
+    def render_404
+      render file: "#{Rails.root}/public/404.html", status: 404, layout: false
+    end
   end
-end
+end

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

@@ -2,31 +2,30 @@ module Spina
   module Admin
     class AccountsController < AdminController
       admin_section :settings
-      
+
       before_action :set_breadcrumbs
 
       def edit
       end
 
       def update
-        if current_account.update(account_params)
-          redirect_back fallback_location: spina.edit_admin_account_path, flash: {success: t('spina.accounts.saved')}
+        if current_spina_account.update(account_params)
+          redirect_back fallback_location: spina.edit_admin_account_path, flash: {success: t("spina.accounts.saved")}
         else
-          flash.now[:error] = t('spina.accounts.couldnt_be_saved')
+          flash.now[:error] = t("spina.accounts.couldnt_be_saved")
           render :edit, status: :unprocessable_entity
         end
       end
 
       private
 
-        def account_params
-          params.require(:account).permit!
-        end
-        
-        def set_breadcrumbs
-          add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
-        end
+      def account_params
+        params.require(:account).permit!
+      end
 
+      def set_breadcrumbs
+        add_breadcrumb I18n.t("spina.preferences.account"), spina.edit_admin_account_path
+      end
     end
   end
 end

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

@@ -2,35 +2,35 @@ module Spina
   module Admin
     class AdminController < ActionController::Base
       include Spina.config.authentication.constantize
-      include Spina::CurrentAccount, Spina::CurrentTheme
-      
+      include Spina::CurrentTheme
+      include Spina::CurrentSpinaAccount
+
       helper Spina::Engine.helpers
-      
+
       before_action :add_view_path
       before_action :set_admin_locale
       before_action :authenticate
-      
+
       admin_section :content
-      
+
       def current_admin_path
-        request.fullpath[%r{/#{ Spina.config.backend_path }(.*)}, 1]
+        request.fullpath[%r{/#{Spina.config.backend_path}(.*)}, 1]
       end
       helper_method :current_admin_path
 
       private
-      
-        def render_flash
-          render turbo_stream: turbo_stream.update("flash", partial: "spina/admin/shared/flash")
-        end
-
-        def set_admin_locale
-          I18n.locale = I18n.default_locale
-        end
-        
-        def add_view_path
-          prepend_view_path Spina::Engine.root.join('app/views/spina/admin')
-        end
 
+      def render_flash
+        render turbo_stream: turbo_stream.update("flash", partial: "spina/admin/shared/flash")
+      end
+
+      def set_admin_locale
+        I18n.locale = I18n.default_locale
+      end
+
+      def add_view_path
+        prepend_view_path Spina::Engine.root.join("app/views/spina/admin")
+      end
     end
   end
 end

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

@@ -6,11 +6,11 @@ module Spina
       def index
         @attachments = Attachment.sorted.with_attached_file.page(params[:page]).per(25)
       end
-      
+
       def show
         @attachment = Attachment.find(params[:id])
       end
-      
+
       def edit
         @attachment = Attachment.find(params[:id])
       end
@@ -18,18 +18,23 @@ module Spina
       def create
         @attachments = params[:attachment][:files].map do |file|
           next if file.blank? # Skip the blank string posted by the hidden files[] field
-          
+
           attachment = Attachment.create(attachment_params)
           attachment.file.attach(file)
           attachment
         end.compact
-        
+
         respond_to do |format|
-          format.turbo_stream { render turbo_stream: turbo_stream.prepend("attachments", partial: "attachment", collection: @attachments)}
+          format.turbo_stream { render turbo_stream: turbo_stream.prepend("attachments", partial: "attachment", collection: @attachments) }
           format.html { redirect_to spina.admin_attachments_url }
         end
       end
-      
+
+      def inline_upload
+        @attachment = Attachment.create(attachment_params)
+        render turbo_stream: turbo_stream.append(params[:select_id], partial: "parts/attachments/attachment", object: @attachment)
+      end
+
       def update
         @attachment = Attachment.find(params[:id])
         old_signed_id = @attachment.file&.blob&.signed_id
@@ -40,12 +45,12 @@ module Spina
           @attachment.file.blob.update(filename: filename)
         end
 
-        # Replace all occurrences of the old signed blob ID 
+        # Replace all occurrences of the old signed blob ID
         # with the new ID in a background job
         if @attachment.reload.file&.blob&.signed_id != old_signed_id
           Spina::ReplaceSignedIdJob.perform_later(old_signed_id, @attachment.file&.blob&.signed_id)
         end
-                
+
         render @attachment
       end
 
@@ -58,11 +63,11 @@ module Spina
       private
 
       def set_breadcrumbs
-        add_breadcrumb I18n.t('spina.website.media_library')
+        add_breadcrumb I18n.t("spina.website.media_library")
       end
 
       def attachment_params
-        params.require(:attachment).permit(:file, :page_id, :_destroy)
+        params.require(:attachment).permit(:file, :_destroy)
       end
     end
   end

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

@@ -1,36 +1,34 @@
 module Spina
   module Admin
     class EmbedsController < AdminController
-      
       def new
         @embeddable = (Spina::Embeds.constantize(embed_type) || embeddables.first).new
       end
-      
+
       def create
         @embeddable = Spina::Embeds.constantize(embed_type).new(embed_params)
-        
+
         if @embeddable.valid?
           render turbo_stream: turbo_stream.update(:trix_attachment_html, @embeddable.to_trix_attachment)
         else
           render :new, status: :unprocessable_entity
         end
       end
-      
+
       private
-      
-        def embeddables
-          @embeddables ||= current_theme.embeddables
-        end
-        helper_method :embeddables
-      
-        def embed_type
-          params[:embed_type]
-        end
-      
-        def embed_params
-          params.require(:embeddable).permit!
-        end
-      
+
+      def embeddables
+        @embeddables ||= current_theme.embeddables
+      end
+      helper_method :embeddables
+
+      def embed_type
+        params[:embed_type]
+      end
+
+      def embed_params
+        params.require(:embeddable).permit!
+      end
     end
   end
-end
+end

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

@@ -8,11 +8,11 @@ module Spina
         @media_folders = MediaFolder.order(:name).includes(:images)
         @images = Image.sorted.where(media_folder: @media_folder).with_attached_file.page(params[:page]).per(25)
       end
-      
+
       def show
         @image = Image.find(params[:id])
       end
-      
+
       def edit
         @image = Image.find(params[:id])
       end
@@ -24,7 +24,7 @@ module Spina
       def create
         @images = params[:image][:files].map do |file|
           next if file.blank? # Skip the blank string posted by the hidden files[] field
-          
+
           # Create the image and attach the file
           image = Image.create(media_folder_id: image_params[:media_folder_id])
           image.file.attach(file)
@@ -34,14 +34,14 @@ module Spina
 
           image
         end.compact
-        
+
         if params[:modal]
           redirect_to spina.admin_media_picker_path(media_folder_id: image_params[:media_folder_id])
         else
           render turbo_stream: turbo_stream.prepend("images", partial: "image", collection: @images)
         end
       end
-      
+
       def update
         @image = Image.find(params[:id])
         old_signed_id = @image.file&.blob&.signed_id
@@ -51,16 +51,16 @@ module Spina
           filename = "#{params[:filename]}.#{extension}"
           @image.file.blob.update(filename: filename)
         end
-        
+
         if @image.saved_change_to_media_folder_id?
           render :update
         else
-          # Replace all occurrences of the old signed blob ID 
+          # Replace all occurrences of the old signed blob ID
           # with the new ID in a background job
           if @image.reload.file&.blob&.signed_id != old_signed_id
             Spina::ReplaceSignedIdJob.perform_later(old_signed_id, @image.file&.blob&.signed_id)
           end
-          
+
           @media_folders = MediaFolder.order(:name)
           render @image
         end
@@ -74,25 +74,24 @@ module Spina
 
       private
 
-        def set_breadcrumbs
-          if @media_folder.present?
-            add_breadcrumb I18n.t('spina.website.media_library'), admin_images_path, class: 'text-gray-400'
-            add_breadcrumb @media_folder.name
-          else
-            add_breadcrumb I18n.t('spina.website.media_library')
-          end
-        end
-        
-        def set_media_folder
-          if params[:media_folder_id].present?
-            @media_folder = MediaFolder.find(params[:media_folder_id])
-          end
+      def set_breadcrumbs
+        if @media_folder.present?
+          add_breadcrumb I18n.t("spina.website.media_library"), admin_images_path, class: "text-gray-400"
+          add_breadcrumb @media_folder.name
+        else
+          add_breadcrumb I18n.t("spina.website.media_library")
         end
-        
-        def image_params
-          params.require(:image).permit(:media_folder_id, :file)
+      end
+
+      def set_media_folder
+        if params[:media_folder_id].present?
+          @media_folder = MediaFolder.find(params[:media_folder_id])
         end
+      end
 
+      def image_params
+        params.require(:image).permit(:media_folder_id, :file)
+      end
     end
   end
-end
+end

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

@@ -3,7 +3,7 @@ module Spina::Admin
     before_action :set_account
     before_action :set_locale
     before_action :set_breadcrumb
-    
+
     admin_section :content
 
     def edit
@@ -11,31 +11,30 @@ module Spina::Admin
 
     def update
       if @account.update(layout_params)
-        redirect_to spina.edit_admin_layout_path(locale: @locale), flash: {success: t('spina.layout.saved')}
+        redirect_to spina.edit_admin_layout_path(locale: @locale), flash: {success: t("spina.layout.saved")}
       else
-        flash.now[:error] = t('spina.layout.couldnt_be_saved')
-        render partial: 'error', status: :unprocessable_entity
+        flash.now[:error] = t("spina.layout.couldnt_be_saved")
+        render partial: "error", status: :unprocessable_entity
       end
     end
 
     private
-    
-      # Permit all attributes when editing your layout
-      def layout_params
-        params.require(:account).permit!
-      end
-      
-      def set_breadcrumb
-        add_breadcrumb t('spina.layout.layout')
-      end
 
-      def set_account
-        @account = current_account
-      end
+    # Permit all attributes when editing your layout
+    def layout_params
+      params.require(:account).permit!
+    end
 
-      def set_locale
-        @locale = params[:locale] || I18n.default_locale
-      end
+    def set_breadcrumb
+      add_breadcrumb t("spina.layout.layout")
+    end
 
+    def set_account
+      @account = current_spina_account
+    end
+
+    def set_locale
+      @locale = params[:locale] || I18n.default_locale
+    end
   end
-end
+end

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

@@ -1,7 +1,6 @@
 module Spina
   module Admin
     class MediaFoldersController < AdminController
-
       def new
         @media_folder = MediaFolder.new
       end
@@ -36,9 +35,9 @@ module Spina
 
       private
 
-        def media_folder_params
-          params.require(:media_folder).permit(:name)
-        end
+      def media_folder_params
+        params.require(:media_folder).permit(:name)
+      end
     end
   end
-end
+end

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

@@ -1,15 +1,13 @@
 module Spina
   module Admin
     class MediaPickerController < AdminController
-      
       def show
         @images = Spina::Image.sorted.with_attached_file.page(params[:page]).per(16)
-        
-        if @media_folder = Spina::MediaFolder.find_by(id: params[:media_folder_id])
+
+        if (@media_folder = Spina::MediaFolder.find_by(id: params[:media_folder_id]))
           @images = @images.where(media_folder: @media_folder)
         end
       end
-      
     end
   end
 end

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

@@ -1,24 +1,22 @@
 module Spina
   module Admin
     class MovePagesController < AdminController
-      
       def new
         @page = Page.find(params[:page_id])
       end
-      
+
       def update
         @page = Page.find(params[:page_id])
         @page.update(page_params)
-        flash[:success] = t('spina.pages.moved')
+        flash[:success] = t("spina.pages.moved")
         redirect_back fallback_location: spina.edit_admin_page_url(@page)
       end
-      
+
       private
-      
-        def page_params
-          params.require(:page).permit(:parent_id, :resource_id)
-        end
-      
+
+      def page_params
+        params.require(:page).permit(:parent_id, :resource_id)
+      end
     end
   end
-end
+end

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

@@ -2,35 +2,34 @@ module Spina
   module Admin
     class NavigationItemsController < AdminController
       before_action :set_navigation
-      
+
       def new
         @navigation_item = @navigation.navigation_items.new(parent_id: params[:parent_id])
         @pages = Page.sorted.main.includes(:translations)
       end
-      
+
       def create
         @navigation_item = NavigationItem.new(navigation_item_params)
         if @navigation_item.save
           render turbo_stream: turbo_stream.append(@navigation_item.parent || @navigation, @navigation_item)
         end
       end
-      
+
       def destroy
         @navigation_item = @navigation.navigation_items.find(params[:id])
         @navigation_item.destroy
         render turbo_stream: turbo_stream.remove(view_context.dom_id(@navigation_item, :container))
       end
-      
+
       private
-      
-        def navigation_item_params
-          params.require(:navigation_item).permit(:page_id, :parent_id).merge(navigation_id: @navigation.id)
-        end
-      
-        def set_navigation
-          @navigation = Navigation.find(params[:navigation_id])
-        end
-      
+
+      def navigation_item_params
+        params.require(:navigation_item).permit(:page_id, :parent_id).merge(navigation_id: @navigation.id)
+      end
+
+      def set_navigation
+        @navigation = Navigation.find(params[:navigation_id])
+      end
     end
   end
-end
+end