adminterface 0.2.0 → 0.3.0

data/lib/adminterface/extensions/base_controller.rb

@@ -9,11 +9,19 @@ module Adminterface
 
       def set_resource_scope
         session[:resource_scope] = {
-          controller: controller_name,
-          action: action_name
+          controller: controller_path,
+          action: action_name_pairing(action_name)
         }
       end
 
+      def action_name_pairing(name)
+        case name
+        when "create" then "new"
+        when "update" then "edit"
+        else name
+        end
+      end
+
       def reset_tab
         params.delete(:tab)
         params.delete(:anchor_id)
@@ -26,30 +34,26 @@ module Adminterface
       def same_controller?
         return true if resource_scope[:controller].blank?
 
-        resource_scope[:controller] == controller_name
+        resource_scope[:controller] == controller_path
       end
 
       def same_action?
-        return true if resource_scope[:action].blank?
-
-        case resource_scope[:action]
-        when "edit", "update" then %w[edit update].include? action_name
-        else action_name == resource_scope[:action]
-        end
+        resource_scope[:action].presence &&
+          action_name_pairing(action_name).eql?(resource_scope[:action])
       end
 
       def resource_scope
-        session.fetch(:resource_scope, {})
+        session.fetch(:resource_scope, {}).with_indifferent_access
       end
     end
   end
 end
 
 # Overwrite activeadmin/lib/active_admin/base_controller.rb
-ActiveSupport.on_load(:active_admin) do
+ActiveAdmin.after_load do
   ActiveAdmin::BaseController.class_eval do
     prepend Adminterface::Extensions::BaseController
     before_action :reset_tab, if: :should_reset_tab?
-    after_action :set_resource_scope
+    before_action :set_resource_scope
   end
 end

data/lib/adminterface/extensions/namespace_settings.rb

@@ -6,6 +6,9 @@ module Adminterface
       CONFIGS = Adminterface::Configs::DEFAULTS
 
       included do
+        # Language direction ltr or rtl
+        register :lang_dir, "ltr", :string_symbol_or_proc
+
         # The default component configs
         register :components, CONFIGS[:components]
 

data/lib/adminterface/extensions/view_helpers/alert_helper.rb

@@ -4,7 +4,9 @@ module Adminterface
       module AlertHelper
         def flashes_html
           flash.each do |type, msg|
-            concat(content_tag(:div, msg, class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]}".squish))
+            concat(content_tag(:div, msg,
+              class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]}".squish,
+              role: "alert"))
           end
           nil
         end

data/lib/adminterface/extensions/views/components/dropdown_menu.rb

@@ -47,7 +47,10 @@ ActiveAdmin::Views::DropdownMenu.class_eval do
     button_options[:class] = "#{button_options[:class]} dropdown-toggle".squish
     options[:class] = "#{options[:class]} dropdown".squish
 
-    @button = build_button(name, button_options.merge("data-bs-toggle": "dropdown"))
+    @button = build_button(
+      name,
+      button_options.merge("data-bs-toggle": "dropdown", role: "button", "aria-expanded": "false")
+    )
     @menu = build_menu(menu_options)
 
     super(options)

data/lib/adminterface/extensions/views/components/menu_item.rb

@@ -15,8 +15,13 @@ module Adminterface
             end
           end
 
-          def item_class(item)
-            "#{item.html_options[:class]} #{item.current?(assigns[:current_tab]) ? "active" : nil}".squish
+          def current_item_options(item)
+            return {} unless item.current?(assigns[:current_tab])
+
+            {
+              class: "#{item.html_options[:class]} active".squish,
+              "aria-current": "page"
+            }
           end
         end
       end
@@ -51,7 +56,7 @@ ActiveAdmin::Views::MenuItem.class_eval do
     end
 
     if url
-      item_options = item.html_options.merge(class: item_class(item)).delete_if { |_k, v| v.blank? }
+      item_options = item.html_options.merge(current_item_options(item)).delete_if { |_k, v| v.blank? }
       text_node link_to(menu_label, url, **item_options)
     else
       span menu_label, item.html_options.merge(class: "navbar-text")

data/lib/adminterface/extensions/views/components/tabs.rb

@@ -6,20 +6,16 @@ module Adminterface
           def build_menu_item(title, options, &_block)
             fragment = options.fetch(:id, fragmentize(title))
             html_options = options.fetch(:html_options, {})
-            li html_options.merge(class: "nav-item") do
-              if @http
-                params[:tab] ||= @default_tab || fragment
-                link_to title, url_for(tab: fragment, anchor: id, anchor_id: id), class: toggler_class(fragment)
-              else
-                link_to title, "##{fragment}", class: toggler_class(fragment), data: {"bs-toggle": "tab", "bs-target": "##{fragment}"}
-              end
+
+            li html_options.merge(class: "nav-item", role: "presentation") do
+              @http ? link_to_http(title, fragment) : link_to_js(title, fragment)
             end
           end
 
           def build_content_item(title, options, &block)
             fragment = options.fetch(:id, fragmentize(title))
