comfortable_mexican_sofa 2.0.9 → 2.0.10

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_hover.scss

@@ -1,61 +1,39 @@
 // stylelint-disable indentation
+
+// Hover mixin and `$enable-hover-media-query` are deprecated.
+//
+// Origally added during our alphas and maintained during betas, this mixin was
+// designed to prevent `:hover` stickiness on iOS—an issue where hover styles
+// would persist after initial touch.
+//
+// For backward compatibility, we've kept these mixins and updated them to
+// always return their regular psuedo-classes instead of a shimmed media query.
+//
+// Issue: https://github.com/twbs/bootstrap/issues/25195
+
 @mixin hover {
-  // TODO: re-enable along with mq4-hover-shim
-//  @if $enable-hover-media-query {
-//    // See Media Queries Level 4: https://drafts.csswg.org/mediaqueries/#hover
-//    // Currently shimmed by https://github.com/twbs/mq4-hover-shim
-//    @media (hover: hover) {
-//      &:hover { @content }
-//    }
-//  }
-//  @else {
-    &:hover { @content; }
-//  }
+  &:hover { @content; }
 }
 
-
 @mixin hover-focus {
-  @if $enable-hover-media-query {
-    &:focus {
-      @content;
-    }
-    @include hover { @content; }
-  } @else {
-    &:focus,
-    &:hover {
-      @content;
-    }
+  &:hover,
+  &:focus {
+    @content;
   }
 }
 
 @mixin plain-hover-focus {
-  @if $enable-hover-media-query {
-    &,
-    &:focus {
-      @content;
-    }
-    @include hover { @content; }
-  } @else {
-    &,
-    &:focus,
-    &:hover {
-      @content;
-    }
+  &,
+  &:hover,
+  &:focus {
+    @content;
   }
 }
 
 @mixin hover-focus-active {
-  @if $enable-hover-media-query {
-    &:focus,
-    &:active {
-      @content;
-    }
-    @include hover { @content; }
-  } @else {
-    &:focus,
-    &:active,
-    &:hover {
-      @content;
-    }
+  &:hover,
+  &:focus,
+  &:active {
+    @content;
   }
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_list-group.scss

@@ -4,21 +4,18 @@
   .list-group-item-#{$state} {
     color: $color;
     background-color: $background;
-  }
-
-  a.list-group-item-#{$state},
-  button.list-group-item-#{$state} {
-    color: $color;
 
-    @include hover-focus {
-      color: $color;
-      background-color: darken($background, 5%);
-    }
+    &.list-group-item-action {
+      @include hover-focus {
+        color: $color;
+        background-color: darken($background, 5%);
+      }
 
-    &.active {
-      color: #fff;
-      background-color: $color;
-      border-color: $color;
+      &.active {
+        color: #fff;
+        background-color: $color;
+        border-color: $color;
+      }
     }
   }
 }

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_screen-reader.scss

@@ -9,7 +9,7 @@
   height: 1px;
   padding: 0;
   overflow: hidden;
-  clip: rect(0,0,0,0);
+  clip: rect(0, 0, 0, 0);
   white-space: nowrap;
   clip-path: inset(50%);
   border: 0;

data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-hide.scss

@@ -1,5 +1,6 @@
 // CSS image replacement
 @mixin text-hide() {
+  // stylelint-disable-next-line font-family-no-missing-generic-family-keyword
   font: 0/0 a;
   color: transparent;
   text-shadow: none;

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_borders.scss

@@ -4,7 +4,12 @@
 // Border
 //
 
-.border          { border: $border-width solid $border-color !important; }
+.border         { border: $border-width solid $border-color !important; }
+.border-top     { border-top: $border-width solid $border-color !important; }
+.border-right   { border-right: $border-width solid $border-color !important; }
+.border-bottom  { border-bottom: $border-width solid $border-color !important; }
+.border-left    { border-left: $border-width solid $border-color !important; }
+
 .border-0        { border: 0 !important; }
 .border-top-0    { border-top: 0 !important; }
 .border-right-0  { border-right: 0 !important; }

data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_display.scss

@@ -25,32 +25,14 @@
 // Utilities for toggling `display` in print
 //
 
-.d-print-block {
-  display: none !important;
-
-  @media print {
-    display: block !important;
-  }
-}
-
-.d-print-inline {
-  display: none !important;
-
-  @media print {
-    display: inline !important;
-  }
-}
-
-.d-print-inline-block {
-  display: none !important;
-
-  @media print {
-    display: inline-block !important;
-  }
-}
-
-.d-print-none {
-  @media print {
-    display: none !important;
-  }
+@media print {
+  .d-print-none         { display: none !important; }
+  .d-print-inline       { display: inline !important; }
+  .d-print-inline-block { display: inline-block !important; }
+  .d-print-block        { display: block !important; }
+  .d-print-table        { display: table !important; }
+  .d-print-table-row    { display: table-row !important; }
+  .d-print-table-cell   { display: table-cell !important; }
+  .d-print-flex         { display: flex !important; }
+  .d-print-inline-flex  { display: inline-flex !important; }
 }

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

@@ -50,18 +50,17 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
   end
 
   def create
-    if params[:category]
-      ids = @site.categories.of_type("Comfy::Cms::File")
-        .where(label: params[:category])
-        .each_with_object({}) { |c, h| h[c.id] = 1 }
+    categories_scope = @site.categories.of_type("Comfy::Cms::File")
+
+    if params[:categories]
+      ids = categories_scope.where(label: params[:categories]).pluck(:id)
       @file.category_ids = ids
     end
 
     # Automatically tagging upload if it's done through redactor
     if params[:source] == "redactor"
-      category = @site.categories.of_type("Comfy::Cms::File").find_or_create_by(label: "wysiwyg")
-      @file.category_ids ||= {}
-      @file.category_ids[category.id] = 1
+      category = categories_scope.find_or_create_by(label: "wysiwyg")
+      @file.category_ids = [category.id]
     end
 
     @file.save!

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

@@ -3,10 +3,11 @@ module Comfy
     module CmsHelper
 
       # Wrapper around ComfortableMexicanSofa::FormBuilder
-      def comfy_form_for(record, options = {}, &block)
-        options[:builder] = ComfortableMexicanSofa::FormBuilder
-        options[:layout] ||= :horizontal
-        bootstrap_form_for(record, options, &block)
+      def comfy_form_with(**options, &block)
+        form_options = options.merge(builder: ComfortableMexicanSofa::FormBuilder)
+        form_options[:bootstrap]  = { layout: :horizontal }
+        form_options[:local]      = true
+        bootstrap_form_with(**form_options, &block)
       end
 
       def comfy_admin_partial(path, params = {})

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

@@ -11,7 +11,7 @@ module Comfy::Cms::WithCategories
       through:    :categorizations,
       class_name: "Comfy::Cms::Category"
 
-    attr_accessor :category_ids
+    attr_writer :category_ids
 
     after_save :sync_categories
 
@@ -24,17 +24,28 @@ module Comfy::Cms::WithCategories
     }
   end
 
+  def category_ids
+    @category_ids ||= categories.pluck(:id)
+  end
+
   def sync_categories
-    (category_ids || {}).each do |category_id, flag|
-      case flag.to_i
-      when 1
-        if (category = Comfy::Cms::Category.find_by_id(category_id))
-          category.categorizations.create(categorized: self)
-        end
-      when 0
-        categorizations.where(category_id: category_id).destroy_all
+    return unless category_ids.is_a?(Array)
+
+    scope = Comfy::Cms::Category.of_type(self.class.to_s)
+    existing_ids = scope.pluck(:id)
+
+    ids_to_add = category_ids.map(&:to_i)
+
+    # adding categorizations
+    ids_to_add.each do |id|
+      if (category = scope.find_by_id(id))
+        category.categorizations.create(categorized: self)
       end
     end
+
+    # removing categorizations
+    ids_to_remove = existing_ids - ids_to_add
+    categorizations.where(category_id: ids_to_remove).destroy_all
   end
 
 end

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

@@ -1,7 +1,7 @@
 - url = comfy_admin_cms_site_category_path(@site, category)
-= form_for @category, as: :category, url: url, remote: true, html: {id: dom_id(category)} do |form|
+= form_with model: @category, scope: :category, url: url, html: {class: "edit-category", id: dom_id(category)} do |form|
   .input-group
-    = form.text_field :label, class: "form-control form-control-sm"
+    = form.text_field :label, class: "form-control form-control-sm", id: nil
     .input-group-btn
-      %button.btn.btn-primary.btn-sm
+      %button.btn.btn-primary.btn-sm{aria: {label: "Update Category"}}
         %i.fas.fa-fw.fa-check

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

@@ -1,11 +1,5 @@
 - object = form.object
 - if (categories = @site.categories.of_type(object.class.to_s)).present?
-  = form.form_group label: {text: t('.label')}, class: "categories" do
-    - categories.each do |category|
-      - name = "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]"
-      = hidden_field_tag name, 0, id: nil
-      .form-check.form-check-inline
-        %label.form-check-label
-          - name = "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]"
-          = check_box_tag name, 1, object.categories.member?(category), id: nil, class: 'form-check-input'
-          = category.label
+  - options = {bootstrap: {check_inline: true, label: {text: t(".label"), class: "pt-0"}}}
+  = form.collection_check_boxes :category_ids, categories, :id, :label, options
+

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

@@ -19,9 +19,9 @@
     = form_for :category, url: url, remote: true, 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'
+        = form.text_field :label, placeholder: t('.add_placeholder'), class: 'form-control form-control-sm', id: nil
         .input-group-btn
-          %button#cat-add-button.btn.btn-primary.btn-sm
+          %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

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

@@ -6,9 +6,10 @@
   - if read
     - active_class = active ? "active" : nil
     - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
-    = link_to category.label, {categories: categories}, class: "btn btn-sm btn-light btn-block text-left text-truncate #{active_class}"
+    - url = "?#{{categories: categories}.to_query}"
+    = link_to category.label, url, class: "btn btn-sm btn-light btn-block text-left text-truncate #{active_class}"
   - else
     .btn-group.d-flex
       = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), remote: true, class: "btn btn-sm btn-light w-100 text-left text-truncate"
-      = link_to comfy_admin_cms_site_category_path(@site, category), method: :delete, remote: true, data: {confirm: t('.are_you_sure')}, class: 'btn btn-sm btn-danger' do
-        %i.fas.fa-fw.fa-times
+      = link_to comfy_admin_cms_site_category_path(@site, category), method: :delete, remote: true, data: {confirm: t('.are_you_sure')}, class: 'btn btn-sm btn-danger', aria: {label: "Delete Category"} do
+        %i.fas.fa-fw.fa-times

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#category_label').val('');
+$('.categories-widget .editable form#new-category input').val('');

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

@@ -3,16 +3,13 @@
 = form.text_field :label
 = form.file_field :file
 
-// TODO replace with form_group when it's fixed: https://github.com/bootstrap-ruby/rails-bootstrap-forms/issues/353
 - unless @file.new_record?
-  .form-group.row
-    .col-sm-2.text-lg-right
-      = t('.current_file')
-    .col-sm-10
-      - if @file.attachment.image?
-        .file-image
-          = image_tag @file.attachment
-      = link_to @file.attachment.filename, @file.attachment, target: '_blank'
+
+  = form.form_group bootstrap: {label: {text: t('.current_file')}}do
+    - if @file.attachment.image?
+      .file-image
+        = image_tag @file.attachment
+    = link_to @file.attachment.filename, @file.attachment, target: '_blank'
 
 = form.text_area :description
 
@@ -21,7 +18,9 @@
 = comfy_admin_partial 'comfy/admin/cms/partials/file_form_after', form: form
 
 = form.form_actions do
-  = form.submit t(@file.new_record?? '.create' : '.update'), class: 'btn btn-primary'
+  = submit_tag t(@file.new_record? ? ".create" : ".update"), class: "btn btn-primary"
+
   - unless @file.new_record?
-    = link_to t('.delete'), comfy_admin_cms_site_file_path(@site, @file), method: :delete, data: {confirm: t('.are_you_sure')}, class: 'btn btn-danger'
-  = link_to t('.cancel'), comfy_admin_cms_site_files_path, class: 'btn btn-link'
+    = link_to t(".delete"), comfy_admin_cms_site_file_path(@site, @file), method: :delete, data: {confirm: t(".are_you_sure")}, class: "btn btn-danger"
+
+  = link_to t(".cancel"), comfy_admin_cms_site_files_path, class: "btn btn-link"

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

@@ -1,5 +1,5 @@
 .page-header
-  %h2= t('.title')
+  %h2= t(".title")
 
-= comfy_form_for @file, as: :file, url: {action: :update} do |form|
+= comfy_form_with model: @file, scope: :file, url: {action: :update} do |form|
   = render form

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

@@ -1,5 +1,5 @@
 .page-header
-  %h2= t('.title')
+  %h2= t(".title")
 
-= comfy_form_for @file, as: :file, url: {action: :create}, html: {multipart: true} do |form|
+= comfy_form_with model: @file, scope: :file, url: {action: :create}, html: {multipart: true} do |form|
   = render form

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

@@ -3,8 +3,10 @@
     - if attachment.image?
       - variant = attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
       - thumb = image_tag(url_for(variant), size: "200x150")
-    .btn.btn-outline-light
-      = link_to attachment.filename, attachment, {data: {toggle: "page-file-popover", content: thumb}}
-      %label.custom-control.custom-checkbox
-        = check_box_tag "#{object_name}[fragments_attributes][#{index}][file_ids_destroy][]", attachment.id, false, id: nil, class: "custom-control-input"
-        %span.custom-control-indicator
+    .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"
+      = 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

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

@@ -14,7 +14,7 @@
         = t(".no_tags").html_safe
 
     - else
-      = fields_for :fragments, nil, builder: ComfortableMexicanSofa::FormBuilder, layout: :horizontal do |fragments|
+      = fields scope: :fragments, builder: ComfortableMexicanSofa::FormBuilder, bootstrap: { layout: :horizontal } do |fragments|
 
         .tabbable
           - if namespace.size > 1

data/app/views/comfy/admin/cms/layouts/_form.html.haml

@@ -2,6 +2,7 @@
 
 = form.text_field :label, data: {slugify: @layout.new_record?}
 = form.text_field :identifier, data: {slug: true}
+
 - if (options = Comfy::Cms::Layout.options_for_select(@site, @layout)).present?
   = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options
 
@@ -12,8 +13,8 @@
 = form.text_area :css, data: {'cms-cm-mode' => 'css'}
 = form.text_area :js, data: {'cms-cm-mode' => 'javascript'}
 
-= comfy_admin_partial 'comfy/admin/cms/partials/layout_form_after', form: form
+= comfy_admin_partial "comfy/admin/cms/partials/layout_form_after", form: form
 
 = form.form_actions do
-  = form.submit t(@layout.new_record?? '.create' : '.update'), class: "btn btn-primary"
+  = submit_tag t(@layout.new_record? ? ".create" : ".update"), class: "btn btn-primary"
   = link_to t('.cancel'), comfy_admin_cms_site_layouts_path, class: "btn btn-link"

data/app/views/comfy/admin/cms/layouts/edit.html.haml

@@ -5,5 +5,5 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_for @layout, as: :layout, url: {action: :update} do |form|
+= comfy_form_with model: @layout, scope: :layout, url: {action: :update} do |form|
   = render form