spina 2.12.0 → 2.13.1

data/app/helpers/spina/admin/icons_helper.rb

@@ -1,156 +1,154 @@
-require 'nokogiri'
+require "nokogiri"
 
 module Spina::Admin
-	module IconsHelper
-	
-		class FileNotFound < StandardError
-	  end
-		
-		def heroicon(name, style: :outline, **options)
-			name = heroicons_naming_v1_to_v2(name)
-	    file = read_file(Spina::Engine.root.join("app/assets/icons/heroicons", style.to_s, "#{name}.svg"))
-	    return "" if file.nil?
-	    doc = Nokogiri::XML(file)
-	    svg = doc.root
-	    svg[:class] = options[:class]
-	    ActiveSupport::SafeBuffer.new(svg.to_s)
-		end
-		
-		private
-		
-	    def read_file(path)
-	      return nil unless File.exist?(path)
-	      File.read(path)
-	    end
-			
-			def heroicons_naming_v1_to_v2(name)
-				lookup_table = {
-					"adjustments" => "adjustments-vertical",
-					"annotation" => "chat-bubble-bottom-center-text",
-					"archive" => "archive-box",
-					"arrow-circle-down" => "arrow-down-circle",
-					"arrow-circle-left" => "arrow-left-circle",
-					"arrow-circle-right" => "arrow-right-circle",
-					"arrow-circle-up" => "arrow-up-circle",
-					"arrow-narrow-down" => "arrow-long-down",
-					"arrow-narrow-left" => "arrow-long-left",
-					"arrow-narrow-right" => "arrow-long-right",
-					"arrow-narrow-up" => "arrow-long-up",
-					"arrow-sm-left" => nil,
-					"arrow-sm-right" => nil,
-					"arrow-sm-up" => nil,
-					"arrow-sm-down" => nil,
-					"arrows-expand" => "arrows-pointing-out",
-					"badge-check" => "check-badge",
-					"ban" => "no-symbol",
-					"bookmark-alt" => "bookmark-square",
-					"cash" => "banknotes",
-					"chart-square-bar" => "chart-bar-square",
-					"chat-alt-2" => "chat-bubble-left-right",
-					"chat-alt" => "chat-bubble-left-ellipsis",
-					"chat" => "chat-bubble-oval-left-ellipsis",
-					"chip" => "cpu-chip",
-					"clipboard-check" => "clipboard-document-check",
-					"clipboard-copy" => "clipboard-document",
-					"clipboard-list" => "clipboard-document-list",
-					"cloud-download" => "cloud-arrow-down",
-					"cloud-upload" => "cloud-arrow-up",
-					"code" => "code-bracket",
-					"collection" => "rectangle-stack",
-					"color-swatch" => "swatch",
-					"cube-transparent" => nil,
-					"currency-bangladeshi" => nil,
-					"cursor-click" => "cursor-arrow-rays",
-					"database" => "circle-stack",
-					"desktop-computer" => "computer-desktop",
-					"device-mobile" => "device-phone-mobile",
-					"document-add" => "document-plus",
-					"document-download" => "document-arrow-down",
-					"document-remove" => "document-minus",
-					"document-report" => "document-chart-bar",
-					"document-search" => "document-magnifying-glass",
-					"dots-circle-horizontal" => "ellipsis-horizontal-circle",
-					"dots-horizontal" => "ellipsis-horizontal",
-					"dots-vertical" => "ellipsis-vertical",
-					"download" => "arrow-down-tray",
-					"duplicate" => "square-2-stack",
-					"emoji-happy" => "face-smile",
-					"emoji-sad" => "face-frown",
-					"exclamation" => "exclamation",
-					"external-link" => "arrow-top-right-on-square",
-					"eye-off" => "eye-slash",
-					"fast-forward" => "forward",
-					"filter" => "funnel",
-					"folder-add" => "folder-plus",
-					"folder-download" => "folder-arrow-down",
-					"folder-remove" => "folder-minus",
-					"globe" => "globe-europe-africa",
-					"hand" => "hand-raised",
-					"inbox-in" => "inbox-arrow-down",
-					"library" => "building-library",
-					"lightning-bolt" => "bolt",
-					"location-marker" => "map-pin",
-					"login" => "arrow-left-on-rectangle",
-					"logout" => "arrow-right-on-rectangle",
-					"mail-open" => "envelope-open",
-					"mail" => "envelope",
-					"menu-alt-1" => "bars-3-center-left",
-					"menu-alt-2" => "bars-3-bottom-left",
-					"menu-alt-3" => "bars-3-bottom-right",
-					"menu-alt-4" => "bars-2",
-					"menu" => "bars-3",
-					"minus-sm" => nil,
-					"music-note" => "musical-note",
-					"office-building" => "building-office",
-					"pencil-alt" => "pencil-square",
-					"phone-incoming" => "phone-arrow-down-left",
-					"phone-missed-call" => "phone-x-mark",
-					"phone-outgoing" => "phone-arrow-up-right",
-					"photograph" => "photo",
-					"plus-sm" => nil,
-					"puzzle" => "puzzle-piece",
-					"qrcode" => "qr-code",
-					"receipt-tax" => "receipt-percent",
-					"refresh" => "arrow-path",
-					"reply" => "arrow-uturn-left",
-					"rewind" => "backward",
-					"save-as" => "arrow-down-on-square-stack",
-					"save" => "arrow-down-on-square",
-					"search-circle" => "magnifying-glass-circle",
-					"search" => "magnifying-glass",
-					"selector" => "chevron-up-down",
-					"sort-ascending" => "bars-arrow-up",
-					"sort-descending" => "bars-arrow-down",
-					"speakerphone" => "megaphone",
-					"status-offline" => "signal-slash",
-					"status-online" => "signal",
-					"support" => "lifebuoy",
-					"switch-horizontal" => "arrow-right-left",
-					"switch-vertical" => "arrow-up-down",
-					"table" => "table-cells",
-					"template" => "rectangle-group",
-					"terminal" => "command-line",
-					"thumb-down" => "hand-thumb-down",
-					"thumb-up" => "hand-thumb-up",
-					"translate" => "language",
-					"trending-down" => "arrow-trending-down",
-					"trending-up" => "arrow-trending-up",
-					"upload" => "arrow-up-tray",
-					"user-add" => "user-plus",
-					"user-remove" => nil,
-					"variable" => nil,
-					"view-boards" => "view-columns",
-					"view-grid-add" => "squares-plus",
-					"view-grid" => "squares-2x2",
-					"view-list" => "bars-4",
-					"volume-off" => "speaker-x-mark",
-					"volume-up" => "speaker-wave",
-					"x" => "x-mark",
-					"zoom-in" => "magnifying-glass-plus",
-					"zoom-out" => "magnifying-glass-minus"
-				}
-				lookup_table[name] || name
-			end
+  module IconsHelper
+    class FileNotFound < StandardError
+    end
 
