activeadmin_dynamic_fields 0.2.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a41854a61414d8eb8f8c35556fd0cbfdfa8364ed
-  data.tar.gz: 85340ca45697226edb75f74a5189c812400e19cd
+SHA256:
+  metadata.gz: 703a3fcf46aa777dda6ed22421da5a937027a19de733cc461da566d892bf207a
+  data.tar.gz: c5c389c17b60a395a77d0d9d92a0171af83d5f94fb102017c3b01adbf10f7857
 SHA512:
-  metadata.gz: 72f93305d28ba3134437e19d062cc03a654113776d8aecfceb78f06d0939caeb8a3e01e4bca0f273db11be3b4358d2a7d72a57fbd838248c4af6108c54a44d42
-  data.tar.gz: 45231b55baf2d328e05e83d843285858487067f7798859c8b0d5fbfee11663e282c9230a41a8a5efed1a71082f68e1892c31e06fbc09893f9d12f69f6986ddec
+  metadata.gz: 3f45524f227c1d73c64eea3f8660aee6e8054617c17f969ed85f3c131048678d8fc0988c24d5421b7a27b6a8787135a0957c8de1d5c7033e13fa92f25a504c6c
+  data.tar.gz: a77b5396c95012b32f2a682c7bb40974f9e60e9f65fc8a0a890595f968a9114ba3c883c3f19f1352b1f84ef8c9ea97a07024887c1209c6e63043a57c5d5cdf19

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Mattia Roccoberton
+Copyright (c) 2017-2020 Mattia Roccoberton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -1,116 +1,138 @@
-# ActiveAdmin Dynamic Fields [![Gem Version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields)
+# ActiveAdmin Dynamic Fields [![Gem Version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields) [![CircleCI](https://circleci.com/gh/blocknotes/activeadmin_dynamic_fields.svg?style=svg)](https://circleci.com/gh/blocknotes/activeadmin_dynamic_fields)
 
-An Active Admin plugin to add dynamic behaviors to fields.
+An Active Admin plugin to add dynamic behaviors to some fields.
 
 Features:
-
 - set conditional checks on fields
-- trigger some actions on other fields
+- trigger actions on target elements
 - inline field editing
 - create links to load some content in a dialog
 
