class_variants 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3460025f84ed33be2203bd2340bfa5769342778ff2d8b8656b28ff05dd858f
-  data.tar.gz: 05d3075c1c174ba4140f40a5755b4972160708ca9afc5866207a7d222802efc2
+  metadata.gz: 2012fb19a3b94a62a3278f1256167126ef85e203a967cc20f8cb67d6fc94bfcb
+  data.tar.gz: ec7bf120843ba12c34f7bfbef26f5170fac8bd4e7f40d7717c6a478bf0116cbf
 SHA512:
-  metadata.gz: 7719a590c8afc043a1e3538c4e0c91d38f0d968951f555ed782a0254a7b539573ba0ba4034d91f50507cfba331d37989f8dee3d47aa97fbab2f7508337b64c3d
-  data.tar.gz: 553a22135fb34a7b853da679fb0cc8db3e68c2394ad13a0e8fd8a4c8a60fcabfef4aad6d62aa52e3e1d3f98da6bd2772b240be8fc8dd5fcdbc71c73f14488cfe
+  metadata.gz: fceccde2ac9e59dad730915436bd9d8fc2193316c8ce494e76227ac6f64de4bbffa448adc06f70f811a3c869c4b767d489ad750aff41e942ecc4afdc3545b4cd
+  data.tar.gz: b881d68c49c2e9cccea155e021aafcaad68ec2df3d48c9c78afac833b96e8c0cc325c174bf34660733ed64570501477351f8b8bf5672290fdd1ed10cf1ab41f3

data/lib/class_variants/instance.rb

@@ -5,35 +5,41 @@ class ClassVariants::Instance
 
   def initialize(classes = "", variants: {}, defaults: {})
     @classes = classes
-    @variants = variants
+    @variants = expand_boolean_variants(variants)
     @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
+    @defaults.merge(overrides)
+      .each do |variant_type, variant|
+        # dig the classes out and add them to the result
+        result << @variants.dig(variant_type, variant)
+      end
 
-    # Keep the applied variants so we can later apply the defaults
-    applied_options = []
+    # Compact out any nil values we may have dug up
+    result.compact!
 
-    # Go through each keys provided
-    settings.each do |key, value|
-      if variants.keys.include? key
-        applied_options << key
-        result << variants[key][value]
-      end
-    end
+    # Return the final token list
+    result.join " "
+  end
+
+  private
 
-    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
+  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
-
-    result.join " "
   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.6" 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.6
 platform: ruby
 authors:
 - Adrian Marin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
-dependencies: []
+date: 2022-12-21 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: []