panda_cms 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a953aae667e1d450d28af607ecdc6c6cc0aa87ae622519c59362b7fc90385f
-  data.tar.gz: b465ff1fa193637da7ad4f6fa5bd5128b86f8bf2f16d365ae80adc7467759e2c
+  metadata.gz: 65c0f177dde95736d5eb516e10568d0867eb474fc4731a268313cf3165cb37c3
+  data.tar.gz: 4ff173e34e9b76c9ca4027db6700e8f29be6e4f628d871e9ccc7ee679f571d55
 SHA512:
-  metadata.gz: 04e44f0c39f269a83611ad87ddbc09fb1ac7f195dc66403b10d38201f241303a248609cc3fc62763f9a7077c5c0b4b4348d2da4dfe4c6c6aa467ced31ad0e5fe
-  data.tar.gz: edf4e1d30a60504886385f0615a5e64a3f19a2303ee155e0821829c21e8da14c302324447b1b62e9f10f3541cad89d64aa85b6665206676c02b20432b6019e2b
+  metadata.gz: '09ba22d20cb50cea4dea7dcdd8fa2b2a9d2f2d10144e6684cf1e15bdfd7ebc74d169b37c0c5d59f5d6d1875d58236d419f3022867ebbdd55e66d066ff712da28'
+  data.tar.gz: ada109f3c7103ae592cc86354bb6faed2f0364cf143cba2511b36e01fc6ad14b219dc98c0f3eabd2059c65000945c4e8855ae158605a5bace688bfd69a985b89

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(params[:id])
+          PandaCms::Post.find_by_slug(params[:id])
         else
           PandaCms::Post.new
         end

data/app/controllers/panda_cms/posts_controller.rb

@@ -4,7 +4,7 @@ module PandaCms
     end
 
     def show
-      post = PandaCms::Post.find_by(slug: "/" + params[:slug])
+      post = PandaCms::Post.find_by(slug: params[:slug])
 
       # TODO: Make this much nicer in future
       globals = {

data/app/helpers/panda_cms/application_helper.rb

@@ -47,8 +47,8 @@ module PandaCms
       "text-white hover:bg-mid/60 transition-all group flex gap-x-3 py-3 px-2 mb-2 rounded-md text-base leading-6 font-normal "
     end
 
-    def table_indent(item_with_level_attribute)
-      case item_with_level_attribute.level
+    def level_indent(level)
+      case level
       when 0
         "ml-0"
       when 1
@@ -76,6 +76,10 @@ module PandaCms
       end
     end
 
+    def table_indent(item_with_level_attribute)
+      level_indent(item_with_level_attribute.level)
+    end
+
     def menu_indent(item_with_level_attribute)
       case item_with_level_attribute.level
       when 0

data/app/javascript/controllers/text_field_update_controller.js

@@ -1,23 +1,51 @@
-import { Controller as PandaCmsController } from "@hotwired/stimulus"
+import { Controller as PandaCmsController } from "@hotwired/stimulus";
 export default class extends PandaCmsController {
-  static targets = [ "existing_root", "input_select", "input_text", "output_text" ]
+  static targets = [
+    "existing_root",
+    "input_select",
+    "input_text",
+    "output_text",
+  ];
 
-  connect() {
-  }
+  connect() {}
 
   generatePath() {
-    this.output_textTarget.value = "/" + this.createSlug(this.input_textTarget.value);
+    this.output_textTarget.value =
+      "/" + this.createSlug(this.input_textTarget.value);
   }
 
   setPrePath() {
-    this.parent_slugs = this.input_selectTarget.options[this.input_selectTarget.selectedIndex].text.match(/.*\((.*)\)$/)[1];
-    this.output_textTarget.previousSibling.innerHTML = (this.existing_rootTarget.value + this.parent_slugs).replace(/\/$/, '');;
+    this.parent_slugs =
+      this.input_selectTarget.options[
+        this.input_selectTarget.selectedIndex
+      ].text.match(/.*\((.*)\)$/)[1];
+    this.output_textTarget.previousSibling.innerHTML = (
+      this.existing_rootTarget.value + this.parent_slugs
+    ).replace(/\/$/, "");
   }
 
+  // TODO: Invoke a library or helper which can be shared with the backend
+  // and check for uniqueness at the same time
   createSlug(input) {
-    return input.toLowerCase().trim()
+    var str = input
+      .toLowerCase()
+      .trim()
       .replace(/[^\w\s-]/g, "-")
-      .replace(/&/, "and")
-      .replace(/[\s_-]+/g, "-");
+      .replace(/&/g, "and")
+      .replace(/[\s_-]+/g, "-")
+      .trim();
+
+    return this.trimStartEnd(str, "-");
+  }
+
+  trimStartEnd(str, ch) {
+    var start = 0,
+      end = str.length;
+
+    while (start < end && str[start] === ch) ++start;
+
+    while (end > start && str[end - 1] === ch) --end;
+
+    return start > 0 || end < str.length ? str.substring(start, end) : str;
   }
 }

data/app/models/panda_cms/post.rb

@@ -27,8 +27,14 @@ module PandaCms
       archived: "archived"
     }
 
-    def excerpt(length = 100)
-      content.gsub(/<[^>]*>/, "").truncate(length).html_safe
+    def to_param
+      slug.to_s
+    end
+
+    def excerpt(length = 100, squish: true)
+      excerpt = post_content.to_plain_text
+      excerpt = excerpt.squish if squish
+      excerpt.truncate(length).html_safe
     end
 
     def path

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

@@ -7,7 +7,7 @@
     <% table.column("Title") do |post| %>
       <div class="">
         <%= link_to post.title, edit_admin_post_path(post), class: "block h-full w-full" %>
-        <span class="block text-xs text-black/60"><%= post.path %></span>
+        <span class="block text-xs text-black/60"><%= post_path(post) %></span>
       </div>
     <% end %>
     <% table.column("Status") { |post| render PandaCms::Admin::TagComponent.new(status: post.status) } %>

data/lib/panda_cms/version.rb

@@ -1,3 +1,3 @@
 module PandaCms
-  VERSION = "0.5.5"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Panda Software Limited
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-office-previewer
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.1'
+        version: '15.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.1'
+        version: '15.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -1152,7 +1152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Better websites on Rails.