comfortable_media_surfer 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e13956535a432a90cf4905da00b95ed763fcf7045666eb2951fa0e61cda1687
-  data.tar.gz: ffb8456f3b63e657765e1f99f3063cd10e4358fb1ffb8edf889d2d51858618c9
+  metadata.gz: df84d4de2393538c878591357b75bd7cc61cb27a3e4eea90acb44ce21579dca1
+  data.tar.gz: abef451e22b1a95f3d49ca1dc28ec3d1a4c31034e2f1eda54d88f212e3c78cba
 SHA512:
-  metadata.gz: b457c2eaad7e7f76d3f8ae944d9f7dc7f28dbb1a4892e08f4ba3369f4037ab8818c26084abaf84d0e5aee897f9a723d9c5d84616031fb8ad4b70cdf338a29a80
-  data.tar.gz: bd40c8934a344398aaa8d89be7191ca5d7d0391f1ad544cc9c3faa5e26c91db0dc86f9314cc356b2095ad1e1c474bbb479795dbe348e864e957af79537a8db04
+  metadata.gz: 89445969fe9fa29f82adb27e4fe91d07270fc1a9b12eac200daa3a64fd6554acb2213ac27bb9f59215f9e978228b537181265f9c7a3089339bc1f3eea861cdc2
+  data.tar.gz: 0a70882548a1298e1406f46828d96f07ab90c53348e2af489bd7998d9f23ba720d563c0072df583a39898918a9301d161245d3d356703b44bbb453643ca06d50

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "bundler"
+    directory: "/"  # The root directory where your Gemfile is located
+    schedule:
+      interval: "monthly" # Options: "daily", "weekly", "monthly"

data/CHANGELOG.md

