comfy_middle_seat 3.2.0 → 4.0.0

data/app/controllers/comfy/admin/cms/base_controller.rb

@@ -8,12 +8,12 @@ class Comfy::Admin::Cms::BaseController < Comfy::Admin::BaseController
 
   layout :infer_layout
 
-  if ComfortableMediaSurfer.config.admin_cache_sweeper.present?
-    cache_sweeper(*ComfortableMediaSurfer.config.admin_cache_sweeper)
+  if ComfyMiddleSeat.config.admin_cache_sweeper.present?
+    cache_sweeper(*ComfyMiddleSeat.config.admin_cache_sweeper)
   end
 
   def jump
-    path = ComfortableMediaSurfer.config.admin_route_redirect
+    path = ComfyMiddleSeat.config.admin_route_redirect
     return redirect_to(path) unless path.blank?
 
     load_admin_site
@@ -27,24 +27,29 @@ protected
     if (@site = ::Comfy::Cms::Site.find_by(id: id_param) || ::Comfy::Cms::Site.first)
       session[:site_id] = @site.id
     else
-      I18n.locale = ComfortableMediaSurfer.config.admin_locale || I18n.default_locale
+      I18n.locale = ComfyMiddleSeat.config.admin_locale || I18n.default_locale
       flash[:danger] = I18n.t('comfy.admin.cms.base.site_not_found')
       redirect_to(new_comfy_admin_cms_site_path)
     end
   end
 
   def set_locale?
-    I18n.locale = ComfortableMediaSurfer.config.admin_locale || @site&.locale
+    I18n.locale = ComfyMiddleSeat.config.admin_locale || @site&.locale
     true
   end
 
+  def acknowledge_draft_save
+    key = params[:cms_draft_key].to_s
+    flash[:cms_saved_draft_key] = key if key.start_with?('comfy-cms:draft:v1:')
+  end
+
   def load_seeds
-    return unless ComfortableMediaSurfer.config.enable_seeds
+    return unless ComfyMiddleSeat.config.enable_seeds
 
     controllers = %w[layouts pages snippets files].collect { |c| "comfy/admin/cms/#{c}" }
     return unless controllers.member?(params[:controller]) && params[:action] == 'index'
 
-    ComfortableMediaSurfer::Seeds::Importer.new(@site.identifier).import!
+    ComfyMiddleSeat::Seeds::Importer.new(@site.identifier).import!
     flash.now[:warning] = I18n.t('comfy.admin.cms.base.seeds_enabled')
   end
 

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -12,7 +12,7 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
   before_action :authorize
 
   def index
-    files_scope = @site.files.with_attached_attachment
+    files_scope = @site.files.with_attached_attachment.search(params[:q])
 
     case params[:source]
 

data/app/controllers/comfy/admin/cms/pages_controller.rb

@@ -8,6 +8,8 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction
 
+  helper_method :page_branch_open?
+
   self.reorder_action_resource = ::Comfy::Cms::Page
 
   before_action :check_for_layouts, only: %i[new edit]
@@ -23,14 +25,18 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
     return index_for_redactor if params[:source] == 'redactor'
 
-    @pages_by_parent = pages_grouped_by_parent
-
-    @pages =
-      if params[:categories].present?
-        @site.pages.includes(:categories).for_category(params[:categories]).order(:label)
-      else
-        [@site.pages.root].compact
-      end
+    if page_filters?
+      @pages_by_parent = {}
+      @pages = @site.pages
+        .includes(:categories)
+        .for_category(params[:categories])
+        .search(params[:q])
+        .order(:label)
+    else
+      root = @site.pages.roots.includes(:categories).first
+      @pages = [root].compact
+      @pages_by_parent = pages_grouped_for_open_tree(root)
+    end
   end
 
   def new
@@ -49,6 +55,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   def create
     @page.save!
     update_family
+    acknowledge_draft_save
     flash[:success] = I18n.t('comfy.admin.cms.pages.created')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
@@ -59,6 +66,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   def update
     @page.save!
     update_family
+    acknowledge_draft_save
     flash[:success] = I18n.t('comfy.admin.cms.pages.updated')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
@@ -67,7 +75,15 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   end
 
   def destroy
