activeadmin_addons 1.9.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31434452186d9b02e7d7272b27d06d1e4831b1c4c6de9c068e973cf5311da476
-  data.tar.gz: 0a43f7f1d45b50c01eeb4b4f7a56f5ff9bcb4329a24adb4f77fc1d1ca28fa0e7
+  metadata.gz: b6fc13e5fdaeb949d49a7ec0a3330885ef1ec2e0b6b35179ea696b016eb9d0c9
+  data.tar.gz: aeea860c39cd59ccb6a4c6c141a42a5b29d8bdc19e8679147175238ec2afa67e
 SHA512:
-  metadata.gz: 10db20adc03c85569ab16debe8edffd16115b348baf7779e79544fa42a265058cc60d3d24ac77dea5e85591297a6daeb2ede226141cb7dbb4e34d0776966462a
-  data.tar.gz: b911e25eeb0801b2bbe7857c012f4c93fa71a2bf77d574d552461e39cdedfcdd698673ed625a4034c749852f2d1b47e1387a7b7c0a4f754cdb3311c753beab6a
+  metadata.gz: 2e336a0da29c1f1a2717a7a577d7c22c81afd02510e166a33d0dbaca003be506ce38d1d793916adfb4b1c56ba4d8353ca805e65fb32468fe2443f8fd789ee3da
+  data.tar.gz: 29314fd56a40f6f5353dbf90072128f580c0aa99a2d44519355c51a89d82aa216adfba999d583f3496d49ab8a6727f00e7fc680f5cec56c4992cdda24505a461

data/app/assets/javascripts/activeadmin_addons/all.js

@@ -171,7 +171,7 @@
     };
   };
   $(initializer$9);
-  $(document).on("turbolinks:load", initializer$9);
+  $(document).on("turbolinks:load turbo:load", initializer$9);
   var initializer$8 = function() {
     configureSelect2(document);
     $(document).on("has_many_add:after", function(event, container) {
@@ -213,7 +213,7 @@
     }
   };
   $(initializer$8);
-  $(document).on("turbolinks:load", initializer$8);
+  $(document).on("turbolinks:load turbo:load", initializer$8);
   var initializer$7 = function() {
     setupSearchSelect(document);
     $(document).on("has_many_add:after", function(event, container) {
@@ -283,7 +283,7 @@
     }
   };
   $(initializer$7);
-  $(document).on("turbolinks:load", initializer$7);
+  $(document).on("turbolinks:load turbo:load", initializer$7);
   $.fn.select2.amd.define("select2/data/nestedCustomAdapter", [ "select2/data/array", "select2/utils" ], function(ArrayData, Utils) {
     function CustomData($element, options) {
       CustomData.__super__.constructor.call(this, $element, options);
@@ -429,7 +429,7 @@
     }
   };
   $(initializer$6);
-  $(document).on("turbolinks:load", initializer$6);
+  $(document).on("turbolinks:load turbo:load", initializer$6);
   var initializer$5 = function() {
     setupTags(document);
     $(document).on("has_many_add:after", function(event, container) {
@@ -495,7 +495,7 @@
     }
   };
   $(initializer$5);
-  $(document).on("turbolinks:load", initializer$5);
+  $(document).on("turbolinks:load turbo:load", initializer$5);
   var initializer$4 = function() {
     setupSelectedList(document);
     $(document).on("has_many_add:after", function(event, container) {
@@ -533,7 +533,11 @@
                 m: "or"
               };
               fields.forEach(function(field) {
-                textQuery[field + "_" + predicate] = params.term;
+                if (field === "id") {
+                  textQuery[field + "_eq"] = params.term;
+                } else {
+                  textQuery[field + "_" + predicate] = params.term;
+                }
               });
               var query = {
                 order: order,
@@ -589,7 +593,7 @@
     }
   };
   $(initializer$4);
-  $(document).on("turbolinks:load", initializer$4);
+  $(document).on("turbolinks:load turbo:load", initializer$4);
   var initializer$3 = function() {
     setupDateTimePicker(document);
     $(document).on("has_many_add:after", ".has_many_container", function(event, fieldset) {
@@ -613,7 +617,7 @@
     }
   };
   $(initializer$3);
-  $(document).on("turbolinks:load", initializer$3);
+  $(document).on("turbolinks:load turbo:load", initializer$3);
   var initializer$2 = function() {
     setupColorPicker();
     $(document).on("has_many_add:after", setupColorPicker);
@@ -626,7 +630,7 @@
     }
   };
   $(initializer$2);
-  $(document).on("turbolinks:load", initializer$2);
+  $(document).on("turbolinks:load turbo:load", initializer$2);
   var initializer$1 = function() {
     $(".toggle-bool-switch").click(function(e) {
       var boolSwitch = $(e.target);
@@ -665,7 +669,7 @@
     });
   };
   $(initializer$1);
-  $(document).on("turbolinks:load", initializer$1);
+  $(document).on("turbolinks:load turbo:load", initializer$1);
   var initializer = function() {
     configureInteractiveSelect(document);
     $(document).on("has_many_add:after", function(event, container) {
@@ -749,5 +753,5 @@
     });
   };
   $(initializer);
-  $(document).on("turbolinks:load", initializer);
+  $(document).on("turbolinks:load turbo:load", initializer);
 });

data/app/inputs/nested_level_input.rb

@@ -16,7 +16,7 @@ class NestedLevelInput < ActiveAdminAddons::InputBase
   def load_control_attributes
     load_class(@options[:class])
     load_data_attr(:fields, default: ["name"], formatter: :to_json)
-    load_data_attr(:predicate, default: "contains")
+    load_data_attr(:predicate, default: "cont")
     load_data_attr(:filters)
     load_data_attr(:model, value: model_name)
     load_data_attr(:display_name, default: "name")

data/app/inputs/search_select_input.rb

@@ -14,7 +14,7 @@ class SearchSelectInput < ActiveAdminAddons::InputBase
   def load_control_attributes
     load_class(@options[:class])
     load_data_attr(:fields, default: ["name"], formatter: :to_json)
-    load_data_attr(:predicate, default: "contains")
+    load_data_attr(:predicate, default: "cont")
     load_data_attr(:url, default: url_from_method)
     load_data_attr(:response_root, default: tableize_method)
     load_data_attr(:display_name, default: "name")

data/app/inputs/selected_list_input.rb

@@ -11,7 +11,7 @@ class SelectedListInput < ActiveAdminAddons::InputBase
     load_data_attr(:url, default: url_from_method)
     load_data_attr(:response_root, default: tableize_method)
     load_data_attr(:fields, default: ["name"], formatter: :to_json)
-    load_data_attr(:predicate, default: "contains")
+    load_data_attr(:predicate, default: "cont")
     load_data_attr(:display_name, default: "name")
     load_data_attr(:minimum_input_length, default: 1)
     load_data_attr(:width, default: "100%")
@@ -26,7 +26,6 @@ class SelectedListInput < ActiveAdminAddons::InputBase
 
   def render_control_wrapper
     template.content_tag(:div, class: "selected-list-container") do
-      template.content_tag(label_html)
       template.concat(render_items_list)
       template.concat(builder.select(build_virtual_attr, [], {}, input_html_options))
     end

data/app/javascript/activeadmin_addons/addons/interactive_select_tag.js

@@ -92,4 +92,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/addons/toggle_bool.js

@@ -36,4 +36,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/config.js

@@ -7,4 +7,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/color-picker.js

@@ -13,4 +13,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/date-time-picker.js

@@ -25,4 +25,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/nested-select.js

@@ -167,4 +167,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/search-select.js

@@ -73,4 +73,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/select2.js

@@ -49,4 +49,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/selected-list.js

@@ -37,7 +37,11 @@ var initializer = function() {
           data: function(params) {
             var textQuery = { m: 'or' };
             fields.forEach(function(field) {
-              textQuery[field + '_' + predicate] = params.term;
+              if (field === 'id') {
+                textQuery[field + '_eq'] = params.term;
+              } else {
+                textQuery[field + '_' + predicate] = params.term;
+              }
             });
 
             var query = {
@@ -104,4 +108,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/app/javascript/activeadmin_addons/inputs/tags.js

@@ -73,4 +73,4 @@ var initializer = function() {
 };
 
 $(initializer);
-$(document).on('turbolinks:load', initializer);
+$(document).on('turbolinks:load turbo:load', initializer);

data/lib/activeadmin_addons/addons/image_builder.rb

@@ -2,10 +2,35 @@ module ActiveAdminAddons
   class ImageBuilder < CustomBuilder
     def render
       return nil if data.nil?
-      raise "you need to pass a paperclip image attribute" unless data.respond_to?(:url)
+
+      if Object.const_defined?('Paperclip::Attachment') && data.is_a?(Paperclip::Attachment)
+        paperclip_data
+      elsif Object.const_defined?('Shrine::UploadedFile') && data.is_a?(Shrine::UploadedFile)
+        shrine_data
+      else
+        raise "you need to pass a paperclip or shrine image attribute"
+      end
+    end
+
+    private
+
+    def paperclip_data
       style = options.fetch(:style, :original)
       context.image_tag(data.url(style)) if data.file?
     end
+
+    def shrine_data
+      image_options = options[:image_options].presence || {}
+      if options[:style] && derivatives.include?(options[:style])
+        context.image_tag(model.send("#{attribute}_url", options[:style]), image_options)
+      else
+        context.image_tag(data.url, image_options)
+      end
+    end
+
+    def derivatives
+      model.send("#{attribute}_derivatives")
+    end
   end
 end
 

data/lib/activeadmin_addons/addons/markdown_builder.rb

@@ -0,0 +1,38 @@
+require 'redcarpet'
+
+module ActiveAdminAddons
+  class MarkdownBuilder < CustomBuilder
+    def render
+      return if data.blank?
+
+      Redcarpet::Markdown.new(renderer, extensions).render(@data).html_safe
+    end
+
+    private
+
+    def extensions_default
+      { fenced_code_blocks: true,
+        no_intra_emphasis: true,
+        strikethrough: true,
+        superscript: true }
+    end
+
+    def renderer_options_default
+      { filter_html: true, hard_wrap: true }
+    end
+
+    def extensions
+      @extensions ||= extensions_default.merge(options[:extensions] || {})
+    end
+
+    def render_options
+      @render_options ||= renderer_options_default.merge(options[:render_options] || {})
+    end
+
+    def renderer
+      @renderer ||= Redcarpet::Render::HTML.new(render_options)
+    end
+  end
+end
+
+ActiveAdminAddons::MarkdownBuilder.create_view_methods

data/lib/activeadmin_addons/addons/tag_builder.rb

@@ -25,9 +25,9 @@ module ActiveAdminAddons
 
         context.div(interactive_tag_select_params) do
           context.select do
-            possible_values.each do |val|
-              context.option(value: val, selected: val == data) do
-                context.text_node val.capitalize
+            possible_values.each do |label, value|
+              context.option(value: value, selected: value == data) do
+                context.text_node label
               end
             end
           end
@@ -36,7 +36,11 @@ module ActiveAdminAddons
     end
 
     def display_data
-      @enum_attr == :enumerize ? data.text : data
+      if @enum_attr == :enumerize
+        data.text
+      else
+        EnumUtils.translate_enum_option(model.class, attribute.to_s, data)
+      end
     end
 
     def interactive_params(klass)
@@ -69,9 +73,9 @@ module ActiveAdminAddons
     def possible_values
       klass = model.class
       if @enum_attr == :enumerize
-        klass.enumerized_attributes[attribute.to_s].values
+        klass.enumerized_attributes[attribute.to_s].values.map { |value| [value.capitalize, value] }
       else
-        klass.defined_enums[attribute.to_s].keys
+        EnumUtils.options_for_select(klass, attribute.to_s)
       end
     end
 

data/lib/activeadmin_addons/support/enum_utils.rb

@@ -0,0 +1,19 @@
+module ActiveAdminAddons
+  class EnumUtils
+    def self.options_for_select(klass, enum_name, use_db_value: false)
+      enum_options_hash = klass.defined_enums[enum_name]
+      enum_options_hash.map do |enum_option_name, db_value|
+        value = use_db_value ? db_value : enum_option_name
+        [translate_enum_option(klass, enum_name, enum_option_name), value]
+      end
+    end
+
+    def self.translate_enum_option(klass, enum_name, enum_option_name)
+      return if enum_option_name.blank?
+
+      klass_key = klass.model_name.i18n_key
+      key = "activerecord.attributes.#{klass_key}.#{enum_name.pluralize}.#{enum_option_name}"
+      I18n.t(key, default: enum_option_name)
+    end
+  end
+end

data/lib/activeadmin_addons/support/select_filter_input_extension.rb

@@ -0,0 +1,19 @@
+module ActiveAdminAddons
+  module SelectFilterInputExtension
+    def collection_from_enum?
+      klass.respond_to?(:defined_enums) && klass.defined_enums.has_key?(method.to_s)
+    end
+
+    def collection
+      if !options[:collection] && collection_from_enum?
+        EnumUtils.options_for_select(klass, method.to_s, use_db_value: true)
+      else
+        super
+      end
+    end
+  end
+end
+
+::ActiveAdmin::Inputs::Filters::SelectInput.send(
+  :prepend, ActiveAdminAddons::SelectFilterInputExtension
+)

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "1.9.0"
+  VERSION = "1.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.2
 platform: ruby
 authors:
 - Platanus
@@ -11,10 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_material
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -28,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-selenium
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,6 +209,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -243,20 +285,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.1
+        version: 6.1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +355,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.65.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -314,21 +384,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -509,12 +579,14 @@ files:
 - lib/activeadmin_addons/addons/bool_builder.rb
 - lib/activeadmin_addons/addons/image_builder.rb
 - lib/activeadmin_addons/addons/list_builder.rb
+- lib/activeadmin_addons/addons/markdown_builder.rb
 - lib/activeadmin_addons/addons/number_builder.rb
 - lib/activeadmin_addons/addons/state_builder.rb
 - lib/activeadmin_addons/addons/tag_builder.rb
 - lib/activeadmin_addons/addons/toggle_bool_builder.rb
 - lib/activeadmin_addons/engine.rb
 - lib/activeadmin_addons/support/custom_builder.rb
+- lib/activeadmin_addons/support/enum_utils.rb
 - lib/activeadmin_addons/support/enumerize_formtastic_support.rb
 - lib/activeadmin_addons/support/input_base.rb
 - lib/activeadmin_addons/support/input_helpers/filter_input.rb
@@ -523,6 +595,7 @@ files:
 - lib/activeadmin_addons/support/input_helpers/input_methods.rb
 - lib/activeadmin_addons/support/input_helpers/input_options_handler.rb
 - lib/activeadmin_addons/support/input_helpers/select_helpers.rb
+- lib/activeadmin_addons/support/select_filter_input_extension.rb
 - lib/activeadmin_addons/support/set_datepicker.rb
 - lib/activeadmin_addons/version.rb
 - lib/generators/activeadmin_addons/assets/assets_generator.rb
@@ -551,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Set of addons to help with the activeadmin ui