attrify 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15da6170447306522cb53c74db61937e5fc59d3e5a8619d40142c253be2ab7a
-  data.tar.gz: 70c850497d0d5ceec7a8e5693e806494477303bde85030bd3da862e98eead7c8
+  metadata.gz: 9ac6216b57e120efe2b749bf0d4365d5b179136311de1efda843334a0bde6492
+  data.tar.gz: 794a2357fa54ceadd98daa22066e5594f06afc4b750e4657eb13ae836712cd8b
 SHA512:
-  metadata.gz: 512a4466eae20886eff9b71a615c7a08f251a3691fad2af0f8ec46ddec6fe9c039bdba4d27c56c61da909e95e5c8dfb4ecbde22f559aca151ce3c0a0fbbcfc7a
-  data.tar.gz: 7f2726c8394496baa5e7e4e7f5a2b4a70d3ec81495e725e44291db36a77b439c6993626c08800a4697a4c5223dd522bed3027820053088050c9107b43d54aafd
+  metadata.gz: 68450882d13145bb7100673ee58142a17fdb905117da8223ae84001c43b5ae2d3043305bf394db031654b10d66342c5a2d7b0a11bf8ab4c635c6571a501320de
+  data.tar.gz: e64f4ecddcbb5761f8d24641c0c6d1e6bcc0cdba568860553112d6a8d5cb64184d71da4361ec8a9b65c9f3807982a06c19aae475e32e46e8417a2a60d522db4d

data/Gemfile.lock

@@ -1,122 +1,132 @@
 PATH
   remote: .
   specs:
-    attrify (0.4.0)
+    attrify (0.4.5)
       actionview (> 7.0)
       activesupport (> 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.1.4)
-      activesupport (= 7.1.4)
+    actionview (8.0.2)
+      activesupport (= 8.0.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.4)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
     base64 (0.2.0)
+    benchmark (0.4.0)
     benchmark-ips (2.14.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.1)
     drb (2.2.1)
-    erubi (1.13.0)
-    i18n (1.14.6)
+    erubi (1.13.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
-    loofah (2.22.0)
+    logger (1.7.0)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.25.1)
-    mutex_m (0.2.0)
-    nokogiri (1.15.6-x86_64-linux)
+    minitest (5.25.5)
+    nokogiri (1.18.6-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.7.3)
       ast (~> 2.4.1)
       racc
+    prism (1.4.0)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.12)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.7)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rspec-support (3.13.2)
+    rubocop (1.73.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.23.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.24.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    standard (1.37.0)
+    securerandom (0.4.1)
+    standard (1.47.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.64.0)
+      rubocop (~> 1.73.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.4)
+      standard-performance (~> 1.7)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.4.0)
+    standard-performance (1.7.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.21.0)
-    standard-rails (1.0.2)
+      rubocop-performance (~> 1.24.0)
+    standard-rails (1.2.0)
       lint_roller (~> 1.0)
-      rubocop-rails (~> 2.23.1)
+      rubocop-rails (~> 2.26.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -29,46 +29,46 @@ class BaseComponent
 
   # Optional: pass keyword arguments from the initializer directly to the attributes API
   def initialize(**args)
-    with_attributes(**args)
+    variant.set(**args)
   end
 end
 ```
 
-Define attributes for your class:
+Define variants for your class:
 ```ruby
 class Button < BaseComponent
-  attributes {
+  variants do
     base id: ->{ "button_#{SecureRandom.uuid}}"},
          class: %w[inline-flex items-center rounded], 
          data: { controller: "button_controller" }
     
-    variant(:color) {
+    variant(:color) do
       primary   class: { append: %w[bg-blue-500 text-white] }
       secondary class: { append: %w[bg-gray-500 text-white shadow-sm] }
       danger    class: { append: %w[bg-red-500 text-white] }
-    }
+    end
 
-    variant(:size) {
+    variant(:size) do
       xs class: { append: %w[text-xs h-7 px-3 py-1] }
       sm class: { append: %w[text-sm h-8 px-3.5 py-1.5] }
       md class: { append: %w[text-sm h-9 px-4 py-2] }
       lg class: { append: %w[text-base h-10 px-5 py-2.5] }
       xl class: { append: %w[text-lg h-11 px-6 py-3] }
-    }
+    end
 
     default color: :primary, size: :md
-  }
+  end
 end
 ```
 
 Add the attributes to your component's html
 ```erb
-  <button <%= attribs() %>> <%= content %> </button> 
+  <button <%= attributes %>> <%= content %> </button> 
 ```
 
 Try it out!
 ```ruby
-  # Use the default attributes
+  # Use the default variant
   Button.new() { "Click Me" }
 
   # Use a predefined color and size 
@@ -112,49 +112,36 @@ Slots allow you to define different attributes for different parts of a componen
 
 ```ruby
 class Card < BaseComponent
-  attributes {
-    base {
+  variants do
+    base do
       slot :card, id: ->{"card_#{id}"}, class: %w[rounded-md border]
       slot :header, class: %w[bg-gray-100 border-b]
       slot :body, class: %w[]
       slot :footer, class: %w[border-t]
-    }
+    end
 
-    variant(:color) {
-      primary {
+    variant(:color) do
+      primary do
         slot :header, class: { append: %w[bg-blue-500] }
         slot :footer, class: { append: %w[bg-blue-500] }
-      }
-      danger {
+      end
+      danger do
         slot :header, class: { append: %w[bg-red-500] }
         slot :footer, class: { append: %w[bg-red-500] }
-      }
-    }
-
-    # Wildcard applies to all slots
-    variant(:padding) {
-      default {
-        slot *, class: { append: %w[p-4] }
-      }
-      condensed {
-        slot *, class: { append: %w[px-4 py-2] }
-      }
-      spacious {
-        slot *, class: { append: %w[p-6] }
-      }
-    }
-
-    default padding: :default
-  }
+      end
+    end
+
+    default color: :primary
+  end
 end
 ```
 
 Use it in your html
 ```erb
-<div <%= attribs(slot: :card) %>>
-  <div <%= attribs(slot: :header) %>> Header </div>
-  <div <%= attribs(slot: :body) %>> Body </div>
-  <div <%= attribs(slot: :footer) %>> Footer </div>
+<div <%= attributes(slot: :card) %>>
+  <div <%= attributes(slot: :header) %>> Header </div>
+  <div <%= attributes(slot: :body) %>> Body </div>
+  <div <%= attributes(slot: :footer) %>> Footer </div>
 </div>
 ```
 
@@ -169,27 +156,27 @@ We can define variants of a child component inside a parent
 
 ```ruby
 class Alert < BaseComponent
-  attributes {
-    base {
+  variants do
+    base do
       slot :main, class: %w[rounded-md border]
       slot :button, size: :md 
-    }
-    variant(:color) {
-      primary {
+    end
+    variant(:color) do
+      primary do
         slot :main, class: { append: %w[bg-blue-100] }
         slot :button, color: :primary
-      }
-      danger {
+      end
+      danger do
         slot :main, class: { append: %w[bg-red-100] }
         slot :button, color: :danger, size: :lg, id: "alert_button_1"
-      }
-    }
-  }
+      end
+    end
+  end
 ```
 
 
 ```erb
-<div <%= attribs(slot: :main) %>>
+<div <%= attributes(slot: :main) %>>
   Hello World
   <%= render Button.new(**attribs(slot: :button)) %>
 </div>

data/lib/attrify/dsl/variant.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require_relative "nested_variant"
+require_relative "../helpers"
 
 module Attrify
   module DSL
     class Variant
+      include Helpers
+
       def initialize
         @variants = {}
       end
@@ -29,6 +32,10 @@ module Attrify
           super
         end
       end
+
+      def value(value, *args, &block)
+        method_missing(value, *args, &block) 
+      end
     end
   end
 end

data/lib/attrify/operation_set.rb

@@ -36,10 +36,9 @@ module Attrify
 
     def values_for(instance:, keys:)
       # if @has_procs
-
       @operations = run_procs_on(@operations, instance)
       @result = cache_result(@operations)[:value]
-      @result = @result.dig(*keys)
+      @result = @result.dig(*keys) || {}
       if @result.present?
         if @result.has_key?(:attributes)
           @result = @result[:attributes]

data/lib/attrify/parser.rb

@@ -46,9 +46,19 @@ module Attrify
           raise ArgumentError, "Defaults must be a hash, got #{defaults.class}"
         end
 
-        # Ensure that all keys and values are symbols
-        unless defaults.all? { |key, value| key.is_a?(Symbol) && value.is_a?(Symbol) }
-          raise ArgumentError, "Defaults must be a flat hash of symbols. Got: #{defaults.inspect}"
+        defaults.each_with_object({}) do |(key, value), hash|
+          # Ensure keys are symbols.
+          unless key.is_a?(Symbol)
+            raise ArgumentError, "All keys must be symbols. Got key #{key.inspect} (#{key.class})"
+          end
+
+          hash[key] = if value.is_a?(Symbol)
+            value
+          elsif value.respond_to?(:to_s)
+            value.to_s
+          else
+            raise ArgumentError, "Value #{value.inspect} cannot be used as an default value"
+          end
         end
 
         defaults

data/lib/attrify/variant_config.rb

@@ -0,0 +1,37 @@
+module Attrify
+  class VariantConfig < Hash
+    module MergeableAttributes
+      def <<(other)
+        merge!(other) do |key, old_val, new_val|
+          if old_val.is_a?(Hash) && new_val.is_a?(Hash)
+            old_val.merge(new_val)
+          else
+            new_val
+          end
+        end
+      end
+    end
+
+    include MergeableAttributes
+
+    def initialize(*args)
+      super
+      # missing keys auto-initialize as new AttributeSet instances.
+      self.default_proc = proc { |hash, key| hash[key] = self.class.new }
+    end
+
+    def []=(key, value)
+      # Convert plain hashes to AttributeSet instances.
+      if value.is_a?(Hash) && !value.is_a?(self.class)
+        value = self.class.new.merge(value)
+      end
+      super
+    end
+
+    def set(**args)
+      clear
+      merge!(args)
+      self
+    end
+  end
+end

data/lib/attrify/variant_registry.rb

@@ -42,12 +42,13 @@ module Attrify
     def fetch(**args)
       # Split args into variant and operations
       variant_keys = variants.keys
+
       variant_args = {}
       operation_args = {}
 
       args.each do |key, value|
         if variant_keys.include?(key)
-          variant_args[key] = Array(value).join("_").to_sym
+          variant_args[key] = value #Array(value).join("_").to_sym
         else
           operation_args[key] = value
         end

data/lib/attrify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Attrify
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/attrify.rb

@@ -2,8 +2,8 @@
 
 require_relative "attrify/version"
 require_relative "attrify/variant_registry"
+require_relative "attrify/variant_config"
 require_relative "attrify/parser"
-
 require_relative "attrify/dsl/engine"
 
 module Attrify
@@ -12,7 +12,7 @@ module Attrify
   end
 
   module ClassMethods
-    def attributes(&)
+    def variants(&)
       result = DSL::Engine.new.build(&)
       config = variant_registry
       config.base = result.base_attr
@@ -30,24 +30,19 @@ module Attrify
         end
     end
   end
+
   include Helpers
-  def attribs(slot: :main, **args)
-    @attr_options ||= {}
 
-    new_arguments = if slot == :main
-      args
-    else
-      {slot => args}
-    end
+  def attributes(slot: :main, **args)
+    new_arguments = (slot == :main) ? args : {slot => args}
 
-    merged_arguments = deep_merge_hashes(@attr_options, new_arguments)
+    merged_arguments = deep_merge_hashes(variant, new_arguments)
 
     variant = self.class.variant_registry&.fetch(**merged_arguments)
     variant.values_for(instance: self, keys: Array(slot))
   end
 
-  def with_attributes(**args)
-    @attr_options = args
-    self
+  def variant
+    @variant_config ||= VariantConfig.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attrify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Hector Medina Fetterman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-13 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,6 +65,7 @@ files:
 - lib/attrify/operation_set.rb
 - lib/attrify/parser.rb
 - lib/attrify/variant.rb
+- lib/attrify/variant_config.rb
 - lib/attrify/variant_registry.rb
 - lib/attrify/version.rb
 - sig/attribute_variants.rbs