panda_cms 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3676f4753c5561f12abfaddd4d9e96a349de95c1ecee5126d5bf093002c4e4bd
-  data.tar.gz: 879ff146c2c451565ae6983fb4ce908c179e52b13b1084348609a60868be855f
+  metadata.gz: 96666fe5a080a1428ca44e73fef768066b869579efdbd156b95ab448b2c58825
+  data.tar.gz: f5c6fc6a7d62ffb4d02c0589b9dd0450f1e88df2711b0ba76abcd5f82c1ad005
 SHA512:
-  metadata.gz: 9300786a0c99d6b14220b02e5770449b81ac0dcb1f92eaa1ae38d482687355e1066ae33b33f4ea5ad8831e4aefb7fabe9c1b676c78d0b5ff1eea4697bbf68fb6
-  data.tar.gz: 780ea144e8034c04b0ed8af45555e310c22592bfc387bddb974d7be0be5be4eab87774eb262c1f8069fdb7eba29b73c8e1923057b93f3ae65e41e7acf2be5094
+  metadata.gz: d0f84177176aa3119defd218c40712c81f872f362578bcc69a8e531ff8d24350ab7f177fd77614961ff1d1349dcdf5a012c99113229a5649d945c2fdbb6aaf41
+  data.tar.gz: d3523315875e2b925d9b10a1a6341c5bd381fd0ddd73513b7af5c2051701193159799f0f6219ba5b80e226059f33c3b064de5ecaeb65359826f815e2e1e51db7

data/app/lib/panda_cms/demo_site_generator.rb

@@ -15,15 +15,16 @@ module PandaCms
     def create_templates
       # Templates
       initial_templates = [
-        {name: "Homepage", file_path: "layouts/homepage", max_uses: 1},
+        {name: "Homepage", file_path: "layouts/homepage"},
         {name: "Page", file_path: "layouts/page"}
       ]
 
       initial_templates.each do |template|
         key = template[:name].downcase.to_sym
-        @templates[key] = PandaCms::Template.find_or_create_by!(template)
+        @templates[key] = PandaCms::Template.find_or_create_by(template)
       end
 
+      @templates[:homepage].update(max_uses: 1)
       @templates
     end
 
@@ -32,9 +33,9 @@ module PandaCms
     #
     # @return [Hash] A hash containing the created pages
     def create_pages
-      @pages[:home] = PandaCms::Page.find_or_create_by!({path: "/", title: "Home", template: @templates[:homepage]})
-      @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], status: "hidden"})
+      @pages[:home] = PandaCms::Page.find_or_create_by({path: "/", title: "Home", template: @templates[:homepage]})
+      @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], status: "hidden"})
 
       PandaCms::Page.reset_column_information
       PandaCms::Page.rebuild!
@@ -48,8 +49,8 @@ module PandaCms
     # @return [Hash] A hash containing the created menus
     def create_menus
       @menus = {}
-      @menus[:main] = PandaCms::Menu.find_or_create_by!(name: "Main Menu")
-      @menus[:footer] = PandaCms::Menu.find_or_create_by!(name: "Footer Menu")
+      @menus[:main] = PandaCms::Menu.find_or_create_by(name: "Main Menu")
+      @menus[:footer] = PandaCms::Menu.find_or_create_by(name: "Footer Menu")
 
       # Automatically create main menu from homepage
       unless @pages[:home].nil?

data/lib/panda_cms/engine.rb

@@ -56,9 +56,6 @@ module PandaCms
         get "/*path", to: "panda_cms/pages#show", as: :panda_cms_page
         root to: "panda_cms/pages#root"
       end
-
-      # Ensure we don't have any missing blocks from new templates
-      PandaCms::Template.generate_missing_blocks
     end
 
     # Add the migrations to the main app
@@ -70,6 +67,34 @@ module PandaCms
       end
     end
 
+    initializer "#{engine_name}.backtrace_cleaner" do |app|
+      engine_root_regex = Regexp.escape(root.to_s + File::SEPARATOR)
+
+      # Clean those ERB lines, we don't need the internal autogenerated
+      # ERB method, what we do need (line number in ERB file) is already there
+      Rails.backtrace_cleaner.add_filter do |line|
+        line.sub(/(\.erb:\d+):in `__.*$/, "\\1")
+      end
+
+      # Remove our own engine's path prefix, even if it's
+      # being used from a local path rather than the gem directory.
+      Rails.backtrace_cleaner.add_filter do |line|
+        line.sub(/^#{engine_root_regex}/, "#{engine_name} ")
+      end
+
+      # Keep Umlaut's own stacktrace in the backtrace -- we have to remove Rails
+      # silencers and re-add them how we want.
+      Rails.backtrace_cleaner.remove_silencers!
+
+      # Silence what Rails silenced, UNLESS it looks like
+      # it's from Umlaut engine
+      Rails.backtrace_cleaner.add_silencer do |line|
+        (line !~ Rails::BacktraceCleaner::APP_DIRS_PATTERN) &&
+          (line !~ /^#{engine_root_regex}/) &&
+          (line !~ /^#{engine_name} /)
+      end
+    end
+
     # Set up ViewComponent and Lookbook
     # config.view_component.component_parent_class = "PandaCms::BaseComponent"
     # config.view_component.view_component_path = PandaCms::Engine.root.join("lib/components").to_s

data/lib/panda_cms/version.rb

@@ -1,3 +1,3 @@
 module PandaCms
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Panda Software Limited
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-office-previewer
@@ -417,7 +417,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: annotate
+  name: annotaterb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="