trek 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71867750da0cef4ae1928a4245e69742d7d32c6614c54da4d107f992da5e0e23
-  data.tar.gz: 71cb0d0b2ce4098030705245aaf92b50eefec11b4491bc0180e145eeb2f6a8e3
+  metadata.gz: 5a1b779a620ab9d8286b2f42d3164cef475a04d2696e765951e33ef4ac351036
+  data.tar.gz: 1485275e1fe7f5bdc5f1d8785de59d8c8e39410bcafe05732e148abf17c4634a
 SHA512:
-  metadata.gz: 0e3a672cb3ebf8abee38d436832d92d3cc5c8bd5502f37344bda47275d4bd090a7326920cd823ed84e30990cd9feb453dddc2e62bfc1d43967de230498fd8287
-  data.tar.gz: aa4c5e9ee652804fc0361b8ac9e459863f67ff42441484e26fd8387312d8ba70517809b04d81fb68d9b9cab0ea6e6c7a27b943486c80c94b1544678841806fab
+  metadata.gz: 6e9492dd289b327e48cd06f9f8d3abd5962c1cf19319bb2fb0bc94bbafc35a1438fef67b80134a56e13400410ffa0504b41518ebe9ad7ca450de4ce2ef35826b
+  data.tar.gz: c2b8ecb84e9944bd1477b90b1d98731a8b7403459071de88911b8676eff237c987a04873fb978b486a56e73a676ad35358a4b0dbfa16a8e6ff16d30f6af0d278

data/.node-version

@@ -1 +1 @@
-22.21.1
+24.18.0

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.1.26] - 2026-07-02
+
+### Changed
+
+- `Trek::Localization` now resolves the request locale through an overridable `locale_for_request` method (still `params` → `current_user` → `headers` by default). Apps that need another source can override it and fall back to the default chain with `super` instead of forking the whole concern — e.g. `def locale_for_request = Current.event&.locale.presence || super`. No behavior change for existing consumers.
+- `trek:install:authentication` no longer injects `generates_token_for` declarations into the generated `User`: `:password_reset` (15 min) is provided automatically by Rails' `has_secure_password`, and `:invite` (1 week) now lives in the `Trek::Users::Invitable` concern (which owns the rest of the invite behaviour). **Upgrade note:** existing apps can delete both `generates_token_for` blocks from their `User` — Rails and the concern provide them; customise the reset window via `has_secure_password reset_token: { expires_in: … }` if needed.
+- `trek:install:ruby` now pins **Ruby 4.0.5** (was 4.0.0), and the CI images (repo + generated `.gitlab-ci.yml` template) use the matching `4.0.5` tag. **Upgrade note:** existing apps can set `4.0.5` in `.ruby-version` and bump the `ci-ruby` image tag in `.gitlab-ci.yml`.
+- `trek:install:yarn` now installs **Yarn 4.17.0** (was 3.8.7) and no longer imports the `interactive-tools` plugin, whose `upgrade-interactive` command is built into Yarn 4. Yarn 4 is also what supports the minimal-age-gate exception below. **Upgrade note:** existing apps can upgrade with `yarn set version 4.17.0` followed by `yarn install`, and drop the now-redundant `interactive-tools` plugin.
+- Bumped **Node to 24.18.0** (was 22.21.1) in `.node-version` and the CI images (repo + generated `.gitlab-ci.yml` template, now `ci-ruby/node-24`). **Upgrade note:** existing apps can set `24.18.0` in `.node-version` and bump the `ci-ruby/node-*` image in `.gitlab-ci.yml`.
+- CI now runs `i18n-tasks missing -t diff` (config in `config/i18n-tasks.yml`) so a base-locale key with no translation in another locale fails the build. (Full `health` isn't used: as an engine, Trek's keys are consumed by host apps and many components/templates use relative keys that only resolve there.)
+
+### Fixed
+
+- Added the missing French translations that fell back to English: `admin.dialog_component.{title,text}` (the confirmation dialog shown on every destroy action) and `admin.{pages,fragments}.{show.intro,reorder.success,search.alert}`. Also added the English `admin.section`/`admin.sections` flash messages that previously existed only in French. (#194)
+- `trek:install:yarn` now exempts the `@etaminstudio` scope from Yarn's minimal-age gate (`npmMinimalAgeGate: 0` under `npmScopes.etaminstudio` in the generated `.yarnrc.yml`), so a freshly published `@etaminstudio/trek` release installs without being quarantined; the gate still applies to public packages. **Upgrade note:** existing apps can add `npmMinimalAgeGate: 0` under `npmScopes.etaminstudio` in their `.yarnrc.yml`.
+- `trek:install:locales` no longer generates an invalid `config/initializers/locales.rb` (`I18n.available_locales = [:]` / `I18n.default_locale = :`) when passed no or blank locales. A blank option/env now falls back to the default (`en, fr`), blank entries are dropped, and the list can never end up empty. (#169)
+
 ## [0.1.25] - 2026-07-01
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.25)
+    trek (0.1.26)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)

data/app/controllers/concerns/trek/localization.rb

@@ -10,13 +10,25 @@ module Trek
 
     def set_locale
       old_locale = I18n.locale
-      I18n.locale = locale_from_params || locale_from_current_user || locale_from_headers
+      I18n.locale = locale_for_request
 
       yield
     ensure
       I18n.locale = old_locale
     end
 
+    # The locale a request is answered in. Overridable seam: an app can prepend
+    # its own source (e.g. the locale of the event a request belongs to) and
+    # fall back to this default chain with `super`, rather than forking the
+    # whole concern:
+    #
+    #   def locale_for_request
+    #     Current.event&.locale.presence || super
+    #   end
+    def locale_for_request
+      locale_from_params || locale_from_current_user || locale_from_headers
+    end
+
     def locale_from_params
       params[:locale]
     end

data/app/models/concerns/trek/users/invitable.rb

@@ -9,6 +9,14 @@ module Trek
         attribute :send_invite, :boolean
 
         after_create :send_invite_email, if: :send_invite
+
+        # Invite links last a week and invalidate once the password is set
+        # (password_salt), so a used invite can't be replayed. A distinct,
+        # longer-lived purpose than :password_reset. Assumes the including model
+        # has has_secure_password.
+        generates_token_for :invite, expires_in: 1.week do
+          password_salt&.last(10)
+        end
       end
 
       private

data/config/i18n-tasks.yml

@@ -0,0 +1,21 @@
+# i18n-tasks config for the Trek engine.
+#
+# Trek ships translations for host apps, so the usual "unused key" and code
+# scan checks don't apply here (keys are used by generated apps, and many
+# components/templates use relative keys that only resolve in the host). What
+# we do want to guard is locale parity: every key present in the base locale
+# must be translated in the others. `i18n-tasks missing -t diff` enforces that.
+base_locale: en
+locales:
+  - en
+  - fr
+
+data:
+  read:
+    - config/locales/trek.%{locale}.yml
+
+# The gendered resource-label variants (f/m/m_alt) only exist in locales whose
+# models declare a gender; English always resolves to `n` (see i18n_model_gender),
+# so it intentionally omits them.
+ignore_missing:
+  - "admin.actions.*_resource.{f,m,m_alt}"

data/config/locales/trek.en.yml

@@ -155,6 +155,14 @@ en:
     search_component:
       search: Search
       search_user: Search for a user with an email
+    section:
+      destroy:
+        confirm: Are you sure you want to delete this section? This operation is irreversible.
+    sections:
+      create:
+        success: Section added
+      update:
+        success: Section updated
     seo: SEO
     settings: Settings
     user_password_resets:

data/config/locales/trek.fr.yml

@@ -86,6 +86,9 @@ fr:
       index:
         intro: Accès rapide aux fonctions-clés d'administration de votre appli
         title: Raccourcis
+    dialog_component:
+      text: Cette action est irréversible.
+      title: Êtes-vous sûr·e ?
     errors:
       message:
         one: 1 erreur détectée
@@ -106,6 +109,12 @@ fr:
         intro: Gestion des fragments de contenu utilisés sur le site
       new:
         intro: Ajout d'un fragment de contenu au site
+      reorder:
+        success: Fragments réorganisés
+      search:
+        alert: Fragment non trouvé avec ce titre
+      show:
+        intro: Fragment
       update:
         success: Fragment mis à jour
     navigation: Navigation
@@ -122,6 +131,12 @@ fr:
         intro: Gestion des pages du site
       new:
         intro: Ajout d'une page au site
+      reorder:
+        success: Pages réorganisées
+      search:
+        alert: Page non trouvée avec ce titre
+      show:
+        intro: Page
       update:
         success: Page mise à jour
     panels:

data/lib/generators/trek/install/authentication_generator.rb

@@ -66,18 +66,10 @@ module Trek
         def user_model_injection
           <<-RUBY
   has_secure_password
+  # Token purposes: :password_reset (15 min) comes from has_secure_password;
+  # :invite (1 week) comes from Trek::Users::Invitable.
   has_many :user_sessions, dependent: :destroy
 
-  # Both tokens invalidate once the password changes (password_salt). Invites
-  # get a longer window than a password reset, so they are a distinct purpose.
-  generates_token_for :password_reset, expires_in: 15.minutes do
-    password_salt&.last(10)
-  end
-
-  generates_token_for :invite, expires_in: 1.week do
-    password_salt&.last(10)
-  end
-
   scope :privileged, -> { where(role: Trek::Users::Roles::PRIVILEGED_ROLES) }
 
           RUBY

data/lib/generators/trek/install/locales_generator.rb

@@ -12,18 +12,24 @@ module Trek
 
         source_root File.expand_path("../templates", __dir__)
 
+        DEFAULT_LOCALES = "en, fr".freeze
+
         class_option :locales, type: :string,
-          desc: "Comma-separated locales to enable, e.g. en,fr (default: en)"
+          desc: "Comma-separated locales to enable, e.g. en,fr (default: en, fr)"
 
         def set_locales
-          raw = options[:locales] || ENV["TREK_LOCALES"] || "en"
-          @locales = raw.split(",").map(&:strip)
+          # `.presence` so a blank option/env (e.g. an empty answer) falls back
+          # to the default instead of producing an empty, invalid initializer.
+          raw = options[:locales].presence || ENV["TREK_LOCALES"].presence || DEFAULT_LOCALES
+          @locales = raw.split(",").map(&:strip).reject(&:blank?)
 
           invalid = @locales.reject { |locale| valid_locales?(locale) }
-          return if invalid.empty?
+          if invalid.any?
+            say "Ignoring unavailable locales: #{invalid.join(", ")}", :yellow
+            @locales -= invalid
+          end
 
-          say "Ignoring unavailable locales: #{invalid.join(", ")}", :yellow
-          @locales -= invalid
+          # Never leave the list empty — that would generate `[:]` / `:`.
           @locales = ["en"] if @locales.empty?
         end
 

data/lib/generators/trek/install/ruby_generator.rb

@@ -5,7 +5,7 @@ module Trek
   module Generators
     module Install
       class RubyGenerator < Rails::Generators::Base
-        RUBY_VERSION = "4.0.0"
+        RUBY_VERSION = "4.0.5"
 
         include Trek::Generators::Helpers
 

data/lib/generators/trek/install/yarn_generator.rb

@@ -5,7 +5,7 @@ module Trek
   module Generators
     module Install
       class YarnGenerator < Rails::Generators::Base
-        YARN_VERSION = "3.8.7"
+        YARN_VERSION = "4.17.0"
 
         include Trek::Generators::Helpers
 
@@ -41,10 +41,6 @@ module Trek
           end
         end
 
-        def add_interactive_tools_plugin
-          run "yarn plugin import interactive-tools"
-        end
-
         # The default bin/setup (generated by `rails new -j esbuild`) runs
         # `yarn install --check-files`, but `--check-files` is not a valid flag
         # under Yarn berry (the version we pin above), so it breaks `bin/setup`
@@ -67,6 +63,9 @@ module Trek
             npmScopes:
               etaminstudio:
                 npmRegistryServer: "https://git.etaminstud.io/api/v4/packages/npm"
+                # Our own registry — skip Yarn's minimal-age gate so a freshly
+                # published Trek release installs without the quarantine delay.
+                npmMinimalAgeGate: 0
           YAML
         end
 

data/lib/generators/trek/templates/.gitlab-ci.yml

@@ -20,7 +20,7 @@ stages:
 
 # Defaults
 default:
-  image: registry.git.etaminstud.io/devops/ci-ruby/node-22:4.0.0
+  image: registry.git.etaminstud.io/devops/ci-ruby/node-24:4.0.5
 
   services:
     - postgres:16

data/lib/trek/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "A modern CMS for Ruby on Rails",
   "main": "app/javascript/trek.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -730,6 +730,7 @@ files:
 - app/views/trek/shared/_resource_heading.html.slim
 - app/views/trek/shared/_resource_index_heading.html.slim
 - config/brakeman.ignore
+- config/i18n-tasks.yml
 - config/locales/trek.en.yml
 - config/locales/trek.fr.yml
 - docs/.vitepress/config.mjs