-	end
-end
+    def heroicon(name, style: :outline, **options)
+      name = heroicons_naming_v1_to_v2(name)
+      file = read_file(Spina::Engine.root.join("app/assets/icons/heroicons", style.to_s, "#{name}.svg"))
+      return "" if file.nil?
+      doc = Nokogiri::XML(file)
+      svg = doc.root
+      svg[:class] = options[:class]
+      ActiveSupport::SafeBuffer.new(svg.to_s)
+    end
+
+    private
+
+    def read_file(path)
+      return nil unless File.exist?(path)
+      File.read(path)
+    end
+
+    def heroicons_naming_v1_to_v2(name)
+      lookup_table = {
+        "adjustments" => "adjustments-vertical",
+        "annotation" => "chat-bubble-bottom-center-text",
+        "archive" => "archive-box",
+        "arrow-circle-down" => "arrow-down-circle",
+        "arrow-circle-left" => "arrow-left-circle",
+        "arrow-circle-right" => "arrow-right-circle",
+        "arrow-circle-up" => "arrow-up-circle",
+        "arrow-narrow-down" => "arrow-long-down",
+        "arrow-narrow-left" => "arrow-long-left",
+        "arrow-narrow-right" => "arrow-long-right",
+        "arrow-narrow-up" => "arrow-long-up",
+        "arrow-sm-left" => nil,
+        "arrow-sm-right" => nil,
+        "arrow-sm-up" => nil,
+        "arrow-sm-down" => nil,
+        "arrows-expand" => "arrows-pointing-out",
+        "badge-check" => "check-badge",
+        "ban" => "no-symbol",
+        "bookmark-alt" => "bookmark-square",
+        "cash" => "banknotes",
+        "chart-square-bar" => "chart-bar-square",
+        "chat-alt-2" => "chat-bubble-left-right",
+        "chat-alt" => "chat-bubble-left-ellipsis",
+        "chat" => "chat-bubble-oval-left-ellipsis",
+        "chip" => "cpu-chip",
+        "clipboard-check" => "clipboard-document-check",
+        "clipboard-copy" => "clipboard-document",
+        "clipboard-list" => "clipboard-document-list",
+        "cloud-download" => "cloud-arrow-down",
+        "cloud-upload" => "cloud-arrow-up",
+        "code" => "code-bracket",
+        "collection" => "rectangle-stack",
+        "color-swatch" => "swatch",
+        "cube-transparent" => nil,
+        "currency-bangladeshi" => nil,
+        "cursor-click" => "cursor-arrow-rays",
+        "database" => "circle-stack",
+        "desktop-computer" => "computer-desktop",
+        "device-mobile" => "device-phone-mobile",
+        "document-add" => "document-plus",
+        "document-download" => "document-arrow-down",
+        "document-remove" => "document-minus",
+        "document-report" => "document-chart-bar",
+        "document-search" => "document-magnifying-glass",
+        "dots-circle-horizontal" => "ellipsis-horizontal-circle",
+        "dots-horizontal" => "ellipsis-horizontal",
+        "dots-vertical" => "ellipsis-vertical",
+        "download" => "arrow-down-tray",
+        "duplicate" => "square-2-stack",
+        "emoji-happy" => "face-smile",
+        "emoji-sad" => "face-frown",
+        "exclamation" => "exclamation",
+        "external-link" => "arrow-top-right-on-square",
+        "eye-off" => "eye-slash",
+        "fast-forward" => "forward",
+        "filter" => "funnel",
+        "folder-add" => "folder-plus",
+        "folder-download" => "folder-arrow-down",
+        "folder-remove" => "folder-minus",
+        "globe" => "globe-europe-africa",
+        "hand" => "hand-raised",
+        "inbox-in" => "inbox-arrow-down",
+        "library" => "building-library",
+        "lightning-bolt" => "bolt",
+        "location-marker" => "map-pin",
+        "login" => "arrow-left-on-rectangle",
+        "logout" => "arrow-right-on-rectangle",
+        "mail-open" => "envelope-open",
+        "mail" => "envelope",
+        "menu-alt-1" => "bars-3-center-left",
+        "menu-alt-2" => "bars-3-bottom-left",
+        "menu-alt-3" => "bars-3-bottom-right",
+        "menu-alt-4" => "bars-2",
+        "menu" => "bars-3",
+        "minus-sm" => nil,
+        "music-note" => "musical-note",
+        "office-building" => "building-office",
+        "pencil-alt" => "pencil-square",
+        "phone-incoming" => "phone-arrow-down-left",
+        "phone-missed-call" => "phone-x-mark",
+        "phone-outgoing" => "phone-arrow-up-right",
+        "photograph" => "photo",
+        "plus-sm" => nil,
+        "puzzle" => "puzzle-piece",
+        "qrcode" => "qr-code",
+        "receipt-tax" => "receipt-percent",
+        "refresh" => "arrow-path",
+        "reply" => "arrow-uturn-left",
+        "rewind" => "backward",
+        "save-as" => "arrow-down-on-square-stack",
+        "save" => "arrow-down-on-square",
+        "search-circle" => "magnifying-glass-circle",
+        "search" => "magnifying-glass",
+        "selector" => "chevron-up-down",
+        "sort-ascending" => "bars-arrow-up",
+        "sort-descending" => "bars-arrow-down",
+        "speakerphone" => "megaphone",
+        "status-offline" => "signal-slash",
+        "status-online" => "signal",
+        "support" => "lifebuoy",
+        "switch-horizontal" => "arrow-right-left",
+        "switch-vertical" => "arrow-up-down",
+        "table" => "table-cells",
+        "template" => "rectangle-group",
+        "terminal" => "command-line",
+        "thumb-down" => "hand-thumb-down",
+        "thumb-up" => "hand-thumb-up",
+        "translate" => "language",
+        "trending-down" => "arrow-trending-down",
+        "trending-up" => "arrow-trending-up",
+        "upload" => "arrow-up-tray",
+        "user-add" => "user-plus",
+        "user-remove" => nil,
+        "variable" => nil,
+        "view-boards" => "view-columns",
+        "view-grid-add" => "squares-plus",
+        "view-grid" => "squares-2x2",
+        "view-list" => "bars-4",
+        "volume-off" => "speaker-x-mark",
+        "volume-up" => "speaker-wave",
+        "x" => "x-mark",
+        "zoom-in" => "magnifying-glass-plus",
+        "zoom-out" => "magnifying-glass-minus"
+      }
+      lookup_table[name] || name
+    end
+  end
+end

data/app/helpers/spina/admin/images_helper.rb

@@ -1,6 +1,5 @@
 module Spina::Admin
   module ImagesHelper
-  
     def ratio_tailwind_class_for_image_part(image)
       case image.options.try(:[], :ratio)
       when "portrait"
@@ -13,6 +12,5 @@ module Spina::Admin
         "w-36" # Square (default)
       end
     end
-  
   end
 end

data/app/helpers/spina/admin/pages_helper.rb

@@ -1,6 +1,5 @@
 module Spina::Admin
   module PagesHelper
-    
     def asset_available?(path)
       if Rails.configuration.assets.compile
         Rails.application.precompiled_assets.include?(path)
@@ -12,19 +11,18 @@ module Spina::Admin
     def build_parts(partable, parts)
       I18n.with_locale(@locale) do
         parts.map do |part|
-          part_attributes = current_theme.parts.find{|p|p[:name].to_s == part.to_s}
+          part_attributes = current_theme.parts.find { |p| p[:name].to_s == part.to_s }
           partable.part(part_attributes)
         end
       end
     end
 
     def parts_partial_namespace(part_type)
-      part_type.tableize.sub(/\Aspina\/parts\//, '')
+      part_type.tableize.sub(/\Aspina\/parts\//, "")
     end
 
     def option_label(part, value)
-      t(['options',part.name,value].compact.join('.'))
+      t(["options", part.name, value].compact.join("."))
     end
-
   end
 end

data/app/helpers/spina/attachments_helper.rb

@@ -1,9 +1,7 @@
 module Spina
   module AttachmentsHelper
-
     def file_url(file)
       main_app.url_for(file)
     end
-
   end
-end
+end

data/app/helpers/spina/images_helper.rb

@@ -1,6 +1,5 @@
 module Spina
   module ImagesHelper
-  
     def original_url(image)
       return "" if image.nil?
       main_app.url_for(image.file)
@@ -10,12 +9,12 @@ module Spina
       return "" if image.nil?
       main_app.url_for(image.variant(resize_to_fill: [400, 300]))
     end
-    
+
     def large_thumbnail_url(image)
       return "" if image.nil?
       main_app.url_for(image.variant(resize_to_fit: [800, 600]))
     end
-    
+
     def preview_url(image)
       return "" if image.nil?
       main_app.url_for(image.variant(resize_to_limit: [1600, 1200]))
@@ -26,9 +25,9 @@ module Spina
 
       # support both ImageProcessing gem macro :resize_to_limit and ImageMagick-specific :resize
       resize_key = Spina.config.embedded_image_size.is_a?(Array) ? :resize_to_limit : :resize
-      main_app.url_for(image.variant(Hash[resize_key, Spina.config.embedded_image_size]))
+      main_app.url_for(image.variant({resize_key => Spina.config.embedded_image_size}))
     end
-    
+
     def content_type_color(image)
       case content_type(image)
       when "png"
@@ -45,10 +44,9 @@ module Spina
         "bg-gray-400"
       end
     end
-    
+
     def content_type(image)
       image.file.content_type&.split("/")&.last || I18n.t("spina.images.missing_image")
     end
-
   end
 end

data/app/helpers/spina/pages_helper.rb

@@ -1,6 +1,5 @@
 module Spina
   module PagesHelper
-
     def content(part_name = nil)
       Current.page.content(part_name)
     end
@@ -31,6 +30,5 @@ module Spina
     def current_spina_account
       Current.account
     end
-
   end
 end

data/app/helpers/spina/spina_helper.rb

@@ -1,5 +1,4 @@
 module Spina::SpinaHelper
-
   def spina_importmap_tags(entry_point = "application", shim: true)
     safe_join [
       javascript_inline_importmap_tag(Spina.config.importmap.to_json(resolver: self)),
@@ -9,5 +8,4 @@ module Spina::SpinaHelper
       javascript_import_module_tag(entry_point)
     ], "\n"
   end
-
-end
+end

data/app/jobs/spina/replace_signed_id_job.rb

@@ -1,24 +1,23 @@
 module Spina
   class ReplaceSignedIdJob < ApplicationJob
     queue_as { Spina.config.queues[:page_updates] }
-  
+
     def perform(old_signed_id, new_signed_id)
       return if old_signed_id.blank? || new_signed_id.blank?
-      
+
       pages = get_pages(old_signed_id)
       accounts = Spina::Account.all
-      
+
       [pages, accounts].each do |records|
-        records.update_all("json_attributes = REGEXP_REPLACE(json_attributes::text, '#{old_signed_id}', '#{new_signed_id}', 'g')::jsonb")  
+        records.update_all("json_attributes = REGEXP_REPLACE(json_attributes::text, '#{old_signed_id}', '#{new_signed_id}', 'g')::jsonb")
       end
     end
-    
+
     private
-    
-      def get_pages(signed_id)
-        return Spina::Page.none unless signed_id.present?
-        Spina::Page.where("json_attributes::text LIKE ?", "%#{signed_id}%")
-      end
-    
+
+    def get_pages(signed_id)
+      return Spina::Page.none unless signed_id.present?
+      Spina::Page.where("json_attributes::text LIKE ?", "%#{signed_id}%")
+    end
   end
 end

data/app/jobs/spina/resource_pages_update_job.rb

@@ -1,7 +1,7 @@
 module Spina
   class ResourcePagesUpdateJob < ApplicationJob
     queue_as { Spina.config.queues[:page_updates] }
-  
+
     def perform(resource_id)
       Page.where(resource_id: resource_id).roots.find_each(batch_size: 100) do |page|
         page.save

data/app/mailers/spina/application_mailer.rb

@@ -1,7 +1,7 @@
 module Spina
   class ApplicationMailer < ActionMailer::Base
     default Spina.config.mailer_defaults
-    
-    layout 'spina/mail'
+
+    layout "spina/mail"
   end
 end

data/app/mailers/spina/user_mailer.rb

@@ -1,13 +1,11 @@
 module Spina
   class UserMailer < ApplicationMailer
-
     def forgot_password(user, user_agent_string = nil)
       @user = user
       @browser = Browser.new(user_agent_string)
-      
-      mail to: @user.email, 
-           subject: t('spina.user_mailer.forgot_password.subject')
-    end
 
+      mail to: @user.email,
+        subject: t("spina.user_mailer.forgot_password.subject")
+    end
   end
-end
+end

data/app/models/concerns/spina/gravatar.rb

@@ -1,20 +1,19 @@
 module Spina
   module Gravatar
     extend ActiveSupport::Concern
-    
+
     def gravatar_url
       "https://www.gravatar.com/avatar/#{gravatar_hash}?d=#{fallback_url}"
     end
-    
+
     private
-    
-      def fallback_url
-        "https://eu.ui-avatars.com/api/#{CGI.escape(name)}/128"
-      end
-    
-      def gravatar_hash
-        Digest::MD5.hexdigest(email.to_s.strip.downcase)
-      end
-    
+
+    def fallback_url
+      "https://eu.ui-avatars.com/api/#{CGI.escape(name)}/128"
+    end
+
+    def gravatar_hash
+      Digest::MD5.hexdigest(email.to_s.strip.downcase)
+    end
   end
-end
+end

data/app/models/concerns/spina/partable.rb

@@ -5,12 +5,11 @@ module Spina
     attr_accessor :view_context
 
     included do
-
       def part(attributes)
         part = find_part(attributes[:name]) || attributes[:part_type].constantize.new
 
         # Copy all attributes to part
-        %w(name title hint options).each do |attribute|
+        %w[name title hint options item_name].each do |attribute|
           part.public_send("#{attribute}=", attributes[attribute.to_sym]) if part.respond_to?(attribute)
         end
 
@@ -27,10 +26,9 @@ module Spina
 
       private
 
-        def content_presenter
-          @content_presenter ||= ContentPresenter.new(view_context, self)
-        end
-
+      def content_presenter
+        @content_presenter ||= ContentPresenter.new(view_context, self)
+      end
     end
   end
 end

data/app/models/concerns/spina/translated_content.rb

@@ -1,10 +1,10 @@
 module Spina
   module TranslatedContent
     extend ActiveSupport::Concern
-    
+
     include Spina::AttrJsonMonkeypatch
 
-    included do  
+    included do
       # Store each locale's content in [locale]_content as an array of parts
       Spina.locales.each do |locale|
         attr_json "#{locale}_content".to_sym, AttrJson::Type::SpinaPartsModel.new, array: true, default: -> { [] }
@@ -12,9 +12,9 @@ module Spina
         attr_json_accepts_nested_attributes_for "#{locale}_content".to_sym
       end
     end
-    
+
     def find_part(name)
-      send("#{I18n.locale}_content").find{|part| part.name.to_s == name.to_s}
+      send("#{I18n.locale}_content").find { |part| part.name.to_s == name.to_s }
     end
   end
-end
+end

data/app/models/spina/account.rb

@@ -8,7 +8,7 @@ module Spina
     serialize :preferences
 
     after_save :bootstrap_website
-    
+
     validates :name, presence: true
 
     def to_s
@@ -22,12 +22,12 @@ module Spina
     def self.serialized_attr_accessor(*args)
       args.each do |method_name|
         define_method method_name do
-          if self.preferences.try(:[], method_name.to_sym).present?
+          if preferences.try(:[], method_name.to_sym).present?
             ActiveSupport::Deprecation.warn("#{method_name} is stored as a symbol. Please set and save it again using #{method_name}= on your Spina::Account model to store it as a string. You can do this from the UI by saving your account preferences.")
           end
-          
-          self.preferences.try(:[], method_name.to_s) || 
-          self.preferences.try(:[], method_name.to_sym)
+
+          preferences.try(:[], method_name.to_s) ||
+            preferences.try(:[], method_name.to_sym)
         end
 
         define_method "#{method_name}=" do |value|
@@ -73,18 +73,17 @@ module Spina
     def find_or_create_custom_pages(theme)
       theme.custom_pages.each do |page|
         Page.where(name: page[:name])
-            .first_or_create(title: page[:title])
-            .update(view_template: page[:view_template], deletable: page[:deletable])
+          .first_or_create(title: page[:title])
+          .update(view_template: page[:view_template], deletable: page[:deletable])
       end
     end
 
     def deactivate_unused_view_templates(theme)
-      Page.active.where.not(view_template: theme.view_templates.map{|h|h[:name]}).update_all(active: false)
+      Page.active.where.not(view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: false)
     end
 
     def activate_used_view_templates(theme)
-      Page.where(active: false, view_template: theme.view_templates.map{|h|h[:name]}).update_all(active: true)
+      Page.where(active: false, view_template: theme.view_templates.map { |h| h[:name] }).update_all(active: true)
     end
-
   end
 end

data/app/models/spina/application_record.rb

@@ -1,11 +1,10 @@
 module Spina
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
-    
+
     # Remove Spina namespace from partial paths
     def to_partial_path
       super.gsub(/\Aspina\//, "")
     end
-    
   end
-end
+end