trusty-cms 7.0.25 → 7.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185eb1c3a53672bca444539bfcbb360549c22e9158be57c5463b404f0f705f57
-  data.tar.gz: c45948714f364615ac757a3ae19784bd61e1e059e0617aedc012060b2606c054
+  metadata.gz: 94e21fe3c5c8a96301637f07c7a3520590884187a45d9e1f00aa39e81e129f5c
+  data.tar.gz: 769b855942bd1bb7ecdf193c062e47f45d77fe0561acc9b0b368f5a934e56408
 SHA512:
-  metadata.gz: 2bba25302dd2febb18847d30e00daeeb45421e919cb191e64894ce09d0d328a426ac041e1a13f581ede3ff6aa936f90407190d9c3653858c56139a3342a49019
-  data.tar.gz: 1d6e40435e549b2046440cff8aa1178057388b10e98a70b16fdfd42d3da4041b15f7ccb7059eafa66f7d47b09ff831040f9a73602718b1ebbdbe62cc04d3a598
+  metadata.gz: ec4b76f1b3009d3eb40fa9cd66f033967f9a3ebdeb022ccfbf04d60e88c11dfe7ee2a4dac88a879ecd57170903dd0de2705c8fb5ab50bb2426a34daf23065e37
+  data.tar.gz: 403fc527a1bf912a6498efc113082b360556df0fec15148f4cfeb7efdd213b62b04fa935d60f65f57134297f4685a2da0a1895c0957bb0b6a7719f1384635070

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.25)
+    trusty-cms (7.0.27)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/README.md

@@ -106,6 +106,11 @@ DEFAULT_PAGE_TYPE_ROUTES = %w[
 ].freeze
 ```
 
+### Save and View Draft Caching
+To ensure that pages and drafts under development are not cached by the browser or content delivery networks (such as CloudFront), the CMS appends a `trusty-no-cache` URL parameter containing the current date and time when a user selects **Save and View Draft** or **Save and View Page**.
+
+Because the `trusty-no-cache` parameter is always unique, it effectively bypasses caching mechanisms at both the CDN and browser levels, ensuring the user receives the most up-to-date version of the content with every request. Note that additional CDN configuration may be required to ensure query parameters are respected.
+
 ### Page Status Refresh Setup
 
 To ensure **Scheduled Pages** automatically update their status to **Published** after their designated **Publish Date & Time**, follow these steps to set up an automated refresh using **AWS Lambda** and **EventBridge**.  

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,6 @@ class Admin::PagesController < Admin::ResourceController
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
-  include Admin::NodeHelper
   include Admin::PagesHelper
   include Admin::UrlHelper
 

data/app/helpers/admin/node_helper.rb

@@ -1,4 +1,6 @@
 module Admin::NodeHelper
+  include Admin::UrlHelper
+
   def render_nodes(page, starting_index, parent_index = nil, simple = false)
     @rendered_html = ''
     render_node page, starting_index, parent_index, simple
@@ -25,17 +27,6 @@ module Admin::NodeHelper
     page
   end
 
-  def format_path(path)
-    return '' if path.nil? || path.empty?
-
-    parts = path.split('/').reject(&:empty?)
-    return 'Root' if parts.size == 1
-    return '/' if parts.size == 2
-
-    formatted_path = parts[1..-2].join('/')
-    formatted_path.empty? ? '/' : "/#{formatted_path}"
-  end
-
   def homepage
     @homepage ||= Page.find_by_parent_id(nil)
   end

data/app/helpers/admin/url_helper.rb

@@ -1,6 +1,18 @@
 module Admin::UrlHelper
   require 'uri'
 
+  def format_path(path)
+    return '' if path.to_s.empty?
+
+    parts = path.split('/').reject(&:empty?)
+    parts_size = parts.size
+    return 'Root' if parts_size == 1
+    return '/' if parts_size == 2
+
+    formatted_path = parts[1..-2].join('/')
+    formatted_path.empty? ? '/' : "/#{formatted_path}"
+  end
+
   def generate_page_url(url, page)
     base_url = extract_base_url(url)
     build_url(base_url, page)

data/app/models/page.rb

@@ -121,7 +121,7 @@ class Page < ActiveRecord::Base
   def path
     return '' if slug.blank?
 
-    parent? ? parent.child_path(self) : clean_path(slug)
+    parent.present? ? clean_path("#{parent.path}/#{slug}") : clean_path(slug)
   end
 
   alias_method :url, :path

data/app/views/admin/pages/_fields.html.haml

@@ -83,13 +83,15 @@
 -# Opens a new tab with the page URL when "Save and View Page" is selected
 :javascript
   document.addEventListener("DOMContentLoaded", function() {
-    let params = new URLSearchParams(window.location.search);
-    let dataDiv = document.getElementById("view-page-url-data");
+    const params = new URLSearchParams(window.location.search);
+    const dataDiv = document.getElementById("view-page-url-data");
+    const baseUrl = dataDiv?.dataset?.url;
 
-    if (params.get("view_page") === "true" && dataDiv) {
-      let newTabUrl = dataDiv.dataset.url;
-      if (newTabUrl) {
-        window.open(newTabUrl, '_blank');
-      }
+    if (params.get("view_page") === "true" && baseUrl) {
+      const now = new Date().toISOString();
+      const separator = baseUrl.includes("?") ? "&" : "?";
+      const newTabUrl = `${baseUrl}${separator}trusty-no-cache=${encodeURIComponent(now)}`;
+      window.open(newTabUrl, '_blank');
     }
   });
+

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.25'.freeze
+  VERSION = '7.0.27'.freeze
 end

data/vendor/extensions/layouts-extension/lib/share_layouts/helpers/action_view.rb

@@ -36,10 +36,15 @@ module ShareLayouts
             end
             
             def find_page
-              page = Page.find_by_path(request.path) rescue nil
+              page = Page.find_by_path(request.path, can_view_drafts?) rescue nil
               page.is_a?(RailsPage) ? page : RailsPage.new(:class_name => "RailsPage")
             end
-            
+
+            private
+
+            def can_view_drafts?
+              user_signed_in? # CMS users can view drafts
+            end
           end
         end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.25
+  version: 7.0.27
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator