comfortable_mexican_sofa 2.0.12 → 2.0.13

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::Revisions::BaseController < Comfy::Admin::Cms::BaseController
 
   helper_method :record_path

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::Revisions::LayoutController < Comfy::Admin::Cms::Revisions::BaseController
 
 private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::Revisions::PageController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::Revisions::SnippetController < Comfy::Admin::Cms::Revisions::BaseController
 
 private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::Revisions::TranslationController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
 
   skip_before_action  :load_admin_site,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseController
 
   helper_method :translation_select_options
@@ -43,6 +45,12 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
   def form_fragments
     @translation = @page.translations.find_by(id: params[:id]) || @page.translations.new
     @translation.layout = @site.layouts.find_by(id: params[:layout_id])
+
+    render(
+      partial: "comfy/admin/cms/fragments/form_fragments",
+      locals: { record: @translation, scope: :translation },
+      layout: false
+    )
   end
 
 private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::AssetsController < Comfy::Cms::BaseController
 
   skip_before_action :verify_authenticity_token

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::BaseController < ApplicationController
 
   before_action :load_cms_site
@@ -16,9 +18,9 @@ protected
 
     if @cms_site
       if @cms_site.path.present? && !params[:site_id]
-        if params[:cms_path] && params[:cms_path].match(%r{\A#{@cms_site.path}})
+        if params[:cms_path]&.match(%r{\A#{@cms_site.path}})
           params[:cms_path].gsub!(%r{\A#{@cms_site.path}}, "")
-          params[:cms_path] && params[:cms_path].gsub!(%r{\A/}, "")
+          params[:cms_path]&.gsub!(%r{\A/}, "")
         else
           raise ActionController::RoutingError, "Site Not Found"
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::ContentController < Comfy::Cms::BaseController
 
   # Authentication module must have `authenticate` method
@@ -42,7 +44,7 @@ protected
   # it's possible to control mimetype of a page by creating a `mime_type` field
   def mime_type
     mime_block = @cms_page.fragments.detect { |f| f.identifier == "mime_type" }
-    mime_block && mime_block.content || "text/html"
+    mime_block&.content || "text/html"
   end
 
   def app_layout

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy::Paginate
 
   # Wrapper to deal with WillPaginate vs Kaminari nonsense

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy::ReorderAction
 
   extend ActiveSupport::Concern

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module Admin
     module CmsHelper
@@ -25,6 +27,23 @@ module Comfy
         ComfortableMexicanSofa::ViewHooks.render(name, self, options)
       end
 
+      # @param [String] fragment_id
+      # @param [ActiveStorage::Blob] attachment
+      # @param [Boolean] multiple
+      # @return [String] {{ cms:page_file_link #{fragment_id}, ... }}
+      def cms_page_file_link_tag(fragment_id:, attachment:, multiple:)
+        filename  = ", filename: \"#{attachment.filename}\""  if multiple
+        as        = ", as: image"                             if attachment.image?
+        "{{ cms:page_file_link #{fragment_id}#{filename}#{as} }}"
+      end
+
+      # @param [Comfy::Cms::File] file
+      # @return [String] {{ cms:file_link #{file.id}, ... }}
+      def cms_file_link_tag(file)
+        as = ", as: image" if file.attachment.image?
+        "{{ cms:file_link #{file.id}#{as} }}"
+      end
+
     end
   end
 end

data/app/helpers/comfy/cms_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy
   module CmsHelper
 
@@ -7,7 +9,7 @@ module Comfy
     #   cms_fragment_content(:left_column, CmsPage.first)
     #   cms_fragment_content(:left_column) # if @cms_page is present
     def cms_fragment_content(identifier, page = @cms_page)
-      frag = page && page.fragments.detect { |f| f.identifier == identifier.to_s }
+      frag = page&.fragments&.detect { |f| f.identifier == identifier.to_s }
       return "" unless frag
       case frag.tag
       when "date", "datetime"
@@ -41,7 +43,7 @@ module Comfy
         end
         cms_site = Comfy::Cms::Site.find_site(host, path)
       end
-      snippet = cms_site && cms_site.snippets.find_by_identifier(identifier)
+      snippet = cms_site&.snippets&.find_by_identifier(identifier)
       return "" unless snippet
       snippet.content
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Categorization < ActiveRecord::Base
 
   self.table_name = "comfy_cms_categorizations"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Category < ActiveRecord::Base
 
   self.table_name = "comfy_cms_categories"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::File < ActiveRecord::Base
 
   self.table_name = "comfy_cms_files"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Fragment < ActiveRecord::Base
 
   self.table_name = "comfy_cms_fragments"
@@ -48,7 +50,7 @@ protected
     # If we're dealing with a single file
     if tag == "file"
       @files = [@files.first]
-      attachments.purge_later if attachments
+      attachments&.purge_later
     end
 
     attachments.attach(@files)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Layout < ActiveRecord::Base
 
   self.table_name = "comfy_cms_layouts"
@@ -95,7 +97,7 @@ protected
   end
 
   def assign_position
-    return if position.to_i > 0
+    return if position.to_i.positive?
     max = site.layouts.where(parent_id: parent_id).maximum(:position)
     self.position = max ? max + 1 : 0
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Page < ActiveRecord::Base
 
   self.table_name = "comfy_cms_pages"
@@ -123,7 +125,7 @@ protected
 
   def assign_position
     return unless self.parent
-    return if position.to_i > 0
+    return if position.to_i.positive?
     max = self.parent.children.maximum(:position)
     self.position = max ? max + 1 : 0
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Revision < ActiveRecord::Base
 
   self.table_name = "comfy_cms_revisions"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Site < ActiveRecord::Base
 
   self.table_name = "comfy_cms_sites"
@@ -36,7 +38,9 @@ class Comfy::Cms::Site < ActiveRecord::Base
     cms_site = nil
 
     public_cms_path = ComfortableMexicanSofa.configuration.public_cms_path
-    path.gsub!(%r{\A#{public_cms_path}}, "") unless path.nil? || public_cms_path == "/"
+    if path && public_cms_path != "/"
+      path = path.sub(%r{\A#{public_cms_path}}, "")
+    end
 
     Comfy::Cms::Site.where(hostname: real_host_from_aliases(host)).each do |site|
       if site.path.blank?

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Snippet < ActiveRecord::Base
 
   self.table_name = "comfy_cms_snippets"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Cms::Translation < ActiveRecord::Base
 
   self.table_name = "comfy_cms_translations"

data/app/models/concerns/comfy/cms/with_categories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy::Cms::WithCategories
 
   extend ActiveSupport::Concern

data/app/models/concerns/comfy/cms/with_fragments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Comfy::Cms::WithFragments
 
   extend ActiveSupport::Concern

data/app/views/comfy/admin/cms/categories/_index.html.haml

@@ -7,7 +7,7 @@
         = link_to t('.all'), {categories: nil}, class: "btn btn-sm btn-light btn-block #{active_class}"
       - @site.categories.of_type(type).each do |category|
         = render "comfy/admin/cms/categories/show", category: category, read: true
-    %button.toggle-cat-edit.btn.btn-secondary.btn-sm.btn-block
+    %button.toggle-cat-edit.btn.btn-secondary.btn-sm.btn-block{type: "button"}
       = t(".edit")
 
   .editable
@@ -16,7 +16,7 @@
         = render "comfy/admin/cms/categories/show", category: category
 
     - url = comfy_admin_cms_site_categories_path(@site)
-    = form_for :category, url: url, remote: true, html: {id: "new-category"} do |form|
+    = form_with scope: :category, url: url, html: {id: "new-category"} do |form|
       = form.hidden_field :categorized_type, value: type
       .input-group
         = form.text_field :label, placeholder: t('.add_placeholder'), class: 'form-control form-control-sm', id: nil
@@ -24,5 +24,5 @@
           %button.btn.btn-primary.btn-sm{aria: {label: "Create Category"}}
             %i.fas.fa-fw.fa-plus
 
-    %button.toggle-cat-edit.btn.btn-light.btn-sm.btn-block
+    %button.toggle-cat-edit.btn.btn-light.btn-sm.btn-block{type: "button"}
       = t(".done")

data/app/views/comfy/admin/cms/categories/create.js.erb

@@ -4,4 +4,4 @@ $('.categories-widget .editable .categories').append(
 $('.categories-widget .read .categories').append(
   '<%= escape_javascript(render "show", category: @category, read: true) %>'
 );
-$('.categories-widget .editable form#new-category input').val('');
+$('.categories-widget .editable form#new-category input[name="category[label]"]').val('');

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

@@ -1,3 +1,8 @@
-$('.categories .category#<%= dom_id(@category) %>').fadeOut('slow', function(){
-  $(this).remove()
-})
+(() => {
+  const categoryElements = document.querySelectorAll('.categories .category#<%= dom_id(@category) %>');
+  jQuery(categoryElements).fadeOut('slow', () => {
+    for (const element of categoryElements) {
+      element.remove();
+    }
+  });
+})();

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -1,4 +1,7 @@
 %li{data: {id: file.id}}
+  :ruby
+    file_tag  = cms_file_link_tag(file)
+    thumb_url = url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.image?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block
@@ -7,12 +10,8 @@
             %i.fas.fa-bars
       .item-content
         .item-title
-          - if file.attachment.image?
-            - variant = file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
-            - thumb = image_tag(url_for(variant), size: "200x150")
-          = link_to file.attachment, target: "_blank", data: {toggle: "page-file-popover", content: thumb} do
-            = file.label
-
+          = link_to file.label, file.attachment, target: "_blank",
+                    data: {cms_file_thumb_url: thumb_url, cms_file_link_tag: file_tag}
         .item-meta
           .content-type
             = truncate(file.attachment.content_type)
@@ -23,10 +22,10 @@
       = render partial: "comfy/admin/cms/categories/categories", object: file
 
     .col-md-2.d-flex.align-items-center
-      - file_tag = "{{cms:file_link #{file.id} }}"
-      %input.file-path{type: "text", value: file_tag, readonly: "readonly"}
+      %span.file-path
+        = file_tag
 
     .col-md-3.d-flex.align-items-center.justify-content-md-end
       .btn-group.btn-group-sm
-        = link_to t('.edit'), edit_comfy_admin_cms_site_file_path(@site, file), class: "btn btn-outline-secondary"
-        = link_to t('.delete'), comfy_admin_cms_site_file_path(@site, file), method: :delete, remote: true, data: {confirm: t('.are_you_sure')}, class: "btn btn-danger"
+        = link_to t(".edit"), edit_comfy_admin_cms_site_file_path(@site, file), class: "btn btn-outline-secondary"
+        = link_to t(".delete"), comfy_admin_cms_site_file_path(@site, file), method: :delete, remote: true, data: {confirm: t(".are_you_sure")}, class: "btn btn-danger"

data/app/views/comfy/admin/cms/files/_modal.html.haml

@@ -1,4 +1,3 @@
-.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-iframe-src' => comfy_admin_cms_site_files_path(@site), role: 'dialog', tabindex: "-1"}
+.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-url' => comfy_admin_cms_site_files_path(@site, layout: false), role: 'dialog', tabindex: "-1"}
   .modal-dialog.modal-lg
     .modal-content
-      %iframe{src: ''}

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

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

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -1,16 +1,16 @@
-- content_for :head do
-
-  - uploader_url = comfy_admin_cms_site_files_path(@site, source: :plupload, categories: params[:categories])
-  %meta{name: "cms-uploader-url",           content: uploader_url}
-  %meta{name: "cms-uploader-token-name",    content: request_forgery_protection_token}
-  %meta{name: "cms-uploader-token-value",   content: form_authenticity_token}
-  %meta{name: "cms-uploader-session-name",  content: Rails.application.config.session_options[:key]}
-  %meta{name: "cms-uploader-session-value", content: request.session_options[:id]}
-
 - content_for :right_column do
   = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
 
-#cms-uploader
+:ruby
+  cms_uploader_data = {
+    cms_uploader: {
+      url: comfy_admin_cms_site_files_path(@site, source: :plupload, categories: params[:categories]),
+      token: {name: request_forgery_protection_token, value: form_authenticity_token},
+      session: {name: Rails.application.config.session_options[:key], value: request.session_options[:id]}
+    }
+  }
+
+#cms-uploader{data: cms_uploader_data}
   #cms-uploader-drag-drop-target
 
   .page-header

data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml

@@ -1,12 +1,21 @@
 .fragment-attachments
   - attachments.each do |attachment|
-    - if attachment.image?
-      - variant = attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
-      - thumb = image_tag(url_for(variant), size: "200x150")
+    :ruby
+      thumb_url = url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if attachment.image?
+      filename  = attachment.filename.to_s
+      truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")
+
+      link_data = {
+        cms_file_thumb_url: thumb_url,
+        cms_file_link_tag: cms_page_file_link_tag(
+          fragment_id:  fragment_id,
+          attachment:   attachment,
+          multiple:     multiple
+        )
+      }
+
     .fragment-attachment.btn-group.btn-group-sm.mb-1
-      - filename = attachment.filename.to_s
-      - truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")
-      = link_to truncated_filename, attachment, data: {toggle: "page-file-popover", content: thumb}, class: "btn btn-light text-truncate", target: "_blank"
+      = link_to truncated_filename, attachment, data: link_data, class: "btn btn-light text-truncate", target: "_blank"
       = check_box_tag "#{object_name}[fragments_attributes][#{index}][file_ids_destroy][]", attachment.id, false, id: dom_id(attachment)
       %label.btn.btn-light{for: dom_id(attachment)}
         %i.fas.fa-fw.fa-times