spina 2.18.0 → 2.20.0

data/config/locales/en.yml

@@ -241,8 +241,10 @@ en:
       wrong_username_or_password: Wrong email or password
     options:
       choose_option: Choose option
+    page_links:
+      text_placeholder: "Optional text for the link"
     pages:
-      add_page_to: 'Add page to:'
+      add_page_to: "Add page to:"
       add_translation: Add %{language} translation
       advanced: Advanced
       cannot_be_deleted: Page can't be deleted
@@ -270,7 +272,7 @@ en:
       page_content: Content
       page_part: Page section
       page_seo: Search engines
-      path: 'Path:'
+      path: "Path:"
       photo_picker: Choose image
       photos_picker: Choose images
       preview: Preview
@@ -295,7 +297,7 @@ en:
       deleted: Translation deleted
     permanently_delete: Permanently delete
     photos:
-      cannot_be_created: 'Image could not be processed:'
+      cannot_be_created: "Image could not be processed:"
       choose_images: Choose images
       delete: Delete
       delete_confirmation: Are you sure you want to delete this <strong>image</strong>?
@@ -303,7 +305,7 @@ en:
       done_organizing: Done organizing
       insert_photo: Insert image
       insert_photos: Choose images
-      link: 'URL of your image:'
+      link: "URL of your image:"
       new_folder: New folder
       organize: Organize images
       rename_folder: Rename folder
@@ -335,6 +337,7 @@ en:
       manual_sorting: Manual sorting
       no_default_template: No default template
       saved: Page collection saved
+      select_resource: Select resource
       settings: "%{label} settings"
       settings_description: All pages inside this collection will be prepended with this slug.
     save: Save
@@ -379,7 +382,7 @@ en:
       delete: Delete user
       delete_confirmation_html: Are you sure you want to delete the user <strong>%{user}</strong>?
       deleted: User deleted
-      last_login: 'Last login:'
+      last_login: "Last login:"
       never_logged_in: Never logged in
       new: New user
       profile: Profile

data/config/routes.rb

@@ -48,7 +48,7 @@ Spina::Engine.routes.draw do
         get :children
         post :sort_one
       end
-      
+
       collection do
         post :sort
       end
@@ -58,6 +58,9 @@ Spina::Engine.routes.draw do
     resources :page_select_options, only: [:show, :index] do
       post :search, on: :collection
     end
+    resources :resource_select_options, only: [:show, :index] do
+      post :search, on: :collection
+    end
     resources :page_translations, only: [:destroy]
     resources :parent_pages
     resource :layout, controller: :layout, only: [:edit, :update]

data/db/migrate/18_change_default_spina_resources_slug.rb

@@ -0,0 +1,9 @@
+class ChangeDefaultSpinaResourcesSlug < ActiveRecord::Migration[7.0]
+  def up
+    change_column :spina_resources, :slug, :jsonb, default: {}
+  end
+
+  def down
+    change_column :spina_resources, :slug, :jsonb, default: nil
+  end
+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
@@ -38,7 +37,8 @@ module Spina
         Spina::Parts::Repeater,
         Spina::Parts::Option,
         Spina::Parts::Attachment,
-        Spina::Parts::PageLink
+        Spina::Parts::PageLink,
+        Spina::Parts::ResourceLink
       )
     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/theme.rb

@@ -2,6 +2,8 @@ module Spina
   class Theme
     attr_accessor :name, :title, :parts, :page_parts, :structures, :view_templates, :layout_parts, :custom_pages, :plugins, :public_theme, :config, :navigations, :resources, :embeds
 
+    NewPageTemplate = Struct.new(:name, :title, :description, :recommended)
+
     class << self
       def all
         ::Spina::THEMES
@@ -50,12 +52,12 @@ module Spina
         next if is_custom_undeletable_page?(view_template[:name])
         next if view_template[:exclude_from]&.include?(page_collection)
 
-        OpenStruct.new({
-          name: view_template[:name],
-          title: view_template[:title],
-          description: view_template[:description],
-          recommended: view_template[:name] == resource&.view_template
-        })
+        NewPageTemplate.new(
+          view_template[:name],
+          view_template[:title],
+          view_template[:description],
+          view_template[:name] == resource&.view_template
+        )
       end.compact.sort_by do |page_template|
         [page_template.recommended ? 0 : 1]
       end

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.18.0"
+  VERSION = "2.20.0"
 end

data/lib/tasks/tailwind.rake

@@ -1,20 +1,28 @@
-require "tailwindcss-rails"
+require "tailwindcss/ruby"
 
 namespace :spina do
   namespace :tailwind do
     def spina_tailwind_compile_command
-      "#{Tailwindcss::Engine.root.join("exe/tailwindcss")} -i #{Spina::Engine.root.join("app/assets/stylesheets/spina/application.tailwind.css")} -o #{Rails.root.join("app/assets/builds", "spina/tailwind.css")} -c #{Rails.root.join("app/assets/config/spina/tailwind.config.js")}"
+      [
+        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,
+      ]
     end
 
     desc "Build your Tailwind CSS"
     task build: :environment do
       Rails::Generators.invoke("spina:tailwind_config", ["--force"])
