panda_cms 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7ca583180961d77d05634c9159ab828e8412bb393189a17673e205678e2c2c
-  data.tar.gz: 27f77b7dea245a10c9e3f67404ce599009f46545c446d11102d4fbca6f4ba948
+  metadata.gz: c8d2e30561848d6e53c6717861b56681eff580b74b81dbe14fdd26d72dd964a1
+  data.tar.gz: 60c6219ab70bda2f649b6354277dcb730d500135a6d1d399f15cc3ee0c34942c
 SHA512:
-  metadata.gz: f9af8638df72dc9f4f444ad05cb3458fd1f04e499fe7f9246854973b0f713df7e360f9d6ce4f7aa7ccdff4e66826ed712de24b768eeec6d12ecbca47a41c863d
-  data.tar.gz: 6a28ab4cd9dd1e7ccf9f48d1dec7c21c2902313dc0ce11da4809862625953a38ae9f76e9eb91980aeed4dfe5d4a9f58ffc1b290b445466822196f465a0d2bb58
+  metadata.gz: 8f25a5a0b0bbe6a616caff5e7d57ec4c2d3471b03c2ea031e15a9c94b8b62531e8f6115f94555bae102e6561b499c38d9bf7051bbf52fdd2f1dc30de84bbf9e5
+  data.tar.gz: 2fbca70b88f2c37ae46f512e6c2c1ed228f1ab8ac45b34ec2ede63f9aaf0c44fe724a543e80020301a8e3c3b07292e34b17d2c06e54e2a198450b186e8339405

data/app/controllers/panda_cms/admin/posts_controller.rb

@@ -68,7 +68,7 @@ module PandaCms
       # @return PandaCms::post
       def post
         @post ||= if params[:id]
-          PandaCms::Post.find_by_slug(params[:id])
+          PandaCms::Post.find_by_slug("/" + params[:id])
         else
           PandaCms::Post.new
         end

data/app/controllers/panda_cms/posts_controller.rb

@@ -1,18 +1,11 @@
 module PandaCms
   class PostsController < ApplicationController
-    def index
-    end
-
     def show
-      post = PandaCms::Post.find_by(slug: params[:slug])
-
-      # TODO: Make this much nicer in future
-      globals = {
-        post: post,
-        title: post.title
-      }
+      @posts_index_page = PandaCms::Page.find_by(path: "/#{PandaCms.posts[:prefix]}")
+      @post = PandaCms::Post.find_by(slug: "/#{params[:slug]}")
+      @title = @post.title
 
-      render inline: "", assigns: globals, status: :ok, layout: "layouts/post"
+      render inline: "", status: :ok, layout: "layouts/post"
     end
   end
 end

data/app/lib/panda_cms/demo_site_generator.rb

@@ -38,6 +38,9 @@ module PandaCms
       @pages[:about] = PandaCms::Page.find_or_create_by!({path: "/about", title: "About", template: @templates[:page], parent: @pages[:home]})
       @pages[:terms] = PandaCms::Page.find_or_create_by!({path: "/terms-and-conditions", title: "Terms & Conditions", template: @templates[:page], parent: @pages[:home]})
 
+      PandaCms::Page.reset_column_information
+      PandaCms::Page.rebuild!
+
       @pages
     end
 
@@ -52,7 +55,7 @@ module PandaCms
 
       # Automatically create main menu from homepage
       unless @pages[:home].nil?
-        @menus[:main].update(kind: :auto, start_page: @pages[:home])
+        @menus[:main].update(kind: :auto, start_page: @pages[:home], depth: 1)
         @menus[:main].generate_auto_menu_items
       end
 

data/app/models/panda_cms/post.rb

@@ -11,7 +11,13 @@ module PandaCms
     belongs_to :user, class_name: "PandaCms::User"
 
     validates :title, presence: true
-    validates :slug, presence: true, uniqueness: true, format: {with: /\A[a-z0-9-]+\z/}
+    validates :slug,
+      presence: true,
+      uniqueness: true,
+      format: {
+        with: /\A\/[a-z0-9-]+\z/,
+        message: "must start with a forward slash and contain only lowercase letters, numbers, and hyphens"
+      }
 
     scope :ordered, -> { order(published_at: :desc) }
     scope :with_user, -> { includes(:user) }
@@ -28,7 +34,7 @@ module PandaCms
     }
 
     def to_param
-      slug.to_s
+      formatted_slug.to_s
     end
 
     def excerpt(length = 100, squish: true)
@@ -42,10 +48,10 @@ module PandaCms
     end
 
     def formatted_slug
-      if params[:slug][0] != "/"
-        "/#{params[:slug]}"
+      if slug[0] == "/"
+        slug[1, slug.length].to_s
       else
-        params[:slug]
+        slug
       end
     end
   end

data/app/views/panda_cms/admin/posts/_form.html.erb

@@ -10,7 +10,6 @@
     <%= f.button %>
   </div>
 <% end %>
-
 <% content_for :head do %>
   <link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
   <script type="text/javascript" src="https://unpkg.com/trix@2.0.8/dist/trix.umd.min.js"></script>

data/config/routes.rb

@@ -37,7 +37,8 @@ PandaCms::Engine.routes.draw do
 
   if PandaCms.posts
     # TODO: Allow multiple types of post in future
-    get PandaCms.posts[:prefix], to: "posts#index", as: :posts
+    # TODO: This now requires a page to be created, make it explicit (with a rendering posts helper?)
+    # get PandaCms.posts[:prefix], to: "posts#index", as: :posts
     get "#{PandaCms.posts[:prefix]}/:slug", to: "posts#show", as: :post
   end
 

data/lib/panda_cms/version.rb

@@ -1,3 +1,3 @@
 module PandaCms
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Panda Software Limited
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-office-previewer
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: amazing_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -388,20 +402,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: amazing_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: annotate
   requirement: !ruby/object:Gem::Requirement