spina 2.19.0 → 2.21.0

data/db/migrate/18_change_default_spina_resources_slug.rb

@@ -0,0 +1,9 @@
+class ChangeDefaultSpinaResourcesSlug < ActiveRecord::Migration[7.0]
+  def up
+    # Default handled in model layer for MySQL compatibility
+  end
+
+  def down
+    # Default handled in model layer for MySQL compatibility
+  end
+end

data/db/migrate/7_create_spina_settings.rb

@@ -2,7 +2,7 @@ class CreateSpinaSettings < ActiveRecord::Migration[5.0]
   def change
     create_table :spina_settings do |t|
       t.string :plugin
-      t.jsonb :preferences, default: {}
+      t.json :preferences
       t.timestamps
     end
 

data/lib/generators/spina/tailwind_config_generator.rb

@@ -3,7 +3,7 @@ module Spina
     source_root File.expand_path("../templates", __FILE__)
 
     def create_tailwind_config_file
-      filename = "app/assets/config/spina/tailwind.config.js"
+      filename = "app/assets/stylesheets/spina/application.tailwind.css"
       template filename
       insert_into_file ".gitignore", <<~TEXT
 

data/lib/generators/spina/templates/app/assets/stylesheets/spina/application.tailwind.css.tt

@@ -0,0 +1,232 @@
+@import "tailwindcss";
+
+/* Source paths */
+<%= Spina.config.tailwind_content.map{|path| "@source \"#{path}\";"}.join("\n") %>
+
+/* Plugins */
+<%= Spina.config.tailwind_plugins.map{|plugin| "@plugin \"#{plugin}\";"}.join("\n") %>
+
+@theme {
+  --font-body: "Metropolis";
+
+  --color-spina: #6865b4;
+  --color-spina-light: #797ab8;
+  --color-spina-dark: #3a3a70;
+
+  --animate-duration: 600ms;
+}
+
+/* Configuration */
+@layer base {
+  html {
+    @apply font-body;
+  }
+
+  body {
+    background: #f5f5fa; /* Ever so slightly indigo bg */
+    @apply antialiased;
+  }
+
+  /* Disable tap highlight on iOS */
+  a,
+  button {
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  }
+}
+
+/* Components */
+@layer components {
+  /* Buttons */
+  .btn {
+    @apply flex items-center justify-center rounded-md border;
+    @apply h-9 px-4;
+    @apply text-sm font-medium leading-none whitespace-nowrap;
+    @apply transition-colors duration-200;
+    @apply cursor-pointer;
+  }
+
+  .btn-default {
+    @apply text-gray-700 bg-white shadow-xs border-gray-300;
+  }
+
+  .btn-default:hover {
+    @apply bg-gray-50;
+  }
+
+  .btn-default:active {
+    @apply shadow-inner bg-gray-100;
+  }
+
+  .btn-primary {
+    @apply bg-spina border-spina-dark text-white;
+  }
+
+  .btn-primary:hover {
+    @apply bg-spina-dark;
+  }
+
+  .btn-red {
+    @apply bg-red-500 border-red-500;
+    @apply text-white;
+  }
+
+  .btn.btn-red:hover {
+    @apply bg-red-600 border-red-600;
+  }
+
+  .btn.btn-red:active {
+    @apply bg-red-600 border-red-600 shadow-inner;
+  }
+
+  .btn-gray {
+    @apply border-gray-300;
+    @apply text-gray-800;
+    @apply bg-gray-300;
+  }
+
+  .btn-gray:hover {
+    @apply bg-gray-400/75 border-gray-400;
+  }
+
+  .btn-gray:active {
+    @apply bg-gray-400/75 border-gray-400 shadow-inner;
+  }
+
+  .btn-green {
+    @apply bg-emerald-500;
+  }
+
+  /* Forms */
+  .form-input,
+  .form-select {
+    /* @apply py-3 px-4; */
+    @apply text-gray-700;
+    @apply shadow-xs;
+    @apply transition duration-150 ease-in-out;
+    @apply border-gray-300;
+    @apply rounded-md;
+  }
+
+  .form-input::placeholder {
+    @apply text-gray-400;
+  }
+
+  .form-select {
+    @apply text-sm font-medium;
+    @apply pr-12;
+  }
+
+  .form-select:focus {
+    @apply border-spina-light;
+    @apply ring-spina-light;
+  }
+
+  .form-textarea {
+    @apply bg-white;
+    @apply text-gray-700;
+    @apply shadow-xs;
+    @apply transition duration-150 ease-in-out;
+    @apply border border-gray-300;
+    @apply rounded-md;
+  }
+
+  .form-input:focus {
+    @apply border-spina-light;
+    @apply ring-spina-light;
+  }
+
+  /* Modals */
+
+  .modal {
+    @apply flex items-center justify-center;
+    @apply fixed z-40 inset-0 h-full p-6;
+  }
+
+  .modal-window {
+    -webkit-backdrop-filter: blur(10px);
+    backdrop-filter: blur(10px);
+    @apply w-full max-w-lg overflow-hidden relative;
+    @apply bg-white/75 shadow-lg rounded-xl;
+    @apply border border-gray-400;
+  }
+
+  /* Trix */
+  trix-toolbar button[data-trix-active] {
+    @apply text-white bg-spina;
+  }
+
+  trix-toolbar [data-trix-dialog] {
+    @apply hidden;
+  }
+
+  trix-toolbar .trix-dialog {
+    @apply absolute;
+    @apply top-0;
+    @apply left-0;
+    @apply z-50;
+    @apply bg-white;
+    @apply rounded-lg;
+    @apply shadow-lg;
+  }
+  trix-toolbar [data-trix-dialog][data-trix-active] {
+    @apply block;
+  }
+
+  trix-toolbar button[disabled] {
+    @apply bg-gray-100 text-gray-400;
+  }
+
+  trix-editor [data-trix-mutable]:not(.attachment__captain-editor) {
+    @apply select-none;
+  }
+
+  trix-editor figure.attachment {
+    @apply m-0 inline-block;
+  }
+
+  trix-editor figure.attachment[data-trix-content-type="Spina::Image"] {
+    max-height: 150px;
+    max-width: 200px;
+  }
+
+  trix-editor figure.attachment[data-trix-content-type="Spina::Image"] img {
+    @apply m-0 rounded-md object-contain;
+  }
+
+  trix-editor
+    figure.attachment[data-trix-content-type="Spina::Image"]
+    [data-label]:after {
+    content: attr(data-label);
+    @apply italic text-gray-500 h-8 flex items-center px-2 mt-1 text-sm;
+  }
+
+  trix-editor figure[data-trix-mutable].attachment[data-trix-content-type="Spina::Image"] img {
+    @apply shadow-lg ring-3 ring-spina-light
+  }
+
+  trix-editor
+    figure[data-trix-mutable][data-trix-content-type="application/vnd+spina.embed+html"].attachment
+    > spina-embed {
+    @apply block;
+    @apply shadow-lg ring-3 ring-spina-light rounded-md;
+  }
+
+  trix-editor figure .attachment__caption {
+    @apply hidden;
+  }
+
+  trix-editor figure .attachment__toolbar {
+    @apply hidden;
+  }
+
+  trix-editor [data-trix-mutable]::-moz-selection,
+  trix-editor [data-trix-cursor-target]::-moz-selection,
+  trix-editor [data-trix-mutable] ::-moz-selection {
+    background: none;
+  }
+  trix-editor [data-trix-mutable]::selection,
+  trix-editor [data-trix-cursor-target]::selection,
+  trix-editor [data-trix-mutable] ::selection {
+    background: none;
+  }
+}

