activeadmin_addons 1.8.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55def873497d38747a6897932970590af63bd4dd135293804d7b39a938fd082f
-  data.tar.gz: 7e544cbc4d57033643f9334d46c05769044423faca46b1a2ea3b8335340a4ecd
+  metadata.gz: d72fffa977c3deca692ef85867b113cff5d81c77448124ce2be3b7bb8bca205e
+  data.tar.gz: db4ff250da3a471b018b02735185adf0627fcd5ab2b0062fac45994259b125a8
 SHA512:
-  metadata.gz: 91987d8083fb82cfb200f87bd252ccaed20bbb7072be7ff9853d492e13baf089d6bd4e564996711f25f44f4105608de539e68dac4d17d918c0c74f3fb497577e
-  data.tar.gz: 770e27656a0ba98f37a32e449c35ed06a55d7cb9b07b090177bebcee25681b76d0c9c12f10507da31a068e7114ff76b9d5709a4e950867f5c2948d73225ca3e7
+  metadata.gz: b2785b849c40e967c81226a546e284185b497ab0359297036f302400685dc0dd2f3bbffdfbf40a03b5f574e98647a8d8707b9fe914cb44e672b54993bbb8e846
+  data.tar.gz: 2d4f90088726b45b97a67e16db4325fa4b2c24b78d69ce380e8635f089b4ed4cf6c8544689d40e02a63de823aa07d057da9b25c788c4a482fe2b5064bac14ab4

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) {
@@ -589,7 +589,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 +613,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 +626,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 +665,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 +749,5 @@
     });
   };
   $(initializer);
-  $(document).on("turbolinks:load", initializer);
+  $(document).on("turbolinks:load turbo:load", initializer);
 });

data/app/inputs/date_time_picker_input.rb

@@ -43,9 +43,8 @@ class DateTimePickerInput < ActiveAdminAddons::InputBase
 
   def datetime_picker_options
     @datetime_picker_options ||= begin
-      opts = options.fetch(:picker_options, {})
-      opts = Hash[opts.map { |k, v| [k.to_s.camelcase(:lower), v] }]
-      default_picker_options.merge(opts)
+      opts = default_picker_options.merge(options.fetch(:picker_options, {}))
+      Hash[opts.map { |k, v| [k.to_s.camelcase(:lower), v] }]
     end
   end
 

data/app/inputs/nested_select_input.rb

@@ -15,6 +15,7 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
   def hierarchy
     data = get_levels_data
     raise("Undefined levels on nested_select") if data.empty?
+
     set_parent_attributes(data)
     data.reverse
   end
@@ -67,17 +68,26 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
     parent_attribute = level_data[:parent_attribute]
     build_virtual_attr(parent_attribute)
     instance = instance_from_attribute_name(level_data[:attribute])
-    if instance && instance.respond_to?(parent_attribute)
+    if instance&.respond_to?(parent_attribute)
       @object.send("#{parent_attribute}=", instance.send(parent_attribute))
     end
   end
 
   def instance_from_attribute_name(attribute)
     return unless attribute
+
     attribute_value = @object.send(attribute)
     return unless attribute_value
-    klass = attribute.to_s.chomp("_id").camelize.constantize
-    klass.find_by_id(attribute_value)
+
+    klass = class_from_attribute(attribute)
+    klass.find_by(id: attribute_value)
+  end
+
+  def class_from_attribute(attribute)
+    association_name = attribute.to_s.chomp("_id")
+    association_name.camelize.constantize
+  rescue NameError
+    object_class.reflect_on_association(association_name).klass
   end
 
   def build_virtual_attr(attribute_name)

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

@@ -104,4 +104,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)
@@ -45,7 +49,7 @@ module ActiveAdminAddons
         'data-model' => class_name,
         'data-object_id' => model.id,
         'data-field' => attribute,
-        'data-url' => context.resource_path(model),
+        'data-url' => resource_url,
         'data-value' => data
       }
     end
@@ -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/input_helpers/input_html_helpers.rb

@@ -16,6 +16,7 @@ module ActiveAdminAddons
 
     def method_to_input_id(id)
       raise "invalid input id" if id.blank?
