classy-yaml 1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda6808c6932b7207c7c1904f4d797cd854532d6bde8e399358571a4b9d5e0b2
-  data.tar.gz: 69db95341f9669126246d13e77ee3647fc0b47a79516dda1f314598e7752d42f
+  metadata.gz: 9cb94b02acbc1f92548d666eb321fe7b06e68828c2cb6d53d5989f4435cd2c38
+  data.tar.gz: c52c21899d471cf246e4c1adf2571b88e405a42ac5ea5c3dd659a8cd4edfb918
 SHA512:
-  metadata.gz: 9356e475faf159ce5d4bfc416021b5fc0dbc3b02050dbceb31629eee7d5aee315365f59b19baae20b1108a74f74f3ec7bf57b7df5b93b7d899dd702b44c0c245
-  data.tar.gz: 6ef3431328fb368bd12dbbf458154936ecc3520c58f7884edf34c0037812266fbdb4db11ae42bbb4a57b9d84daf88efbc54a429df797c663883e3d6963648ac5
+  metadata.gz: 36b989e46790ceb55f42bb802980e3ec5de7960b10818493646a911b204a0a6857c0d9a5053353c9b317a9c74a5317c3b9e343d889fd8fe7adb9b9af3284d914
+  data.tar.gz: 28013c5c0348754432641c55bbc7827f912c5ba9320bb9a7d3768c383bfcb3159a6e1cfbae476d545cabc87159145d4b27539e9c080eb4064e6ac97d0ffc7420

data/README.md

@@ -25,6 +25,19 @@ btn:
 
 Now, calling `yass(btn: :blue)` or `yass(btn: :yellow)` will ALSO pull in the classes from `btn: :base`.
 
+### Optionally Skipping Base
+
+You can optionally skip including the base on a `yass` call by including the key/value `skip_base: true`. So, using the example above,
+we can perform:
+```
+btn:
+  base: "px-3 py-2"
+  blue: "text-blue-200 bg-blue-500"
+  yellow: "text-yellow-200 bg-blue-500"
+```
+
+Now, calling `yass(btn: :blue, skip_base: true)` and this will skip pulling in the classes from `btn: :base`. This is helpful
+when defining animation classes and you only want to include the different classes, such as `active` and `inactive` for instance.
 
 ### ViewComponent
 There is a special helper built for ViewComponent and sidecar assets. In your `example_component.rb`, add the line `include Classy::Yaml::ComponentHelpers`. This helper will tell `yass` to check if there is a `example_component.yml` file, and first use that for definitions. If the definitions aren't found in the `example_component.yml`, then it will fallback to `config/utility_classes.yml`.

data/lib/classy/yaml/component_helpers.rb

@@ -7,11 +7,17 @@ module Classy
         component_name = self.class.name.underscore.split("/").last.split(".").first
 
         classy_files = ["#{calling_path}/#{component_name}.yml",
-                       "#{calling_path}/#{calling_file}/#{calling_file}.yml",
-                       "#{calling_path}/#{calling_file}/#{component_name}.yml"
+                        "#{calling_path}/#{calling_file}/#{calling_file}.yml",
+                        "#{calling_path}/#{calling_file}/#{component_name}.yml"
         ]
 
-        helpers.yass(args, classy_files: classy_files.uniq)
+        if args.first.is_a?(Hash)
+          args.first.merge!({ classy_files: classy_files.uniq })
+        else
+          args << { classy_files: classy_files.uniq }
+        end
+
+        helpers.yass(*args)
       end
     end
   end

data/lib/classy/yaml/helpers.rb

@@ -16,8 +16,9 @@ module Classy
 
         return if classy_yamls.blank?
 
+        skip_base_hash = args.find { |arg| arg.is_a?(Hash) && arg.keys.include?(:skip_base) } || {}
         keys, classes = flatten_args(values: args)
-        classes += fetch_classes(keys, classy_yamls: classy_yamls)
+        classes += fetch_classes(keys, classy_yamls: classy_yamls, skip_base: skip_base_hash[:skip_base])
 
         return classes.flatten.join(" ")
       end
@@ -48,7 +49,7 @@ module Classy
         return keys, added_classes
       end
 
-      def fetch_classes(keys, classy_yamls: [])
+      def fetch_classes(keys, classy_yamls: [], skip_base: false)
         classes = []
 
         keys.map do |key|
@@ -56,14 +57,16 @@ module Classy
           fetched_classes = nil
 
           classy_yamls.reverse_each do |classy_yaml|
-            begin
-              base_classes ||= if classy_yaml.send(:dig, *key).is_a?(Hash)
-                                 classy_yaml.send(:dig, *(key + ['base'])).try(:split, " ")
-                               else
-                                 classy_yaml.send(:dig, *(key[0...-1] + ['base'])).try(:split, " ")
-                               end
-            rescue
-              Rails.logger.warn(Classy::Yaml::InvalidKeyError.new(data: key))
+            unless skip_base == true
+              begin
+                base_classes ||= if classy_yaml.send(:dig, *key).is_a?(Hash)
+                                   classy_yaml.send(:dig, *(key + ['base'])).try(:split, " ")
+                                 else
+                                   classy_yaml.send(:dig, *(key[0...-1] + ['base'])).try(:split, " ")
+                                 end
+              rescue
+                Rails.logger.warn(Classy::Yaml::InvalidKeyError.new(data: key))
+              end
             end
 
             begin
@@ -78,8 +81,8 @@ module Classy
             end
           end
 
-          classes << base_classes
-          classes << fetched_classes
+          classes << base_classes unless base_classes.blank?
+          classes << fetched_classes unless fetched_classes.blank?
         end
 
         classes.reject!(&:blank?)

data/lib/classy/yaml/version.rb

@@ -1,5 +1,5 @@
 module Classy
   module Yaml
-    VERSION = '1.1'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classy-yaml
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.2.1
 platform: ruby
 authors:
 - Tonksthebear
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport