class_variants 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8fd556b85ee91d2d2709e66af72e1d4017c5a20ba5884c49eed0c755f1a593
-  data.tar.gz: c6f77333c70953510eb23ab94846c2b2f9d1ae1a8b185c289ee3530060546651
+  metadata.gz: ffcbc4e2fd078ac3b22bd391226eec4fc4429bcee10237613f1736bfcff08b6f
+  data.tar.gz: 4101b943cfd16a259d52e978c3081788451fcd1336ae44644b027aeebb1a4f34
 SHA512:
-  metadata.gz: c9f77343da5f6e521cd8a895cef3683a5fc65823b8df3f1f84d03adf38099fb6f51cfc191e24111d35f7ac95ef697e6a61b6dc37a547c50b4732e0863e78631f
-  data.tar.gz: 5a0db3c1db7f88ccc689fbaadc514aa04d73ef405e1ae05755a55918d16d1f1179ff9c736b11402da99e57917c393fd830801f6d78b87c07964d9dc951ac3f98
+  metadata.gz: 3dd5e798a846188944d4fe74342414ccfa180ba6fa319a0e1f2b0ab775f4c32c4d0a5c1129a42c52dce44765cd981db20b5a222b6605989ade32e39a7693fb5f
+  data.tar.gz: e3eb94faf2f8ad63b6d96fe322b274c77e8a4b2e9fcc2123e267d2b6580398fd06122b73841dbd1a1aea9709667b1afec8ab8c3bce3eecfb4db7e6d409907a76

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Adrian Marin
+Copyright (c) 2025 Adrian Marin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/class_variants/action_view/helpers.rb

@@ -1,8 +1,8 @@
 module ClassVariants
   module ActionView
     module Helpers
-      def class_variants(classes, **args)
-        ClassVariants::Instance.new classes, **args
+      def class_variants(...)
+        ClassVariants::Instance.new(...)
       end
     end
   end

data/lib/class_variants/helper.rb

@@ -2,22 +2,22 @@ module ClassVariants
   module Helper
     module ClassMethods
       def class_variants(...)
-        @_class_variants_instance = ClassVariants.build(...)
-      end
-
-      def _class_variants_instance
-        @_class_variants_instance
+        singleton_class.instance_variable_get(:@_class_variants_instance).merge(...)
       end
     end
 
     def self.included(base)
       base.extend(ClassMethods)
+      base.singleton_class.instance_variable_set(:@_class_variants_instance, ClassVariants::Instance.new)
+      base.define_singleton_method(:inherited) do |subclass|
+        subclass.singleton_class.instance_variable_set(
+          :@_class_variants_instance, base.singleton_class.instance_variable_get(:@_class_variants_instance).dup
+        )
+      end
     end
 
     def class_variants(...)
-      raise "You must configure class_variants in class definition" unless self.class._class_variants_instance
-
-      self.class._class_variants_instance.render(...)
+      self.class.singleton_class.instance_variable_get(:@_class_variants_instance).render(...)
     end
   end
 end

data/lib/class_variants/instance.rb

@@ -1,20 +1,44 @@
 module ClassVariants
   class Instance
-    def initialize(**options, &block)
+    def initialize(...)
+      @bases = []
+      @variants = []
+      @defaults = {}
+
+      merge(...)
+    end
+
+    def dup
+      self.class.new.tap do |copy|
+        copy.instance_variable_set(:@bases, @bases.dup)
+        copy.instance_variable_set(:@variants, @variants.dup)
+        copy.instance_variable_set(:@defaults, @defaults.dup)
+      end
+    end
+
+    def merge(**options, &block)
       raise ArgumentError, "Use of hash config and code block is not supported" if !options.empty? && block_given?
 
-      @base = options.empty? ? {} : {default: options.fetch(:base, nil)}
-      @variants = expand_variants(options.fetch(:variants, {})) + expand_compound_variants(options.fetch(:compound_variants, []))
-      @defaults = options.fetch(:defaults, {})
+      (base = options.fetch(:base, nil)) && @bases << {class: base, slot: :default}
+      @variants += [
+        expand_variants(options.fetch(:variants, {})),
+        expand_compound_variants(options.fetch(:compound_variants, []))
+      ].inject(:+)
+      @defaults.merge!(options.fetch(:defaults, {}))
 
       instance_eval(&block) if block_given?
+
+      self
     end
 
     def render(slot = :default, **overrides)
       classes = overrides.delete(:class)
+      result = []
 
       # Start with our default classes
-      result = [@base[slot]]
+      @bases.each do |base|
+        result << base[:class] if base[:slot] == slot
+      end
 
       # Then merge the passed in overrides on top of the defaults
       criteria = @defaults.merge(overrides)
@@ -44,10 +68,10 @@ module ClassVariants
 
       if block_given?
         with_slots(&block).each do |slot|
-          @base[slot[:slot]] = slot[:class]
+          @bases << slot
         end
       else
-        @base[:default] = klass
+        @bases << {slot: :default, class: klass}
       end
     end
 

data/lib/class_variants/version.rb

@@ -1,3 +1,3 @@
 module ClassVariants
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/readme.md

@@ -8,7 +8,6 @@ Inspired by [variant-classnames](https://github.com/mattvalleycodes/variant-clas
 
 * [DRY up your tailwind CSS using this awesome gem](https://www.youtube.com/watch?v=cFcwNH6x77g)
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -34,9 +33,9 @@ $ gem install class_variants
 We create an object from the class or helper where we define the configuration using four arguments:
 
 1. The `base` keyword argument with default classes that should be applied to each variant.
-1. The `variants` keyword argument where we declare the variants with their option and classes.
-1. The `compound_variants` keyword argument where we declare the compound variants with their conditions and classes
-1. The `defaults` keyword argument (optional) where we declare the default value for each variant.
+2. The `variants` keyword argument where we declare the variants with their option and classes.
+3. The `compound_variants` keyword argument where we declare the compound variants with their conditions and classes
+4. The `defaults` keyword argument (optional) where we declare the default value for each variant.
 
 Below we'll implement the [button component](https://tailwindui.com/components/application-ui/elements/buttons) from Tailwind UI.
 
@@ -185,6 +184,14 @@ end
 </div>
 ```
 
+## Merge definitions
+
+```ruby
+alert_classes = ClassVariants.build(base: "bg-white")
+alert_classes.merge(base: "text-black")
+alert_classes.render # => "bg-white text-black"
+```
+
 ## Full API
 
 ```ruby
@@ -272,7 +279,7 @@ alert_classes.render(:body, class: "...")
 
 ```ruby
 # Somewhere in your helpers
-def button_classes(classes, **args)
+def button_classes
   class_variants(
     base: "inline-flex items-center rounded border border-transparent font-medium text-white hover:text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-2",
     variants: {
@@ -303,6 +310,10 @@ end
 <%= link_to :Avo, "https://avohq.io", class: button_classes.render(color: :red, size: :xl) %>
 ```
 
+### Output
+
+### ![](sample.jpg)
+
 ## Helper module
 
 If you're developing something more complex you might want to use composition more. You might want to use the helper module for that.
@@ -311,19 +322,43 @@ If you're developing something more complex you might want to use composition mo
 class MyClass
   include ClassVariants::Helper
 
-  class_variants {
-    base: {},
-    variants: {}
-  }
+  class_variants(
+    base: "bg-white",
+    variants: {
+      color: {
+        red: "text-red",
+        blue: "text-blue"
+      }
+    }
+  )
 end
 
-MyClass.new.class_variants(:container, color: :red, class: "shadow")
+MyClass.new.class_variants(color: :red, class: "shadow") # => "bg-white text-red shadow"
+```
+
+This helper supports class inheritance, so that the subclass receives a copy of the class_variants config that the parent class had at the time of inheritance. From that point on, the settings are kept separate for both. Successive calls to class_variants helper method, will cause the configuration to be merged.
+
+```ruby
+class A
+  include ClassVariants::Helper
+
+  class_variants(base: "bg-red")
+end
+
+class B < A
+  class_variants(base: "text-black")
+end
+
+A.class_variants(base: "text-white")
+
+A.new.class_variants # => "bg-red text-white"
+B.new.class_variants # => "bg-red text-black"
 ```
 
 ## `tailwind_merge`
 
 By default, the classes are merged using `concat`, but you can use the awesome [TailwindMerge](https://github.com/gjtorikian/tailwind_merge) gem.
-Install the gem using `bundle add tailwind_merge` and use this configuration to enable it.
+Install the gem using `bundle add tailwind_merge` and use this configuration to enable it. If you're using Rails, you can put this in an initializer.
 
 ```ruby
 ClassVariants.configure do |config|
@@ -333,16 +368,12 @@ ClassVariants.configure do |config|
 end
 ```
 
-### Output
-
-![](sample.jpg)
-
 ## Other packages
 
- - [`active_storage-blurhash`](https://github.com/avo-hq/active_storage-blurhash) - A plug-n-play [blurhash](https://blurha.sh/) integration for images stored in ActiveStorage
- - [`avo`](https://github.com/avo-hq/avo) - Build Content management systems with Ruby on Rails
- - [`prop_initializer`](https://github.com/avo-hq/prop_initializer) - A flexible tool for defining properties on Ruby classes.
- - [`stimulus-confetti`](https://github.com/avo-hq/stimulus-confetti) - The easiest way to add confetti to your StimulusJS app
+- [`active_storage-blurhash`](https://github.com/avo-hq/active_storage-blurhash) - A plug-n-play [blurhash](https://blurha.sh/) integration for images stored in ActiveStorage
+- [`avo`](https://github.com/avo-hq/avo) - Build Content management systems with Ruby on Rails
+- [`prop_initializer`](https://github.com/avo-hq/prop_initializer) - A flexible tool for defining properties on Ruby classes.
+- [`stimulus-confetti`](https://github.com/avo-hq/stimulus-confetti) - The easiest way to add confetti to your StimulusJS app
 
 ## Try Avo ⭐️
 
@@ -353,12 +384,13 @@ If you enjoyed this gem try out [Avo](https://github.com/avo-hq/avo). It helps d
 ## Contributing
 
 1. Fork it `git clone https://github.com/avo-hq/class_variants`
-1. Create your feature branch `git checkout -b my-new-feature`
-1. Commit your changes `git commit -am 'Add some feature'`
-1. Push to the branch `git push origin my-new-feature`
-1. Create new Pull Request
+2. Create your feature branch `git checkout -b my-new-feature`
+3. Commit your changes `git commit -am 'Add some feature'`
+4. Push to the branch `git push origin my-new-feature`
+5. Create new Pull Request
 
 ## License
+
 This package is available as open source under the terms of the MIT License.
 
 ## Cutting a release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class_variants
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Adrian Marin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies: []
 description: Easily configure styles and apply them as classes.
 email: adrian@adrianthedev.com