katalyst-html-attributes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c544198e07c9d144a3e9aceeb25e313c50363556996eb18676da0c833702e06d
-  data.tar.gz: 78b155006b143e651facf97731065ef402151d20a00d1763f5f1228bfe03f5f8
+  metadata.gz: 22dc61eb82f19345cd8a5b4e2929cb74b41578fe37950629f37219cd85e958ab
+  data.tar.gz: 72168e12c5d010ec54233e5fb89933c77ebef08fc121c6a559feb0e2462f4cad
 SHA512:
-  metadata.gz: 2dfd3e3ddfb9b4dddbc2cad16dac27132b63fc9e824acfd49db14f8c1f2a5aea02d3f989626f3d2debb75100eb4a88372d45b0f0fe222b7a537d7e8341e04b88
-  data.tar.gz: e8c1041fbc322d54dae3b89643496d61a229394393dbec9b4cb40c5eedba9e532a529a5c72a1092061558cd5cc72ac16be74d6dc4033c9774cf9a5a76b968fcf
+  metadata.gz: e1db494a3f7b7d503455df70b2dfb3ee593c2954e4b04d2fea91dfd919ebdb8582239b1b0366c4891e64719b44b0a68777083fa3ea4e0899bb8a9b725c91d62e
+  data.tar.gz: 781b25b38f0d78c0ddb7e517663feba486ca6ad3e15eab41eefaef3f252cdf370344309376ddefa9c12cb52bd659dc53950ab89c88c90353c014bd7693e20f85

data/lib/katalyst/html_attributes.rb

@@ -1,35 +1,34 @@
 # frozen_string_literal: true
 
-require_relative "html_attributes/has_html_attributes"
+require "active_support"
+require "active_support/rails"
 
 module Katalyst
   module HtmlAttributes
+    extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
 
-    using HasHtmlAttributes
+    autoload :HasHtmlAttributes
 
-    def self.options_to_html_attributes(options)
-      options.slice(:id, :aria, :class, :data).merge_html(options.fetch(:html, {}))
-    end
+    using HasHtmlAttributes
 
     class_methods do
       def define_html_attribute_methods(name, default: {})
-        define_method(:"default_#{name}") { default }
-        private(:"default_#{name}")
+        ivar = :"@#{name}"
+        default_method = :"default_#{name}"
+        define_method(default_method) { default.deep_dup }
+        private(default_method)
 
         define_method(name) do
-          send(:"default_#{name}").merge_html(instance_variable_get(:"@#{name}") || {})
+          html_attributes_get(ivar, default_method)
         end
 
         define_method(:"#{name}=") do |options|
-          instance_variable_set(:"@#{name}", HtmlAttributes.options_to_html_attributes(options))
+          html_attributes_set(ivar, options)
         end
 
         define_method(:"update_#{name}") do |**options, &block|
-          attributes = instance_variable_get(:"@#{name}") || {}
-          attributes = attributes.merge_html(HtmlAttributes.options_to_html_attributes(options))
-          attributes = yield(attributes) if block
-          instance_variable_set(:"@#{name}", attributes)
+          html_attributes_update(ivar, options, &block)
         end
       end
     end
@@ -43,5 +42,31 @@ module Katalyst
 
       self.html_attributes = options
     end
+
+    def options_to_html_attributes(options)
+      options.slice(:id, :aria, :class, :data).merge_html(options.fetch(:html, {}))
+    end
+    module_function(:options_to_html_attributes)
+
+    private
+
+    def html_attributes_get(ivar, default)
+      if instance_variable_defined?(ivar)
+        send(default).merge_html(instance_variable_get(ivar))
+      else
+        send(default)
+      end
+    end
+
+    def html_attributes_set(ivar, options)
+      instance_variable_set(ivar, options_to_html_attributes(options))
+    end
+
+    def html_attributes_update(ivar, options, &block)
+      attributes = instance_variable_get(ivar) || {}
+      attributes = attributes.merge_html(options_to_html_attributes(options))
+      attributes = yield(attributes) if block
+      instance_variable_set(ivar, attributes)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-html-attributes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - developers@katalyst.com.au
 executables: []
@@ -53,7 +53,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: HTML Attributes utilities for use with ViewComponents
 test_files: []