-            options = options.reverse_merge(id: fragmentize(title))
-            div(options.merge(class: tab_pane_class(fragment)), &block)
+            options = options.reverse_merge(id: fragment, "aria-labelledby": "#{fragment}-tab")
+            div(options.merge(tab_pane_options(fragment)), &block)
           end
 
           def default_css_class
@@ -39,12 +35,41 @@ module Adminterface
 
           private
 
-          def toggler_class(fragment)
-            "nav-link #{current_tab?(fragment) ? "active" : nil}".squish
+          def link_to_js(title, fragment)
+            options = toggler_options(fragment).merge(data: {"bs-toggle": "tab", "bs-target": "##{fragment}"})
+            link_to(title, "##{fragment}", **options)
+          end
+
+          def link_to_http(title, fragment)
+            params[:tab] ||= @default_tab || fragment
+
+            link_to(title,
+              url_for(controller: resource_scope[:controller],
+                      action: resource_scope[:action], tab: fragment, anchor: id, anchor_id: id),
+              **toggler_options(fragment))
+          end
+
+          def resource_scope
+            session.fetch(:resource_scope, {}).with_indifferent_access
+          end
+
+          def toggler_options(fragment)
+            defaults = {id: "#{fragment}-tab", "aria-controls": fragment}
+            options =
+              if current_tab?(fragment)
+                {class: "nav-link active", "aria-selected": "true"}
+              else
+                {class: "nav-link", "aria-selected": "false"}
+              end
+
+            defaults.merge(options)
           end
 
-          def tab_pane_class(fragment)
-            "tab-pane #{current_tab?(fragment) ? "active" : nil}".squish
+          def tab_pane_options(fragment)
+            {
+              class: "tab-pane #{current_tab?(fragment) ? "active" : nil}".squish,
+              role: "tabpanel"
+            }
           end
 
           def current_tab?(fragment)

data/lib/adminterface/extensions/views/header.rb

@@ -26,7 +26,8 @@ module Adminterface
         end
 
         def navbar_toggler
-          button(class: "navbar-toggler", 'data-bs-target': "##{ID}", 'data-bs-toggle': "collapse") do
+          button(class: "navbar-toggler", 'data-bs-target': "##{ID}",
+                 'data-bs-toggle': "collapse", "aria-expanded": "false") do
             span class: "navbar-toggler-icon"
           end
         end

data/lib/adminterface/extensions/views/pages/base.rb

@@ -5,6 +5,8 @@ module Adminterface
         module Base
           def build(*args)
             super
+            set_attribute :dir,
+              render_or_call_method_or_proc_on(self, active_admin_config.lang_dir(self))
             build_breakpoint_helpers
             build_meta_tags_for_js
           end
@@ -102,7 +104,8 @@ module Adminterface
             div class: "flashes" do
               flash_messages.each do |type, messages|
                 [*messages].each do |message|
-                  div class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]} #{flash_dismissible_class}".squish do
+                  div class: "flash flash_#{type} alert #{flash_css_classes[type.to_sym]} #{flash_dismissible_class}".squish,
+                      role: "alert" do
                     text_node(message)
                     button(class: "btn-close", "data-bs-dismiss": "alert", "aria-label": "Close") if flash_dismissible?
                   end

data/lib/adminterface/initializers/configurations.rb

@@ -25,7 +25,7 @@ module Adminterface
 
             meta_tags = {
               version: Adminterface::VERSION,
-              viewport: "width=device-width, height=device-height, initial-scale=1.0, user-scalable=no"
+              viewport: "width=device-width, height=device-height, initial-scale=1.0"
             }
 
             config.meta_tags_for_logged_out_pages = meta_tags

data/lib/adminterface/version.rb

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

data/lib/adminterface.rb

@@ -7,7 +7,6 @@ module Adminterface
   autoload :VERSION, "adminterface/version"
   autoload :Configs, "adminterface/configs"
   autoload :Data, "adminterface/data"
-  autoload :License, "adminterface/license"
   autoload :Callable, "adminterface/callable"
 
   # Load Initializers
@@ -20,36 +19,6 @@ module Adminterface
     autoload :ViewHelpers, "adminterface/initializers/view_helpers"
     autoload :Views, "adminterface/initializers/views"
   end
