trusty-cms 6.0.5 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e18272551dce1a329a35f2392d27ab7db0a2b5add8a97817675566af694c574
-  data.tar.gz: eceba4ff32ac87ce60d9a3a09d4293bc8c5b492ca4054a377ffa9cf80839b1c8
+  metadata.gz: 317a11bc953c6892d860b8c0e13b7d71ca9feffd3e9c6251c52606928fc1ada3
+  data.tar.gz: aef8f45d869c2b2ec31df22d23002ba14c4b1399e1bf82b06a4a6bc5ca8d707e
 SHA512:
-  metadata.gz: 42b6a79322a0316b30e3b47f8fcb59854fa5b9aff6c93c6fe0bbdf07191cb38887cc70b46461cc5dd9a51443c0f41f08d0f8900a5fdea360cd7cc2e8f8d24252
-  data.tar.gz: 29a6abd9a87189113fe66ca8680e26bcddea84af5582eafd991c5de2cd7ee581553308ff259249e52100cc456e45f461adadc5af90971b4b425f258b7a20e32a
+  metadata.gz: 7c6011cc75d010d0a669e5105820b8ab4d498c081220a5584e654dd8e9c8002fa748175b06cce6145c8011b3f1ab0823052c231bd2107946b725afcfcc94b5ea
+  data.tar.gz: 9b9460d709ae5504c298d03a3a5b170db440fc9db7b7998531ac856f7635dfee5f99dfe3d66d25bf4ce54494c4a687523355b84ff73d8f887f81bfef38fc5f25

data/Gemfile

@@ -15,7 +15,7 @@ group :development, :test do
   gem 'activestorage-validator'
   gem 'acts_as_list'
   gem 'database_cleaner'
-  gem 'factory_bot_rails', '6.2.0'
+  gem 'factory_bot_rails', '6.4.2'
   gem 'file_validators'
   gem 'launchy', '~> 2.5.0'
   gem 'mysql2'
@@ -23,6 +23,7 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'psych', '5.1.1.1'
   gem 'rails-observers'
+  gem 'ransack'
   gem 'rspec-rails'
   gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.0.4)
-      RedCloth (= 4.3.2)
+    trusty-cms (6.1.2)
+      RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
       acts_as_tree (~> 2.9.1)
@@ -22,6 +22,7 @@ PATH
       radius (~> 0.7)
       rails
       rake (< 14.0)
+      ransack
       rdoc (>= 5.1, < 7.0)
       roadie-rails
       sass-rails
@@ -33,7 +34,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.2)
+    RedCloth (4.3.3)
     actioncable (6.1.7.6)
       actionpack (= 6.1.7.6)
       activesupport (= 6.1.7.6)
@@ -141,10 +142,10 @@ GEM
     docile (1.4.0)
     erubi (1.12.0)
     execjs (2.9.1)
-    factory_bot (6.2.1)
+    factory_bot (6.4.2)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
+    factory_bot_rails (6.4.2)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.15.5)
     file_validators (3.0.0)
@@ -179,7 +180,7 @@ GEM
       addressable (~> 2.8)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -228,7 +229,7 @@ GEM
     psych (5.1.1.1)
       stringio
     public_suffix (4.0.7)
-    racc (1.7.2)
+    racc (1.7.3)
     rack (2.2.8)
     rack-cache (1.14.0)
       rack (>= 0.4)
@@ -265,6 +266,10 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rake (13.1.0)
+    ransack (4.1.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
+      i18n
     rdoc (6.5.0)
       psych (>= 4.0.0)
     regexp_parser (2.1.1)
@@ -282,10 +287,10 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -293,7 +298,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     sass-rails (6.0.0)
@@ -354,7 +359,7 @@ DEPENDENCIES
   activestorage-validator
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 6.2.0)
+  factory_bot_rails (= 6.4.2)
   file_validators
   launchy (~> 2.5.0)
   mysql2
@@ -362,6 +367,7 @@ DEPENDENCIES
   pry-byebug
   psych (= 5.1.1.1)
   rails-observers
+  ransack
   rspec-rails
   simplecov
   trusty-cms!

data/app/assets/javascripts/admin/assets.js

@@ -1,268 +1,285 @@
 Assets = {
-  attachEvents: function() {
-    $('a.attach_asset').off('click').click(function(e){
-      e.preventDefault();
-      var link = $(this);
-      var container = link.parents('li.asset');
-      var title = link.parents('div.title').html();
-      var image = link.parents('img');
-      container.addClass('waiting');
-      $.ajax({
-        url: link.attr('href'),
-        success: function(data, textStatus, jqXHR) {
-          container.removeClass('waiting');
-          Assets.addToList(data);
-        }
-      });
-    });
-
-    $('a.detach_asset').off('click').click(function(e){
-      e.preventDefault();
-      var link = $(this);
-      Assets.removeFromList(link.parents('li.asset'));
-    });
+    attachEvents: function () {
+        $('a.attach_asset').off('click').click(function (e) {
+            e.preventDefault();
+            var link = $(this);
+            var container = link.parents('li.asset');
+            var title = link.parents('div.title').html();
+            var image = link.parents('img');
+            container.addClass('waiting');
+            $.ajax({
+                url: link.attr('href'),
+                success: function (data, textStatus, jqXHR) {
+                    container.removeClass('waiting');
+                    Assets.addToList(data);
+                }
+            });
+        });
+
+        $('a.detach_asset').off('click').click(function (e) {
+            e.preventDefault();
+            var link = $(this);
+            Assets.removeFromList(link.parents('li.asset'));
+        });
+
+        $('a.insert_asset').off('click').click(function (e) {
+            e.preventDefault();
+            var part_name = $("a.tab.here").children('span').html();
+            if (part_name.indexOf(' ')) part_name = part_name.replace(' ', '-').toLowerCase();
+            part_name = part_name.replace('_', '-');
+            var part_id = 'part_' + part_name + '_content';
+            var tag_parts = $(this).attr('rel').split('_');
+            var tag_name = tag_parts[0];
+            var asset_size = tag_parts[1];
+            var asset_id = tag_parts[2];
+            var radius_tag = '<r:asset:' + tag_name;
+            if (asset_size != '') radius_tag = radius_tag + ' size="' + asset_size + '"';
+            radius_tag = radius_tag + ' id="' + asset_id + '" />';
+            Assets.insertAtCursor(part_id, radius_tag);
+
+        });
+
+        $(".pagination a").off('click').click(function (e) {
+            e.preventDefault();
+            $.ajax({
+                method: 'get',
+                url: $(this).attr('href') + Assets.assetFilterParameters(),
+                complete: function (data, textStatus, jqXHR) {
+                    Assets.updateTable(data.responseText);
+                    Assets.attachEvents();
+                }
+            });
+        });
 
-    $('a.insert_asset').off('click').click(function(e){
-      e.preventDefault();
-      var part_name = $("a.tab.here").children('span').html();
-      if (part_name.indexOf(' ')) part_name = part_name.replace(' ', '-').toLowerCase();
-      part_name = part_name.replace('_', '-');
-      var part_id = 'part_' + part_name + '_content';
-      var tag_parts = $(this).attr('rel').split('_');
-      var tag_name = tag_parts[0];
-      var asset_size = tag_parts[1];
-      var asset_id = tag_parts[2];
-      var radius_tag = '<r:asset:' + tag_name;
-      if (asset_size != '') radius_tag = radius_tag + ' size="' + asset_size + '"';
-      radius_tag =  radius_tag +' id="' + asset_id + '" />';
-      Assets.insertAtCursor(part_id, radius_tag);
+    },
 
-    });
+    assetFilterParameters: function () {
+        var parameters = [];
+        if ($('#filesearchforminput').val() !== '') {
+            parameters.push([ 'search[title_cont]', $('#filesearchforminput').val() ]);
+        }
 
-    $(".pagination a").off('click').click(function(e){
-      e.preventDefault();
-      $.ajax({
-        method: 'get',
-        url: $(this).attr('href') + Assets.assetFilterParameters(),
-        complete: function(data, textStatus, jqXHR) {
-          Assets.updateTable(data.responseText);
-          Assets.attachEvents();
+        if ($('#page_id').val() !== undefined) {
+            parameters.push([ 'page_id', $('#page_id').val() ]);
         }
-      });
-    });
 
-  },
+        var filters = [];
+        var url_params = "";
+        $('a.selective.pressed').each(function () {
+            filters.push($(this).attr('rel'));
+        });
 
-  assetFilterParameters: function() {
-    var parameters = [];
-    if ($('#filesearchforminput').val() !== '') {
-      parameters.push(['search', $('#filesearchforminput').val()]);
-    }
+        if (filters.length > 0) {
+            parameters.push([ 'filter', filters.toString() ])
+        }
 
-    if ($('#page_id').val() !== undefined) {
-      parameters.push(['page_id', $('#page_id').val()]);
-    }
+        for (var i = 0; i < parameters.length; i++) {
+            if (i > 0) {
+                url_params = url_params + '&'
+            }
+            url_params = url_params + parameters[i][0] + '=' + parameters[i][1];
+        }
+        return url_params + '&pp=50';
+    },
 
-    var filters = [];
-    var url_params = "";
-    $('a.selective.pressed').each(function(){
-      filters.push($(this).attr('rel'));
-    });
+    activateUpload: function () {
+        $('#upload-controls').hide();
+        $('#update-controls').show();
+        $('#asset_title').prop("disabled", false);
+        $('#new_asset input[name="commit"]').prop("disabled", false);
+    },
+    activateUpdate: function () {
+        $('#upload-controls').show();
+        $('#update-controls').hide();
+        $('#asset_title').prop("disabled", true);
+        $('#new_asset input[name="commit"]').prop("disabled", true);
+    },
 
-    if (filters.length > 0) {parameters.push(['filter', filters.toString()])}
+    insertAtCursor: function (part_id, insertion) {
+        if (CKEDITOR.instances[part_id].mode == 'wysiwyg') {
+            CKEDITOR.instances[part_id].insertText(insertion);
+        } else {
+            var textbox = $("textarea.cke_source[title~=" + part_id + "]");
+            var caretPos = textbox[0].selectionStart;
+            var textAreaTxt = textbox.val();
+            textbox.val(textAreaTxt.substring(0, caretPos) + insertion + textAreaTxt.substring(caretPos));
+        }
+    },
+    filterAssets: function () {
+        var url = $("#filesearchform").attr('action');
+        var parameters = Assets.assetFilterParameters();
+
+        url = url + "?" + parameters;
+        $.ajax({
+            url: url,
+            complete: function (data, textStatus, jqXHR) {
+                Assets.updateTable(data.responseText);
+            }
+        });
+    },
+    updateTable: function (html) {
+        $("#assets_table").html(html);
+        Assets.attachEvents();
+    },
+    addToList: function (html) {
+        var list = $('#attachment_fields');
+        list.append(html);
+        Assets.showListIfHidden();
+        Assets.notify('Save page to commit changes');
+        Assets.attachEvents();
+        // I'm not sure what Sortable does and can't find any example of
+        // its use in current Trusty, so I'm going to comment it out for now.
 
-    for(var i = 0; i < parameters.length; i++) {
-      if (i > 0) {url_params = url_params + '&'}
-      url_params = url_params + parameters[i][0] + '=' + parameters[i][1];
-    }
-    return url_params + '&pp=20';
-  },
-
-  activateUpload: function(){
-    $('#upload-controls').hide();
-    $('#update-controls').show();
-    $('#asset_title').prop( "disabled", false );
-    $('#new_asset input[name="commit"]').prop( "disabled", false );
-  },
-  activateUpdate: function() {
-    $('#upload-controls').show();
-    $('#update-controls').hide();
-    $('#asset_title').prop( "disabled", true );
-    $('#new_asset input[name="commit"]').prop( "disabled", true );
-  },
-
-  insertAtCursor: function(part_id, insertion) {
-    if (CKEDITOR.instances[part_id].mode == 'wysiwyg') {
-      CKEDITOR.instances[part_id].insertText( insertion );
-    } else {
-      var textbox = $("textarea.cke_source[title~=" + part_id +"]");
-      var caretPos = textbox[0].selectionStart;
-      var textAreaTxt = textbox.val();
-      textbox.val(textAreaTxt.substring(0, caretPos) + insertion + textAreaTxt.substring(caretPos) );
-    }
-  },
-  filterAssets: function() {
-    var url = $("#filesearchform").attr('action');
-    var parameters = Assets.assetFilterParameters();
-
-    url = url + "?" + parameters;
-    $.ajax({
-      url: url,
-      complete: function(data, textStatus, jqXHR) {
-        Assets.updateTable(data.responseText);
-      }
-    });
-  },
-  updateTable: function(html) {
-    $("#assets_table").html(html);
-    Assets.attachEvents();
-  },
-  addToList: function(html){
-    var list = $('#attachment_fields');
-    list.append(html);
-    Assets.showListIfHidden();
-    Assets.notify('Save page to commit changes');
-    Assets.attachEvents();
-    // I'm not sure what Sortable does and can't find any example of
-    // its use in current Trusty, so I'm going to comment it out for now.
-
-    //Assets.makeSortable(list);
-
-  },
-  removeFromList: function(container) {
-    container.children('input.attacher').remove();
-    container.children('input.pos').remove();
-    container.children('input.destroyer').val(1);
-    container.fadeOut();
-    container.addClass('detached');
-  },
-  showListIfHidden: function() {
-    var list = $('#attachment_fields');
-    if (list.hasClass('empty')) {
-      list.removeClass('empty');
+        //Assets.makeSortable(list);
+
+    },
+    removeFromList: function (container) {
+        container.children('input.attacher').remove();
+        container.children('input.pos').remove();
+        container.children('input.destroyer').val(1);
+        container.fadeOut();
+        container.addClass('detached');
+    },
+    showListIfHidden: function () {
+        var list = $('#attachment_fields');
+        if (list.hasClass('empty')) {
+            list.removeClass('empty');
+        }
+    },
+    notify: function (message) {
+        $('#attachment_list span.message').html(message).addClass('important');
     }
-  },
-  notify: function(message){
-    $('#attachment_list span.message').html(message).addClass('important');
-  }
 
 };
 
 
-$(function() {
+$(function () {
 
-  $('a.selective').click(function(e){
-    e.preventDefault();
-    var element = $(this);
-    var type_id = element.attr('rel');
-    var type_check = $('#' + type_id + '-check');
+    $('a.selective').click(function (e) {
+        e.preventDefault();
+        var element = $(this);
+        var type_id = element.attr('rel');
+        var type_check = $('#' + type_id + '-check');
+
+        if (element.hasClass('pressed')) {
+            element.removeClass('pressed');
+            $(type_check).prop('checked', false);
+            if ($('a.selective.pressed').length == 0) $('#select_all').addClass('pressed');
+        } else {
+            element.addClass('pressed');
+            $('a.deselective').each(function () {
+                $(this).removeClass('pressed');
+            });
+            $(type_check).prop('checked', true);
+        }
+        Assets.filterAssets();
+        Assets.attachEvents();
 
-    if(element.hasClass('pressed')) {
-      element.removeClass('pressed');
-      $(type_check).prop('checked', false);
-      if ($('a.selective.pressed').length == 0) $('#select_all').addClass('pressed');
-    }
-    else {
-      element.addClass('pressed');
-      $('a.deselective').each(function() { $(this).removeClass('pressed'); });
-      $(type_check).prop('checked', true);
-    }
-    Assets.filterAssets();
-    Assets.attachEvents();
+    });
 
-  });
-
-  $('a.deselective').click(function(e){
-    e.preventDefault();
-    var element = $(this);
-    if(!element.hasClass('pressed')) {
-      $('a.selective').each(function() { $(this).removeClass('pressed'); });
-      $('input.selective').each(function() { $(this).prop('checked', false); });
-      element.addClass('pressed');
-      Assets.filterAssets();
-      Assets.attachEvents();
-    }
-  });
+    $('a.deselective').click(function (e) {
+        e.preventDefault();
+        var element = $(this);
+        if (!element.hasClass('pressed')) {
+            $('a.selective').each(function () {
+                $(this).removeClass('pressed');
+            });
+            $('input.selective').each(function () {
+                $(this).prop('checked', false);
+            });
+            element.addClass('pressed');
+            Assets.filterAssets();
+            Assets.attachEvents();
+        }
+    });
 
-  $('#filesearchforminput').keyup(function(){
-    Assets.filterAssets();
-    Assets.attachEvents();
-  });
-
-  $("#attach_assets").click(function(e) {
-    e.preventDefault();
-    Popup.show('attach_asset');
-    $('.close_popup').click(function(e){
-      e.preventDefault();
-      Popup.close();
-      $('#attach_asset').hide();
+    $('#filesearchforminput').keyup(function () {
+        clearTimeout($(this).data('timeout'));
+        var timeout = setTimeout(function () {
+            Assets.filterAssets();
+            Assets.attachEvents();
+        }, 500);
+        $(this).data('timeout', timeout);
     });
-  });
-
-  $('#filesearchforminput').keyup(function(){
-    Assets.filterAssets();
-  });
-
-  $("#upload_asset_link").click(function(e) {
-    e.preventDefault();
-    Popup.close();
-    $('#attach_asset').hide();
-    Assets.activateUpdate();
-    Popup.show('upload_asset');
-
-    $("#attach-popup").click(function(e) {
-      e.preventDefault();
-      Popup.close();
-      $('#upload_asset').hide();
-      Popup.show('attach_asset');
-      $('.close_popup').click(function(e){
+
+    $("#attach_assets").click(function (e) {
         e.preventDefault();
-        Popup.close();
-        $('#attach_asset').hide();
-      });
+        Popup.show('attach_asset');
+        $('.close_popup').click(function (e) {
+            e.preventDefault();
+            Popup.close();
+            $('#attach_asset').hide();
+        });
     });
 
-  $('.close_popup').click(function(e){
-    e.preventDefault();
-    Popup.close();
-    $('#upload_asset').hide();
+    $('#filesearchforminput').keyup(function () {
+        clearTimeout($(this).data('timeout'));
+        var timeout = setTimeout(function () {
+            Assets.filterAssets();
+        }, 500);
+        $(this).data('timeout', timeout);
     });
-  });
-
-  $('#update_asset').submit(function(e){
-    e.preventDefault();
-    $("#update-asset").attr("disabled", true);
-    $('#update-status').show();
-    $.ajax({
-      method: 'put',
-      url: $(this).attr('action') + $("#asset_id").val(),
-      data: $(this).serialize(),
-      complete: function(data, textStatus, jqXHR) {
+
+    $("#upload_asset_link").click(function (e) {
+        e.preventDefault();
         Popup.close();
-        $('#upload_asset').hide();
-        $('#update-status').hide();
-        $("#update-asset").attr("disabled", false);
-        $('#update_asset').trigger("reset");
-      }
+        $('#attach_asset').hide();
+        Assets.activateUpdate();
+        Popup.show('upload_asset');
+
+        $("#attach-popup").click(function (e) {
+            e.preventDefault();
+            Popup.close();
+            $('#upload_asset').hide();
+            Popup.show('attach_asset');
+            $('.close_popup').click(function (e) {
+                e.preventDefault();
+                Popup.close();
+                $('#attach_asset').hide();
+            });
+        });
+
+        $('.close_popup').click(function (e) {
+            e.preventDefault();
+            Popup.close();
+            $('#upload_asset').hide();
+        });
     });
-  });
 
-  $('#asset_asset').fileupload({
-    add: function(e, data) {
-      $("#asset_asset").attr("disabled", true);
-      $('#upload-status').show();
-      data.submit();
-    },
-    done: function (e, data) {
-      $("#asset_id").val($(data.result).find(".attacher").val());
-      Assets.addToList($(data.result));
-      Assets.activateUpload();
-      $("#asset_asset").attr("disabled", false);
-      $('#upload-status').hide();
-      $("#popup_window").hide();
-    }
-  });
+    $('#update_asset').submit(function (e) {
+        e.preventDefault();
+        $("#update-asset").attr("disabled", true);
+        $('#update-status').show();
+        $.ajax({
+            method: 'put',
+            url: $(this).attr('action') + $("#asset_id").val(),
+            data: $(this).serialize(),
+            complete: function (data, textStatus, jqXHR) {
+                Popup.close();
+                $('#upload_asset').hide();
+                $('#update-status').hide();
+                $("#update-asset").attr("disabled", false);
+                $('#update_asset').trigger("reset");
+            }
+        });
+    });
+
+    $('#asset_asset').fileupload({
+        add: function (e, data) {
+            $("#asset_asset").attr("disabled", true);
+            $('#upload-status').show();
+            data.submit();
+        },
+        done: function (e, data) {
+            $("#asset_id").val($(data.result).find(".attacher").val());
+            Assets.addToList($(data.result));
+            Assets.activateUpload();
+            $("#asset_asset").attr("disabled", false);
+            $('#upload-status').hide();
+            $("#popup_window").hide();
+        }
+    });
 
-  Assets.attachEvents();
+    Assets.attachEvents();
 
 });

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -40,8 +40,8 @@ input[type="submit"], input[type="button"] {
 input[type="text"], input[type="search"], input[type="password"], input[type="email"] {
   border: 0.5px solid $gray;
   margin: 0.5em;
+  max-width: 75%;
   padding: 0.25em;
-  width: 75%;
 }
 
 select {

data/app/controllers/admin/assets_controller.rb

@@ -8,9 +8,8 @@ class Admin::AssetsController < Admin::ResourceController
   def index
     assets = Asset.order('created_at DESC')
     @page = Page.find(params[:page_id]) if params[:page_id]
-
-    @term = params[:search] || ''
-    assets = assets.matching(@term) if @term && !@term.blank?
+    @term = assets.ransack(params[:search] || '')
+    assets = @term.result(distinct: true)
 
     @types = params[:filter] ? params[:filter].split(',') : []
     if @types.include?('all')
@@ -20,6 +19,7 @@ class Admin::AssetsController < Admin::ResourceController
     end
 
     @assets = paginated? ? assets.paginate(pagination_parameters) : assets.all
+
     respond_to do |format|
       format.js do
         @page = Page.find_by_id(params[:page_id])
@@ -54,7 +54,7 @@ class Admin::AssetsController < Admin::ResourceController
         end
       end
     end
-    
+
     if asset_params[:for_attachment]
       render partial: 'admin/page_attachments/attachment', collection: @page_attachments
     else

data/app/controllers/admin/pages_controller.rb

@@ -27,11 +27,20 @@ class Admin::PagesController < Admin::ResourceController
   end
 
   def new
+    assets = Asset.order('created_at DESC')
+    @term = assets.ransack(params[:search] || '')
     @page = self.model = model_class.new_with_defaults(trusty_config)
     assign_page_attributes
     response_for :new
   end
 
+  def edit
+    assets = Asset.order('created_at DESC')
+    @term = assets.ransack(params[:search] || '')
+    @term.result(distinct: true)
+    response_for :edit
+  end
+
   def preview
     render_preview
   rescue PreviewStop => e

data/app/models/asset.rb

@@ -56,6 +56,10 @@ class Asset < ActiveRecord::Base
     asset_type.icon(style_name.to_s)
   end
 
+  def self.ransackable_attributes(auth_object = nil)
+    %w[asset_content_type asset_file_name asset_file_size caption created_at created_by_id id original_extension original_height original_width title updated_at updated_by_id uuid]
+  end
+
   def render_original(style_name)
     style_name.to_s == 'original' && asset.key.include?('culturaldistrict')
   end

data/app/views/admin/assets/_search.html.haml

@@ -1,18 +1,19 @@
-= form_tag(admin_assets_path, :id=>'filesearchform', :method => 'get', :class=>"search") do
-  - if @page
-    = hidden_field_tag "page_id", @page.id
+= search_form_for term, url: admin_assets_path, class: 'search', id: 'filesearchform' do |f|
+  - if page
+    = hidden_field_tag "page_id", page.id
     = hidden_field_tag "p", params['p'] || 1
-    = hidden_field_tag "pp", params['pp'] || 20
+    = hidden_field_tag "pp", params['pp'] || 50
 
   .asset_filters
     = link_to t("asset_types.all"), admin_assets_url, :id => "select_all", :class => params[:filter].blank? ? "deselective pressed" : "deselective"
     - AssetType.all.each do |type|
       - unless type.name == :other
         = link_to t("asset_types.#{type.plural}"), admin_assets_url(:filter => type.name), :rel => type.name.to_s, :class => params[:filter] == type.name.to_s ? "selective pressed" : "selective"
+
   .asset_search
     %i.fas.fa-search
-    %input{:type=>"search", :id => 'filesearchforminput', :class=>"search", :name=>"search", :value=>h(params[:search]), :placeholder=>"Search", :results=>0, :size=>30}
-
+    = f.search_field :title_cont, placeholder: 'Search Asset Title', class: 'search', id: 'filesearchforminput', size: '30'
+    Sort By #{sort_link(term, :title)} or #{sort_link(term, :created_at)}
   #type_boxes{:style => "display: none"}
     - AssetType.all.each do |type|
       = check_box_tag 'filter[]',  type.name.to_s, false, :id => "#{type.name}-check", :class => 'selective'

data/app/views/admin/assets/index.html.haml

@@ -3,11 +3,11 @@
 - body_classes << 'reversed'
 
 - content_for :toolbar do
-  = render 'search'
+  = render partial: 'search', locals: { term: @term, page: @page }
 
 .outset
   #assets_table.assets
-    = render :partial => 'asset_table', :locals => { assets: @assets, with_pagination: true }
+    = render partial: 'asset_table', locals: { assets: @assets, with_pagination: true }
   %p{style: 'clear: both; height: 2em'} &nbsp;
 
 - render_region :bottom do |bottom|

data/app/views/admin/pages/_asset_popups.html.haml

@@ -24,7 +24,7 @@
       .popup_title= t('clipped_extension.find_assets')
 
       .toolbar
-        = render :partial => 'admin/assets/search'
+        = render :partial => 'admin/assets/search', locals: { term: @term, page: @page }
 
       #assets_table.assets.viewport
         - assets = Asset.all.paginate(:per_page => 20, page: params[:p])

data/config/initializers/ransack.rb

@@ -0,0 +1,5 @@
+Ransack.configure do |c|
+  # Change default search parameter key name.
+  # Default key name is :q
+  c.search_key = :search
+end

data/lib/trusty_cms/engine.rb

@@ -21,4 +21,5 @@ end
 
 require 'ckeditor'
 require 'devise'
+require 'ransack'
 

data/lib/trusty_cms.rb

@@ -2,7 +2,7 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '6.0.5'.freeze
+    VERSION = '6.1.2'.freeze
   end
 end
 

data/trusty_cms.gemspec

@@ -43,8 +43,9 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'radius', '~> 0.7'
   s.add_dependency 'rails'
   s.add_dependency 'rake', '< 14.0'
+  s.add_dependency 'ransack'
   s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
-  s.add_dependency 'RedCloth', '4.3.2'
+  s.add_dependency 'RedCloth', '4.3.3'
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'

data/vendor/extensions/clipped-extension/clipped_extension.rb

@@ -5,10 +5,10 @@ class ClippedExtension < TrustyCms::Extension
   def activate
     if database_exists?
       if Asset.table_exists?
-        Page.send :include, PageAssetAssociations                                          # defines page-asset associations. likely to be generalised soon.
-        TrustyCms::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset         # defines shards for extension of the asset-admin interface
-        Admin::PagesController.send :helper, Admin::AssetsHelper                           # currently only provides a description of asset sizes
-        Page.send :include, AssetTags                                                      # radius tags for selecting sets of assets and presenting each one
+        Page.send :include, PageAssetAssociations # defines page-asset associations. likely to be generalised soon.
+        TrustyCms::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset # defines shards for extension of the asset-admin interface
+        Admin::PagesController.send :helper, Admin::AssetsHelper # currently only provides a description of asset sizes
+        Page.send :include, AssetTags # radius tags for selecting sets of assets and presenting each one
         AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => :standard, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
         AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => :standard, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
         AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
@@ -16,19 +16,19 @@ class ClippedExtension < TrustyCms::Extension
         AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
         AssetType.new :other, :icon => 'unknown'
 
-        admin.asset ||= TrustyCms::AdminUI.load_default_asset_regions                        # loads the shards defined in AssetsAdminUI
-        admin.page.edit.add :form, 'assets', :after => :edit_page_parts                    # adds the asset-attachment picker to the page edit view
-        admin.page.edit.add :main, 'asset_popups', :after => :edit_popups                  # adds the asset-attachment picker to the page edit view
+        admin.asset ||= TrustyCms::AdminUI.load_default_asset_regions # loads the shards defined in AssetsAdminUI
+        admin.page.edit.add :form, 'assets', :after => :edit_page_parts # adds the asset-attachment picker to the page edit view
+        admin.page.edit.add :main, 'asset_popups', :after => :edit_popups # adds the asset-attachment picker to the page edit view
         admin.page.edit.asset_popups.concat %w{upload_asset attach_asset}
         admin.configuration.show.add :trusty_config, 'admin/configuration/clipped_show', :after => 'defaults'
-        admin.configuration.edit.add :form,   'admin/configuration/clipped_edit', :after => 'edit_defaults'
+        admin.configuration.edit.add :form, 'admin/configuration/clipped_edit', :after => 'edit_defaults'
 
-        if TrustyCms::Config.table_exists? && TrustyCms::config["paperclip.command_path"]    # This is needed for testing if you are using mod_rails
+        if TrustyCms::Config.table_exists? && TrustyCms::config["paperclip.command_path"] # This is needed for testing if you are using mod_rails
           Paperclip.options[:command_path] = TrustyCms::config["paperclip.command_path"]
         end
 
         tab "Assets", :after => "Content" do
-          add_item "All", "/admin/assets/"
+          add_item "All", "/admin/assets"
         end
       end
     end

data/vendor/extensions/clipped-extension/lib/asset_tags.rb

@@ -2,34 +2,34 @@ module AssetTags
   include TrustyCms::Taggable
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::AssetTagHelper
-  
+
   class TagError < StandardError; end
-  
+
   %w{top_padding width height caption asset_file_name asset_content_type asset_file_size id filename image flash thumbnail url link extension if_content_type page:title page:url}.each do |name|
     deprecated_tag "assets:#{name}", :substitute => "asset:#{name}", :deadline => '2.0'
   end
-  
+
   desc %{
     The namespace for referencing images and assets.
     
     *Usage:* 
     <pre><code><r:asset [name="asset name"]>...</r:asset></code></pre>
-  }    
+  }
   tag 'asset' do |tag|
     tag.locals.asset = find_asset(tag, tag.attr) unless tag.attr.empty?
-      tag.expand
+    tag.expand
   end
 
   desc %{
     Cycles through all assets attached to the current page.  
-    This tag does not require the name atttribute, nor do any of its children.
+    This tag does not require the name attribute, nor do any of its children.
     Use the @limit@ and @offset@ attribute to render a specific number of assets.
     Use @by@ and @order@ attributes to control the order of assets.
     Use @extensions@ attribute to specify which assets to be rendered.
     
     *Usage:* 
     <pre><code><r:assets:each [limit=0] [offset=0] [order="asc|desc"] [by="position|title|..."] [extensions="png|pdf|doc"]>...</r:assets:each></code></pre>
-  }    
+  }
   tag 'assets' do |tag|
     tag.expand
   end
@@ -58,7 +58,7 @@ module AssetTags
     end
     result
   end
-  
+
   desc %{
     References the first asset attached to the current page.  
     
@@ -84,7 +84,7 @@ module AssetTags
     assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
     tag.expand if assets >= count
   end
-  
+
   desc %{
     The opposite of @<r:if_assets/>@.
   }
@@ -93,7 +93,7 @@ module AssetTags
     assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
     tag.expand unless assets >= count
   end
-  
+
   # Resets the page Url and title within the asset tag
   [:title, :url].each do |method|
     tag "asset:page:#{method.to_s}" do |tag|
@@ -127,10 +127,10 @@ module AssetTags
     size = options['size'] ? options.delete('size') : 'icon'
     raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.style?(size)
     container = options.delete('container')
-    ((container.to_i - asset.height(size).to_i)/2).to_s
+    ((container.to_i - asset.height(size).to_i) / 2).to_s
   end
-    
-  ['height','width'].each do |dimension|
+
+  ['height', 'width'].each do |dimension|
     desc %{
       Renders the #{dimension} of the asset.
     }
@@ -180,11 +180,11 @@ module AssetTags
   tag 'asset:if_content_type' do |tag|
     options = tag.attr.dup
     # XXX build_regexp_for comes from StandardTags
-    regexp = build_regexp_for(tag,options)
+    regexp = build_regexp_for(tag, options)
     asset_content_type = tag.locals.asset.asset_content_type
     tag.expand unless asset_content_type.match(regexp).nil?
   end
-    
+
   [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
     desc %{
       Renders the @#{method.to_s}@ attribute of the asset
@@ -194,16 +194,16 @@ module AssetTags
       asset.send(method) rescue nil
     end
   end
-  
+
   tag 'asset:name' do |tag|
     tag.render('asset:title', tag.attr.dup)
-  end  
-  
+  end
+
   tag 'asset:filename' do |tag|
     asset, options = asset_and_options(tag)
     asset.asset_file_name rescue nil
   end
-  
+
   desc %{
     Renders an image tag for the asset.
     
@@ -213,7 +213,7 @@ module AssetTags
     
     *Usage:* 
     <pre><code><r:asset:image [name="asset name" or id="asset id"] [size="icon|thumbnail|whatever"]></code></pre>
-  }    
+  }
   tag 'asset:image' do |tag|
     tag.locals.asset, options = image_asset_and_options(tag)
     return "Error: This image cannot be found" if tag.locals.asset == nil
@@ -223,20 +223,20 @@ module AssetTags
     url = tag.locals.asset.thumbnail(size)
     ActionController::Base.helpers.image_tag(url, options)
   end
-    
+
   desc %{
     Renders the url for the asset. If the asset is an image, the <code>size</code> attribute can be used to 
     generate the url for that size. 
     
     *Usage:* 
     <pre><code><r:url [name="asset name" or id="asset id"] [size="icon|thumbnail"]></code></pre>
-  }    
+  }
   tag 'asset:url' do |tag|
     asset, options = asset_and_options(tag)
     size = options['size'] ? options.delete('size') : 'original'
     asset.thumbnail(size) rescue nil
   end
-  
+
   desc %{
     Renders a link to the asset. If the asset is an image, the <code>size</code> attribute can be used to 
     generate a link to that size. 
@@ -255,8 +255,9 @@ module AssetTags
     url = asset.thumbnail(size)
     %{<a href="#{url  }#{anchor}"#{attributes}>#{text}</a>} rescue nil
   end
-    
-private
+
+  private
+
   def asset_and_options(tag)
     options = tag.attr.dup
     [find_asset(tag, options), options]
@@ -269,19 +270,19 @@ private
 
   def find_asset(tag, options)
     tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
-      Asset.find_by_title(title)
-    elsif id = options.delete('id')
-      Asset.find_by_id(id)
-    end
+                           Asset.find_by_title(title)
+                         elsif id = options.delete('id')
+                           Asset.find_by_id(id)
+                         end
     tag.locals.asset || raise(TagError, "Asset not found.")
   end
 
   def find_image_asset(tag, options)
     tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
-      Asset.find_by_title(title)
-    elsif id = options.delete('id')
-      Asset.find_by_id(id)
-    end
+                           Asset.find_by_title(title)
+                         elsif id = options.delete('id')
+                           Asset.find_by_id(id)
+                         end
     tag.locals.asset || nil
   end
 
@@ -289,16 +290,16 @@ private
     attr = tag.attr.symbolize_keys
     extensions = attr[:extensions] && attr[:extensions].split('|') || []
     conditions = unless extensions.blank?
-      # this is soon to be removed in favour of asset types
-      [ extensions.map { |ext| "assets.asset_file_name LIKE ?"}.join(' OR '), 
-        *extensions.map { |ext| "%.#{ext}" } ]
-    else
-      nil
-    end
-    
+                   # this is soon to be removed in favour of asset types
+                   [extensions.map { |ext| "assets.asset_file_name LIKE ?" }.join(' OR '),
+                    *extensions.map { |ext| "%.#{ext}" }]
+                 else
+                   nil
+                 end
+
     by = attr[:by] || 'page_attachments.position'
     order = attr[:order] || 'asc'
-    
+
     options = {
       :order => "#{by} #{order}",
       :limit => attr[:limit] || nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.1.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -312,6 +312,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '14.0'
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -338,14 +352,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: roadie-rails
   requirement: !ruby/object:Gem::Requirement
@@ -781,6 +795,7 @@ files:
 - config/initializers/assets.rb
 - config/initializers/devise.rb
 - config/initializers/kraken.rb
+- config/initializers/ransack.rb
 - config/initializers/response_cache_timeout.rb
 - config/initializers/secret_token.rb
 - config/initializers/tmp.rb
@@ -1132,52 +1147,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/models/layout_spec.rb
-- spec/rails_helper.rb
-- spec/spec_helper.rb
+- spec/fixtures/users.yml
+- spec/features/layouts_spec.rb
+- spec/features/config_spec.rb
+- spec/features/pages_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/support/custom_actions.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/yarn.lock
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/package.json
-- spec/dummy/config.ru
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/spec_helper.rb
+- spec/ci/database.mysql.yml
+- spec/models/layout_spec.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/locales/en.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
 - spec/dummy/README.rdoc
-- spec/dummy/bin/rails
-- spec/dummy/bin/bundle
-- spec/dummy/bin/setup
-- spec/dummy/bin/rake
+- spec/dummy/db/schema.rb
+- spec/dummy/Rakefile
+- spec/dummy/public/422.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
-- spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/Rakefile
-- spec/fixtures/users.yml
-- spec/factories/page.rb
+- spec/dummy/yarn.lock
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/config.ru
+- spec/support/custom_actions.rb
+- spec/rails_helper.rb
 - spec/factories/page_part.rb
-- spec/factories/layout.rb
 - spec/factories/user.rb
-- spec/features/pages_spec.rb
-- spec/features/config_spec.rb
-- spec/features/layouts_spec.rb
-- spec/ci/database.mysql.yml
+- spec/factories/page.rb
+- spec/factories/layout.rb