+
       "#{prefixed_method}_#{id}"
     end
 

data/lib/activeadmin_addons/support/input_helpers/input_methods.rb

@@ -6,11 +6,13 @@ module ActiveAdminAddons
 
     def valid_method
       raise "invalid method given" if method.blank?
+
       method
     end
 
     def valid_object
       raise "blank object given" if @object.blank?
+
       @object
     end
 
@@ -42,6 +44,10 @@ module ActiveAdminAddons
       @input_value ||= valid_object.send(valid_method)
     end
 
+    def input_association_value
+      @input_association_value ||= valid_object.send(association_name)
+    end
+
     def translated_method
       valid_object.class.human_attribute_name(valid_method)
     end
@@ -60,6 +66,7 @@ module ActiveAdminAddons
     def build_virtual_attr
       attribute_name = "virtual_#{valid_method}_attr"
       fail "#{attribute_name} is already defined" if valid_object.respond_to?(attribute_name)
+
       valid_object.singleton_class.send(:attr_accessor, attribute_name)
       attribute_name
     end

data/lib/activeadmin_addons/support/input_helpers/input_options_handler.rb

@@ -41,6 +41,7 @@ module ActiveAdminAddons
     def load_class(class_attr)
       @css_classes ||= []
       return if class_attr.blank?
+
       class_attr = class_attr.strip
       @css_classes << class_attr
       class_attr
@@ -49,6 +50,7 @@ module ActiveAdminAddons
     def get_data_attr_value(attr_name)
       item = data_attr_options[attr_name.to_sym]
       return unless item
+
       item[:value]
     end
 
@@ -56,13 +58,14 @@ module ActiveAdminAddons
 
     def formatted_option_value(item)
       return item[:value].send(item[:formatter]) if item[:formatter]
+
       item[:value]
     end
 
     def load_option_attr(attr_name, options)
       value = calculate_attr_value(attr_name, options)
       item = { value: value }
-      item[:formatter] = options[:formatter] unless options[:formatter].blank?
+      item[:formatter] = options[:formatter] if options[:formatter].present?
       item
     end
 
@@ -80,6 +83,7 @@ module ActiveAdminAddons
       default_value = attr_options[:default]
       return unless default_value
       return default_value.call if default_value.is_a?(Proc)
+
       default_value
     end
 

data/lib/activeadmin_addons/support/input_helpers/select_helpers.rb

@@ -42,6 +42,7 @@ module ActiveAdminAddons
 
     def item_to_select_option(item)
       return unless item
+
       {
         id: item.send((valid_options[:value] || :id)),
         text: item.send((valid_options[:display_name] || :name))
@@ -66,19 +67,26 @@ module ActiveAdminAddons
     end
 
     def selected_item
-      @selected_item ||= selected_collection.first
+      @selected_item ||= begin
+                           input_association_value
+                         rescue NoMethodError
+                           selected_collection.first
+                         end
     end
 
     private
 
     def active_record_relation?(value)
       klass = value.class.name
-      klass == "ActiveRecord::Relation" ||
-        klass == "ActiveRecord::Associations::CollectionProxy"
+      [
+        "ActiveRecord::Relation",
+        "ActiveRecord::Associations::CollectionProxy"
+      ].include?(klass)
     end
 
     def valid_options
       raise "missing @options hash" unless !!@options
+
       @options
     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/support/set_datepicker.rb

@@ -5,9 +5,19 @@ module ::Formtastic
 
       def default_input_type(method, options = {})
         input_type = original_default_input_type(method, options)
-        input_type = :datepicker if input_type == :date_select
+
+        if input_type == :date_select && active_admin_context?
+          input_type = :datepicker
+        end
+
         input_type
       end
+
+      def active_admin_context?
+        options[:builder] == ::ActiveAdmin::FormBuilder
+      rescue NameError
+        false
+      end
     end
   end
 end

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "1.8.3"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Platanus
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_material
@@ -41,6 +41,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -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: 5.2.4.1
+        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: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +369,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shrine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -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.3.26
 signing_key: 
 specification_version: 4
 summary: Set of addons to help with the activeadmin ui