class_variants 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcbc4e2fd078ac3b22bd391226eec4fc4429bcee10237613f1736bfcff08b6f
-  data.tar.gz: 4101b943cfd16a259d52e978c3081788451fcd1336ae44644b027aeebb1a4f34
+  metadata.gz: b8ecbdedc158b731b446bf166b1dcc6d99b4569cc90f484e95ff6c5466cc3db9
+  data.tar.gz: 80de309d4e820f9a3b5667f8c8b4958172906971e923beb3fd169a915cb20811
 SHA512:
-  metadata.gz: 3dd5e798a846188944d4fe74342414ccfa180ba6fa319a0e1f2b0ab775f4c32c4d0a5c1129a42c52dce44765cd981db20b5a222b6605989ade32e39a7693fb5f
-  data.tar.gz: e3eb94faf2f8ad63b6d96fe322b274c77e8a4b2e9fcc2123e267d2b6580398fd06122b73841dbd1a1aea9709667b1afec8ab8c3bce3eecfb4db7e6d409907a76
+  metadata.gz: 3fda53be42ac74e51fb85209a24d3bbfed78101052c4bcf016f307f5c0e852adfaf1062102f5e7a80d5563c101c1e418b836eb274557fee1655679084dafe9b8
+  data.tar.gz: c20bcba0b71ea4b7c151e2e9a07ca6eac7508f4d938cf8c4b0923baea4dd934651582f4ba7a9eaf0fdacaa606ad71db1faff4ac31705237ca7b5fe5bd31bf26d

data/lib/class_variants/action_view/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClassVariants
   module ActionView
     module Helpers

data/lib/class_variants/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClassVariants
   class Configuration
     def process_classes_with(&block)

data/lib/class_variants/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClassVariants
   module Helper
     module ClassMethods
@@ -9,9 +11,12 @@ module ClassVariants
     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|
+
+      def base.inherited(subclass)
+        super if defined?(super)
+
         subclass.singleton_class.instance_variable_set(
-          :@_class_variants_instance, base.singleton_class.instance_variable_get(:@_class_variants_instance).dup
+          :@_class_variants_instance, singleton_class.instance_variable_get(:@_class_variants_instance).dup
         )
       end
     end

data/lib/class_variants/instance.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module ClassVariants
   class Instance
     def initialize(...)
       @bases = []
       @variants = []
       @defaults = {}
+      @slots = nil
 
       merge(...)
     end
@@ -17,7 +20,7 @@ module ClassVariants
     end
 
     def merge(**options, &block)
-      raise ArgumentError, "Use of hash config and code block is not supported" if !options.empty? && block_given?
+      raise ArgumentError, "Use of hash config and code block is not supported" if !options.empty? && block
 
       (base = options.fetch(:base, nil)) && @bases << {class: base, slot: :default}
       @variants += [
@@ -26,7 +29,7 @@ module ClassVariants
       ].inject(:+)
       @defaults.merge!(options.fetch(:defaults, {}))
 
-      instance_eval(&block) if block_given?
+      instance_eval(&block) if block
 
       self
     end
@@ -46,9 +49,15 @@ module ClassVariants
       @variants.each do |candidate|
         next unless candidate[:slot] == slot
 
-        if (candidate.keys - [:class, :slot]).all? { |key| criteria[key] == candidate[key] }
-          result << candidate[:class]
+        match = false
+
+        candidate.each_key do |key|
+          next if key == :class || key == :slot
+          match = criteria[key] == candidate[key]
+          break unless match
         end
+
+        result << candidate[:class] if match
       end
 
       # add the passed in classes to the result
@@ -64,9 +73,9 @@ module ClassVariants
     private
 
     def base(klass = nil, &block)
-      raise ArgumentError, "Use of positional argument and code block is not supported" if klass && block_given?
+      raise ArgumentError, "Use of positional argument and code block is not supported" if klass && block
 
-      if block_given?
+      if block
         with_slots(&block).each do |slot|
           @bases << slot
         end
@@ -76,9 +85,9 @@ module ClassVariants
     end
 
     def variant(**options, &block)
-      raise ArgumentError, "Use of class option and code block is not supported" if options.key?(:class) && block_given?
+      raise ArgumentError, "Use of class option and code block is not supported" if options.key?(:class) && block
 
-      if block_given?
+      if block
         with_slots(&block).each do |slot|
           @variants << options.merge(slot)
         end
@@ -98,9 +107,10 @@ module ClassVariants
     end
 
     def with_slots
-      @slots = []
+      new_slots = []
+      @slots = new_slots
       yield
-      @slots
+      new_slots
     end
 
     def expand_variants(variants)

data/lib/class_variants/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/railtie"
 
 module ClassVariants

data/lib/class_variants/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClassVariants
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1"
 end

data/lib/class_variants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "class_variants/version"
 require "class_variants/action_view/helpers"
 require "class_variants/configuration"

data/lib/generators/class_variants/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClassVariants
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/readme.md

@@ -2,6 +2,8 @@
 
 We ❤️ Tailwind CSS but sometimes it's difficult to manage the state of some elements using conditionals. `class_variants` is a tiny helper that should enable you to create, configure, and apply different variants of elements as classes.
 
+![](./logo.png)
+
 Inspired by [variant-classnames](https://github.com/mattvalleycodes/variant-classnames) ✌️
 
 ## Quicklinks
@@ -98,7 +100,7 @@ button_classes = ClassVariants.build(
 )
 
 button_classes.render(color: :red) # => "inline-flex items-center rounded bg-red-600"
-button_classes.render(color: :red, border: true) # => "inline-flex items-center rounded bg-red-600 border border-red-600"
+button_classes.render(color: :red, border: true) # => "inline-flex items-center rounded bg-red-600 border border-red-800"
 ```
 
 ## Override classes with `render`
@@ -362,8 +364,9 @@ Install the gem using `bundle add tailwind_merge` and use this configuration to
 
 ```ruby
 ClassVariants.configure do |config|
+  merger = TailwindMerge::Merger.new
   config.process_classes_with do |classes|
-    TailwindMerge::Merger.new.merge(classes)
+    merger.merge(classes)
   end
 end
 ```
@@ -371,7 +374,8 @@ end
 ## 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
+- [`avo`](https://github.com/avo-hq/avo) - Build internal tools, admin panels, and dashboards with Ruby on Rails
+- [`marksmith`](https://github.com/avo-hq/marksmith) - GitHub-style markdown editor for Ruby and 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
 
@@ -379,7 +383,11 @@ end
 
 If you enjoyed this gem try out [Avo](https://github.com/avo-hq/avo). It helps developers build Internal Tools, Admin Panels, CMSes, CRMs, and any other type of Business Apps 10x faster on top of Ruby on Rails.
 
-[![](./logo-on-white.png)](https://github.com/avo-hq/avo)
+[![](./avo-logo.png)](https://github.com/avo-hq/avo)
+
+## Articles
+
+[TIL: How to use `class_variants` with Phlex](https://henrikbjorn.medium.com/til-how-to-use-class-variants-with-phlex-8042bd4407f1)
 
 ## Contributing
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: class_variants
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adrian Marin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Easily configure styles and apply them as classes.
 email: adrian@adrianthedev.com
@@ -36,7 +35,6 @@ metadata:
   source_code_uri: https://github.com/avo-hq/class_variants
   bug_tracker_uri: https://github.com/avo-hq/class_variants/issues
   changelog_uri: https://github.com/avo-hq/class_variants/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -51,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easily configure styles and apply them as classes.
 test_files: []