-
-  module Licensing
-    autoload :Notice, "adminterface/licensing/notice"
-    autoload :Commercial, "adminterface/licensing/commercial"
-    autoload :Personal, "adminterface/licensing/personal"
-  end
-
-  module Encryption
-    autoload :Encryptor, "adminterface/encryption/encryptor"
-  end
-
-  # License key
-  mattr_accessor :license_key
-  @@license_key = nil
-
-  def self.setup
-    yield self
-  end
-
-  def self.rails6_and_up?
-    Rails::VERSION::MAJOR >= 6
-  end
-
-  def self.cache_store
-    if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
-      ActiveSupport::Cache::MemoryStore.new
-    else
-      Rails.cache
-    end
-  end
 end
 
 require "adminterface/engine"

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.3.0
 platform: ruby
 authors:
 - I-Lung Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-11-26 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: []
@@ -143,6 +144,7 @@ files:
 - app/assets/stylesheets/adminterface/vendors/_all.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/_all.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/_variables.scss
+- app/assets/stylesheets/adminterface/vendors/bootstrap/components/_breadcrumb.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/components/_buttons.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/components/_dropdowns.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/components/_navs.scss
@@ -150,8 +152,8 @@ files:
 - app/assets/stylesheets/adminterface/vendors/bootstrap/content/_tables.scss
 - app/assets/stylesheets/adminterface/vendors/bootstrap/content/_typography.scss
 - app/assets/stylesheets/adminterface/vendors/flatpickr/_all.scss
+- app/assets/stylesheets/adminterface/vendors/flatpickr/_main.scss
 - app/assets/stylesheets/adminterface/vendors/flatpickr/_variables.scss
-- app/assets/stylesheets/adminterface/vendors/flatpickr/main.scss
 - app/assets/stylesheets/adminterface/vendors/tom_select/_all.scss
 - app/assets/stylesheets/adminterface/vendors/tom_select/_main.scss
 - app/assets/stylesheets/adminterface/vendors/trix/_actiontext.scss
@@ -174,8 +176,15 @@ 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__/header_toggler.html
+- app/javascript/adminterface/lib/__tests__/header_toggler.spec.js
+- app/javascript/adminterface/lib/__tests__/per_page.spec.js
 - app/javascript/adminterface/lib/__tests__/utils.spec.js
 - app/javascript/adminterface/lib/batch_actions.js
 - app/javascript/adminterface/lib/checkbox_toggler.js
@@ -234,7 +243,6 @@ files:
 - lib/adminterface/data/base.rb
 - lib/adminterface/data/countries.rb
 - lib/adminterface/data/time_zones.rb
-- lib/adminterface/encryption/encryptor.rb
 - lib/adminterface/engine.rb
 - lib/adminterface/extensions/base_controller.rb
 - lib/adminterface/extensions/batch_actions/resource_extension.rb
@@ -329,12 +337,6 @@ files:
 - lib/adminterface/initializers/resource.rb
 - lib/adminterface/initializers/view_helpers.rb
 - lib/adminterface/initializers/views.rb
-- lib/adminterface/license.rb
-- lib/adminterface/licensing/base.rb
-- lib/adminterface/licensing/commercial.rb
-- lib/adminterface/licensing/notice.rb
-- lib/adminterface/licensing/personal.rb
-- lib/adminterface/public.pem
 - lib/adminterface/version.rb
 - lib/generators/adminterface/comments/comments_generator.rb
 - lib/generators/adminterface/comments/templates/README
@@ -353,7 +355,7 @@ files:
 - lib/tasks/adminterface_tasks.rake
 homepage: https://adminterface.io
 licenses:
-- See LICENSE in LICENSE.md
+- MIT
 metadata:
   homepage_uri: https://adminterface.io
   source_code_uri: https://github.com/cmdbrew/adminterface
@@ -374,8 +376,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 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: []

data/lib/adminterface/encryption/encryptor.rb

@@ -1,26 +0,0 @@
-module Adminterface
-  module Encryption
-    class Encryptor
-      extend Callable
-      attr_reader :message
-
-      def initialize(message)
-        @message = message
-      end
-
-      def call
-        Base64.encode64(public_key.public_encrypt(message))
-      end
-
-      private
-
-      def public_key_file
-        @public_key_file ||= File.read(Engine.root.join("lib/adminterface/public.pem"))
-      end
-
-      def public_key
-        @public_key ||= OpenSSL::PKey::RSA.new(public_key_file)
-      end
-    end
-  end
-end

data/lib/adminterface/license.rb

@@ -1,18 +0,0 @@
-module Adminterface
-  class License
-    class_attribute :license, default: {}
-
-    class << self
-      def verify!
-        return if Rails.env.test?
-
-        self.license =
-          if ::Adminterface.license_key.present?
-            ::Adminterface::Licensing::Commercial
-          else
-            ::Adminterface::Licensing::Personal
-          end.call
-      end
-    end
-  end
-end