panda_cms 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625476035c61b37e617fe74e22deca62b77522d70c4776663ee0429453bc6ea2
-  data.tar.gz: 0e5424b52179f8b3f6b0108763399ac65c7b2ed3fc12dc68c0f6721663526547
+  metadata.gz: 66117a36fa0ee06ce08670baa4b54eae990054f9bc0c80091ca6e97a67b6ce28
+  data.tar.gz: a7d7c50fd4a0c65f157bde152fef22c6a632c8878f67de9c73fbeb91fa02acf5
 SHA512:
-  metadata.gz: 852b417dc7bea4ebe4f5c96edfe3937ab435f2a549722349f019b70a147d853b728a2951acebc95a9e67a28fbd907e5625e3b0d84e2b5d6ada7d0a31a1415f47
-  data.tar.gz: 13c1b3692557a6f9768921029da41d93ba34f6664cb85a9967a2dc6e656cc0db1a56023f07bc28bd8ee23b15fd3a0efeeb2fdae32d3041fa9797e04d28558c28
+  metadata.gz: d7f66d163bbde65c92bf600bbd21432f7083b0ff302adef3284b99ea7e233b8309f7e8a022d4b06f5dc513d0e38b795a37aac47691d97fc50ad603f8f8efb9b5
+  data.tar.gz: b9cbbcc92f2774f780f50e7faf0b03950a3d87b1f643b783c33bc2514e445be240a090f9b985a7600ec31253b25a79942f4a8c72cf4e7a23703fdbe765f7968a

data/app/lib/panda_cms/demo_site_generator.rb

@@ -20,26 +20,10 @@ module PandaCms
       ]
 
       initial_templates.each do |template|
-        @templates[template[:name].downcase.to_sym] = PandaCms::Template.find_or_create_by!(template)
+        PandaCms::Template.find_or_create_by!(template)
       end
 
-      # Blocks
-      initial_blocks = [
-        {kind: "rich_text", name: "Introduction Text", key: "introduction_text", template: @templates[:homepage]},
-        {kind: "rich_text", name: "Main Content", key: "main_content", template: @templates[:homepage]},
-        {kind: "rich_text", name: "Main Content", key: "main_content", template: @templates[:page]}
-      ]
-
-      initial_blocks.each do |block_data|
-        PandaCms::Block.find_or_create_by!(block_data)
-      end
-
-      # Empty block contents
-      PandaCms::Block.find_each do |block|
-        block.template.pages.each do |page|
-          PandaCms::BlockContent.find_or_create_by!(page: page, block: block, content: "")
-        end
-      end
+      PandaCms::Template.generate_missing_blocks
     end
 
     #

data/app/models/panda_cms/template.rb

@@ -27,38 +27,6 @@ module PandaCms
     scope :ordered, -> { order(:sort_order) }
     scope :available, -> { where("max_uses IS NULL OR (pages_count < max_uses)") }
 
-    private
-
-    # Custom validation method to check if the file_path is a valid layout file path
-    # NB: Currently only supports .html.erb templates, may want to expand in future?
-    # @return [void]
-    def validate_template_file_exists
-      # Remove any directory traversal attempts from the file_path
-      safe_file_path = file_path.to_s.gsub("../", "")
-      # Check if the file_path is an ERB template that exists in app/views
-      template_path = Rails.root.join("app", "views", "#{safe_file_path}.html.erb")
-      # NB: file? checks for files and excludes directories (unlike exist?)
-      errors.add(:file_path, "must be an existing layout file path") unless File.file?(template_path)
-    end
-
-    # Import templates from the filesystem into the database
-    # @return [void]
-    def self.load_from_filesystem
-      Rails.root.glob("app/views/layouts/**/*.html.erb").each do |file|
-        # Extract the file path from the Rails root
-        file_path = file.to_s.sub("#{Rails.root}/app/views/", "").sub(".html.erb", "")
-
-        next if file_path == "layouts/application" || file_path == "layouts/mailer"
-
-        # Find or create the template based on the file path
-        find_or_create_by(file_path: file_path) do |t|
-          t.name = file_path.sub("layouts/", "").titleize
-        end
-      end
-    end
-
-    private_class_method :load_from_filesystem
-
     # Generate missing blocks for all templates
     # @return [void]
     def self.generate_missing_blocks
@@ -112,6 +80,36 @@ module PandaCms
       end
     end
 
-    private_class_method :generate_missing_blocks
+    private
+
+    # Custom validation method to check if the file_path is a valid layout file path
+    # NB: Currently only supports .html.erb templates, may want to expand in future?
+    # @return [void]
+    def validate_template_file_exists
+      # Remove any directory traversal attempts from the file_path
+      safe_file_path = file_path.to_s.gsub("../", "")
+      # Check if the file_path is an ERB template that exists in app/views
+      template_path = Rails.root.join("app", "views", "#{safe_file_path}.html.erb")
+      # NB: file? checks for files and excludes directories (unlike exist?)
+      errors.add(:file_path, "must be an existing layout file path") unless File.file?(template_path)
+    end
+
+    # Import templates from the filesystem into the database
+    # @return [void]
+    def self.load_from_filesystem
+      Rails.root.glob("app/views/layouts/**/*.html.erb").each do |file|
+        # Extract the file path from the Rails root
+        file_path = file.to_s.sub("#{Rails.root}/app/views/", "").sub(".html.erb", "")
+
+        next if file_path == "layouts/application" || file_path == "layouts/mailer"
+
+        # Find or create the template based on the file path
+        find_or_create_by(file_path: file_path) do |t|
+          t.name = file_path.sub("layouts/", "").titleize
+        end
+      end
+    end
+
+    private_class_method :load_from_filesystem
   end
 end

data/lib/panda_cms/version.rb

@@ -1,3 +1,3 @@
 module PandaCms
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Panda Software Limited
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-01 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-office-previewer