theo-rails 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a354561a6eaaa54fdcfe0b6c40f5c3e5a2fe183748beaa59eeec65cc268b2a13
-  data.tar.gz: c7e7f95887c0529086469d5f659fc7626bd9efc4e5cda1f1a3cd7eb31c959e34
+  metadata.gz: 4484f097ca557a4007972199d45de0bbb90fcb0a92af7a2104c77594c06b2a2e
+  data.tar.gz: 03ed89bdc2f88aa202e78c74100d2059e9eb6169a32aa44cce28577ef81b9367
 SHA512:
-  metadata.gz: cc7258020cf8eb358bb9c2a4427ba099ba24b320e57ffb6fb101790d866bbee67bed477a7c909f48df73edf269924e23ff99ecc1cb98840d05288ec6b22a5d96
-  data.tar.gz: a5028cf66693c1a327f31ea4f192e99c36cfa1b6928db4372225c6e3130c3c7baa97dc43d04d1eb35e1b3a7342b909874d0fe9988e1bdc924840fa3683f63cf6
+  metadata.gz: 9ebc2bbe2787fa431f803aacca5634330d234a9d66eb4ed2bdb74cde7e721acf4e032dba170282bc73c5296bf88013604b0ef6f30cc2a5604373a1ab478645ef
+  data.tar.gz: 98fc003281e01a7fddefbf1f807983b826337a0a6a067d7b4e5452a16b48519b15e62bdf535234f2e15bd87cd7a48a97e3877058067a5a7d6bf489d2d39d94f7

data/lib/theo-rails/theo.rb

@@ -1,12 +1,23 @@
 module Theo
   module Rails
-    ATTRIBUTE_NAME = /(?<name>[\w:@_][-\w:@_]*)/
+    def self.attribute_value(name = 'value')
+      /(?:(?:"(?<#{name}>[^"]*)")|(?:'(?<#{name}>[^']*)'))/.source
+    end
+
+    ATTRIBUTE_NAME = /(?<name>[\w:@_%][-\w:@_]*)/
     ATTRIBUTE_VALUE = /(?:(?:"(?<value>[^"]*)")|(?:'(?<value>[^']*)'))/
-    ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*=\s*#{ATTRIBUTE_VALUE.source})|#{ATTRIBUTE_NAME.source})/
-    DYNAMIC_ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*%=\s*#{ATTRIBUTE_VALUE.source})|(?:#{ATTRIBUTE_NAME.source}%))/
+    ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*=\s*#{attribute_value})|#{ATTRIBUTE_NAME.source})/
+    DYNAMIC_ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*%=\s*#{attribute_value('dynvalue')})|(?:#{ATTRIBUTE_NAME.source}%))/
     RESERVED_ATTRIBUTE_NAME = %w[alias and begin break case class def do else elsif end ensure false for if in module next nil not or redo rescue retry return self super then true undef unless until when while yield].to_set
+    CLASS_ATTRIBUTE=/(?:\s+class\s*=\s*#{attribute_value})/
+    STYLE_ATTRIBUTE=/(?:\s+style\s*=\s*#{attribute_value})/
     ATTRIBUTES = /(?<attrs>(?:\s+#{ATTRIBUTE.source})*)/
-    LITERAL_ATTRIBUTES = %i[path as yields collection].freeze
+    ATTRIBUTES_INCLUDING_DYNAMIC = /(?<attrs>(?:\s+#{ATTRIBUTE.source}|#{DYNAMIC_ATTRIBUTE.source})*)/
+    TAG_WITH_DYNAMIC_ATTRIBUTE = /(?:<\w+#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s+#{DYNAMIC_ATTRIBUTE.source}#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*\/?>)/m
+    SPECIAL_ATTRIBUTES = %i[%path %as %yields %collection %if].freeze
+    VOID_TAGS=%i[area base br col embed hr img input link meta source track wbr]
+    IF_SPECIAL_ATTRIBUTE = /(?<special> %if\s*=\s*#{attribute_value('specvalue')})/
+    TAG_WITH_IF_SPECIAL_ATTRIBUTE = /(?:<(?<tag>\w+)#{ATTRIBUTES.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES.source}\s*>.*?<\/\k<tag>>)|(?:<(?<tag>\w+)#{ATTRIBUTES.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES.source}\s*\/>)|(?:<(?<tag>#{VOID_TAGS.join('|')})#{ATTRIBUTES.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES.source}\s*>)/m
     PARTIAL_TAG = /(?:(?<partial>[A-Z]\w+)|(?<partial>_[\w-]+))/
     PARTIAL = /(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*>(?<content>.*?)<\/\k<partial>>)|(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*\/>)/m
     DYNAMIC_EXPRESSION = /^<%=([^%]*)%>$/
@@ -14,15 +25,52 @@ module Theo
     class Theo
       def process(source)
         # Attributes
-        source = source.gsub(DYNAMIC_ATTRIBUTE) do |_|
+        source = source.gsub(TAG_WITH_DYNAMIC_ATTRIBUTE) do |_|
           match = Regexp.last_match
 
-          name = match[:name]
+          tag = match[0]
+
+          remove_attributes = []
+
+          tag = tag.gsub(DYNAMIC_ATTRIBUTE) do |_|
+            match = Regexp.last_match
+
+            name = match[:name]
+
+            # See https://island94.org/2024/06/rails-strict-locals-local_assigns-and-reserved-keywords for more info
+            value = match[:dynvalue] || (RESERVED_ATTRIBUTE_NAME.include?(name) ? "binding.local_variable_get('#{name}')" : name)
+
+            if name == 'class'
+              class_attribute = CLASS_ATTRIBUTE.match(tag)
+
+              if class_attribute
+                remove_attributes += [class_attribute[0]]
+                next "#{name}=\"<%= (#{value}).to_s + ' #{class_attribute[:value]}' %>\""
+              end
+            end
+
+            if name == 'style'
+              style_attribute = STYLE_ATTRIBUTE.match(tag)
+
+              if style_attribute
+                remove_attributes += [style_attribute[0]]
+                next "#{name}=\"<%= (#{value}).to_s + '; #{style_attribute[:value]}' %>\""
+              end
+            end
+
+            "#{name}=\"<%= #{value} %>\""
+          end
 
-          # See https://island94.org/2024/06/rails-strict-locals-local_assigns-and-reserved-keywords for more info
-          value = match[:value] || (RESERVED_ATTRIBUTE_NAME.include?(name) ? "binding.local_variable_get('#{name}')" : name)
+          remove_attributes.each { |remove_attribute| tag = tag.sub(remove_attribute, '') }
+
+          tag
+        end
+
+        # Specials
+        source = source.gsub(TAG_WITH_IF_SPECIAL_ATTRIBUTE) do |_|
+          match = Regexp.last_match
 
-          "#{name}=\"<%= #{value} %>\""
+          "<% if #{match[:specvalue]} %>\n#{match[0].sub(match[:special], '')}\n<% end %>" \
         end
 
         # Partials
@@ -36,12 +84,12 @@ module Theo
 
           attributes = process_attributes(attributes)
 
-          path = attributes.delete(:path)
+          path = attributes.delete(:'%path')
 
-          collection = attributes.delete(:collection)
-          as = attributes.delete(:as)
+          collection = attributes.delete(:'%collection')
+          as = attributes.delete(:'%as')
 
-          yields = attributes.delete(:yields)
+          yields = attributes.delete(:'%yields')
           yields = " |#{yields}|" if yields
 
           locals = attributes.empty? ? '' : attributes.map { |k, v| "'#{k}': #{v}" }.join(', ')
@@ -86,7 +134,7 @@ module Theo
           .map do |attr|
             name = attr[:name].to_sym
             value = attr[:value]
-            value = attribute(value) unless LITERAL_ATTRIBUTES.include?(name)
+            value = attribute(value) unless SPECIAL_ATTRIBUTES.include?(name)
             [name, value]
           end
           .to_h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theo-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Jarek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport