class_variants 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3460025f84ed33be2203bd2340bfa5769342778ff2d8b8656b28ff05dd858f
-  data.tar.gz: 05d3075c1c174ba4140f40a5755b4972160708ca9afc5866207a7d222802efc2
+  metadata.gz: 765533378fe25d4d376f7b79d3071f056438f7c94ddddcdd45043d54669c1859
+  data.tar.gz: d05e57bd9f860e806687b52ee20faeffb59b2774904ec6fb84f3403bdff7d692
 SHA512:
-  metadata.gz: 7719a590c8afc043a1e3538c4e0c91d38f0d968951f555ed782a0254a7b539573ba0ba4034d91f50507cfba331d37989f8dee3d47aa97fbab2f7508337b64c3d
-  data.tar.gz: 553a22135fb34a7b853da679fb0cc8db3e68c2394ad13a0e8fd8a4c8a60fcabfef4aad6d62aa52e3e1d3f98da6bd2772b240be8fc8dd5fcdbc71c73f14488cfe
+  metadata.gz: e7517aed893faec0040d34907290f335135631fd12268359687dbcf411b4cbe1cc206ed9a1bffd34ad667bd3e43166300efa9fae7f81ae44c5bf129d6587805e
+  data.tar.gz: c1bb443cc535bd4eec83ebcc6880a851ab8c3bd89342406f904c83136006a082f60092111a20d05273b014639342ca8fb3faa9e67cb6a326e351411e18e57522

data/lib/class_variants/instance.rb

@@ -3,37 +3,51 @@ class ClassVariants::Instance
   attr_reader :variants
   attr_reader :defaults
 
-  def initialize(classes = "", variants: {}, defaults: {})
+  def initialize(classes = "", variants: {}, compoundVariants: [], defaults: {})
     @classes = classes
-    @variants = variants
+    @variants = expand_boolean_variants(variants)
+    @compoundVariants = compoundVariants
     @defaults = defaults
   end
 
-  def render(**settings)
-    result = []
+  def render(**overrides)
+    # Start with our default classes
+    result = [@classes]
 
-    # Add the default classes if any provided
-    result << classes if classes
+    # Then merge the passed in overrides on top of the defaults
+    selected = @defaults.merge(overrides)
 
-    # Keep the applied variants so we can later apply the defaults
-    applied_options = []
-
-    # Go through each keys provided
-    settings.each do |key, value|
-      if variants.keys.include? key
-        applied_options << key
-        result << variants[key][value]
-      end
+    selected.each do |variant_type, variant|
+      # dig the classes out and add them to the result
+      result << @variants.dig(variant_type, variant)
     end
 
-    if defaults.present?
-      defaults.each do |key, key_to_use|
-        unless applied_options.include? key
-          result << @variants[key][key_to_use] if @variants[key].present?
-        end
+    @compoundVariants.each do |compound_variant|
+      if (compound_variant.keys - [:class]).all? { |key| selected[key] == compound_variant[key] }
+        result << compound_variant[:class]
       end
     end
 
+    # Compact out any nil values we may have dug up
+    result.compact!
+
+    # Return the final token list
     result.join " "
   end
-end
+
+  private
+
+  def expand_boolean_variants(variants)
+    variants.each.map { |key, value|
+      case value
+      when String
+        s_key = key.to_s
+        { s_key.delete_prefix("!").to_sym => { !s_key.start_with?("!") => value } }
+      else
+        { key => value }
+      end
+    }.reduce do |variants, more_variants|
+      variants.merge!(more_variants) { |_key, v1, v2| v1.merge!(v2) }
+    end
+  end
+end

data/lib/class_variants/version.rb

@@ -1,3 +1,3 @@
 module ClassVariants
-  VERSION = "0.0.5" unless const_defined?(:VERSION)
+  VERSION = "0.0.7" unless const_defined?(:VERSION)
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: class_variants
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Adrian Marin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily configure styles and apply them as classes.
 email: adrian@adrianthedev.com
 executables: []
@@ -43,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Easily configure styles and apply them as classes.