data/lib/generators/spina/templates/app/views/demo/shared/_languages.html.erb

@@ -1,5 +1,5 @@
-<% if Spina.locales.size > 1 %>
+<% if Spina.config.locales.size > 1 %>
   <div id="languages">
-    <%= Spina.locales.map{|l| link_to_unless(l == I18n.locale, l.upcase, root_url(params: {locale: l}))}.join(' / ').html_safe %>
+    <%= Spina.config.locales.map{|l| link_to_unless(l == I18n.locale, l.upcase, root_url(params: {locale: l}))}.join(' / ').html_safe %>
   </div>
 <% end %>

data/lib/spina/engine.rb

@@ -11,7 +11,6 @@ require "attr_json"
 require "view_component"
 require "jsonapi/serializer"
 require "browser"
-require "sprockets/railtie"
 
 module Spina
   class Engine < ::Rails::Engine
@@ -22,7 +21,7 @@ module Spina
     config.to_prepare do
       unless Spina.config.disable_decorator_load
         Dir.glob(Rails.root + "app/decorators/**/*_decorator.rb").each do |decorator|
-          ActiveSupport::Deprecation.warn("using app/decorators is deprecated in favor of app/overrides. Read more about overriding Spina at spinacms.com/guides")
+          Spina.deprecator.warn("using app/decorators is deprecated in favor of app/overrides. Read more about overriding Spina at spinacms.com/guides")
           require_dependency(decorator)
         end
       end

