comfortable_media_surfer 3.1.2 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a85a3f0b343392faa4c1a694a01ed10f22a2bbc4a0226457ccc4477560ca3d4
-  data.tar.gz: 637c668f4813532a4c184b7513b72497c636ff3d507d0f165b586b580cf3f536
+  metadata.gz: 8cf323e095236d5bf70617e2f6fdc7274844f10f3ae63312ddbd569becb71907
+  data.tar.gz: 69ef4521653d87de1dbc5cc5cf7f40c90eb0329bda6b8224038b6822c0973996
 SHA512:
-  metadata.gz: 2f48fbc4b720a10e251a088d125a0e3e45e4539a7f2e5d697209f8ba21afa7f206a875e53702ed87f2819391886e344c32fc2cb3b170dd32a53e68c6a6b275cb
-  data.tar.gz: 78dbda62d0289007c4cf021866585057b4448a1452f06dd1b97d718b0ce597dc98b5a31fcf54962e13662bf0da012aa2106b0a5ebad0d1406e525b9ff7e8bd1c
+  metadata.gz: 74e32612a8d303dd5e21cefe7996ec9123308878ffc88c33d1bf7a64ec3151a3fb4a83d1f530159305e3c9ed9ecb2b7da95e72ad871c2ccaeae40cd9c33b4c45
+  data.tar.gz: 9d64b2d2537f236502af7964f3cc623ed6d395856688b5cfd64f66653b9d84fb6455b0938250515ab7b201a54c4c2a3b63ec277ff907062be339974836c67c53

data/CHANGELOG.md

@@ -12,6 +12,16 @@ For all changes prior to the inception of this project, see the [Release History
 
 ## [Unreleased]
 
+## [v3.1.3] - 2025-05-29
+
+### Fixed
+
+- Fixed file descriptor leak during seeds import
+- Fixed ‘Deep nesting of tags’ error for pages containing more than MAX_DEPTH tags
+- Fixed importing pages with the same slug but different parents
+
+## [v3.1.2] - 2025-05-26
+
 ### Fixed
 
 - Fixed Expand/Collapse error in Admin/Pages.
@@ -80,7 +90,9 @@ First release of `comfortable_media_surfer`. This new gem is a revival of [Comfo
 
 - Rebranded **ComfortableMexicanSofa** as **ComfortableMediaSurfer** in order to publish new gem (database table names and schema have not changed).
 
-[Unreleased]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.0...master
+[Unreleased]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.3...master
+[v3.1.3]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.2...v3.1.3
+[v3.1.2]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.1...v3.1.2
 [v3.1.1]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.0...v3.1.1
 [v3.1.0]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.0.0...v3.1.0
 [v3.0.0]: https://github.com/shakacode/comfortable-media-surfer/compare/v2.0.19...v3.0.0

data/Gemfile

@@ -26,7 +26,7 @@ end
 group :test do
   gem 'brakeman',                 '~> 7.0.2'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'coveralls_reborn',         '~> 0.28.0', require: false
+  gem 'coveralls_reborn',         '~> 0.29.0', require: false
   gem 'cuprite',                  '>= 0.15'
   gem 'equivalent-xml',           '~> 0.6.0'
   gem 'minitest',                 '>= 5.23.0'
@@ -35,7 +35,7 @@ group :test do
   gem 'ostruct'
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.75.7', require: false
+  gem 'rubocop',                  '~> 1.77.0', require: false
   gem 'rubocop-minitest'
   gem 'rubocop-rails'
   gem 'simplecov', '~> 0.22.0', require: false

data/README.md

@@ -79,6 +79,8 @@ ALTER TABLE occams_cms_revisions RENAME TO comfy_cms_revisions;
 ALTER TABLE occams_cms_sites RENAME TO comfy_cms_sites;
 ALTER TABLE occams_cms_snippets RENAME TO comfy_cms_snippets;
 ALTER TABLE occams_cms_translations RENAME TO comfy_cms_translations;
+UPDATE comfy_cms_categories SET categorized_type = 'Comfy::Cms::Page' WHERE categorized_type = 'Occams::Cms::Page';
+UPDATE comfy_cms_categorizations SET categorized_type = 'Comfy::Cms::Page' WHERE categorized_type = 'Occams::Cms::Page';
 UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Page' WHERE record_type = 'Occams::Cms::Page';
 UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Layout' WHERE record_type = 'Occams::Cms::Layout';
 UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Snippet' WHERE record_type = 'Occams::Cms::Snippet';

data/app/views/comfy/admin/cms/files/destroy.js.erb

@@ -1,4 +1,4 @@
 (() => {
   const listItem = document.querySelector('li[data-id="<%= @file.id %>"]');
-  jQuery(listItem).fadeOut('slow', () => listItem.remove());
+  listItem.remove();
 })();

data/db/cms_seeds/sample-site/pages/index/child_b/child_a/content.html

@@ -0,0 +1,6 @@
+[attributes]
+label: Child of Child Seed Page
+layout: nested
+
+[textares content]
+Child A of Child B Page Seed Content

data/lib/comfortable_media_surfer/content/renderer.rb

@@ -39,15 +39,15 @@ class ComfortableMediaSurfer::Content::Renderer
   # @param [Comfy::Cms::WithFragments, nil] context
   def initialize(context)
     @context = context
-    @depth   = 0
   end
 
   # This is how we render content out. Takes context (cms page) and content
   # nodes
   # @param [Array<String, ComfortableMediaSurfer::Content::Tag>]
   # @param [Boolean] allow_erb
-  def render(nodes, allow_erb = ComfortableMediaSurfer.config.allow_erb)
-    if (@depth += 1) > MAX_DEPTH
+  # @param [Integer] depth current tag nesting position
+  def render(nodes, allow_erb = ComfortableMediaSurfer.config.allow_erb, depth = 0)
+    if depth >= MAX_DEPTH
       raise Error, 'Deep tag nesting or recursive nesting detected'
     end
 
@@ -58,7 +58,7 @@ class ComfortableMediaSurfer::Content::Renderer
       else
         tokens  = tokenize(node.render)
         nodes   = nodes(tokens)
-        render(nodes, allow_erb || node.allow_erb?)
+        render(nodes, allow_erb || node.allow_erb?, depth.next)
       end
     end.flatten.join
   end

data/lib/comfortable_media_surfer/seeds/file/importer.rb

@@ -15,37 +15,23 @@ module ComfortableMediaSurfer::Seeds::File
           .where('active_storage_blobs.filename' => filename).references(:blob).first ||
                site.files.new
 
-        # We need to track actual file and its attributes
-        fresh_file = false
-
         if File.exist?(attrs_path = File.join(path, "_#{filename}.yml")) && fresh_seed?(file, attrs_path)
-          fresh_file = true
-
           attrs = YAML.safe_load_file(attrs_path)
           category_ids = category_names_to_ids(file, attrs.delete('categories'))
           file.attributes = attrs.merge(
             category_ids: category_ids
           )
+          save(file, file_path)
         end
 
         if fresh_seed?(file, file_path)
-          fresh_file = true
-
-          file_handler = File.open(file_path)
-          file.file = {
-            io: file_handler,
-            filename: filename,
-            content_type: MimeMagic.by_magic(file_handler)
-          }
-        end
-
-        if fresh_file
-          if file.save
-            message = "[CMS SEEDS] Imported File \t #{file_path}"
-            ComfortableMediaSurfer.logger.info(message)
-          else
-            message = "[CMS SEEDS] Failed to import File \n#{file.errors.inspect}"
-            ComfortableMediaSurfer.logger.warn(message)
+          File.open(file_path) do |file_handler|
+            file.file = {
+              io: file_handler,
+              filename: filename,
+              content_type: MimeMagic.by_magic(file_handler)
+            }
+            save(file, file_path)
           end
         end
 
@@ -55,5 +41,15 @@ module ComfortableMediaSurfer::Seeds::File
       # cleaning up
       site.files.where('id NOT IN (?)', seed_ids).destroy_all
     end
+
+  private
+
+    def save(file, path)
+      if file.save
+        ComfortableMediaSurfer.logger.info("[CMS SEEDS] Imported File \t #{path}")
+      else
+        ComfortableMediaSurfer.logger.warn("[CMS SEEDS] Failed to import File \n#{file.errors.inspect}")
+      end
+    end
   end
 end

data/lib/comfortable_media_surfer/seeds/page/importer.rb

@@ -29,7 +29,7 @@ module ComfortableMediaSurfer::Seeds::Page
       # setting page record
       page =
         if parent.present?
-          child = site.pages.where(slug: slug).first_or_initialize
+          child = site.pages.where(slug: slug, parent_id: parent.id).first_or_initialize
           child.parent = parent
           child
         else

data/lib/comfortable_media_surfer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComfortableMediaSurfer
-  VERSION = '3.1.2'
+  VERSION = '3.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_media_surfer
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.4
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -556,6 +556,7 @@ files:
 - db/cms_seeds/sample-site/layouts/default/content.html
 - db/cms_seeds/sample-site/layouts/default/nested/content.html
 - db/cms_seeds/sample-site/pages/index/child_a/content.html
+- db/cms_seeds/sample-site/pages/index/child_b/child_a/content.html
 - db/cms_seeds/sample-site/pages/index/child_b/content.html
 - db/cms_seeds/sample-site/pages/index/cms logo.png
 - db/cms_seeds/sample-site/pages/index/content.es.html