phlexy_ui 0.1.15 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f0cc8b2a831ce17e7db2594b848d14c374e2d59d057a0fea04c9695cc3d059
-  data.tar.gz: f3c4226ae079c44c46ba49da6ca0e0b53709414f4022264bca190d23de3e05e4
+  metadata.gz: e28571932626bbfb52238b529c6dfe67ba038b32c2c735377667fa0005974295
+  data.tar.gz: 820d96f4249069a762071132fcbe977bd78b00b54aa9e86b4f44622459c73628
 SHA512:
-  metadata.gz: 6bc67b1c3b0321b1f4c3d78b7e1e7524d5fad019b97925f226be89a27721d90cc13f904f26797f72bc42e169ffc0b18dfc5e4128f23431c668fabbdb63943dac
-  data.tar.gz: 246e8df27ac5d8c48377e05fb91be4513fcfcdcb9aa4da3e1bfb40af1c62cfe5ce9a95930ca1fb4f90e8202bed4310732dc171df5ae742a6cbfbc4b2633199c0
+  metadata.gz: 70be19b85cf1ce3d9eb6f0837f207399830901e3dd3d8556e7881eb612c4cf6c99b022609743d51d6fa58ab08a18e919806d211490a05aa5f5a52591f474db41
+  data.tar.gz: d1e10d0c19ca19d07159e60a98cd3a34669cf368166231ba9ed87b3dd3b8109bba0c2f8637df5a7fdd5f02353a606738f6d873c9957327a21f346d5b28398c05

data/lib/phlexy_ui/class_list.rb

@@ -13,76 +13,70 @@ module PhlexyUI
       @base_modifiers = base_modifiers
       @options = options
       @modifiers_map = modifiers_map
+      @responsive_options = options.delete(:responsive)
     end
 
     def to_a
-      classes = []
-      add_component_class(classes)
-      add_selected_modifiers_classes(classes)
-      add_conditioned_modifiers_classes(classes)
-      add_responsive_modifiers_classes(classes)
-      add_class_option_classes(classes)
-      classes
+      [
+        component_classes,
+        modifier_classes,
+        responsive_classes,
+        options.delete(:class)
+      ].flatten.compact
     end
 
     private
 
-    attr_reader :component_html_class, :base_modifiers, :options, :modifiers_map
+    attr_reader :component_html_class,
+      :base_modifiers,
+      :options,
+      :modifiers_map,
+      :responsive_options
 
-    def selected_base_modifiers
-      base_modifiers.select { |modifier| modifiers_map.key?(modifier) }
-    end
-
-    def add_component_class(classes)
+    def component_classes
       return unless component_html_class
+      return if responsive_options&.values&.any? do |v|
+        v == true || (v.is_a?(Array) && v.include?(true))
+      end
 
-      classes << with_config_prefix(component_html_class)
+      with_config_prefix(component_html_class)
     end
 
-    def add_selected_modifiers_classes(classes)
-      classes.concat(
-        html_classes_for_modifiers(
-          selected_base_modifiers
-        )
-      )
+    def modifier_classes
+      (selected_base_modifiers + conditioned_modifiers).map do |modifier|
+        with_config_prefix(modifiers_map[modifier])
+      end
     end
 
-    def add_conditioned_modifiers_classes(classes)
-      modifiers_map.each do |modifier, class_name|
-        next unless options.delete(modifier)
-
-        classes << with_config_prefix(class_name)
-      end
+    def selected_base_modifiers
+      base_modifiers.select { |modifier| modifiers_map.key?(modifier) }
     end
 
-    def html_classes_for_modifiers(modifiers, responsive_prefix: nil)
-      modifiers.map do |modifier|
-        with_responsive_prefix(
-          with_config_prefix(
-            modifiers_map.fetch(modifier)
-          ),
-          responsive_prefix
-        )
-      end
+    def conditioned_modifiers
+      modifiers_map.keys.select { |modifier| options.delete(modifier) }
     end
 
-    def add_responsive_modifiers_classes(classes)
-      return unless (responsive_options = options.delete(:responsive))
-
-      RESPONSIVE_PREFIXES.each do |responsive_prefix|
-        if (values = responsive_options[responsive_prefix])
-          classes.concat(
-            html_classes_for_modifiers(
-              Array(values),
-              responsive_prefix:
-            )
-          )
+    def responsive_classes
+      return unless responsive_options
+
+      RESPONSIVE_PREFIXES.flat_map do |prefix|
+        next unless responsive_options[prefix]
+
+        values = Array(responsive_options[prefix])
+
+        component_responsive_class =
+          if values.delete(true)
+            [with_responsive_prefix(with_config_prefix(component_html_class), prefix)]
+          else
+            []
+          end
+
+        modifier_responsive_classes = values.map do |v|
+          with_responsive_prefix(with_config_prefix(modifiers_map[v]), prefix)
         end
-      end
-    end
 
-    def add_class_option_classes(classes)
-      classes << options.delete(:class) if options[:class]
+        component_responsive_class + modifier_responsive_classes
+      end
     end
 
     def with_config_prefix(string)
@@ -91,14 +85,8 @@ module PhlexyUI
       end.join(" ")
     end
 
-    def with_responsive_prefix(string, responsive_prefix = nil)
-      string.split.map do |word|
-        if responsive_prefix
-          "#{responsive_prefix}:#{word}"
-        else
-          word
-        end
-      end.join(" ")
+    def with_responsive_prefix(string, prefix)
+      string.to_s.split.map { |word| "#{prefix}:#{word}" }.join(" ")
     end
   end
 end

data/lib/phlexy_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhlexyUI
-  VERSION = "0.1.15"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexy_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.18
 platform: ruby
 authors:
 - David Alejandro Aguilar Ramos