adminterface 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4069cfffd19de3ada098678538e0e7ca4f9a840c8477de55fe3612cd6f541572
-  data.tar.gz: 7454d611f8fd759b502577cd30f1a00ee7f7c6587b2361155998ef1c2e29aff7
+  metadata.gz: 7aa4367f85794395d6b92b141c12488c2158b99f0585f4a76f201bb080fb167c
+  data.tar.gz: 88a7bb2ecafe63f80145908a0cd4d1289011a71352ee9960f2870a80c91fc08f
 SHA512:
-  metadata.gz: d04bd12439c118daedfb64958cdcf0a3a24a077331147bc98376ed0a8df5de9eada6dadb7de0eb066690a2d979c0277a357b42cead3ccf2b4a7e9a4c81bb5972
-  data.tar.gz: dc004f3881b891829f647c813ec8025459a76be580276b9bcb54ff5eafcd91a35324169b099b0ffb1eb588ea4f34820d41621027bcdff5f3e7509696c81d02f1
+  metadata.gz: 92dfa1e53f319043ee355df3d0d70e9888f070727c5828851ee1e10d6e2aa590af464dc7ad75ef871d8e375676dfc68ed4c97decc0fc3f0492868d642f2f2667
+  data.tar.gz: 650a23ef8b8f323f6f792fa591aec71d60701c7b5c32d3d2d311cb51ed73a42f9ef8bf0d988498d60aba2cfe0b8a87e82bd8aa7c8e5162b209ac6f72e5d60004

data/README.md

@@ -1,7 +1,11 @@
 # Adminterface <!-- omit in toc -->
 [![CI](https://github.com/CMDBrew/adminterface/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/CMDBrew/adminterface/actions/workflows/ci.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/4dbedfdf21a2d675d2ca/maintainability)](https://codeclimate.com/github/CMDBrew/adminterface/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/4dbedfdf21a2d675d2ca/test_coverage)](https://codeclimate.com/github/CMDBrew/adminterface/test_coverage)
+[![gem](https://img.shields.io/gem/v/adminterface?color=%23E9573F&label=rubygems.org)](https://rubygems.org/gems/adminterface)
+[![npm](https://img.shields.io/npm/v/@cmdbrew/adminterface?color=%230273B4&label=npmjs.com)](https://www.npmjs.com/package/@cmdbrew/adminterface)
 
-An add-on that brings Bootstrap 5 and other goodies into ActiveAdmin.
+A gem that brings Bootstrap 5, advanced customizability, and other goodies into ActiveAdmin
 
 [![](preview.jpg)](https://adminterface.io)
 
@@ -26,6 +30,10 @@ An add-on that brings Bootstrap 5 and other goodies into ActiveAdmin.
    $ rails g active_admin:install --use_webpacker
    ```
 4. Install Adminterface
+
+   > This command will ask for permissions to overwrite files generated by ActiveAdmin. Make sure to review the files carefully and accept them.
+   > We recommend you commit your files before running this command to ensure you are aware of the changes made.
+
    ```bash
    $ rails g adminterface:install
    ```

data/app/javascript/adminterface/initializers/header_toggler.js

@@ -3,7 +3,7 @@ import HeaderToggler from '../lib/header_toggler'
 document.addEventListener('DOMContentLoaded', () => {
   const togglerTriggerList = [].slice.call(document.querySelectorAll('[data-aa-header-toggler]'))
   togglerTriggerList.map((el) => {
-    const options = JSON.parse(el.dataset.aaHeaderToggler || {})
+    const options = JSON.parse(el.dataset.aaHeaderToggler || '{}')
 
     return new HeaderToggler(el, options)
   })

data/app/javascript/adminterface/initializers/plugins/flatpickr.js

@@ -5,7 +5,7 @@ const initFlatpickr = (element) => {
   const flatpickrTriggerList = [].slice.call(element.querySelectorAll('[data-aa-flatpickr]'))
 
   flatpickrTriggerList.map((el) => {
-    const options = JSON.parse(el.dataset.aaFlatpickr || {})
+    const options = JSON.parse(el.dataset.aaFlatpickr || '{}')
     const instance = flatpickr(el, options)
 
     adminterface.addObserver(el, instance, 'flatpickr')

data/app/javascript/adminterface/initializers/plugins/input_counter.js

@@ -4,7 +4,7 @@ const initInputCounter = function (element) {
   const inputCounterTriggerList = [].slice.call(element.querySelectorAll('[data-aa-input-counter]'))
 
   inputCounterTriggerList.map((el) => {
-    const options = JSON.parse(el.dataset.aaInputCounter || {})
+    const options = JSON.parse(el.dataset.aaInputCounter || '{}')
 
     return new InputCounter(el, options)
   })

data/app/javascript/adminterface/initializers/plugins/password_visibility.js

@@ -4,7 +4,7 @@ import initBootstrap from '../bootstrap'
 const initPasswordVisibility = function (element) {
   const visibilityTriggerList = [].slice.call(element.querySelectorAll('[data-aa-password-visibility]'))
   visibilityTriggerList.map((el) => {
-    const options = JSON.parse(el.dataset.aaPasswordVisibility || {})
+    const options = JSON.parse(el.dataset.aaPasswordVisibility || '{}')
     const instance = new PasswordVisibility(el, options)
 
     initBootstrap(instance.eventTarget)

data/app/javascript/adminterface/initializers/plugins/tom_select.js

@@ -5,7 +5,7 @@ const initTomSelect = function (element) {
   const tomSelectTriggerList = [].slice.call(element.querySelectorAll('[data-aa-tom-select]'))
 
   tomSelectTriggerList.map((el) => {
-    const options = JSON.parse(el.dataset.aaTomSelect || {})
+    const options = JSON.parse(el.dataset.aaTomSelect || '{}')
     const instance = new TomSelect(el, options)
 
     adminterface.addObserver(el, instance, instance.constructor.name)

data/app/javascript/adminterface/lib/__tests__/checkbox_toggler.html

@@ -0,0 +1,5 @@
+<div id="find-me">
+  <input type="checkbox" class="toggle_all" checked>
+  <input type="checkbox" class="toggle_one" checked>
+  <input type="checkbox" class="toggle_two" checked>
+</div>

data/app/javascript/adminterface/lib/__tests__/checkbox_toggler.spec.js

@@ -0,0 +1,110 @@
+import fs from 'fs'
+import path from 'path'
+import CheckboxTogglerClass from '../checkbox_toggler'
+
+describe('CheckboxToggler', () => {
+  const html = fs.readFileSync(path.resolve(__dirname, './checkbox_toggler.html'))
+  const container = '#find-me'
+  const options = 'options'
+
+  beforeEach(() => {
+    document.documentElement.innerHTML = html.toString()
+  })
+
+  afterEach(() => {
+    jest.restoreAllMocks()
+  })
+
+  test('constructor initiates correctly', () => {
+    const spyOnInit = jest.spyOn(CheckboxTogglerClass.prototype, '_init')
+    const spyOnBind = jest.spyOn(CheckboxTogglerClass.prototype, '_bind')
+
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+
+    expect(CheckboxToggler.options).toStrictEqual(options)
+    expect(CheckboxToggler.container).toStrictEqual(container)
+
+    expect(spyOnInit).toHaveBeenCalledTimes(1)
+    expect(spyOnBind).toHaveBeenCalledTimes(1)
+  })
+
+  test('init throws error if container is null', () => {
+    expect(() => { new CheckboxTogglerClass(null, options) }).toThrow( // eslint-disable-line no-new
+      'Container element not found'
+    )
+  })
+
+  test('init throws error if toggle checkbox missing', () => {
+    const element = document.createElement('div')
+    element.id = 'find-me'
+    document.documentElement.innerHTML = element.outerHTML
+
+    expect(() => { new CheckboxTogglerClass(container, options) }).toThrow( // eslint-disable-line no-new
+      '"toggle all" checkbox not found'
+    )
+  })
+
+  test('init sets $container, $toggleAllCheckbox, $checkboxes', () => {
+    const $container = document.querySelector(container)
+    const $toggleAllCheckbox = $container.querySelector('.toggle_all')
+    const $checkboxes = $container.querySelectorAll('input[type="checkbox"]:not(.toggle_all)')
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+
+    expect(CheckboxToggler.$container).toStrictEqual($container)
+    expect(CheckboxToggler.$toggleAllCheckbox).toStrictEqual($toggleAllCheckbox)
+    expect(CheckboxToggler.$checkboxes).toStrictEqual($checkboxes)
+  })
+
+  test('bind triggers addEventListener', () => {
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+    const spyOnCheckboxesAddEvent = jest.spyOn(
+      CheckboxToggler.$checkboxes[0], 'addEventListener'
+    )
+    const spyOnToggleAllCheckboxAddEvent = jest.spyOn(
+      CheckboxToggler.$toggleAllCheckbox, 'addEventListener'
+    )
+
+    CheckboxToggler._bind()
+
+    expect(spyOnCheckboxesAddEvent).toHaveBeenCalledTimes(1)
+    expect(spyOnCheckboxesAddEvent).toHaveBeenCalledWith(
+      'change',
+      expect.any(Function)
+    )
+
+    expect(spyOnToggleAllCheckboxAddEvent).toHaveBeenCalledTimes(1)
+    expect(spyOnToggleAllCheckboxAddEvent).toHaveBeenCalledWith(
+      'change',
+      expect.any(Function)
+    )
+  })
+
+  test('didChangeCheckbox sets toggleAllCheckbox checked to true when all checked', () => {
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+    CheckboxToggler._didChangeCheckbox()
+
+    expect(CheckboxToggler.$toggleAllCheckbox.checked).toBeTruthy()
+    expect(CheckboxToggler.$toggleAllCheckbox.indeterminate).toBeFalsy()
+  })
+
+  test('didChangeCheckbox sets toggleAllCheckbox checked to false when some checked', () => {
+    const inputElementToggleTwo = document.querySelector('input.toggle_two')
+    inputElementToggleTwo.checked = false
+
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+    CheckboxToggler._didChangeCheckbox()
+
+    expect(CheckboxToggler.$toggleAllCheckbox.checked).toBeFalsy()
+    expect(CheckboxToggler.$toggleAllCheckbox.indeterminate).toBeTruthy()
+  })
+
+  test('didChangeToggleAllCheckbox', () => {
+    const CheckboxToggler = new CheckboxTogglerClass(container, options)
+    const setting = CheckboxToggler._didChangeToggleAllCheckbox()
+
+    expect(setting).toBeTruthy()
+    CheckboxToggler.$checkboxes.forEach(el => {
+      expect(el.checked).toStrictEqual(setting)
+    })
+  })
+})

data/app/javascript/adminterface/lib/__tests__/detached_dropdown.spec.js

@@ -1,4 +1,3 @@
-/* eslint-env jest */
 import DetachedDropdownClass from '../detached_dropdown'
 
 describe('DetachedDropdown', () => {

data/app/javascript/adminterface/lib/__tests__/filters.spec.js

@@ -1,4 +1,3 @@
-/* eslint-env jest */
 import Filters from '../filters'
 import * as utilModule from '../utils'
 

data/app/javascript/adminterface/lib/__tests__/has_many.html

@@ -0,0 +1,14 @@
+<div data-sortable="address">
+  <form class="has-many-list">
+    <fieldset class="has_many_fields">
+      <input type="checkbox" name="[_destroy]" checked>
+      <input type="text" name="[address]" value="Tokyo">
+      <a class="button has_many_remove"></a>
+      <a
+        class="button has_many_add"
+        data-html="<div></div>"
+        data-placeholder="script"
+      ></a>
+    </fieldset>
+  </form>
+</div>

data/app/javascript/adminterface/lib/__tests__/has_many.spec.js

@@ -0,0 +1,224 @@
+import fs from 'fs'
+import path from 'path'
+import Sortable from 'sortablejs'
+import HasManyClass from '../has_many'
+
+jest.mock('sortablejs')
+
+describe('HasMany', () => {
+  const html = fs.readFileSync(path.resolve(__dirname, './has_many.html'))
+  let element
+
+  const options = {
+    list: '.has-many-list',
+    item: 'fieldset.has_many_fields',
+    addLink: 'a.button.has_many_add',
+    removeLink: 'a.button.has_many_remove',
+    destroyInput: 'input[name$="[_destroy]"]'
+  }
+
+  beforeEach(() => {
+    document.documentElement.innerHTML = html
+    element = document.querySelector('div')
+    global.adminterface = {
+      addObserver: jest.fn()
+    }
+  })
+
+  afterEach(() => {
+    jest.restoreAllMocks()
+  })
+
+  test('constructor initiates correctly', () => {
+    const spyOnBind = jest.spyOn(HasManyClass.prototype, '_bind')
+    spyOnBind.mockImplementation(() => {})
+
+    const HasMany = new HasManyClass(element)
+    expect(HasMany.element).toStrictEqual(element)
+
+    expect(spyOnBind).toHaveBeenCalledTimes(1)
+  })
+
+  test('bind calls bindEvents, initSortable and admininterface', () => {
+    const spyOnBindEvents = jest.spyOn(HasManyClass.prototype, '_bindEvents')
+    spyOnBindEvents.mockImplementation(() => {})
+
+    const spyOnInitSortable = jest.spyOn(HasManyClass.prototype, '_initSortable')
+    spyOnInitSortable.mockImplementation(() => {})
+
+    const HasMany = new HasManyClass(element)
+
+    expect(spyOnBindEvents).toHaveBeenCalledWith(element)
+    expect(spyOnInitSortable).toHaveBeenCalledTimes(1)
+    expect(global.adminterface.addObserver).toHaveBeenCalledTimes(1)
+    expect(global.adminterface.addObserver).toHaveBeenCalledWith(
+      element,
+      HasMany,
+      HasMany.constructor.name,
+      []
+    )
+  })
+
+  test('initSortable assigns new instance of Sortable to sortable property', () => {
+    const spyOnBindEvents = jest.spyOn(HasManyClass.prototype, '_bindEvents')
+    spyOnBindEvents.mockImplementation(() => {})
+
+    const HasMany = new HasManyClass(element)
+
+    const MockSortableArgument = {
+      handle: '.handle',
+      animation: 150,
+      ghostClass: 'sortable-placeholder',
+      dragClass: 'sortable-drag',
+      onUpdate: expect.any(Function)
+    }
+
+    expect(Sortable).toHaveBeenCalledTimes(1)
+    expect(Sortable).toHaveBeenCalledWith(
+      document.querySelector(HasMany.options.list),
+      MockSortableArgument
+    )
+    const sortable = new Sortable(
+      document.querySelector(HasMany.options.list),
+      MockSortableArgument
+    )
+    expect(HasMany.sortable.toString()).toStrictEqual(sortable.toString())
+  })
+
+  test('recomputePosition changes sortableInput value', () => {
+    const query = 'input[name$="[address]"]'
+    const sortableInput = element.querySelector(query)
+
+    expect(sortableInput.value.length).not.toEqual(0)
+
+    const HasMany = new HasManyClass(element)
+    HasMany._recomputePosition()
+
+    expect(sortableInput.value.length).toEqual(0)
+  })
+
+  test('bindDestroyEvent called with element and change event added', () => {
+    const spyOnBindDestroyEvent = jest.spyOn(
+      HasManyClass.prototype,
+      '_bindDestroyEvent'
+    )
+    const destroyInput = document.querySelector(options.destroyInput)
+    destroyInput.addEventListener = jest.fn()
+
+    new HasManyClass(element) // eslint-disable-line no-new
+
+    expect(spyOnBindDestroyEvent).toHaveBeenCalledTimes(1)
+    expect(spyOnBindDestroyEvent).toHaveBeenCalledWith(destroyInput)
+
+    expect(destroyInput.addEventListener).toHaveBeenCalledTimes(1)
+    expect(destroyInput.addEventListener).toHaveBeenCalledWith(
+      'change',
+      expect.any(Function)
+    )
+  })
+
+  test('bindRemoveEvent called with element and click event added', () => {
+    const spyOnBindRemoveEvent = jest.spyOn(
+      HasManyClass.prototype,
+      '_bindRemoveEvent'
+    )
+    const removeLinks = document.querySelector(options.removeLink)
+    removeLinks.addEventListener = jest.fn()
+
+    new HasManyClass(element) // eslint-disable-line no-new
+
+    expect(spyOnBindRemoveEvent).toHaveBeenCalledTimes(1)
+    expect(spyOnBindRemoveEvent).toHaveBeenCalledWith(removeLinks)
+
+    expect(removeLinks.addEventListener).toHaveBeenCalledTimes(1)
+    expect(removeLinks.addEventListener).toHaveBeenCalledWith(
+      'click',
+      expect.any(Function)
+    )
+  })
+
+  test('bindRemoveEventCallBack', () => {
+    const mockEvent = {
+      preventDefault: () => {},
+      target: document.body.querySelector('fieldset')
+    }
+    const spyOnRecomputePosition = jest.spyOn(
+      HasManyClass.prototype,
+      '_recomputePosition'
+    )
+    const HasMany = new HasManyClass(element)
+    const spyOnDispatch = jest.spyOn(HasMany.element, 'dispatchEvent')
+
+    const fieldSet = mockEvent.target.closest(HasMany.options.item)
+    fieldSet.remove = jest.fn()
+
+    const parent = HasMany.element
+    const removeBeforeEvent = HasMany.events.removeBefore
+    removeBeforeEvent.detail = { fieldSet, parent }
+    const removeAfterEvent = HasMany.events.removeAfter
+    removeAfterEvent.detail = { fieldSet, parent }
+
+    const output = HasMany._bindRemoveEventCallBack(mockEvent)
+
+    expect(spyOnRecomputePosition).toHaveBeenCalledTimes(1)
+    expect(spyOnDispatch).toHaveBeenCalledTimes(2)
+    expect(spyOnDispatch.mock.calls).toMatchObject([
+      [removeBeforeEvent],
+      [removeAfterEvent]
+    ])
+    expect(fieldSet.remove).toHaveBeenCalledTimes(1)
+    expect(output).toBeTruthy()
+  })
+
+  test('bindAddEvent called with correctly element and click event added', () => {
+    const spyOnBindAddEvent = jest.spyOn(
+      HasManyClass.prototype,
+      '_bindAddEvent'
+    )
+
+    const addLinks = document.querySelector(options.addLink)
+    addLinks.addEventListener = jest.fn()
+
+    new HasManyClass(element) // eslint-disable-line no-new
+
+    expect(spyOnBindAddEvent).toHaveBeenCalledTimes(1)
+    expect(spyOnBindAddEvent).toHaveBeenCalledWith(addLinks)
+
+    expect(addLinks.addEventListener).toHaveBeenCalledTimes(1)
+    expect(addLinks.addEventListener).toHaveBeenCalledWith(
+      'click',
+      expect.any(Function)
+    )
+  })
+
+  test('bindAddEventCallBack', () => {
+    const mockEvent = {
+      preventDefault: () => {},
+      target: document.body.querySelector(options.addLink)
+    }
+    const HasMany = new HasManyClass(element)
+    const spyOnDispatchEvent = jest.spyOn(HasMany.element, 'dispatchEvent')
+    const $list = HasMany.element.querySelector(HasMany.options.list)
+    const spyOnListAppendChild = jest.spyOn($list, 'appendChild')
+    const spyOnBindEvents = jest.spyOn(HasMany, '_bindEvents')
+    const spyOnRecomputePosition = jest.spyOn(HasMany, '_recomputePosition')
+    const beforeAdd = HasMany.events.addBefore
+    const parent = HasMany.element
+    const datasetHTML = document.createElement('div')
+
+    const output = HasMany._bindAddEventCallBack(mockEvent)
+
+    expect(spyOnDispatchEvent).toHaveBeenCalledTimes(2)
+    expect(spyOnDispatchEvent.mock.calls).toMatchObject([
+      [beforeAdd, [parent]],
+      [HasMany.events.addAfter]
+    ])
+
+    expect(spyOnListAppendChild).toHaveBeenCalledTimes(1)
+    expect(spyOnListAppendChild).toHaveBeenCalledWith(datasetHTML)
+    expect(spyOnBindEvents).toHaveBeenCalledTimes(1)
+    expect(spyOnBindEvents).toHaveBeenCalledWith(datasetHTML)
+    expect(spyOnRecomputePosition).toHaveBeenCalledTimes(1)
+    expect(output).toBeTruthy()
+  })
+})

data/app/javascript/adminterface/lib/__tests__/utils.spec.js

@@ -1,4 +1,3 @@
-/* eslint-env jest */
 import {
   hasTurbolinks,
   turbolinksVisit,

data/app/javascript/adminterface/lib/has_many.js

@@ -51,54 +51,57 @@ class HasMany {
   }
 
   _bindAddEvent (el) {
-    el.addEventListener('click', (e) => {
-      let beforeAdd
-      const el = e.target
-      const parent = this.element
+    el.addEventListener('click', (e) => this._bindAddEventCallBack(e))
+  }
 
-      e.preventDefault()
-      parent.dispatchEvent(beforeAdd = this.events.addBefore, [parent])
+  _bindAddEventCallBack (e) {
+    let beforeAdd
+    const el = e.target
+    const parent = this.element
+    e.preventDefault()
+    parent.dispatchEvent(beforeAdd = this.events.addBefore, [parent])
 
-      if (!beforeAdd.defaultPrevented) {
-        let index = parent.dataset.hasManyIndex || parent.querySelectorAll(this.options.item).length - 1
-        parent.setAttribute('data-has-many-index', ++index)
+    if (!beforeAdd.defaultPrevented) {
+      let index = parent.dataset.hasManyIndex || parent.querySelectorAll(this.options.item).length - 1
+      parent.setAttribute('data-has-many-index', ++index)
 
-        const regex = new RegExp(el.dataset.placeholder, 'g')
-        const html = el.dataset.html.replaceAll(regex, index)
-        const newNode = document.createElement('div')
-        newNode.innerHTML = html
+      const regex = new RegExp(el.dataset.placeholder, 'g')
+      const html = el.dataset.html.replace(regex, index)
+      const newNode = document.createElement('div')
+      newNode.innerHTML = html
 
-        const fieldset = newNode.firstElementChild
-        const $list = this.element.querySelector(this.options.list)
+      const fieldset = newNode.firstElementChild
+      const $list = this.element.querySelector(this.options.list)
 
-        $list.appendChild(fieldset)
-        this._bindEvents(fieldset)
-        this._recomputePosition()
+      $list.appendChild(fieldset)
+      this._bindEvents(fieldset)
+      this._recomputePosition()
 
-        const addAfterEvent = this.events.addAfter
-        addAfterEvent.detail = { fieldset, parent }
-        return parent.dispatchEvent(this.events.addAfter)
-      }
-    })
+      const addAfterEvent = this.events.addAfter
+      addAfterEvent.detail = { fieldset, parent }
+      return parent.dispatchEvent(this.events.addAfter)
+    }
   }
 
   _bindRemoveEvent (el) {
-    el.addEventListener('click', (e) => {
-      const el = e.target
-      const parent = this.element
-      const fieldset = el.closest(this.options.item)
-      const removeBeforeEvent = this.events.removeBefore
-      const removeAfterEvent = this.events.removeAfter
-
-      e.preventDefault()
-      this._recomputePosition()
+    el.addEventListener('click', (e) => this._bindRemoveEventCallBack(e))
+  }
 
-      removeBeforeEvent.detail = { fieldset, parent }
-      removeAfterEvent.detail = { fieldset, parent }
-      parent.dispatchEvent(removeBeforeEvent)
-      fieldset.remove()
-      return parent.dispatchEvent(removeAfterEvent)
-    })
+  _bindRemoveEventCallBack (e) {
+    const el = e.target
+    const parent = this.element
+    const fieldset = el.closest(this.options.item)
+    const removeBeforeEvent = this.events.removeBefore
+    const removeAfterEvent = this.events.removeAfter
+
+    e.preventDefault()
+    this._recomputePosition()
+
+    removeBeforeEvent.detail = { fieldset, parent }
+    removeAfterEvent.detail = { fieldset, parent }
+    parent.dispatchEvent(removeBeforeEvent)
+    fieldset.remove()
+    return parent.dispatchEvent(removeAfterEvent)
   }
 
   _bindEvents (el) {

data/lib/adminterface/version.rb

@@ -1,3 +1,3 @@
 module Adminterface
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/generators/adminterface/comments/comments_generator.rb

@@ -11,6 +11,10 @@ module Adminterface
         ActiveRecord::Migration.next_migration_number(next_migration_number)
       end
 
+      def install_action_text
+        rails_command "action_text:install"
+      end
+
       def create_initializer
         template "active_admin_comment_action_text.rb",
           "config/initializers/active_admin_comment_action_text.rb"

data/lib/generators/adminterface/configs/configs_generator.rb

@@ -2,10 +2,10 @@ module Adminterface
   module Generators
     class ConfigsGenerator < Rails::Generators::Base
       desc "Copies config files into a directory for customization"
-      argument :namespace, type: :string, default: "Admin"
-
       source_root File.expand_path("templates", __dir__)
 
+      argument :namespace, type: :string, default: "Admin"
+
       def copy
         directory Adminterface::Engine.root.join("lib/adminterface/fixtures"),
           "config/adminterface/#{namespace.underscore}/"

data/lib/generators/adminterface/install/install_generator.rb

@@ -4,37 +4,35 @@ module Adminterface
       desc "Installs Adminterface and generates necessary files and migrations"
       source_root File.expand_path("templates", __dir__)
 
-      def install_rails_addons
-        invoke "action_text:install"
-      end
+      class_option :skip_comments,
+        type: :boolean, default: false,
+        desc: "Skip installation of ActionText for comments"
+      class_option :skip_examples,
+        type: :boolean, default: false,
+        desc: "Skip adding sample admin files"
+      class_option :use_webpacker,
+        type: :boolean, default: true,
+        desc: "Install assets with webpacker"
+      class_option :version,
+        aliases: "-v", type: :string, default: Adminterface::VERSION,
+        desc: "Install with a specific version"
 
       def install_assets
-        install_webpacker? do
-          generate "adminterface:webpacker"
-        end
-      end
+        return unless options[:use_webpacker]
 
-      def install_action_text_for_comments
-        generate "adminterface:comments"
+        generate "adminterface:webpacker -v #{options[:version]}"
       end
 
-      def add_samples
-        template "dashboard.rb", "app/admin/dashboard.rb"
-      end
+      def install_comments
+        return if options[:skip_comments]
 
-      private
+        generate "adminterface:comments"
+      end
 
-      def install_webpacker?
-        return yield if defined?(Webpacker)
+      def add_examples
+        return if options[:skip_examples]
 
-        puts Rainbow("Adminterface requires webpacker:").yellow
-        if yes?("Install webpacker and continue?")
-          gem "webpacker"
-          rails_command "webpacker:install"
-          yield
-        else
-          puts Rainbow("Installation aborted").red
-        end
+        template "dashboard.rb", "app/admin/dashboard.rb"
       end
     end
   end

data/lib/generators/adminterface/views/views_generator.rb

@@ -2,13 +2,13 @@ module Adminterface
   module Generators
     class ViewsGenerator < Rails::Generators::Base
       desc "Copies view templates for customization"
-
       source_root Adminterface::Engine.root.join("app/views")
 
       def copy
         directory "active_admin", "app/views/active_admin"
         directory "kaminari/active_admin", "app/views/kaminari/active_admin"
-        directory "layouts/active_admin_logged_out.html.erb", "app/views/layouts/active_admin_logged_out.html.erb"
+        directory "layouts/active_admin_logged_out.html.erb",
+          "app/views/layouts/active_admin_logged_out.html.erb"
       end
     end
   end

data/lib/generators/adminterface/webpacker/webpacker_generator.rb

@@ -2,11 +2,24 @@ module Adminterface
   module Generators
     class WebpackerGenerator < Rails::Generators::Base
       desc "Install Stylesheets and JavaScripts using Webpacker"
+      source_root File.expand_path("templates", __dir__)
+
       class_option :version,
         aliases: "-v", type: :string, default: Adminterface::VERSION,
         desc: "Install with a specific npm package version"
 
-      source_root File.expand_path("templates", __dir__)
+      def install_webpacker
+        return if webpacker_installed?
+
+        puts Rainbow("Adminterface requires webpacker:").yellow
+        if yes?("Install webpacker and continue?")
+          gem "webpacker"
+          rails_command "webpacker:install"
+        else
+          puts Rainbow("Installation aborted").red
+          abort
+        end
+      end
 
       def install_packages
         insert_into_file "config/webpack/environment.js", after: /require\(('|")@rails\/webpacker\1\);?\n/ do
@@ -18,7 +31,7 @@ module Adminterface
           EOF
         end
 
-        run "yarn add @cmdbrew/adminterface@v#{find_npm_version}"
+        run "yarn add @cmdbrew/adminterface@#{npm_version}"
       end
 
       def install_assets
@@ -44,11 +57,12 @@ module Adminterface
 
       private
 
-      def find_npm_version
-        version = options[:version]
-        return version unless version.include?(".rc")
+      def webpacker_installed?
+        defined?(Webpacker)
+      end
 
-        version.gsub(".rc", "-rc")
+      def npm_version
+        options[:version].gsub(".rc", "-rc")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminterface
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - I-Lung Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -80,7 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
-description: An add-on that brings Bootstrap 5 and other goodies into ActiveAdmin.
+description: A gem that brings Bootstrap 5, advanced customizability, and other goodies
+  into ActiveAdmin
 email:
 - ilung@hey.com
 executables: []
@@ -174,8 +175,12 @@ files:
 - app/javascript/adminterface/initializers/plugins/input_counter.js
 - app/javascript/adminterface/initializers/plugins/password_visibility.js
 - app/javascript/adminterface/initializers/plugins/tom_select.js
+- app/javascript/adminterface/lib/__tests__/checkbox_toggler.html
+- app/javascript/adminterface/lib/__tests__/checkbox_toggler.spec.js
 - app/javascript/adminterface/lib/__tests__/detached_dropdown.spec.js
 - app/javascript/adminterface/lib/__tests__/filters.spec.js
+- app/javascript/adminterface/lib/__tests__/has_many.html
+- app/javascript/adminterface/lib/__tests__/has_many.spec.js
 - app/javascript/adminterface/lib/__tests__/utils.spec.js
 - app/javascript/adminterface/lib/batch_actions.js
 - app/javascript/adminterface/lib/checkbox_toggler.js
@@ -377,5 +382,5 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: An add-on that brings Bootstrap 5 and other goodies into ActiveAdmin.
+summary: Build functional and beautiful web apps faster with ActiveAdmin
 test_files: []