-    @page.destroy
+    if @page.root?
+      flash[:danger] = I18n.t(
+        'comfy.admin.cms.pages.root_delete_failure',
+        default: 'The root page cannot be deleted.'
+      )
+      return redirect_to action: :index
+    end
+
+    @page.destroy!
     update_family
     flash[:success] = I18n.t('comfy.admin.cms.pages.deleted')
     redirect_to action: :index
@@ -85,13 +101,21 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   end
 
   def toggle_branch
-    @pages_by_parent = pages_grouped_by_parent
     @page = @site.pages.find(params[:id])
-    s   = (session[:cms_page_tree] ||= [])
-    id  = @page.id.to_s
-    s.member?(id) ? s.delete(id) : s << id
+    tree = page_tree_session
+    id = @page.id.to_s
+
+    if tree.member?(id)
+      tree.delete(id)
+      @branch_open = false
+      @pages_by_parent = {}
+    else
+      tree << id
+      @branch_open = true
+      @pages_by_parent = pages_grouped_for_open_tree(@page)
+    end
   rescue ActiveRecord::RecordNotFound
-    render nothing: true
+    head :not_found
   end
 
   def publish_children
@@ -138,8 +162,44 @@ protected
     @site.pages.none?
   end
 
-  def pages_grouped_by_parent
-    @site.pages.order(:position).includes(:categories).group_by(&:parent_id)
+  def pages_grouped_for_open_tree(parent)
+    return {} unless parent
+
+    pages_by_parent = {}
+    open_ids = session_open_page_ids
+    parent_ids = [parent.id]
+
+    while parent_ids.present?
+      children = @site.pages
+        .where(parent_id: parent_ids)
+        .includes(:categories)
+        .order(:parent_id, :position, :id)
+        .to_a
+      pages_by_parent.merge!(children.group_by(&:parent_id))
+      parent_ids = children.filter_map { |page| page.id if open_ids.include?(page.id) }
+    end
+
+    pages_by_parent
+  end
+
+  def page_branch_open?(page)
+    page.root? || page_tree_session.member?(page.id.to_s)
+  end
+
+  def page_tree_session
+    trees = session[:cms_page_tree]
+    trees = session[:cms_page_tree] = {} unless trees.is_a?(Hash)
+    trees[@site.id.to_s] ||= []
+  end
+
+  def session_open_page_ids
+    page_tree_session.filter_map do |id|
+      id.to_i if id.to_s.match?(%r{\A[1-9]\d*\z})
+    end.to_set
+  end
+
+  def page_filters?
+    params[:categories].present? || params[:q].present?
   end
 
   def check_for_layouts

data/app/controllers/comfy/admin/cms/revisions/base_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Comfy::Admin::Cms::Revisions::BaseController < Comfy::Admin::Cms::BaseController
-  helper_method :record_path
+  helper_method :record_path, :preview_path
 
   before_action :load_record
   before_action :load_revision, except: :index
@@ -31,6 +31,40 @@ class Comfy::Admin::Cms::Revisions::BaseController < Comfy::Admin::Cms::BaseCont
 
 protected
 
+  def load_fragment_content
+    current_content = @record.fragments.to_h do |fragment|
+      [fragment.identifier, fragment.content]
+    end
+    versioned_content = @revision.data.fetch('fragments_attributes', []).to_h do |attributes|
+      attributes = attributes.with_indifferent_access
+      [attributes[:identifier], attributes[:content]]
+    end
+    identifiers = current_content.keys | versioned_content.keys
+
+    @current_content = identifiers.to_h { |identifier| [identifier, current_content[identifier]] }
+    @versioned_content = identifiers.to_h { |identifier| [identifier, versioned_content[identifier]] }
+  end
+
+  def render_fragment_preview(cms_page:, locale:)
+    apply_revision_in_memory
+
+    @cms_site   = @record.site
+    @cms_layout = @record.layout
+    @cms_page   = cms_page
+
+    I18n.locale = locale
+    response.headers['X-XSS-Protection'] = '0'
+
+    app_layout = @cms_layout.app_layout.presence || false
+    render inline: @record.render, layout: app_layout, content_type: 'text/html'
+  end
+
+  def apply_revision_in_memory
+    @record.fragments.load_target
+    @record.fragments.target.clear
+    @record.assign_attributes(@revision.data.deep_dup)
+  end
+
   def load_record
     raise 'not implemented'
   end
@@ -45,4 +79,8 @@ protected
   def record_path
     raise 'not implemented'
   end
+
+  def preview_path
+    nil
+  end
 end

data/app/controllers/comfy/admin/cms/revisions/page_controller.rb

@@ -2,17 +2,14 @@
 
 class Comfy::Admin::Cms::Revisions::PageController < Comfy::Admin::Cms::Revisions::BaseController
   def show
-    @current_content = @record.fragments.to_h do |fragment|
-      [fragment.identifier, fragment.content]
-    end
-    @versioned_content = @record.fragments.to_h do |fragment|
-      data = @revision.data['fragments_attributes'].detect { |item| item[:identifier] == fragment.identifier }
-      [fragment.identifier, data.try(:[], :content)]
-    end
-
+    load_fragment_content
     render 'comfy/admin/cms/revisions/show'
   end
 
+  def preview
+    render_fragment_preview(cms_page: @record, locale: @site.locale)
+  end
+
 private
 
   def load_record
@@ -25,4 +22,8 @@ private
   def record_path
     edit_comfy_admin_cms_site_page_path(@site, @record)
   end
+
+  def preview_path
+    preview_comfy_admin_cms_site_page_revision_path(@site, @record, @revision)
+  end
 end

data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb

@@ -2,17 +2,14 @@
 
 class Comfy::Admin::Cms::Revisions::TranslationController < Comfy::Admin::Cms::Revisions::BaseController
   def show
-    @current_content = @record.fragments.to_h do |fragment|
-      [fragment.identifier, fragment.content]
-    end
-    @versioned_content = @record.fragments.to_h do |fragment|
-      data = @revision.data['fragments_attributes'].detect { |item| item[:identifier] == fragment.identifier }
-      [fragment.identifier, data.try(:[], :content)]
-    end
-
+    load_fragment_content
     render 'comfy/admin/cms/revisions/show'
   end
 
+  def preview
+    render_fragment_preview(cms_page: @page, locale: @record.locale)
+  end
+
 private
 
   def load_record
@@ -26,4 +23,13 @@ private
   def record_path
     edit_comfy_admin_cms_site_page_translation_path(@site, @page, @record)
   end
+
+  def preview_path
+    preview_comfy_admin_cms_site_page_translation_revision_path(
+      @site,
+      @page,
+      @record,
+      @revision
+    )
+  end
 end

data/app/controllers/comfy/admin/cms/sites_controller.rb

@@ -56,7 +56,7 @@ protected
 
   def load_site
     @site = ::Comfy::Cms::Site.find(params[:id])
-    I18n.locale = ComfortableMediaSurfer.config.admin_locale || @site.locale
+    I18n.locale = ComfyMiddleSeat.config.admin_locale || @site.locale
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.sites.not_found')
     redirect_to action: :index

data/app/controllers/comfy/admin/cms/translations_controller.rb

@@ -25,6 +25,7 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
 
   def create
     @translation.save!
+    acknowledge_draft_save
     flash[:success] = I18n.t('comfy.admin.cms.translations.created')
     redirect_to action: :edit, id: @translation
   rescue ActiveRecord::RecordInvalid
@@ -34,6 +35,7 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
 
   def update
     @translation.save!
+    acknowledge_draft_save
     flash[:success] = I18n.t('comfy.admin.cms.translations.updated')
     redirect_to action: :edit, id: @translation
   rescue ActiveRecord::RecordInvalid
@@ -61,7 +63,7 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
 private
 
   def translation_select_options
-    all = ComfortableMediaSurfer.config.locales
+    all = ComfyMiddleSeat.config.locales
     taken = @page.translations.pluck(:locale) + [@site.locale] - [@translation.locale]
     all.except(*taken).map { |k, v| ["#{v} (#{k})", k] }
   end

data/app/controllers/comfy/cms/base_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Comfy::Cms::BaseController < ComfortableMediaSurfer.config.public_base_controller.to_s.constantize
+class Comfy::Cms::BaseController < ComfyMiddleSeat.config.public_base_controller.to_s.constantize
   before_action :load_cms_site
 
   helper Comfy::CmsHelper

data/app/controllers/comfy/cms/content_controller.rb

@@ -2,10 +2,10 @@
 
 class Comfy::Cms::ContentController < Comfy::Cms::BaseController
   # Authentication module must have `authenticate` method
-  include ComfortableMediaSurfer.config.public_auth.to_s.constantize
+  include ComfyMiddleSeat.config.public_auth.to_s.constantize
 
   # Authorization module must have `authorize` method
-  include ComfortableMediaSurfer.config.public_authorization.to_s.constantize
+  include ComfyMiddleSeat.config.public_authorization.to_s.constantize
 
   before_action :load_seeds
   before_action :load_cms_page,
@@ -24,7 +24,7 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
             inline: @cms_page.content_cache,
             layout: false
           )
-          json_page = @cms_page.as_json(ComfortableMediaSurfer.config.page_to_json_options)
+          json_page = @cms_page.as_json(ComfyMiddleSeat.config.page_to_json_options)
           render json: json_page
         end
       end
@@ -53,9 +53,9 @@ protected
   end
 
   def load_seeds
-    return unless ComfortableMediaSurfer.config.enable_seeds
+    return unless ComfyMiddleSeat.config.enable_seeds
 
-    ComfortableMediaSurfer::Seeds::Importer.new(@cms_site.identifier).import!
+    ComfyMiddleSeat::Seeds::Importer.new(@cms_site.identifier).import!
   end
 
   # Attempting to populate @cms_page and @cms_layout instance variables so they

data/app/controllers/concerns/comfy/reorder_action.rb

@@ -9,11 +9,31 @@ module Comfy::ReorderAction
 
   def reorder
     resource_class = self.class.reorder_action_resource
-    site_resources = resource_class.where(site_id: @site.id)
-    (params.permit(order: [])[:order] || []).each_with_index do |id, index|
-      site_resources.where(id: id).update_all(position: index)
+    positions = (params.permit(order: [])[:order] || []).each_with_index.to_h
+
+    if positions.present?
+      site_resources = resource_class.where(site_id: @site.id)
+      reordered_resources = site_resources.where(id: positions.keys)
+      position = Arel::Nodes::Case.new(resource_class.arel_table[:id])
+      positions.each do |id, index|
+        position.when(id).then(index)
+      end
+
+      reordered_resources.update_all(position: position)
+      if resource_class == Comfy::Cms::Page
+        clear_reordered_page_content_cache(site_resources, reordered_resources)
+      end
     end
-    @site.pages.each(&:save!) if resource_class == ::Comfy::Cms::Page
+
     head :ok
   end
+
+private
+
+  def clear_reordered_page_content_cache(site_pages, reordered_pages)
+    affected_pages = site_pages.where(id: reordered_pages.select(:id)).or(
+      site_pages.where(id: reordered_pages.select(:parent_id))
+    )
+    affected_pages.update_all(content_cache: nil)
+  end
 end

data/app/helpers/comfy/admin/cms_helper.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module Comfy
   module Admin
     module CmsHelper
       # Wrapper around Comfy::FormBuilder
       def comfy_form_with(**options, &)
-        form_options = options.merge(builder: ComfortableMediaSurfer::FormBuilder)
+        form_options = options.merge(builder: ComfyMiddleSeat::FormBuilder)
         form_options[:bootstrap]  = { layout: :horizontal }
         form_options[:local]      = true
         bootstrap_form_with(**form_options, &)
@@ -14,16 +16,39 @@ module Comfy
       def comfy_admin_partial(path, params = {})
         render path, params
       rescue ActionView::MissingTemplate
-        if ComfortableMediaSurfer.config.reveal_cms_partials
+        if ComfyMiddleSeat.config.reveal_cms_partials
           content_tag(:div, class: 'comfy-admin-partial') do
             path
           end
         end
       end
 
+      def cms_draft_form_data(*key_parts, record:)
+        namespace = session[:comfy_cms_draft_namespace] ||= SecureRandom.hex(16)
+        {
+          cms_unsaved_message: t(
+            'comfy.admin.cms.forms.unsaved_changes',
+            default: 'You have unsaved changes. Are you sure you want to leave this page?'
+          ),
+          cms_draft_key: ['comfy-cms:draft:v1', namespace, *key_parts].join(':'),
+          cms_draft_title: t('comfy.admin.cms.drafts.title', default: 'Unsaved draft found'),
+          cms_draft_message: t(
+            'comfy.admin.cms.drafts.message',
+            default: 'A locally saved draft is available. Restore it or discard it?'
+          ),
+          cms_draft_files_message: t(
+            'comfy.admin.cms.drafts.files_message',
+            default: 'Selected files are not stored and must be selected again.'
+          ),
+          cms_draft_restore: t('comfy.admin.cms.drafts.restore', default: 'Restore draft'),
+          cms_draft_discard: t('comfy.admin.cms.drafts.discard', default: 'Discard draft'),
+          cms_save_failed: record.errors.any?
+        }
+      end
+
       # Injects some content somewhere inside cms admin area
       def cms_hook(name, options = {})
-        ComfortableMediaSurfer::ViewHooks.render(name, self, options)
+        ComfyMiddleSeat::ViewHooks.render(name, self, options)
       end
 
       # @param [String] fragment_id

data/app/helpers/comfy/cms_helper.rb

@@ -52,7 +52,7 @@ module Comfy
       snippet = cms_site&.snippets&.find_by_identifier(identifier)
       return '' unless snippet
 
-      r = ComfortableMediaSurfer::Content::Renderer.new(snippet)
+      r = ComfyMiddleSeat::Content::Renderer.new(snippet)
       render inline: r.render(r.nodes(r.tokenize(snippet.content)))
     end
 

data/app/models/comfy/cms/file.rb

@@ -24,7 +24,9 @@ class Comfy::Cms::File < ActiveRecord::Base
   before_create :assign_position
   # active_storage attachment behavior changed in rails 6
   before_save :process_attachment
-  after_save :clear_page_content_cache
+  after_commit :clear_page_content_cache,
+               on: %i[create update destroy],
+               if: :page_content_cache_stale?
 
   # -- Validations -------------------------------------------------------------
   validates :label, presence: true
@@ -36,17 +38,37 @@ class Comfy::Cms::File < ActiveRecord::Base
   scope :with_images, -> {
     where("active_storage_blobs.content_type LIKE 'image/%'").references(:blob)
   }
+  scope :search, ->(query) {
+    term = query.to_s.strip
+    if term.present?
+      pattern = "%#{sanitize_sql_like(term.downcase)}%"
+      left_joins(attachment_attachment: :blob)
+        .where(
+          <<~SQL.squish,
+            LOWER(comfy_cms_files.label) LIKE :pattern OR
+            LOWER(comfy_cms_files.description) LIKE :pattern OR
+            LOWER(active_storage_blobs.filename) LIKE :pattern
+          SQL
+          pattern: pattern
+        )
+        .distinct
+    end
+  }
 
 private
 
   def clear_page_content_cache
-    Comfy::Cms::Page.where(id: site.pages.pluck(:id)).update_all(content_cache: nil)
+    site.pages.update_all(content_cache: nil)
+  end
+
+  def page_content_cache_stale?
+    destroyed? || saved_changes? || @file.present?
   end
 
 protected
 
   def assign_position
-    max = Comfy::Cms::File.maximum(:position)
+    max = site.files.maximum(:position)
     self.position = max ? max + 1 : 0
   end
 

data/app/models/comfy/cms/layout.rb

@@ -3,7 +3,7 @@
 class Comfy::Cms::Layout < ActiveRecord::Base
   self.table_name = 'comfy_cms_layouts'
 
-  require_relative '../../../../lib/comfortable_media_surfer/extensions/acts_as_tree'
+  require_relative '../../../../lib/comfy_middle_seat/extensions/acts_as_tree'
 
   cms_acts_as_tree
   cms_has_revisions_for :content, :css, :js
@@ -15,7 +15,9 @@ class Comfy::Cms::Layout < ActiveRecord::Base
   # -- Callbacks ---------------------------------------------------------------
   before_validation :assign_label
   before_create :assign_position
-  after_save    :clear_page_content_cache
+  after_commit  :clear_page_content_cache,
+                on: %i[create update],
+                if: :saved_changes?
   after_destroy :clear_page_content_cache
 
   # -- Validations -------------------------------------------------------------
@@ -66,12 +68,12 @@ class Comfy::Cms::Layout < ActiveRecord::Base
   # and merges on the {{cms:tag_type content}} tag (if parent layout has that).
   # Returns a list of tokens that can be fed into the renderer.
   def content_tokens
-    renderer  = ComfortableMediaSurfer::Content::Renderer.new(nil)
+    renderer  = ComfyMiddleSeat::Content::Renderer.new(nil)
     tokens    = renderer.tokenize(content)
 
     if parent
-      fragment_tags = ComfortableMediaSurfer::Content::Tags::Fragment.subclasses.map do |c|
-        ComfortableMediaSurfer::Content::Renderer.tags.key(c)
+      fragment_tags = ComfyMiddleSeat::Content::Tags::Fragment.subclasses.map do |c|
+        ComfyMiddleSeat::Content::Renderer.tags.key(c)
       end
 
       parent_tokens = parent.content_tokens
@@ -96,7 +98,7 @@ class Comfy::Cms::Layout < ActiveRecord::Base
 
   # Forcing page content reload
   def clear_page_content_cache
-    Comfy::Cms::Page.where(id: pages.pluck(:id)).update_all(content_cache: nil)
+    pages.update_all(content_cache: nil)
     children.each(&:clear_page_content_cache)
   end
 

data/app/models/comfy/cms/page.rb

@@ -44,6 +44,28 @@ class Comfy::Cms::Page < ActiveRecord::Base
 
   # -- Scopes ------------------------------------------------------------------
   scope :published, -> { where(is_published: true) }
+  scope :search, ->(query) {
+    term = query.to_s.strip
+    if term.present?
+      pattern = "%#{sanitize_sql_like(term.downcase)}%"
+      where(
+        <<~SQL.squish,
+          LOWER(comfy_cms_pages.label) LIKE :pattern OR
+          LOWER(comfy_cms_pages.slug) LIKE :pattern OR
+          LOWER(comfy_cms_pages.full_path) LIKE :pattern OR
+          EXISTS (
+            SELECT 1
+            FROM comfy_cms_fragments
+            WHERE comfy_cms_fragments.record_type = :record_type
+              AND comfy_cms_fragments.record_id = comfy_cms_pages.id
+              AND LOWER(comfy_cms_fragments.content) LIKE :pattern
+          )
+        SQL
+        pattern: pattern,
+        record_type: polymorphic_name
+      )
+    end
+  }
 
   # -- Class Methods -----------------------------------------------------------
   # Tree-like structure for pages

data/app/models/comfy/cms/site.rb

@@ -37,7 +37,7 @@ class Comfy::Cms::Site < ActiveRecord::Base
 
     cms_site = nil
 
-    public_cms_path = ComfortableMediaSurfer.configuration.public_cms_path
+    public_cms_path = ComfyMiddleSeat.configuration.public_cms_path
     if path && public_cms_path != '/'
       path = path.sub(%r{\A#{public_cms_path}}, '')
     end
@@ -54,7 +54,7 @@ class Comfy::Cms::Site < ActiveRecord::Base
   end
 
   def self.real_host_from_aliases(host)
-    if (aliases = ComfortableMediaSurfer.config.hostname_aliases)
+    if (aliases = ComfyMiddleSeat.config.hostname_aliases)
       aliases.each do |alias_host, hosts|
         return alias_host if hosts.include?(host)
       end
@@ -64,7 +64,7 @@ class Comfy::Cms::Site < ActiveRecord::Base
 
   # -- Instance Methods --------------------------------------------------------
   def url(relative: false)
-    public_cms_path = ComfortableMediaSurfer.config.public_cms_path || '/'
+    public_cms_path = ComfyMiddleSeat.config.public_cms_path || '/'
     host = "//#{hostname}"
     path = ['/', public_cms_path, self.path].compact.join('/').squeeze('/').chomp('/')
     relative ? path.presence : [host, path].join