-The easiest way to show how this plugin works is looking the examples [below](#examples-of-dynamic-fields).
+The easiest way to show how this plugin works is looking the examples [below](#examples).
 
 ## Install
-
 - Add to your Gemfile: `gem 'activeadmin_dynamic_fields'`
 - Execute bundle
 - Add at the end of your ActiveAdmin javascripts (_app/assets/javascripts/active_admin.js_):
-`//= require activeadmin/dynamic_fields`
 
-## Options
+```js
+//= require activeadmin/dynamic_fields
+```
 
-Options are passed to fields using *input_html* parameter as *data* attributes:
+## Options
+Options are passed to fields using *input_html* parameter as *data* attributes.
 
+Conditions:
 - **data-if**: check a condition, values:
-  + **checked**: check if a checkbox is checked
+  + **checked**: check if a checkbox is checked (ex. `"data-if": "checked"`)
   + **not_checked**: check if a checkbox is not checked
   + **blank**: check if a field is blank
   + **not_blank**: check if a field is not blank
   + **changed**: check if the value of an input is changed (dirty)
-- **data-eq**: check if a field has a specific value
-- **data-not**: check if a field hasn't a specific value
-- **data-target**: target css selector (from parent fieldset, look for the closest match)
-- **data-gtarget**: target css selector globally
-- **data-action**: the action to trigger, values:
-  + **hide**: hides elements
+- **data-eq**: check if a field has a specific value (ex. `"data-eq": "42"`)
+- **data-not**: check if a field has not a specific value
+- **data-function**: check the return value of a custom function (ex. `"data-function": "my_check"`)
+
+Actions:
+- **data-then**: action to trigger (alias **data-action**), values:
+  + **hide**: hides elements (ex. `"data-then": "hide", "data-target": ".errors"`)
   + **slide**: hides elements (using sliding)
   + **fade**: hides elements (using fading)
-  + **addClass**: adds classes
-  + **setValue**: set a value
-  + **callback**: call a function
-- **data-function**: check the return value of a custom function
-- **data-arg**: argument passed to the custom set function (as array of strings)
+  + **addClass**: adds classes (ex. `"data-then": "addClass red"`)
+  + **addStyle**: adds some styles (ex. `"data-then": "addStyle color: #fb1; font-size: 12px"`)
+  + **setText**: set the text of an element (ex. `"data-then": "setText A sample text"`)
+  + **setValue**: set the value of an input element (ex. `"data-then": "setValue A sample value"`)
+  + **callback**: call a function (with arguments: **data-args**) (ex. `"data-then": "callback a_fun"`)
+- **data-else**: action to trigger when the condition check is not true
+- **data-args**: arguments passed to the callback function
+
+Targets:
+- **data-target**: target css selector (from parent fieldset, look for the closest match)
+- **data-gtarget**: target css selector globally
+
+A check condition or a custom check function are required. A trigger action is required too, unless you are using a custom function (in that case it is optional).
 
 ## Examples
 
 ### Dynamic fields examples
-
-- A checkbox that hides other fields if false (ex. model *Article*):
+- A checkbox that hides other fields if is checked (ex. model *Article*):
 
 ```rb
 form do |f|
   f.inputs 'Article' do
-    f.input :published, input_html: { data: { if: 'not_checked', action: 'hide', target: '.grp1' } }
+    f.input :published, input_html: { data: { if: 'checked', then: 'hide', target: '.grp1' } }
     f.input :online_date, wrapper_html: { class: 'grp1' }
-    f.input :position, wrapper_html: { class: 'grp1' }
+    f.input :draft_notes, wrapper_html: { class: 'grp1' }
   end
   f.actions
 end
 ```
 
-- Add 3 classes (*first*, *second*, *third*) if a checkbox is true:
+- Add 3 classes (*first*, *second*, *third*) if a checkbox is not checked, else add "forth" class:
 
-`f.input :published, input_html: { data: { if: 'checked', action: 'addClass first second third', target: '.grp1' } }`
+```rb
+data = { if: 'not_checked', then: 'addClass first second third', target: '.grp1', else: 'addClass forth' }
+f.input :published, input_html: { data: data }
+```
 
 - Set another field value if a string field is blank:
 
-`f.input :title, input_html: { data: { if: 'blank', action: 'setValue 10', target: '#article_position' } }`
+```rb
+f.input :title, input_html: { data: { if: 'blank', then: 'setValue 10', target: '#article_position' } }
+```
 
 - Use a custom function for conditional check (*title_not_empty()* must be available on global scope) (with alternative syntax for data attributes):
 
-`f.input :title, input_html: { 'data-function': 'title_empty', 'data-action': 'slide', 'data-target': '#article_description_input' }`
+```rb
+attrs = { 'data-function': 'title_empty', 'data-then': 'slide', 'data-target': '#article_description_input' }
+f.input :title, input_html: attrs
+```
 
 ```js
-function title_empty( el ) {
-  return ( $('#article_title').val().trim() === '' );
+function title_empty(el) {
+  return ($('#article_title').val().trim() === '');
 }
 ```
 
 - Call a callback function as action:
 
-`f.input :published, input_html: { data: { if: 'checked', action: 'callback set_title', args: '["Unpublished !"]' } }`
+```rb
+data = { if: 'checked', then: 'callback set_title', args: '["Unpublished !"]' }
+f.input :published, input_html: { data: data }
+```
 
 ```js
-function set_title( args ) {
-  if( $('#article_title').val().trim() === '' ) {
-    $('#article_title').val( args[0] );
-    $('#article_title').trigger( 'change' );
+function set_title(args) {
+  if($('#article_title').val().trim() === '') {
+    $('#article_title').val(args[0]);
+    $('#article_title').trigger('change');
   }
 }
 ```
 
 - Custom function without action:
 
-`f2.input :category, as: :select, collection: [ [ 'Cat 1', 'cat1' ], [ 'Cat 2', 'cat2' ], [ 'Cat 3', 'cat3' ] ], input_html: { 'data-function': 'on_change_category' }`
+```rb
+collection = [['Cat 1', 'cat1'], ['Cat 2', 'cat2'], ['Cat 3', 'cat3']]
+f2.input :category, as: :select, collection: collection, input_html: { 'data-function': 'on_change_category' }
+```
 
 ```js
-function on_change_category( el ) {
-  var target = el.closest( 'fieldset' ).find( '.pub' );
-  target.prop( 'checked', ( el.val() == 'cat2' ) );
-  target.trigger( 'change' );
+function on_change_category(el) {
+  var target = el.closest('fieldset').find('.pub');
+  target.prop('checked', (el.val() == 'cat2');
+  target.trigger('change');
 }
 ```
 
 ### Inline editing examples
-
 - Prepare a custom member action to save data, an *update* helper function is available (third parameter is optional, allow to filter using strong parameters):
 
 ```rb
 member_action :save, method: [:post] do
-  render ActiveAdmin::DynamicFields::update( resource, params )
-  # render ActiveAdmin::DynamicFields::update( resource, params, [:published] )
-  # render ActiveAdmin::DynamicFields::update( resource, params, Article::permit_params )
+  render ActiveAdmin::DynamicFields.update(resource, params)
+  # render ActiveAdmin::DynamicFields.update(resource, params, [:published])
+  # render ActiveAdmin::DynamicFields.update(resource, params, Article::permit_params)
 end
 ```
 
@@ -119,29 +141,28 @@ end
 ```rb
 # Edit a string:
 column :title do |row|
-  div row.title, ActiveAdmin::DynamicFields::edit_string( :title, save_admin_article_path( row.id ) )
+  div row.title, ActiveAdmin::DynamicFields.edit_string(:title, save_admin_article_path(row.id))
 end
 # Edit a boolean:
 column :published do |row|
-  status_tag row.published, ActiveAdmin::DynamicFields::edit_boolean( :published, save_admin_article_path( row.id ), row.published )
+  status_tag row.published, ActiveAdmin::DynamicFields.edit_boolean(:published, save_admin_article_path(row.id), row.published)
 end
 # Edit a select ([''] allow to have a blank value):
 column :author do |row|
-  select ActiveAdmin::DynamicFields::edit_select( :author_id, save_admin_article_path( row.id ) ) do
-    options_for_select( [''] + Author.pluck( :name, :id ), row.author_id )
+  select ActiveAdmin::DynamicFields.edit_select(:author_id, save_admin_article_path(row.id)) do
+    options_for_select([''] + Author.pluck(:name, :id), row.author_id)
   end
 end
 ```
 
-- In *show* config (less useful):
+- In *show* config (inside `attributes_table` block):
 ```rb
 row :title do |row|
-  div row.title, ActiveAdmin::DynamicFields::edit_string( :title, save_admin_article_path( row.id ) )
+  div row.title, ActiveAdmin::DynamicFields.edit_string(:title, save_admin_article_path(row.id))
 end
 ```
 
 ### Dialog example
-
 Example with 2 models: *Author* and *Article*
 
 Prepare the content dialog - in Active Admin Author config:
@@ -150,12 +171,16 @@ Prepare the content dialog - in Active Admin Author config:
 ActiveAdmin.register Author do
   # ...
   member_action :dialog do
-    content  = '<dl style="margin: 12px">'
-    [:name, :age, :created_at].each do |field|
-      content += "<dt>#{Author.human_attribute_name(field)}:</dt><dd>#{resource[field]}</dd>"
+    record = resource
+    context = Arbre::Context.new do
+      dl do
+        %i[name age created_at].each do |field|
+          dt "#{Author.human_attribute_name(field)}:"
+          dd record[field]
+        end
+      end
     end
-    content += '</dl>'
-    render plain: content
+    render plain: context
   end
   # ...
 end
@@ -170,7 +195,7 @@ ActiveAdmin.register Article do
     attributes_table do
       # ...
       row :author do
-        link_to object.author.name, dialog_admin_author_path( object.author ), title: object.author.name, 'data-df-dialog': true, 'data-df-icon': true
+        link_to object.author.name, dialog_admin_author_path(object.author), title: object.author.name, 'data-df-dialog': true, 'data-df-icon': true
       end
     end
   end
@@ -181,13 +206,13 @@ end
 The link url is loaded via AJAX before opening the dialog.
 
 ## Do you like it? Star it!
-
 If you use this component just star it. A developer is more motivated to improve a project when there is some interest.
 
-## Contributors
+Take a look at [other ActiveAdmin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source) that I made if you are curious.
 
-- [Mattia Roccoberton](http://blocknot.es) - creator, maintainer
+## Contributors
+- [Mattia Roccoberton](http://blocknot.es): author
+- The good guys that opened issues and pull requests from time to time
 
 ## License
-
-[MIT](LICENSE.txt)
+The gem is available as open-source under the terms of the [MIT](LICENSE.txt).

data/Rakefile

@@ -1,3 +1,3 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "bundler/gem_tasks"

data/app/assets/javascripts/activeadmin/dynamic_fields.js

@@ -1,212 +1,221 @@
-// Evaluate a condition
-function dfEvalCondition( el, args, on_change ) {
-  if( args.fn ) {
-    if( args.fn && window[args.fn] ) return !window[args.fn]( el );
-    else console.log( 'Warning - activeadmin_dynamic_fields: ' + args.fn + '() not available [1]' );
-  }
-  else if( args.if == 'checked' ) {
-    return el.is(':checked');
-  }
-  else if( args.if == 'not_checked' ) {
-    return !el.is(':checked');
-  }
-  else if( args.if == 'blank' ) {
-    return el.val().length === 0 || !el.val().trim();
-  }
-  else if( args.if == 'not_blank' ) {
-    return el.val().length !== 0 && el.val().trim();
-  }
-  else if( args.if == 'changed' ) {
-    return on_change;
-  }
-  else if( args.eq ) {
-    return el.val() == args.eq;
-  }
-  else if( args.not ) {
-    return el.val() != args.not;
-  }
-  return undefined;
-}
-
-// Prepare a field
-function dfSetupField( el ) {
-  var action = el.data( 'action' );
-  var target, args = {};
-  args.if = el.data( 'if' );
-  args.eq = el.data( 'eq' );
-  args.not = el.data( 'not' );
-  args.fn = el.data( 'function' );
-  if( el.data( 'target' ) ) target = el.closest( 'fieldset' ).find( el.data( 'target' ) );  // closest find for has many associations
-  else if( el.data( 'gtarget' ) ) target = $( el.data( 'gtarget' ) );
-  if( action == 'hide' ) {
-    if( dfEvalCondition( el, args, false ) ) target.hide();
-    else target.show();
-    el.on( 'change', function( event ) {
-      if( dfEvalCondition( $(this), args, true ) ) target.hide();
-      else target.show();
-    });
-  }
-  else if( action == 'slide' ) {
-    if( dfEvalCondition( el, args, false ) ) target.slideDown();
-    else target.slideUp();
-    el.on( 'change', function( event ) {
-      if( dfEvalCondition( $(this), args, true ) ) target.slideDown();
-      else target.slideUp();
-    });
+(function () {
+  'use strict'
+
+  const ACTIONS = {
+    addClass: (el, name) => el.addClass(name),
+    addStyle: (el, extra_style) => {
+      let style = (el.attr('style') || '').trim()
+      if (!style.includes(extra_style)) {
+        if (style) style = style.replace(/;$/, '') + '; ' // ensure style ends with ;
+        el.attr('style', `${style}${extra_style}`)
+      }
+    },
+    callback: (el, name) => {
+      if (window[name]) window[name](el.data('args'))
+      else {
+        el.attr('data-df-errors', 'callback function not found')
+        console.warn(`activeadmin_dynamic_fields callback function not found: ${name}`)
+      }
+    },
+    fade: el => el.fadeOut(),
+    hide: el => el.hide(),
+    setText: (el, text) => el.text(text),
+    setValue: (el, value) => {
+      if (el.attr('type') == 'checkbox') el.prop('checked', value == '1')
+      else el.val(value)
+      el.trigger('change')
+    },
+    slide: el => el.slideUp()
   }
-  else if( action == 'fade' ) {
-    if( dfEvalCondition( el, args, false ) ) target.fadeIn();
-    else target.fadeOut();
-    el.on( 'change', function( event ) {
-      if( dfEvalCondition( $(this), args, true ) ) target.fadeIn();
-      else target.fadeOut();
-    });
+
+  const CONDITIONS = {
+    blank: el => el.val().length === 0 || !el.val().trim(),
+    changed: _el => true,
+    checked: el => el.is(':checked'),
+    eq: (el, value) => el.val() == value,
+    not: (el, value) => el.val() != value,
+    not_blank: el => el.val().trim(),
+    not_checked: el => !el.is(':checked')
   }
-  else if( action.substr( 0, 8 ) == 'setValue' ) {
-    var val = action.substr( 8 ).trim();
-    if( dfEvalCondition( el, args, false ) ) dfSetValue( target, val );
-    el.on( 'change', function( event ) {
-      if( dfEvalCondition( $(this), args, true ) ) dfSetValue( target, val );
-    });
+
+  const REVERSE_ACTIONS = {
+    addClass: (el, name) => el.removeClass(name),
+    addStyle: (el, extra_style) => {
+      if(el.attr('style')) el.attr('style', el.attr('style').replace(extra_style, ''))
+    },
+    fade: el => el.fadeIn(),
+    hide: el => el.show(),
+    slide: el => el.slideDown()
   }
-  else if( action.substr( 0, 8 ) == 'callback' ) {
-    var cb = action.substr( 8 ).trim();
-    if( cb && window[cb] ) {
-      if( dfEvalCondition( el, args, false ) ) window[cb]( el.data( 'args' ) );
-      el.on( 'change', function( event ) {
-        if( dfEvalCondition( $(this), args, true ) ) window[cb]( el.data( 'args' ) );
-      });
+
+  class Field {
+    constructor(el) {
+      const action = el.data('then') || el.data('action') || ''
+      const action_name = action.split(' ', 1)[0]
+      const else_action = el.data('else') || ''
+      const else_action_name = else_action.split(' ', 1)[0]
+
+      this.el = el
+      this.action = ACTIONS[action_name]
+      this.action_arg = action.substring(action.indexOf(' ') + 1)
+      this.reverse_action = REVERSE_ACTIONS[action_name]
+      this.else_action = ACTIONS[else_action_name]
+      this.else_action_arg = else_action.substring(else_action.indexOf(' ') + 1)
+      this.else_reverse_action = REVERSE_ACTIONS[else_action_name]
+      this.condition = CONDITIONS[el.data('if')]
+      if (!this.condition && el.data('eq')) {
+        [this.condition, this.condition_arg] = [CONDITIONS['eq'], el.data('eq')]
+      }
+      if (!this.condition && el.data('not')) {
+        [this.condition, this.condition_arg] = [CONDITIONS['not'], el.data('not')]
+      }
+      this.custom_function = el.data('function')
+      if (!this.condition && this.custom_function) {
+        this.condition = window[this.custom_function]
+        if (!this.condition) {
+          el.attr('data-df-errors', 'custom function not found')
+          console.warn(`activeadmin_dynamic_fields custom function not found: ${this.custom_function}`)
+        }
+      }
+
+      // closest find for has many associations
+      if (el.data('target')) this.target = el.closest('fieldset').find(el.data('target'))
+      else if (el.data('gtarget')) this.target = $(el.data('gtarget'))
+      if (action_name == 'callback') this.target = el
+    }
+
+    apply(el) {
+      if (this.condition(el, this.condition_arg)) {
+        if (this.else_reverse_action) this.else_reverse_action(this.target, this.else_action_arg)
+        this.action(this.target, this.action_arg)
+      }
+      else {
+        if (this.reverse_action) this.reverse_action(this.target, this.action_arg)
+        if (this.else_action) this.else_action(this.target, this.else_action_arg)
+      }
+    }
+
+    is_valid() {
+      if (!this.condition) return false
+      if (!this.action && !this.custom_function) return false
+
+      return true
+    }
+
+    setup() {
+      if (!this.is_valid()) return
+      if (this.el.data('if') != 'changed') this.apply(this.el)
+      this.el.on('change', () => this.apply(this.el))  
     }
-    else console.log( 'Warning - activeadmin_dynamic_fields: ' + cb + '() not available [2]' );
-  }
-  else if( action.substr( 0, 8 ) == 'addClass' ) {
-    var classes = action.substr( 8 ).trim();
-    if( dfEvalCondition( el, args, false ) ) target.removeClass( classes );
-    else target.addClass( classes );
-    el.on( 'change', function( event ) {
-      if( dfEvalCondition( $(this), args, true ) ) target.removeClass( classes );
-      else target.addClass( classes );
-    });
-  }
-  else if( args.fn ) {  // function without action
-    dfEvalCondition( el, args, false );
-    el.on( 'change', function( event ) {
-      dfEvalCondition( el, args, true );
-    });
   }
-}
-
-// Set the value of an element
-function dfSetValue( el, val ) {
-  if( el.attr('type') != 'checkbox' ) el.val( val );
-  else el.prop('checked', val == '1');
-  el.trigger( 'change' );
-}
-
-// Inline update - must be called binded on the editing element
-function dfUpdateField() {
-  if( $(this).data( 'loading' ) != '1' ) {
-    $(this).data( 'loading', '1' );
-    var _this = $(this);
-    var type = $(this).data( 'field-type' );
-    var new_value;
-    if( type == 'boolean' ) new_value = !$(this).data( 'field-value' );
-    else if( type == 'select' ) new_value = $(this).val();
-    else new_value = $(this).text();
-    var data = {};
-    data[$(this).data('field')] = new_value;
-    $.ajax({
-      context: _this,
-      data: { data: data },
-      method: 'POST',
-      url: $(this).data( 'save-url' ),
-      complete: function( req, status ) {
-        $(this).data( 'loading', '0' );
-      },
-      success: function( data, status, req ) {
-        if( data.status == 'error' ) {
-          if( $(this).data( 'show-errors' ) ) {
-            var result = '';
-            var message = data.message;
-            for( var key in message ) {
-              if( typeof( message[key] ) === 'object' ) {
-                if( result ) result += ' - ';
-                result += key + ': ' + message[key].join( '; ' );
+
+  // Inline update - must be called binded on the editing element
+  function dfUpdateField() {
+    if ($(this).data('loading') != '1') {
+      $(this).data('loading', '1');
+      let _this = $(this);
+      let type = $(this).data('field-type');
+      let new_value;
+      if (type == 'boolean') new_value = !$(this).data('field-value');
+      else if (type == 'select') new_value = $(this).val();
+      else new_value = $(this).text();
+      let data = {};
+      data[$(this).data('field')] = new_value;
+      $.ajax({
+        context: _this,
+        data: { data: data },
+        method: 'POST',
+        url: $(this).data('save-url'),
+        complete: function (req, status) {
+          $(this).data('loading', '0');
+        },
+        success: function (data, status, req) {
+          if (data.status == 'error') {
+            if ($(this).data('show-errors')) {
+              let result = '';
+              let message = data.message;
+              for (let key in message) {
+                if (typeof (message[key]) === 'object') {
+                  if (result) result += ' - ';
+                  result += key + ': ' + message[key].join('; ');
+                }
               }
+              if (result) alert(result);
             }
-            if( result ) alert( result );
           }
-        }
-        else {
-          $(this).data( 'field-value', new_value );
-          if( $(this).data('content') ) {
-            var old_text = $(this).text();
-            var old_class = $(this).attr( 'class' );
-            var content = $($(this).data('content'));
-            $(this).text( content.text() );
-            $(this).attr( 'class', content.attr( 'class' ) );
-            content.text( old_text );
-            content.attr( 'class', old_class );
-            $(this).data( 'content', content );
+          else {
+            $(this).data('field-value', new_value);
+            if ($(this).data('content')) {
+              let old_text = $(this).text();
+              let old_class = $(this).attr('class');
+              let content = $($(this).data('content'));
+              $(this).text(content.text());
+              $(this).attr('class', content.attr('class'));
+              content.text(old_text);
+              content.attr('class', old_class);
+              $(this).data('content', content);
+            }
           }
         }
-      },
-      // error: function( req, status, error ) {
-      //   // if( $(this).data( 'show-errors' ) && req.responseJSON.message ) { }
-      // },
-    });
-  }
-}
-
-// Init
-$(document).ready( function() {
-  // Setup dynamic fields
-  $('.active_admin .input [data-if], .active_admin .input [data-function], .active_admin .input [data-eq], .active_admin .input [data-not]').each( function() {
-    dfSetupField( $(this) );
-  });
-  // Setup dynamic fields for has many associations
-  $('.active_admin .has_many_container').on( 'has_many_add:after', function( e, fieldset, container ) {
-    $('.active_admin .input [data-if], .active_admin .input [data-function], .active_admin .input [data-eq], .active_admin .input [data-not]').each( function() {
-      dfSetupField( $(this) );
-    });
-  });
-  // Set dialog icon link
-  $('.active_admin [data-df-icon]').each( function() {
-    $(this).append( ' »' );  // ' •'
-  });
-  // Open content in dialog
-  $('.active_admin [data-df-dialog]').on( 'click', function( event ) {
-    event.preventDefault();
-    $(this).blur();
-    if( $('#df-dialog').data( 'loading' ) != '1' ) {
-      $('#df-dialog').data( 'loading', '1' );
-      if( $('#df-dialog').length == 0 ) $('body').append( '<div id="df-dialog"></div>' );
-      var title = $(this).attr( 'title' );
-      $.ajax({
-        url: $(this).attr( 'href' ),
-        complete: function( req, status ) {
-          $('#df-dialog').data( 'loading', '0' );
-        },
-        success: function( data, status, req ) {
-          if( title ) $('#df-dialog').attr( 'title', title );
-          $('#df-dialog').html( data );
-          $('#df-dialog').dialog({ modal: true });
-        },
       });
     }
-  });
-  // Inline editing
-  $('[data-field][data-field-type="boolean"][data-save-url]').each( function() {
-    $(this).on( 'click', $.proxy( dfUpdateField, $(this) ) );
-  });
-  $('[data-field][data-field-type="string"][data-save-url]' ).each( function() {
-    $(this).data( 'field-value', $(this).text() );
-    var fnUpdate = $.proxy( dfUpdateField, $(this) );
-    $(this).on( 'blur', function() {
-      if( $(this).data( 'field-value' ) != $(this).text() ) fnUpdate();
-    });
-  });
-  $('[data-field][data-field-type="select"][data-save-url]').each( function() {
-    $(this).on( 'change', $.proxy( dfUpdateField, $(this) ) );
-  });
-});
+  }
+
+  // Init
+  $(document).ready(function () {
+    // Setup dynamic fields
+    const selectors = '.active_admin .input [data-if], .active_admin .input [data-eq], .active_admin .input [data-not], .active_admin .input [data-function]'
+    $(selectors).each(function () {
+      new Field($(this)).setup()
+    })
+
+    // Setup dynamic fields for associations
+    $('.active_admin .has_many_container').on('has_many_add:after', () => {
+      $(selectors).each(function () {
+        new Field($(this)).setup()
+      })
+    })
+
+    // Set dialog icon link
+    $('.active_admin [data-df-icon]').each(function () {
+      $(this).append(' &raquo;')
+    })
+
+    // Open content in dialog
+    $('.active_admin [data-df-dialog]').on('click', function (event) {
+      event.preventDefault()
+      $(this).blur()
+      if ($('#df-dialog').data('loading') != '1') {
+        $('#df-dialog').data('loading', '1')
+        if ($('#df-dialog').length == 0) $('body').append('<div id="df-dialog"></div>')
+        let title = $(this).attr('title')
+        $.ajax({
+          url: $(this).attr('href'),
+          complete: function (req, status) {
+            $('#df-dialog').data('loading', '0')
+          },
+          success: function (data, status, req) {
+            if (title) $('#df-dialog').attr('title', title)
+            $('#df-dialog').html(data)
+            $('#df-dialog').dialog({ modal: true })
+          },
+        })
+      }
+    })
+
+    // Inline editing
+    $('[data-field][data-field-type="boolean"][data-save-url]').each(function () {
+      $(this).on('click', $.proxy(dfUpdateField, $(this)))
+    })
+    $('[data-field][data-field-type="string"][data-save-url]').each(function () {
+      $(this).data('field-value', $(this).text())
+      let fnUpdate = $.proxy(dfUpdateField, $(this))
+      $(this).on('blur', function () {
+        if ($(this).data('field-value') != $(this).text()) fnUpdate()
+      })
+    })
+    $('[data-field][data-field-type="select"][data-save-url]').each(function () {
+      $(this).on('change', $.proxy(dfUpdateField, $(this)))
+    })
+  })
+})()

data/lib/activeadmin/dynamic_fields.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'activeadmin/dynamic_fields/engine'

data/lib/activeadmin/dynamic_fields/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_admin'
 
 module ActiveAdmin
@@ -6,21 +8,39 @@ module ActiveAdmin
       engine_name 'activeadmin_dynamic_fields'
     end
 
-    def self.edit_boolean( field, url, value )
-      { 'data-field': field, 'data-field-type': 'boolean', 'data-field-value': value, 'data-content': "<span class=\"status_tag changed\">#{value ? 'no' : 'yes'}</span>", 'data-save-url': url, 'data-show-errors': '1' }
+    def self.edit_boolean(field, url, value)
+      {
+        'data-field': field,
+        'data-field-type': 'boolean',
+        'data-field-value': value,
+        'data-content': "<span class=\"status_tag changed\">#{value ? 'no' : 'yes'}</span>",
+        'data-save-url': url,
+        'data-show-errors': '1'
+      }
     end
 
-    def self.edit_select( field, url )
-      { 'data-field': field, 'data-field-type': 'select', 'data-save-url': url, 'data-show-errors': '1' }
+    def self.edit_select(field, url)
+      {
+        'data-field': field,
+        'data-field-type': 'select',
+        'data-save-url': url,
+        'data-show-errors': '1'
+      }
     end
 
-    def self.edit_string( field, url )
-      { contenteditable: true, 'data-field': field, 'data-field-type': 'string', 'data-save-url': url, 'data-show-errors': '1' }
+    def self.edit_string(field, url)
+      {
+        contenteditable: true,
+        'data-field': field,
+        'data-field-type': 'string',
+        'data-save-url': url,
+        'data-show-errors': '1'
+      }
     end
 
-    def self.update( resource, params, permit_params = nil )
+    def self.update(resource, params, permit_params = nil)
       if params[:data]
-        if resource.update( permit_params ? params[:data].permit( permit_params ) : params[:data].permit! )
+        if resource.update(permit_params ? params[:data].permit(permit_params) : params[:data].permit!)
           { json: { status: 'ok' } }
         else
           { json: { status: 'error', message: resource.errors } }

data/lib/activeadmin/dynamic_fields/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveAdmin
   module DynamicFields
-    VERSION = '0.2.2'
+    VERSION = '0.4.2'
   end
 end

data/lib/activeadmin_dynamic_fields.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'activeadmin/dynamic_fields'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_dynamic_fields
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Mattia Roccoberton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -16,26 +16,149 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: activestorage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.3.2
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.33.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.33.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.5
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.90.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.90.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.142.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.142.7
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 description: An Active Admin plugin to add dynamic behaviors to fields
 email: mat@blocknot.es
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- activeadmin_dynamic_fields.gemspec
 - app/assets/javascripts/activeadmin/dynamic_fields.js
 - lib/activeadmin/dynamic_fields.rb
 - lib/activeadmin/dynamic_fields/engine.rb
@@ -45,7 +168,7 @@ homepage: https://github.com/blocknotes/activeadmin_dynamic_fields
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -60,9 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Dynamic fields for ActiveAdmin
 test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-_misc/
-Gemfile.lock
-*.orig
-

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-

data/activeadmin_dynamic_fields.gemspec

@@ -1,19 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'activeadmin/dynamic_fields/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'activeadmin_dynamic_fields'
-  spec.version       = ActiveAdmin::DynamicFields::VERSION
-  spec.summary       = 'Dynamic fields for ActiveAdmin'
-  spec.description   = 'An Active Admin plugin to add dynamic behaviors to fields'
-  spec.license       = 'MIT'
-  spec.authors       = ['Mattia Roccoberton']
-  spec.email         = 'mat@blocknot.es'
-  spec.homepage      = 'https://github.com/blocknotes/activeadmin_dynamic_fields'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'activeadmin', '~> 1.0'
-end