katalyst-html-attributes 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebf02bb3d00b36a7de997289b233babcc769526e94fdb2c4794dfa87a72304b5
-  data.tar.gz: e873c07f7f2afe9723883fa8742274a22b6c1b634335dc5ed43a3c0ff78c7060
+  metadata.gz: 22dc61eb82f19345cd8a5b4e2929cb74b41578fe37950629f37219cd85e958ab
+  data.tar.gz: 72168e12c5d010ec54233e5fb89933c77ebef08fc121c6a559feb0e2462f4cad
 SHA512:
-  metadata.gz: 4f1bc239f47e06a941336e78047ce0b915ad533bf40f54775619f5e3c7797471adc829f8f14e75e8ff6d23962d8491a480b64e40fbac1f602806e763b87030e0
-  data.tar.gz: 583b0588f9b353b17a0b54537d1d31c1f68f08a8e18df8496fd111253ce263e3cdd0a670fd36a5b23430b24f9a040c4a31132104631adf8ad611db23f0e6ac67
+  metadata.gz: e1db494a3f7b7d503455df70b2dfb3ee593c2954e4b04d2fea91dfd919ebdb8582239b1b0366c4891e64719b44b0a68777083fa3ea4e0899bb8a9b725c91d62e
+  data.tar.gz: 781b25b38f0d78c0ddb7e517663feba486ca6ad3e15eab41eefaef3f252cdf370344309376ddefa9c12cb52bd659dc53950ab89c88c90353c014bd7693e20f85

data/README.md

@@ -30,3 +30,49 @@ class MyViewComponent < ViewComponent::Base
   end
 end
 ```
+
+You can also define your own named attributes:
+
+```ruby
+class MyViewComponent < ViewComponent::Base
+  include Katalyst::HtmlAttributes
+  
+  define_html_attributes :link_attributes, :button_attributes
+  
+  def initialize(link:, button:, **html_attributes)
+    super(**html_attributes)
+    
+    update_link_attributes(**link) if link
+    update_button_attributes(**button) if button
+  end
+  
+  def call
+    tag.div(**html_attributes) do
+      tag.a(**link_attributes) do
+        "Link"
+      end +
+      tag.button(**button_attributes) do
+        "Button"
+      end       
+    end
+  end
+
+  def default_html_attributes
+    {
+      class: "my-class"
+    }
+  end
+
+  def default_link_attributes
+    {
+      class: "my-link"
+    }
+  end
+
+  def default_button_attributes
+    {
+      class: "my-button"
+    }
+  end
+end
+```

data/lib/katalyst/html_attributes.rb

@@ -1,24 +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
 
-    class_methods do
-      using HasHtmlAttributes
+    autoload :HasHtmlAttributes
+
+    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|
+          html_attributes_set(ivar, options)
         end
 
-        define_method("#{name}=") do |options|
-          instance_variable_set("@#{name}", options.slice(:id, :aria, :class, :data).merge(options.fetch(:html, {})))
+        define_method(:"update_#{name}") do |**options, &block|
+          html_attributes_update(ivar, options, &block)
         end
       end
     end
@@ -32,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.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: HTML Attributes utilities for use with ViewComponents