spina 2.12.0 → 2.13.0

data/app/components/spina/pages/location_component.rb

@@ -1,29 +1,28 @@
 module Spina::Pages
   class LocationComponent < Spina::ApplicationComponent
     attr_accessor :f
-    
+
     def initialize(f, page = nil)
       @f = f
       @page = page
     end
-    
+
     def resources
       [main_collection_option] + Spina::Resource.order(:label).map do |resource|
-        [ resource.label, resource.id, data: {
-          parent_pages_url:  helpers.spina.admin_parent_pages_path(resource_id: resource.id)
+        [resource.label, resource.id, data: {
+          parent_pages_url: helpers.spina.admin_parent_pages_path(resource_id: resource.id)
         }]
       end
     end
-    
+
     def main_collection_option
-      [t('spina.pages.main_collection'), nil, data: {
-          parent_pages_url: helpers.spina.admin_parent_pages_path
-        }]
+      [t("spina.pages.main_collection"), nil, data: {
+        parent_pages_url: helpers.spina.admin_parent_pages_path
+      }]
     end
-    
+
     def default_parent_pages_path
       helpers.spina.admin_parent_pages_path(resource_id: @page&.resource_id, parent_id: @page&.parent_id, page_id: @page&.id)
     end
-    
   end
-end
+end

data/app/components/spina/pages/new_page_button_component.rb

@@ -1,19 +1,18 @@
 module Spina::Pages
   class NewPageButtonComponent < Spina::ApplicationComponent
     attr_reader :view_templates, :resource
-    
+
     def initialize(view_templates = [], resource: nil)
       @view_templates = view_templates
       @resource = resource
     end
-    
+
     def view_template
       view_templates.first
     end
-    
+
     def render?
       view_templates.any?
     end
-    
   end
-end
+end

data/app/components/spina/pages/page_component.rb

@@ -2,13 +2,13 @@ module Spina
   module Pages
     class PageComponent < ApplicationComponent
       attr_reader :sortable, :draggable
-  
+
       def initialize(page:, sortable: true, draggable: true)
         @page = page
         @sortable = sortable
         @draggable = draggable
       end
-      
+
       def label
         labels = []
         labels << t("spina.pages.concept") if @page.draft?
@@ -17,19 +17,19 @@ module Spina
         return nil if labels.size.zero?
         "(#{labels.join(", ")})"
       end
-      
+
       def sortable?
         sortable
       end
-      
+
       def draggable?
         draggable
       end
-  
+
       def depth
         @page.depth
       end
-      
+
       def css_class
         case depth
         when 1
@@ -38,11 +38,10 @@ module Spina
           "pl-10 bg-gray-200"
         end
       end
-  
+
       def children
         @children ||= @page.children.active.sorted
       end
-  
     end
   end
-end
+end

data/app/components/spina/pages/page_select_component.rb

@@ -1,7 +1,7 @@
 module Spina::Pages
   class PageSelectComponent < Spina::ApplicationComponent
     attr_accessor :name, :pages, :include_blank, :selected, :disabled
-    
+
     def initialize(name, pages, include_blank: false, selected: nil, disabled: nil)
       @name = name
       @pages = pages
@@ -9,13 +9,12 @@ module Spina::Pages
       @selected = selected
       @disabled = disabled
     end
-    
+
     def options
       Spina::Page.sort_by_ancestry(pages.arrange(order: :position)).map do |page|
-        page_menu_title = page.menu_title.indent(page.depth, '–')
+        page_menu_title = page.menu_title.indent(page.depth, "–")
         [page_menu_title, page.id]
       end
     end
-
   end
 end

data/app/components/spina/pages/tab_button_component.rb

@@ -1,11 +1,9 @@
 module Spina
   module Pages
     class TabButtonComponent < ApplicationComponent
-
       def initialize(tab_name:)
         @tab_name = tab_name
       end
-
     end
   end
-end
+end

data/app/components/spina/pages/translations_component.rb

@@ -1,32 +1,30 @@
 module Spina
   module Pages
     class TranslationsComponent < ApplicationComponent
-  
       def initialize(page, label: nil)
         @page = page
         @label = label
       end
-      
+
       def render?
         spina_locales.many?
       end
-  
+
       def missing_locales
         spina_locales - existing_locales
       end
-  
+
       def existing_locales
         @existing_locales ||= @page.translations.pluck(:locale).map(&:to_sym).sort_by do |locale|
           spina_locales.index(locale)
         end
       end
-  
+
       private
-  
-        def spina_locales
-          Spina.locales.map(&:to_sym)
-        end
-  
+
+      def spina_locales
+        Spina.locales.map(&:to_sym)
+      end
     end
   end
-end
+end

data/app/components/spina/user_interface/dropdown_button_component.rb

@@ -2,15 +2,15 @@ module Spina
   module UserInterface
     class DropdownButtonComponent < ApplicationComponent
       attr_reader :disabled
-      
+
       def initialize(disabled: false)
         @disabled = disabled
       end
-      
+
       def call
         content_tag :button, content, {class: classes, type: :submit, disabled: disabled}
       end
-      
+
       def classes
         if disabled
           "block w-full text-left px-3 py-2 text-sm leading-4 text-gray-400 font-medium cursor-default"
@@ -20,4 +20,4 @@ module Spina
       end
     end
   end
-end
+end

data/app/components/spina/user_interface/dropdown_component.rb

@@ -1,28 +1,27 @@
 module Spina
   module UserInterface
-    class DropdownComponent < ApplicationComponent      
+    class DropdownComponent < ApplicationComponent
       renders_one :button, "ButtonComponent"
-      
+
       renders_one :menu, "MenuComponent"
-      
+
       class ButtonComponent < ApplicationComponent
         attr_reader :classes
-        
+
         def initialize(classes:)
           @classes = classes
         end
-        
+
         def call
-          content_tag :button, content, {type: 'button', class: classes, data: {action: "reveal#toggle"}}
+          content_tag :button, content, {type: "button", class: classes, data: {action: "reveal#toggle"}}
         end
       end
-      
+
       class MenuComponent < ApplicationComponent
         def call
           content_tag :div, content, {class: "origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg border border-gray-200 z-20 rounded-md bg-white shadow-xs py-1", hidden: true, data: {reveal: true, transition: true}}
         end
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/flash_message_component.rb

@@ -1,16 +1,15 @@
 module Spina
   module UserInterface
     class FlashMessageComponent < ApplicationComponent
-      
       def initialize(type:, message:)
         @type = type
         @message = message
       end
-      
+
       def confetti?
         @type == "confetti" && !Spina.config.party_pooper
       end
-      
+
       def theme
         case @type
         when "alert", "error"
@@ -19,7 +18,6 @@ module Spina
           "bg-gray-400"
         end
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/header_component.rb

@@ -1,9 +1,9 @@
 module Spina
   module UserInterface
-    class HeaderComponent < ApplicationComponent      
+    class HeaderComponent < ApplicationComponent
       renders_one :actions
       renders_one :navigation
       renders_one :after_breadcrumbs
     end
   end
-end
+end

data/app/components/spina/user_interface/modal_component.rb

@@ -1,11 +1,9 @@
 module Spina
   module UserInterface
     class ModalComponent < ApplicationComponent
-      
       def initialize(size: "max-w-lg")
         @size = size
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/tab_link_component.rb

@@ -1,14 +1,13 @@
 module Spina
   module UserInterface
     class TabLinkComponent < ApplicationComponent
-      
       def initialize(name = nil, url = nil, active: false)
         url = name if url.nil?
         @url = url
         @name = name
         @active = active
       end
-      
+
       def css_classes
         if @active
           "cursor-default text-gray-900 bg-spina-dark bg-opacity-10"
@@ -16,7 +15,6 @@ module Spina
           ""
         end
       end
-      
     end
   end
 end

data/app/components/spina/user_interface/translations_component.rb

@@ -1,26 +1,24 @@
 module Spina
   module UserInterface
     class TranslationsComponent < ApplicationComponent
-  
       def initialize(record, label: nil)
         @record = record
         @label = label
       end
-      
+
       def render?
         spina_locales.many?
       end
-      
+
       def locales
         spina_locales
       end
-  
+
       private
-  
-        def spina_locales
-          Spina.locales.map(&:to_sym)
-        end
-  
+
+      def spina_locales
+        Spina.locales.map(&:to_sym)
+      end
     end
   end
-end
+end

data/app/controllers/concerns/spina/api/paginable.rb

@@ -2,43 +2,42 @@ module Spina
   module Api
     module Paginable
       extend ActiveSupport::Concern
-    
+
       private
-      
-        def pagination(records)
-          paginated_records = records.page(params[:page]).per(params[:per_page])
-          [paginated_records, {
-            meta: pagination_meta(paginated_records),
-            links: pagination_links(paginated_records)
-          }]
-        end
-        
-        def pagination_meta(paginated_records)
-          {
-            current_page: paginated_records.current_page,
-            total: paginated_records.total_count,
-            per_page: paginated_records.limit_value,
-            path: view_context.url_for(only_path: true)
-          }
-        end
-        
-        def pagination_links(paginated_records)
-          {
-            first: path_to_first_page,
-            prev: view_context.path_to_prev_page(paginated_records),
-            next: view_context.path_to_next_page(paginated_records),
-            last: path_to_last_page(paginated_records)
-          }
-        end
-        
-        def path_to_first_page
-          view_context.url_for(page: 1, per_page: params[:per_page], only_path: true)
-        end
-        
-        def path_to_last_page(paginated_records)
-          view_context.url_for(page: paginated_records.total_pages, per_page: params[:per_page], only_path: true)
-        end
-          
+
+      def pagination(records)
+        paginated_records = records.page(params[:page]).per(params[:per_page])
+        [paginated_records, {
+          meta: pagination_meta(paginated_records),
+          links: pagination_links(paginated_records)
+        }]
+      end
+
+      def pagination_meta(paginated_records)
+        {
+          current_page: paginated_records.current_page,
+          total: paginated_records.total_count,
+          per_page: paginated_records.limit_value,
+          path: view_context.url_for(only_path: true)
+        }
+      end
+
+      def pagination_links(paginated_records)
+        {
+          first: path_to_first_page,
+          prev: view_context.path_to_prev_page(paginated_records),
+          next: view_context.path_to_next_page(paginated_records),
+          last: path_to_last_page(paginated_records)
+        }
+      end
+
+      def path_to_first_page
+        view_context.url_for(page: 1, per_page: params[:per_page], only_path: true)
+      end
+
+      def path_to_last_page(paginated_records)
+        view_context.url_for(page: paginated_records.total_pages, per_page: params[:per_page], only_path: true)
+      end
     end
   end
-end
+end

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

@@ -7,7 +7,7 @@ module Spina
       helper_method :current_spina_account
       helper_method :current_account
     end
-  
+
     private
 
     def current_account

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

@@ -1,17 +1,16 @@
 module Spina
   module CurrentTheme
     extend ActiveSupport::Concern
-    
+
     included do
       before_action :current_theme
       helper_method :current_theme
     end
-  
+
     private
-    
-      def current_theme
-        Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_spina_account.theme)
-      end
-        
+
+    def current_theme
+      Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_spina_account.theme)
+    end
   end
 end

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

@@ -6,7 +6,7 @@ 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_spina_account
@@ -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_spina_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,7 +2,7 @@ module Spina
   module Admin
     class AccountsController < AdminController
       admin_section :settings
-      
+
       before_action :set_breadcrumbs
 
       def edit
@@ -10,23 +10,22 @@ module Spina
 
       def update
         if current_spina_account.update(account_params)
-          redirect_back fallback_location: spina.edit_admin_account_path, flash: {success: t('spina.accounts.saved')}
+          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