trek 2.2.0 → 2.3.1

data/lib/trek/saved_attachments_reload.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Trek
+  # Shrine plugin keeping, across a reload, the attachers whose file was saved with the record.
+  #
+  # Shrine's `activerecord` plugin resets every attacher when the record is reloaded, which is
+  # right for an explicit reload but loses a pending attachment when something reloads the record
+  # *during* the save: closure_tree does exactly that in its `after_save` callback when it
+  # reorders siblings (on create, or when the parent changes) on a numerically ordered tree.
+  # The attacher is then no longer `changed?` when Shrine's `after_commit` runs, so the file is
+  # never promoted from the temporary `cache` storage to `store` and breaks once the cache is
+  # cleaned up.
+  #
+  # An attachment that was *not* saved is still discarded, as on any reload.
+  module SavedAttachmentsReload
+    module ReloadGuard
+      def reload(...)
+        saved_attachers = instance_variables.filter_map do |ivar|
+          attacher = instance_variable_get(ivar)
+          [ivar, attacher.dup] if attacher.is_a?(::Shrine::Attacher) && attacher.changed?
+        end
+
+        super.tap do
+          saved_attachers.each do |ivar, attacher|
+            # Only the attacher whose file is the one now in the column: anything else was
+            # assigned but not saved, and a reload drops it.
+            instance_variable_set(ivar, attacher) if attacher.file == instance_variable_get(ivar).file
+          end
+        end
+      end
+    end
+
+    module AttachmentMethods
+      def included(model)
+        super
+
+        # Prepended rather than included: Shrine's own `reload` is defined on this attachment
+        # module, which the model includes — a prepended module wraps it whatever the order the
+        # model includes its concerns in.
+        model.prepend(ReloadGuard)
+      end
+    end
+  end
+end

data/lib/trek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trek
-  VERSION = "2.2.0"
+  VERSION = "2.3.1"
 end

data/lib/trek.rb

@@ -6,6 +6,7 @@ require "blurhash"
 require "closure_tree"
 require "deepl"
 require "dry-initializer"
+require "email_validator"
 require "fastimage"
 require "http_accept_language"
 require "image_processing"
@@ -19,12 +20,15 @@ require "shrine"
 require "shrine/plugins/blurhash"
 require "slim-rails"
 require "strip_attributes"
+require "turbo-rails"
 require "view_component"
 require "view_component/form"
 
 module Trek
+  require_relative "trek/cached_attachments"
   require_relative "trek/engine"
   require_relative "trek/i18n_keys_resolver"
+  require_relative "trek/saved_attachments_reload"
   require_relative "trek/typography_formatter"
   require_relative "trek/version"
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trek",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "A modern content management & back-office system for Ruby on Rails",
   "homepage": "https://trek.etamin.studio",
   "license": "MIT",

data/postcss.config.js

@@ -1,6 +1,42 @@
+// Radix Colors only ship light (`:root, .light-theme`) and dark (`.dark-theme`)
+// variables, with no way to follow the system preference
+// (https://github.com/radix-ui/colors/issues/26). Copy every rule targeting
+// `.dark-theme` into a `prefers-color-scheme: dark` media query, with
+// `.auto-theme` in place of `.dark-theme`. The media query is appended last so
+// it wins over the light defaults, and each rule keeps its enclosing at-rules
+// (e.g. the Display P3 `@supports`/`@media` blocks).
+const DARK_THEME = /\.dark-theme(?![\w-])/;
+const autoDarkTheme = {
+  postcssPlugin: "auto-dark-theme",
+  OnceExit(root, { AtRule }) {
+    const media = new AtRule({
+      name: "media",
+      params: "(prefers-color-scheme: dark)",
+    });
+
+    root.walkRules((rule) => {
+      const selectors = rule.selectors
+        .filter((selector) => DARK_THEME.test(selector))
+        .map((selector) => selector.replace(DARK_THEME, ".auto-theme"));
+      if (!selectors.length) return;
+
+      let node = rule.clone({ selectors });
+      let parent = rule.parent;
+      while (parent.type === "atrule") {
+        node = parent.clone({ nodes: [] }).append(node);
+        parent = parent.parent;
+      }
+      media.append(node);
+    });
+
+    if (media.nodes?.length) root.append(media);
+  },
+};
+
 module.exports = {
   plugins: [
     require("postcss-import"),
+    autoDarkTheme,
     // call the `postcss-modules` plugin ourselves
     require("postcss-modules")({
       generateScopedName: (name, filename, _css) => {

data/trek.gemspec

@@ -35,10 +35,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency "closure_tree", "~> 9.0"
   spec.add_dependency "deepl-rb", "~> 3.0"
   spec.add_dependency "dry-initializer", "~> 3.1"
+  spec.add_dependency "email_validator", "~> 2.2"
   spec.add_dependency "fastimage", "~> 2.2"
   spec.add_dependency "http_accept_language", "~> 2.1"
   spec.add_dependency "i18n-tasks", "~> 1.0"
   spec.add_dependency "image_processing", "~> 1.8"
+  # json 3's `JSON.parse` takes keyword options only, but ActiveSupport (up to 8.1.3.1) passes them
+  # positionally, which breaks `db/schema.rb` for jsonb columns with a default. Lift once Rails
+  # supports json 3 (spec/dummy/generated_files_spec.rb checks the schema dump).
+  spec.add_dependency "json", "< 3"
   spec.add_dependency "kaminari"
   spec.add_dependency "listen"
   spec.add_dependency "lookbook", ">= 2.3.13"
@@ -53,6 +58,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shrine-blurhash", "~> 0.2"
   spec.add_dependency "slim-rails", "~> 4.0"
   spec.add_dependency "strip_attributes", "~> 2.0"
+  spec.add_dependency "turbo-rails", ">= 1.0"
   spec.add_dependency "view_component", "< 5.0"
   spec.add_dependency "view_component-form", "~> 0.3"
   spec.add_dependency "zeitwerk", "~> 2.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -124,6 +124,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: email_validator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +410,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: turbo-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -459,13 +501,16 @@ files:
 - app/assets/icons/trek/check.svg
 - app/assets/icons/trek/chevron-double-left.svg
 - app/assets/icons/trek/chevron-double-right.svg
+- app/assets/icons/trek/chevron-down.svg
 - app/assets/icons/trek/chevron-left.svg
 - app/assets/icons/trek/chevron-right.svg
+- app/assets/icons/trek/chevron-up.svg
 - app/assets/icons/trek/close.svg
 - app/assets/icons/trek/cursor.svg
 - app/assets/icons/trek/danger.svg
 - app/assets/icons/trek/download.svg
 - app/assets/icons/trek/eraser.svg
+- app/assets/icons/trek/external.svg
 - app/assets/icons/trek/eye.svg
 - app/assets/icons/trek/grid.svg
 - app/assets/icons/trek/hr.svg
@@ -487,7 +532,9 @@ files:
 - app/assets/icons/trek/reorder.svg
 - app/assets/icons/trek/return.svg
 - app/assets/icons/trek/search.svg
-- app/assets/icons/trek/theme.svg
+- app/assets/icons/trek/theme-auto.svg
+- app/assets/icons/trek/theme-dark.svg
+- app/assets/icons/trek/theme-light.svg
 - app/assets/icons/trek/undo.svg
 - app/assets/images/trek/favicon.png
 - app/assets/images/trek/favicon.svg
@@ -528,6 +575,10 @@ files:
 - app/components/trek/dialog_component/dialog_component.css
 - app/components/trek/dialog_component/dialog_component.html.slim
 - app/components/trek/dialog_component/dialog_component.js
+- app/components/trek/dropdown_component.rb
+- app/components/trek/dropdown_component/dropdown_component.css
+- app/components/trek/dropdown_component/dropdown_component.html.slim
+- app/components/trek/dropdown_component/dropdown_component.js
 - app/components/trek/entries/item_component.rb
 - app/components/trek/entries/item_component/item_component.css
 - app/components/trek/entries/item_component/item_component.html.slim
@@ -715,6 +766,7 @@ files:
 - app/policies/trek/preview_policy.rb
 - app/policies/trek/resource_policy.rb
 - app/policies/trek/user_policy.rb
+- app/uploaders/audio_uploader.rb
 - app/uploaders/image_uploader.rb
 - app/uploaders/model_image_uploader.rb
 - app/uploaders/record_image_uploader.rb
@@ -743,11 +795,16 @@ files:
 - docs/.vitepress/config.mjs
 - docs/.vitepress/theme/index.js
 - docs/.vitepress/theme/style.css
+- docs/changelog.md
 - docs/customize.md
 - docs/deploy.md
 - docs/getting-started.md
 - docs/index.md
+- docs/public/apple-touch-icon.png
+- docs/public/favicon.ico
+- docs/public/favicon.png
 - docs/public/logo.svg
+- docs/public/trek-mark.webp
 - docs/reference/components.md
 - docs/reference/concerns/contentable.md
 - docs/reference/concerns/formattable.md
@@ -800,6 +857,7 @@ files:
 - lib/generators/trek/install/admin_generator.rb
 - lib/generators/trek/install/agents_generator.rb
 - lib/generators/trek/install/application_generator.rb
+- lib/generators/trek/install/appsignal_generator.rb
 - lib/generators/trek/install/assets_generator.rb
 - lib/generators/trek/install/attachments_generator.rb
 - lib/generators/trek/install/authentication_generator.rb
@@ -823,6 +881,7 @@ files:
 - lib/generators/trek/install/mailer_generator.rb
 - lib/generators/trek/install/makefile_generator.rb
 - lib/generators/trek/install/menu_node_generator.rb
+- lib/generators/trek/install/model_specs_generator.rb
 - lib/generators/trek/install/package_json_generator.rb
 - lib/generators/trek/install/page_generator.rb
 - lib/generators/trek/install/postcss_generator.rb
@@ -850,6 +909,7 @@ files:
 - lib/generators/trek/templates/Makefile
 - lib/generators/trek/templates/README.md
 - lib/generators/trek/templates/components/index.js
+- lib/generators/trek/templates/config/appsignal.rb.tt
 - lib/generators/trek/templates/config/i18n-tasks.yml.erb
 - lib/generators/trek/templates/controllers/admin/base_controller.rb
 - lib/generators/trek/templates/controllers/admin/dashboards_controller.rb
@@ -861,9 +921,14 @@ files:
 - lib/generators/trek/templates/controllers/admin/user_password_resets_controller.rb
 - lib/generators/trek/templates/controllers/admin/user_sessions_controller.rb
 - lib/generators/trek/templates/controllers/admin/users_controller.rb
+- lib/generators/trek/templates/controllers/concerns/appsignal_context.rb
 - lib/generators/trek/templates/controllers/concerns/trek/authentication.rb
+- lib/generators/trek/templates/db/seeds/setup/fragments.rb
+- lib/generators/trek/templates/db/seeds/setup/users.rb
+- lib/generators/trek/templates/db/seeds/test/cases/page_tree.rb
 - lib/generators/trek/templates/helpers/application_helper.rb
 - lib/generators/trek/templates/helpers/external_link_path_helper.rb
+- lib/generators/trek/templates/initializers/appsignal_context.rb
 - lib/generators/trek/templates/initializers/healthcheck.rb
 - lib/generators/trek/templates/initializers/shrine.rb
 - lib/generators/trek/templates/javascript/application.js
@@ -911,7 +976,24 @@ files:
 - lib/generators/trek/templates/policies/page.rb
 - lib/generators/trek/templates/policies/preview.rb
 - lib/generators/trek/templates/policies/user.rb
+- lib/generators/trek/templates/spec/fixtures/files/image.png
+- lib/generators/trek/templates/spec/fixtures/files/sound.mp3
+- lib/generators/trek/templates/spec/models/page_spec.rb
+- lib/generators/trek/templates/spec/models/user_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/external_link_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/fragment_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/page_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/preview_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/tag_category_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/tag_policy_spec.rb
+- lib/generators/trek/templates/spec/policies/admin/user_policy_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/fragments_spec.rb
 - lib/generators/trek/templates/spec/requests/admin/n_plus_one_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/pages_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/uploads_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/user_password_resets_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/user_sessions_spec.rb
+- lib/generators/trek/templates/spec/requests/admin/users_spec.rb
 - lib/generators/trek/templates/views/admin/dashboards/index.html.slim
 - lib/generators/trek/templates/views/admin/fragments/_form.html.slim
 - lib/generators/trek/templates/views/admin/fragments/_fragment.json.jb
@@ -944,14 +1026,18 @@ files:
 - lib/generators/trek/templates/views/admin/users/index.html.slim
 - lib/generators/trek/templates/views/admin/users/new.html.slim
 - lib/generators/trek/templates/views/admin/users/show.html.slim
+- lib/generators/trek/templates/views/admin/users/theme.turbo_stream.slim
 - lib/generators/trek/templates/views/admin_mailer/invite.en.html.slim
 - lib/generators/trek/templates/views/admin_mailer/invite.en.text.erb
 - lib/generators/trek/templates/views/admin_mailer/invite.fr.html.slim
 - lib/generators/trek/templates/views/admin_mailer/invite.fr.text.erb
 - lib/generators/trek/upgrade/v2_generator.rb
+- lib/tasks/trek/attachments.rake
 - lib/trek.rb
+- lib/trek/cached_attachments.rb
 - lib/trek/engine.rb
 - lib/trek/i18n_keys_resolver.rb
+- lib/trek/saved_attachments_reload.rb
 - lib/trek/typography_formatter.rb
 - lib/trek/version.rb
 - netlify.toml
@@ -981,7 +1067,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A modern content management & back-office system for Ruby on Rails
 test_files: []

data/app/assets/icons/trek/theme.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path d="M8,4.8A3.2,3.2,0,1,1,4.8,8,3.2,3.2,0,0,1,8,4.8ZM8,9.6A1.6,1.6,0,1,0,6.4,8,1.6,1.6,0,0,0,8,9.6Z"/>
-  <path d="M8,3.2a.8.8,0,0,1-.8-.8V.8A.8.8,0,0,1,8.8.8V2.4A.8.8,0,0,1,8,3.2Z"/>
-  <path d="M4.04,4.84a.8.8,0,0,1-.566-.234L2.343,3.474A.8.8,0,0,1,3.474,2.343L4.606,3.474A.8.8,0,0,1,4.04,4.84Z"/>
-  <path d="M2.4,8.8H.8a.8.8,0,0,1,0-1.6H2.4a.8.8,0,0,1,0,1.6Z"/>
-  <path d="M2.909,13.891a.8.8,0,0,1-.566-1.366l1.131-1.131a.8.8,0,0,1,1.131,1.131L3.474,13.657A.8.8,0,0,1,2.909,13.891Z"/>
-  <path d="M8,16a.8.8,0,0,1-.8-.8V13.6a.8.8,0,0,1,1.6,0v1.6A.8.8,0,0,1,8,16Z"/>
-  <path d="M13.091,13.891a.8.8,0,0,1-.566-.234l-1.131-1.131a.8.8,0,1,1,1.131-1.131l1.131,1.131a.8.8,0,0,1-.566,1.366Z"/>
-  <path d="M15.2,8.8H13.6a.8.8,0,1,1,0-1.6h1.6a.8.8,0,0,1,0,1.6Z"/>
-  <path d="M11.96,4.84a.8.8,0,0,1-.566-1.366l1.131-1.131a.8.8,0,0,1,1.131,1.131L12.526,4.606A.8.8,0,0,1,11.96,4.84Z"/>
-</svg>