active_element 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1aee3153ca04daa45cd99c868afb986df934e6a84e1be8675fcb01d9ed5097
-  data.tar.gz: 060f791791440d2d0d880384bd2bfd2c6d6724041bd2451035521f8f8ddd954a
+  metadata.gz: 400b6c6c72f4bf41706eb1266704d9c7ae5a9807969ceb069dce935387db8012
+  data.tar.gz: 716241936a61a2bab52158b538d50ea48880af24f38b0d292f2a2c581a180361
 SHA512:
-  metadata.gz: c9b7a77759b27826038b895f9acc941620d4477192c22c0a13dc33ba03b64c61e292ff94520fc3ff7c2dc0abeb409483aa1f86aa3268e4e271fb3810d558e9e4
-  data.tar.gz: 652d599381d599a7186c654c49c87d3d7eca73c6373241b3900bd7c9c61718efa715ea83f32dfff6b9951ee7a737f79629440bf9b16c1858cedf235e94eed52e
+  metadata.gz: 1cc434c86434948327d8b1c768883a8a806a3440ddc866087627abcd576a777bdc0bab24cd91330336819bf8e12937c144da29d479b8dc1419bb28e6f7ee3dcc
+  data.tar.gz: 0fc355d84b115702c99a162b2f2df2d8728948b192fe643a99db6bbd0abb58d085ede47af66f087f714bdd24731d8a82637b9bb6998e12be2d7c14a643703d4a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_element (0.0.15)
+    active_element (0.0.16)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 0.1.2)
@@ -150,14 +150,14 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.2)
     minitest (5.18.1)
-    net-imap (0.4.8)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
     nokogiri (1.15.2)

data/app/assets/config/active_element/manifest.js

@@ -1,2 +1,2 @@
-//= link active_element/application.js
-//= link active_element/application.css
+//= link active_element/active_element.js
+//= link active_element/active_element.css

data/app/assets/javascripts/active_element/{application.js → active_element.js}

@@ -1,4 +1,3 @@
-//= require rails-ujs
 //= require bootstrap
 //= require active_element/setup
 //= require active_element/theme

data/app/assets/javascripts/active_element/confirm.js

@@ -1,7 +1,7 @@
 (() => {
   const cloneElement = (id) => ActiveElement.cloneElement('form', id);
 
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     const confirmLinks = document.querySelectorAll('[data-confirm-action="true"]');
 
     confirmLinks.forEach((element) => {

data/app/assets/javascripts/active_element/form.js

@@ -39,7 +39,7 @@
     });
   };
 
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     initModalButtons();
     initClearFormButtons();
   });

data/app/assets/javascripts/active_element/json_field.js

@@ -602,7 +602,7 @@ ActiveElement.JsonField = (() => {
 })();
 
 (() => {
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     document.querySelectorAll('.json-field').forEach((element) => {
       ActiveElement.JsonField(element);
     });

data/app/assets/javascripts/active_element/pagination.js

@@ -1,5 +1,5 @@
 (() => {
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     const paginationSelect = document.querySelector('#collection-table-page-size-selector');
 
     if (paginationSelect) {

data/app/assets/javascripts/active_element/popover.js

@@ -1,5 +1,5 @@
 (() => {
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
     const popoverList = popoverTriggerList.map(function (element) {
       return new bootstrap.Popover(element)

data/app/assets/javascripts/active_element/secret.js

@@ -1,7 +1,7 @@
 (() => {
   const cloneElement = (id) => ActiveElement.cloneElement('secret', id);
 
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     document.querySelectorAll('span[data-field-type="secret"]').forEach((element) => {
       const secret = element.dataset.secret;
       const showButton = cloneElement('show-button');

data/app/assets/javascripts/active_element/setup.js

@@ -33,6 +33,7 @@
 
   const ActiveElement = {
     debug: false,
+    reloadEvent: window.ActiveElement.turbo ? 'turbo:load' : 'DOMContentLoaded',
     log: {
       debug: (message) => { ActiveElement.debug && console.log(`[ActiveElement:debug]`, message); },
       info: (message) => { console.log(`[ActiveElement:info] ${message}`); },
@@ -47,7 +48,7 @@
     controller_path: document.querySelector('meta[name="active_element_controller_path"]').content
   };
 
-  window.ActiveElement = ActiveElement;
+  window.ActiveElement = { ...(window.ActiveElement || {}), ...ActiveElement };
 })();
 
 ActiveElement.log.info('Initialized');

data/app/assets/javascripts/active_element/text_search_field.js

@@ -58,7 +58,7 @@
     }
   };
 
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     document.querySelectorAll('[data-field-type="text-search"]').forEach((element) => {
       const id = element.id;
       const hiddenId = `${id}-hidden-value`;

data/app/assets/javascripts/active_element/theme.js

@@ -1,7 +1,7 @@
 (() => {
   const cloneElement = (id) => ActiveElement.cloneElement('theme', id);
 
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     const themeSelect = document.querySelector('#theme-select');
 
     const setTheme = (theme) => {

data/app/assets/javascripts/active_element/timezones.js

@@ -1,5 +1,5 @@
 (() => {
-  window.addEventListener('DOMContentLoaded', () => {
+  window.addEventListener(ActiveElement.reloadEvent, () => {
     const timezoneOffset = new Date().getTimezoneOffset();
     document.cookie = `timezone_offset=${timezoneOffset};`;
   });

data/app/views/layouts/active_element.html.erb

@@ -1,9 +1,24 @@
 <html>
   <head>
+    <script>
+      window.ActiveElement = window.ActiveElement || {};
+    </script>
+
     <%= render_active_element_hook 'active_element/before_head' %>
     <%= render_active_element_hook 'active_element/favicon' %>
     <%= render_active_element_hook 'active_element/title' %>
 
+    <% if respond_to?(:javascript_importmap_tags) %>
+      <%= javascript_importmap_tags %>
+      <script>
+        window.ActiveElement.turbo = true;
+      </script>
+    <% else %>
+      <script>
+        window.ActiveElement.turbo = false;
+      </script>
+    <% end %>
+
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" integrity="sha512-iecdLmaskl7CVkqkXNQ/ZH/XLlvWZOJyj7Yy7tcenmpD1ypASozpmT/E0iPtmFIB46ZmdtAc9eNBvH0H/ZpiBw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <link rel="stylesheet"
           href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.7.0/styles/default.min.css">
@@ -48,16 +63,16 @@
       window.ActiveElement = window.ActiveElement || {};
     </script>
 
-    <%= stylesheet_link_tag 'active_element/application', 'data-turbolinks-track': 'reload' %>
+    <%= csrf_meta_tag %>
+    <meta name="active_element_controller_path" content="<%= controller_path %>">
+
+    <%= stylesheet_link_tag 'active_element/active_element' %>
+    <%= javascript_include_tag 'active_element/active_element' %>
 
     <% if Rails.application.assets&.find_asset('application.css').present? %>
-      <%= stylesheet_link_tag 'application', 'data-turbolinks-track': 'reload' %>
+      <%= stylesheet_link_tag 'application' %>
     <% end %>
 
-    <%= csrf_meta_tag %>
-
-    <meta name="active_element_controller_path" content="<%= controller_path %>">
-
     <%= render_active_element_hook 'active_element/after_head' %>
   </head>
 
@@ -97,9 +112,10 @@
 
     <%= render_active_element_hook 'active_element/after_content' %>
 
-    <%= javascript_include_tag 'active_element/application', 'data-turbolinks-track': 'reload' %>
-    <% if Rails.application.assets&.find_asset('application.js').present? %>
-      <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <% if !respond_to?(:javascript_importmap_tags) && Rails.application.assets&.find_asset('application.js').present? %>
+      <%= javascript_include_tag 'active_element/active_element', 'data-turbo-track': 'reload', 'data-turbolinks-track': 'reload' %>
+      <%= javascript_include_tag 'application', 'data-turbo-track': 'reload', 'data-turbolinks-track': 'reload' %>
     <% end %>
+
   </body>
 </html>

data/lib/active_element/components/util/association_mapping.rb

@@ -144,8 +144,6 @@ module ActiveElement
           end
 
           nil
-        rescue
-          byebug
         end
 
         def link_to(value)

data/lib/active_element/components/util/record_path.rb

@@ -90,6 +90,7 @@ module ActiveElement
         end
 
         def default_record_path
+          return record.controller_name.constantize.controller_path.underscore.singularize.tr('/', '_') + '_path' if record.try(:controller_name).present?
           "#{record_path_prefix}#{namespace_prefix}#{record_name}_path"
         end
 

data/lib/active_element/controller_interface.rb

@@ -52,6 +52,10 @@ module ActiveElement
       state.deletable = true
     end
 
+    def model=(model)
+      state.model = model.constantize
+    end
+
     def application_name
       RailsComponent.new(::Rails).application_name
     end

data/lib/active_element/controller_state.rb

@@ -8,7 +8,7 @@ module ActiveElement
     attr_reader :permissions, :listable_fields, :viewable_fields, :editable_fields, :searchable_fields,
                 :field_options
     attr_accessor :sign_in_path, :sign_in, :sign_in_method, :sign_out_path, :sign_out_method,
-                  :deletable, :authorizor, :authenticator, :list_order, :search_required
+                  :deletable, :authorizor, :authenticator, :list_order, :search_required, :model
 
     def initialize(controller:)
       @controller = controller
@@ -21,6 +21,7 @@ module ActiveElement
       @editable_fields = []
       @searchable_fields = []
       @field_options = {}
+      @model = nil
     end
 
     def deletable?

data/lib/active_element/default_controller/controller.rb

@@ -116,7 +116,7 @@ module ActiveElement
       end
 
       def model
-        controller.controller_name.classify.constantize
+        state.model || controller.controller_name.classify.constantize
       end
 
       def record

data/lib/active_element/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveElement
-  VERSION = '0.0.15'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_element
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -113,7 +113,7 @@ files:
 - Rakefile
 - active_element.gemspec
 - app/assets/config/active_element/manifest.js
-- app/assets/javascripts/active_element/application.js
+- app/assets/javascripts/active_element/active_element.js
 - app/assets/javascripts/active_element/confirm.js
 - app/assets/javascripts/active_element/form.js
 - app/assets/javascripts/active_element/highlight.js
@@ -128,7 +128,7 @@ files:
 - app/assets/javascripts/active_element/toast.js
 - app/assets/stylesheets/active_element/_dark.scss
 - app/assets/stylesheets/active_element/_variables.scss
-- app/assets/stylesheets/active_element/application.scss
+- app/assets/stylesheets/active_element/active_element.scss
 - app/controllers/active_element/application_controller.rb
 - app/controllers/concerns/active_element/default_controller_actions.rb
 - app/views/active_element/_title.html.erb