-      system spina_tailwind_compile_command
+      command = spina_tailwind_compile_command
+      system *command
     end
 
     task watch: :environment do
       Rails::Generators.invoke("spina:tailwind_config", ["--force"])
-      system "#{spina_tailwind_compile_command} -w"
+      command = spina_tailwind_compile_command
+      command << "-w"
+      system *command
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Bram Jetten
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +120,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
@@ -207,7 +199,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -217,7 +209,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
@@ -275,19 +267,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tailwindcss-rails
+  name: tailwindcss-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 description: CMS
 email:
 - bram@denkgroot.com
@@ -1196,6 +1188,7 @@ files:
 - app/assets/javascripts/spina/controllers/button_controller.js
 - app/assets/javascripts/spina/controllers/confetti_controller.js
 - app/assets/javascripts/spina/controllers/confirm_controller.js
+- app/assets/javascripts/spina/controllers/data_binding_controller.js
 - app/assets/javascripts/spina/controllers/delegate_click_controller.js
 - app/assets/javascripts/spina/controllers/editor_insert_images_controller.js
 - app/assets/javascripts/spina/controllers/embed_controller.js
@@ -1217,6 +1210,7 @@ files:
 - app/assets/javascripts/spina/controllers/parent_pages_controller.js
 - app/assets/javascripts/spina/controllers/repeater_controller.js
 - app/assets/javascripts/spina/controllers/reveal_controller.js
+- app/assets/javascripts/spina/controllers/select_controller.js
 - app/assets/javascripts/spina/controllers/select_placeholder_controller.js
 - app/assets/javascripts/spina/controllers/selectable_controller.js
 - app/assets/javascripts/spina/controllers/shortcuts_controller.js
@@ -1229,18 +1223,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-reveal@1.2.4.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
@@ -1320,6 +1312,7 @@ files:
 - app/controllers/spina/admin/pages_controller.rb
 - app/controllers/spina/admin/parent_pages_controller.rb
 - app/controllers/spina/admin/password_resets_controller.rb
+- app/controllers/spina/admin/resource_select_options_controller.rb
 - app/controllers/spina/admin/resources_controller.rb
 - app/controllers/spina/admin/sessions_controller.rb
 - app/controllers/spina/admin/settings_controller.rb
@@ -1373,6 +1366,7 @@ files:
 - app/models/spina/parts/page_link.rb
 - app/models/spina/parts/repeater.rb
 - app/models/spina/parts/repeater_content.rb
+- app/models/spina/parts/resource_link.rb
 - app/models/spina/parts/text.rb
 - app/models/spina/resource.rb
 - app/models/spina/rewrite_rule.rb
@@ -1446,9 +1440,12 @@ files:
 - app/views/spina/admin/parts/page_links/_form.html.erb
 - app/views/spina/admin/parts/repeaters/_fields.html.erb
 - app/views/spina/admin/parts/repeaters/_form.html.erb
+- app/views/spina/admin/parts/resource_links/_form.html.erb
 - app/views/spina/admin/parts/texts/_form.html.erb
 - app/views/spina/admin/password_resets/edit.html.erb
 - app/views/spina/admin/password_resets/new.html.erb
+- app/views/spina/admin/resource_select_options/index.html.erb
+- app/views/spina/admin/resource_select_options/show.html.erb
 - app/views/spina/admin/resources/edit.html.erb
 - app/views/spina/admin/sessions/new.html.erb
 - app/views/spina/admin/settings/_string_field.html.erb
@@ -1481,6 +1478,7 @@ files:
 - config/locales/TH.yml
 - config/locales/bg.yml
 - config/locales/cs.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -1504,6 +1502,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
@@ -1563,7 +1562,7 @@ metadata:
   changelog_uri: https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/SpinaCMS/Spina
 post_install_message: "\n    Spina v2.16 includes a new migration, don't forget to
-  run spina:install:migrations.\n    \n    For details on this specific release, refer
+  run spina:install:migrations.\n\n    For details on this specific release, refer
   to the CHANGELOG file.\n    https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md#2160-august-23rd-2022\n
   \ "
 rdoc_options: []
@@ -1580,7 +1579,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Spina

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

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

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

@@ -1,27 +0,0 @@
-(function(prototype) {
-  if (typeof prototype.requestSubmit == "function")
-    return;
-  prototype.requestSubmit = function(submitter) {
-    if (submitter) {
-      validateSubmitter(submitter, this);
-      submitter.click();
-    } else {
-      submitter = document.createElement("input");
-      submitter.type = "submit";
-      submitter.hidden = true;
-      this.appendChild(submitter);
-      submitter.click();
-      this.removeChild(submitter);
-    }
-  };
-  function validateSubmitter(submitter, form) {
-    submitter instanceof HTMLElement || raise(TypeError, "parameter 1 is not of type 'HTMLElement'");
-    submitter.type == "submit" || raise(TypeError, "The specified element is not a submit button");
-    submitter.form == form || raise(DOMException, "The specified element is not owned by this form element", "NotFoundError");
-  }
-  function raise(errorConstructor, message, name) {
-    throw new errorConstructor("Failed to execute 'requestSubmit' on 'HTMLFormElement': " + message + ".", name);
-  }
-})(HTMLFormElement.prototype);
-export default null;
-