data/lib/spina/railtie.rb

@@ -1,7 +1,10 @@
 module Spina
   class Railtie < Rails::Railtie
     initializer "spina.assets.precompile" do |app|
-      app.config.assets.precompile += %w[spina/manifest]
+      if defined?(Sprockets)
+        # Sprockets configuration
+        app.config.assets.precompile += %w[spina/manifest]
+      end
     end
 
     initializer "spina.theme_reloader" do |app|

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.19.0"
+  VERSION = "2.21.0"
 end

data/lib/spina.rb

@@ -14,100 +14,80 @@ require "spina/embeds"
 require "spina/embeds/trix_conversion"
 
 module Spina
-  include ActiveSupport::Configurable
-
   PARTS = []
   PLUGINS = []
   THEMES = []
 
-  config_accessor :api_key,
-    :api_path,
-    :authentication,
-    :backend_title,
-    :backend_path,
-    :importmap,
-    :frontend_parent_controller,
-    :disable_frontend_routes,
-    :disable_decorator_load,
-    :disable_current_account,
-    :locales,
-    :embedded_image_size,
-    :mailer_defaults,
-    :thumbnail_image_size,
-    :resource_pages_limit_value,
-    :party_pooper,
-    :tailwind_content,
-    :tailwind_plugins,
-    :queues,
-    :transliterations
-
-  # Defaults
-  self.api_key = nil
-  self.api_path = "api"
-  self.authentication = "Spina::Authentication::Sessions"
-  self.backend_title = "Spina CMS"
-  self.backend_path = "admin"
-  self.disable_frontend_routes = false
-  self.disable_decorator_load = false
-  self.disable_current_account = false
-  self.embedded_image_size = [2000, 2000]
-  self.mailer_defaults = ActiveSupport::OrderedOptions.new
-  self.thumbnail_image_size = [400, 400]
-  self.frontend_parent_controller = "ApplicationController"
-  self.locales = [I18n.default_locale]
-  self.resource_pages_limit_value = 25
-  self.party_pooper = false
-  self.transliterations = %i[latin]
-
-  # Queues for background jobs
-  # - config.queues.page_updates
-  self.queues = ActiveSupport::InheritableOptions.new
-
-  # An importmap specifically meant for Spina
-  self.importmap = Importmap::Map.new
+  class Configuration
+    attr_accessor :api_key,
+      :api_path,
+      :authentication,
+      :backend_title,
+      :backend_path,
+      :importmap,
+      :frontend_parent_controller,
+      :disable_frontend_routes,
+      :disable_decorator_load,
+      :disable_current_account,
+      :locales,
+      :embedded_image_size,
+      :mailer_defaults,
+      :thumbnail_image_size,
+      :resource_pages_limit_value,
+      :party_pooper,
+      :tailwind_plugins,
+      :queues,
+      :transliterations
+
+    def initialize
+      @api_key = nil
+      @api_path = "api"
+      @authentication = "Spina::Authentication::Sessions"
+      @backend_title = "Spina CMS"
+      @backend_path = "admin"
+      @disable_frontend_routes = false
+      @disable_decorator_load = false
+      @disable_current_account = false
+      @embedded_image_size = [2000, 2000]
+      @mailer_defaults = ActiveSupport::OrderedOptions.new
+      @thumbnail_image_size = [400, 400]
+      @frontend_parent_controller = "ApplicationController"
+      @locales = [I18n.default_locale]
+      @resource_pages_limit_value = 25
+      @party_pooper = false
+      @transliterations = %i[latin]
+      @queues = ActiveSupport::InheritableOptions.new
+      @importmap = Importmap::Map.new
+      @tailwind_plugins = %w[@tailwindcss/forms @tailwindcss/aspect-ratio @tailwindcss/typography]
+    end
 
-  # Tailwind content
-  # In order for Tailwind to generate all of the CSS Spina needs,
-  # it needs to know about every single file in your project
-  # that contains any Tailwind class names.
-  # Make sure to add your own glob patterns if you're extending
-  # Spina's UI.
-  self.tailwind_content = ["#{Spina::Engine.root}/app/views/**/*.*",
-    "#{Spina::Engine.root}/app/components/**/*.*",
-    "#{Spina::Engine.root}/app/helpers/**/*.*",
-    "#{Spina::Engine.root}/app/assets/javascripts/**/*.js",
-    "#{Spina::Engine.root}/app/**/application.tailwind.css"]
+    def tailwind_content
+      @tailwind_content ||= [
+        "#{Spina::Engine.root}/app/views/**/*.*",
+        "#{Spina::Engine.root}/app/components/**/*.*",
+        "#{Spina::Engine.root}/app/helpers/**/*.*",
+        "#{Spina::Engine.root}/app/assets/javascripts/**/*.js",
+        "#{Spina::Engine.root}/app/**/application.tailwind.css"
+      ]
+    end
 
-  self.tailwind_plugins = %w[@tailwindcss/forms @tailwindcss/aspect-ratio @tailwindcss/typography]
+    attr_writer :tailwind_content
+  end
 
-  # Images that are embedded in the Trix editor are resized to fit
-  # You can optimize this for your website and go for a smaller (or larger) size
-  # Default: 2000x2000px
   class << self
-    alias_method :config_original, :config
-
-    def config
-      config_obj = config_original
-
-      def config_obj.tailwind_purge_content
-        ActiveSupport::Deprecation.warn("config.tailwind_purge_content has been renamed to config.tailwind_content")
-        tailwind_content
-      end
-
-      def config_obj.tailwind_purge_content=(paths)
-        ActiveSupport::Deprecation.warn("config.tailwind_purge_content has been renamed to config.tailwind_content")
-        self.tailwind_content = paths
-      end
+    def configuration
+      @configuration ||= Configuration.new
+    end
+    alias_method :config, :configuration
 
-      def config_obj.embedded_image_size=(image_size)
-        if image_size.is_a? String
-          ActiveSupport::Deprecation.warn("Spina embedded_image_size should be set to an array of arguments to be passed to the :resize_to_limit ImageProcessing macro. https://github.com/janko/image_processing/blob/master/doc/minimagick.md#resize_to_limit")
-        end
+    def configure
+      yield(configuration)
+    end
 
-        self[:embedded_image_size] = image_size
-      end
+    delegate :locales, to: :config
 
-      config_obj
+    def deprecator
+      ActiveSupport::Deprecation.new("", "Spina")
     end
 
     def mounted_at

data/lib/tasks/install.rake

@@ -27,7 +27,7 @@ namespace :spina do
 
   desc "Update translations after adding locales"
   task update_translations: :environment do
-    Spina.locales.each do |locale|
+    Spina.config.locales.each do |locale|
       Mobility.with_locale(locale) do
         Spina::Page.all.order(:id).each do |page|
           page.title = page.title(fallback: I18n.fallbacks[locale])

data/lib/tasks/tailwind.rake

@@ -5,9 +5,8 @@ namespace :spina do
     def spina_tailwind_compile_command
       [
         Tailwindcss::Ruby.executable,
-        "-i", Spina::Engine.root.join("app/assets/stylesheets/spina/application.tailwind.css").to_s,
-        "-o", Rails.root.join("app/assets/builds/spina/tailwind.css").to_s,
-        "-c", Rails.root.join("app/assets/config/spina/tailwind.config.js").to_s,
+        "-i", Rails.root.join("app/assets/stylesheets/spina/application.tailwind.css").to_s,
+        "-o", Rails.root.join("app/assets/builds/spina/tailwind.css").to_s
       ]
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.21.0
 platform: ruby
 authors:
 - Bram Jetten
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,48 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +105,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +150,7 @@ dependencies:
         version: '2.32'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +160,7 @@ dependencies:
         version: '2.32'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -286,14 +257,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -1237,19 +1208,16 @@ files:
 - app/assets/javascripts/spina/libraries/canvas-confetti.js
 - app/assets/javascripts/spina/libraries/canvas-confetti@1.3.2.js
 - app/assets/javascripts/spina/libraries/debounce.js
-- app/assets/javascripts/spina/libraries/form-request-submit-polyfill.js
-- app/assets/javascripts/spina/libraries/form-request-submit-polyfill@2.0.0.js
 - app/assets/javascripts/spina/libraries/hotkeys.js
 - app/assets/javascripts/spina/libraries/hotkeys@3.8.7.js
 - app/assets/javascripts/spina/libraries/sortablejs.js
 - app/assets/javascripts/spina/libraries/sortablejs@1.13.0.js
-- app/assets/javascripts/spina/libraries/stimulus-data-bindings@1.3.2.js
-- app/assets/javascripts/spina/libraries/stimulus-reveal@1.4.2.js
 - app/assets/javascripts/spina/libraries/trix.js
 - app/assets/javascripts/spina/libraries/trix@1.3.1.esm.js
 - app/assets/stylesheets/spina/animate.css
 - app/assets/stylesheets/spina/application.tailwind.css
-- app/assets/stylesheets/spina/fonts.css.erb
+- app/assets/stylesheets/spina/fonts-propshaft.css
+- app/assets/stylesheets/spina/fonts-sprockets.css.erb
 - app/components/spina/application_component.rb
 - app/components/spina/forms/auto_file_upload_component.html.erb
 - app/components/spina/forms/auto_file_upload_component.rb
@@ -1519,6 +1487,7 @@ files:
 - db/migrate/15_add_slug_to_spina_resources.rb
 - db/migrate/16_add_ancestry_cache_columns_to_spina_pages.rb
 - db/migrate/17_add_custom_urls_to_spina_navigation_items.rb
+- db/migrate/18_change_default_spina_resources_slug.rb
 - db/migrate/1_create_spina_tables.rb
 - db/migrate/2_create_spina_translation_tables.rb
 - db/migrate/3_create_spina_navigations.rb
@@ -1532,7 +1501,7 @@ files:
 - lib/generators/spina/embed_generator.rb
 - lib/generators/spina/install_generator.rb
 - lib/generators/spina/tailwind_config_generator.rb
-- lib/generators/spina/templates/app/assets/config/spina/tailwind.config.js.tt
+- lib/generators/spina/templates/app/assets/stylesheets/spina/application.tailwind.css.tt
 - lib/generators/spina/templates/app/models/spina/embeds/embed.rb.tt
 - lib/generators/spina/templates/app/views/default/pages/homepage.html.erb
 - lib/generators/spina/templates/app/views/default/pages/show.html.erb
@@ -1595,8 +1564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Spina
 test_files: []

data/app/assets/javascripts/spina/libraries/form-request-submit-polyfill.js

@@ -1 +0,0 @@
-//= require ./form-request-submit-polyfill@2.0.0.js