@@ -12,6 +12,34 @@ For all changes prior to the inception of this project, see the [Release History
 
 ## [Unreleased]
 
+## [v3.1.2] - 2025-05-26
+
+### Fixed
+
+- Fixed Expand/Collapse error in Admin/Pages.
+- Include sassc-rails to gemspec, since it is deprecated after rails 7.0.8
+- Update documentation to reflect recent changes
+
+### Added
+
+- added migration for Markdown snippets
+
+## [v3.1.1] - 2025-02-08
+
+### Fixed
+
+- Fixed scss: use scss imports, not css ones that cannot be resolved by the browser
+
+### Added
+
+- Added rake task to compile assets, corresponding post install message
+- Added import Rails from UJS
+- Added missing jQuery import
+
+### Removed
+
+- Removed yarn, as not needed
+
 ## [v3.1.0] - 2024-12-31 (gem yanked, pending resolution of [Issue 8](https://github.com/shakacode/comfortable-media-surfer/issues/8)
 
 ### Added
@@ -54,6 +82,8 @@ 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.2...master
+[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/CONTRIBUTING.md

@@ -8,15 +8,16 @@ Fork the project. Optionally, create a branch you want to work on.
 
 ### 2. Get it running locally
 
-- Install NodeJS and yarn
-- Install JS dependencies with `yarn`
 - Install gem dependencies with `bundle install`
 - There's nothing to configure, by default database is SQLite so it will be
   created for you. Just run `bundle exec rake db:migrate`
+- Prepare the environment by running `rails comfy:compile_assets`, and
+  `rake db:test:prepare`
 - Make sure that existing tests are passing by running `bundle exec rake test`
 - There are system tests that can be run with `bundle exec rake test:system`.
   You need to have `chromedriver` installed for that.
 - You should be able to start the app via `bin/rails s` and navigate to http://localhost:3000/admin
+  and log in with username 'user' and password 'pass'
 
 ### 3. Hack away
 

data/Gemfile

@@ -8,8 +8,8 @@ gemspec
 gem 'rails', '~> 8.0'
 
 group :development, :test do
-  gem 'autoprefixer-rails', '~> 10.4.16.0'
-  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
+  gem 'autoprefixer-rails', '~> 10.4.21.0'
+  gem 'byebug',             '~> 12.0.0', platforms: %i[mri mingw x64_mingw]
   gem 'gem-release'
   gem 'image_processing',   '>= 1.12.0'
   gem 'propshaft',          '~> 1.1.0'
@@ -24,7 +24,7 @@ group :development do
 end
 
 group :test do
-  gem 'brakeman',                 '~> 6.1.2'
+  gem 'brakeman',                 '~> 7.0.2'
   gem 'bundler-audit',            '~> 0.9.1'
   gem 'coveralls_reborn',         '~> 0.28.0', require: false
   gem 'cuprite',                  '>= 0.15'
@@ -35,7 +35,7 @@ group :test do
   gem 'ostruct'
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.63.0', require: false
+  gem 'rubocop',                  '~> 1.75.7', require: false
   gem 'rubocop-minitest'
   gem 'rubocop-rails'
   gem 'simplecov', '~> 0.22.0', require: false

data/README.md

@@ -42,7 +42,8 @@ Then from the Rails project's root run:
 ```
     bundle install
     rails generate comfy:cms
-    rake db:migrate
+    rails db:migrate
+    rails comfy:compile_assets
 ```
 
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item or it will make all other routes to be inaccessible.
@@ -84,6 +85,7 @@ UPDATE comfy_cms_fragments SET record_type = 'Comfy::Cms::Snippet' WHERE record_
 UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Page' WHERE record_type = 'Occams::Cms::Page';
 UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Layout' WHERE record_type = 'Occams::Cms::Layout';
 UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::Snippet' WHERE record_type = 'Occams::Cms::Snippet';
+UPDATE active_storage_attachments SET record_type = 'Comfy::Cms::File' WHERE record_type = 'Occams::Cms::File';
 ```
 
 ## Quick Start Guide
@@ -140,5 +142,5 @@ ComfortableMediaSurfer can run like any Rails application in development. It's a
 
 ---
 
-Copyright 2010-2019 Oleg Khabarov, 2024 ShakaCode LLC
+Copyright 2010-2019 Oleg Khabarov, 2024-2025 ShakaCode LLC
 Released under the [MIT license](LICENSE)

data/app/views/comfy/admin/cms/pages/toggle_branch.js.erb

@@ -1,13 +1,19 @@
 // TODO: Extract this so the server only renders the HTML.
-var li = $('li#comfy_cms_page_<%=@page.id%>');
-li.find('.item .toggle').first().toggleClass('open');
-
+var li = document.querySelector('li#comfy_cms_page_<%=@page.id%>');
+var toggle = li.querySelector('.item .toggle');
+toggle.classList.toggle('open');
 <% if session[:cms_page_tree].member?(@page.id.to_s) %>
-  if(!li.find('ul.children')[0]) {
-    li.append('<ul class="children sortable pl-md-3"><%= escape_javascript(render partial: "index_branch", collection: @page.children) %></ul>');
-    CMS.sortableList.dispose();
-    CMS.sortableList.init();
+  if(!li.querySelector('ul.children')) {
+  var childrenList = document.createElement('ul');
+  childrenList.className = 'children sortable pl-md-3';
+  childrenList.innerHTML = '<%= escape_javascript(render partial: "index_branch", collection: @page.children) %>';
+  li.appendChild(childrenList);
+  CMS.sortableList.dispose();
+  CMS.sortableList.init();
   }
 <% else %>
-  li.find('ul.children').remove();
+  var childrenList = li.querySelector('ul.children');
+  if (childrenList) {
+  childrenList.remove();
+  }
 <% end %>

data/comfortable_media_surfer.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'kaminari',             '~> 1.2',   '>= 1.2.2'
   spec.add_dependency 'kramdown',             '~> 2.4',   '>= 2.4.0'
   spec.add_dependency 'mimemagic',            '~> 0.4',   '>= 0.4.3'
-  spec.add_dependency 'mini_magick',          '~> 4.12',  '>= 4.12.0'
+  spec.add_dependency 'mini_magick',          '>= 4.12', '< 6.0'
   spec.add_dependency 'rails',                '>= 7.0.0'
   spec.add_dependency 'rails-i18n',           '>= 6.0.0'
+  spec.add_dependency 'sassc-rails',          '>= 2.1.2'
 end

data/config/application.rb

@@ -10,6 +10,9 @@ Bundler.require(*Rails.groups)
 
 module ComfortableMediaSurfer
   class Application < Rails::Application
+    # Ensuring that ActiveStorage routes are loaded before Comfy's globbing
+    # route. Without this file serving routes are inaccessible.
+    config.railties_order = [ActiveStorage::Engine, :main_app, :all]
     # Load defaults based on Rails major/minor version
     config.load_defaults Rails.version.scan(%r{^\d+\.\d+}).first.to_f
 

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/db/migrate/01_create_cms.rb

@@ -88,7 +88,6 @@ class CreateCms < ActiveRecord::Migration[5.2]
       t.integer :site_id,     null: false
       t.string  :label,       null: false
       t.string  :identifier,  null: false
-      t.boolean :markdown
       t.text    :content,     limit: LIMIT
       t.integer :position,    null: false, default: 0
       t.timestamps

data/db/migrate/02_add_markdown_to_snippets.rb

@@ -0,0 +1,5 @@
+class AddMarkdownToSnippets < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comfy_cms_snippets, :markdown, :boolean, default: false
+  end
+end

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/content/tags/audio.rb

@@ -30,7 +30,7 @@ class ComfortableMediaSurfer::Content::Tags::Audio < ComfortableMediaSurfer::Con
   end
 
   def content
-    format("#{@style}<audio controls class=\"audioplayer\" src=#{@path}></audio>")
+    "#{@style}<audio controls class=\"audioplayer\" src=#{@path}></audio>"
   end
 end
 

data/lib/comfortable_media_surfer/content/tags/breadcrumbs.rb

@@ -34,7 +34,7 @@ class ComfortableMediaSurfer::Content::Tags::Breadcrumbs < ComfortableMediaSurfe
   end
 
   def content
-    format("#{@style}#{@links}")
+    "#{@style}#{@links}"
   end
 end
 

data/lib/comfortable_media_surfer/content/tags/children.rb

@@ -43,7 +43,7 @@ class ComfortableMediaSurfer::Content::Tags::Children < ComfortableMediaSurfer::
       end
       @list += '</ul>'
     end
-    format("#{@style}#{@list}")
+    "#{@style}#{@list}"
   end
 end
 

data/lib/comfortable_media_surfer/content/tags/siblings.rb

@@ -57,7 +57,7 @@ class ComfortableMediaSurfer::Content::Tags::Siblings < ComfortableMediaSurfer::
       end
       @links += '</div>'
     end
-    format("#{@style}#{@links}")
+    "#{@style}#{@links}"
   end
 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.1'
+  VERSION = '3.1.3'
 end

data/lib/generators/comfy/cms/README

@@ -13,16 +13,9 @@ You are almost done.  Don't forget to:
 
   [Optional] - If you want to store files in your CMS with ActiveStorage: `rails active_storage:install`
   [Mandatory] - Create the tables in your database: `rails db:migrate`
+  [Mandatory] - Run `rails comfy:compile_assets`
 
 Then go to http://your-rails-app/admin to start adding content.
 
 Default username and password are: user / pass
-Change these defaults in config/initializers/occams.rb
-
-----------------------------
-IF YOU ARE ON RAILS 6.x
-----------------------------
-and encounter errors referencing webpacker: 
-ensure that you have nvm installed, and then run
-- nvm install 13.7 && nvm use 13.7
-- rails webpacker:install
+Change these defaults in config/initializers/comfortable_media_surfer.rb

data/lib/generators/comfy/cms/cms_generator.rb

@@ -11,14 +11,16 @@ module Comfy
       source_root File.expand_path('../../../..', __dir__)
 
       def generate_migration
-        destination   = File.expand_path('db/migrate/01_create_cms.rb', destination_root)
-        migration_dir = File.dirname(destination)
-        destination   = self.class.migration_exists?(migration_dir, 'create_cms')
+        %w[01_create_cms 02_add_markdown_to_snippets].each do |migration|
+          destination   = File.expand_path("db/migrate/#{migration}.rb", destination_root)
+          migration_dir = File.dirname(destination)
+          destination   = self.class.migration_exists?(migration_dir, migration)
 
-        if destination
-          puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
-        else
-          migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
+          if destination
+            puts "\e[0m\e[31mFound existing #{migration}.rb migration. Remove it if you want to regenerate.\e[0m"
+          else
+            migration_template "db/migrate/#{migration}.rb", "db/migrate/#{migration[3..]}.rb"
+          end
         end
       end
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_media_surfer
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Oleg Khabarov
 - Andrew vonderLuft
 - ShakaCode
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -156,22 +155,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.12'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.12'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +199,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 description: ComfortableMediaSurfer is a powerful Rails 7.0+ CMS Engine
 email:
 - justin@shakacode.com
@@ -209,6 +222,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitattributes"
+- ".github/dependabot.yml"
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/workflows/coveralls.yml"
@@ -542,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
@@ -552,6 +567,7 @@ files:
 - db/cms_seeds/sample-site/snippets/default.html
 - db/migrate/00_create_active_storage_tables.active_storage.rb
 - db/migrate/01_create_cms.rb
+- db/migrate/02_add_markdown_to_snippets.rb
 - gemfiles/7.1.gemfile
 - gemfiles/7.2.gemfile
 - gemfiles/8.0.gemfile
@@ -654,8 +670,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rails 7.0+ CMS Engine
 test_files: []