tailwindcss-formatter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0a52e913a5ea017ecb958467341b07eb9079b113ecc611d0d531a97a786ce2
-  data.tar.gz: 877921beb5246aea9a80c7b3b9fc47c561f86d3dfb8e6280f75e73ed29475e50
+  metadata.gz: f6c8cd02e4f4b52fd2a85a19148d5b28c2e8055b3c851d0547025886baf5dbe7
+  data.tar.gz: 672f2cc8364a601d5841acf22bd756a6ad5d668f1b132ab80679eb09a72e443a
 SHA512:
-  metadata.gz: b009acc4da9a0b0c6012c992b59a0657670dd26533667eb6d4fe727fe2cda1f219f5cb2be6ac3fdc2eb4fcb89de59cc049edd6a98d99d903cf255d962176ebdf
-  data.tar.gz: 15ebf800ea4c9a97dc49a04c2e360dd342dfe4a1d784bed3adb0ff3944bd420e26e2e2f149e52db057c1024f3eaf55c623b1e6d637a1698a386429a12021f9d2
+  metadata.gz: c56a232c431873d2453d2c96ed109208487b9df0936062d8463512ba735f079fc9dec77fb2b6bd22bba42568d2d569390906ca9b36aff43f5c502dcb77d76e36
+  data.tar.gz: fa64b62e76a020cf5b13ce6ebf24808e7a7606dfa0275f559b73561d73b53f88bd9cddcd24dc7a630e484831865c7a6b07e1bd6705fdea8cdd4ee878df41e72b

data/lib/tailwindcss/formatter/class_sorter.rb

@@ -32,32 +32,61 @@ module Tailwindcss
         end
       end
 
-      private
+      def sorted_class_string(str)
+        class_string = str.dup
+        class_list = []
+        template_tags = extract_template_tags(class_string)
 
-      def format_content(content)
-        CLASS_REGEX_PATTERNS.each do |_regex|
-          content = content.gsub(_regex[:pattern]) do |_match|
-            "#{_regex[:prefix]}\"#{sorted_class_string(Regexp.last_match(1))}\""
-          end
+        # Remove the found template tags from the class_string
+        template_tags.each do |tag|
+          class_string.gsub!(tag, "")
         end
 
-        content
-      end
+        # Split the remaing class_string by whitespace
+        class_list += class_string.split(/\s+/)
 
-      def sorted_class_string(class_string)
-        class_list = class_string.split(/\s+/)
-        sorted_list = class_list.sort_by do |class_name|
-          order_index = CLASS_ORDER.index(class_name)
-          order_index.nil? ? [1, class_name] : [0, order_index]
-        end
+        # Sort the class_list
+        sorted_class_list = sort_class_list(class_list)
+
+        # Add the filtered template tags back to the sorted class list
+        sorted_class_list += template_tags
 
-        sorted_list.join(" ")
+        # Join and return the sorted class list as a formatted class_string
+        sorted_class_list.join(" ")
       end
 
       def fail_format_check
         puts "Check format failure - exited with error code 1"
         exit(1)
       end
+
+      private
+
+      def extract_template_tags(class_string)
+        template_tags = []
+
+        # Check for ERB template tags
+        template_tags += class_string.scan(/<%.*?%>/)
+
+        template_tags
+      end
+
+      def sort_class_list(class_list)
+        class_list.sort_by do |class_name|
+          order_index = CLASS_ORDER.index(class_name)
+          order_index.nil? ? [1, class_name] : [0, order_index]
+        end
+      end
+
+      def format_content(content)
+        CLASS_REGEX_PATTERNS.each do |regex|
+          content = content.gsub(regex[:pattern]) do |_match|
+            "#{regex[:prefix]}\"#{sorted_class_string(Regexp.last_match(1))}\""
+          end
+        end
+
+        content
+      end
     end
   end
 end

data/lib/tailwindcss/formatter/constants.rb

@@ -2,9 +2,9 @@
 
 # Regex patterns to get the class strings for formatting
 CLASS_REGEX_PATTERNS = [
-  { pattern: /class:\s*"([^"]*)"/, prefix: "class: " },
-  { pattern: /class="\s*([^"]*)"/, prefix: "class=" },
-  { pattern: /className="\s*([^"]*)"/, prefix: "className=" }
+  { pattern: /class:\s*["]([^"]*)["]/, prefix: "class: " },
+  { pattern: /class=\s*["]([^"]*)["]/, prefix: "class=" },
+  { pattern: /className=\s*["]([^"]*)["]/, prefix: "className=" }
 ].freeze
 
 # Default sorting order for Tailwind classes

data/lib/tailwindcss/formatter/version.rb

@@ -2,6 +2,6 @@
 
 module Tailwindcss
   module Formatter
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/tailwindcss-formatter.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name = "tailwindcss-formatter"
   spec.version = Tailwindcss::Formatter::VERSION
   spec.required_ruby_version = ">= 3.0.0"
-  spec.licenses = %w(MIT)
+  spec.licenses = %w[MIT]
 
   spec.authors = ["Ben Barber"]
   spec.email = ["contact@benbarber.co.uk"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailwindcss-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Barber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email: