theo-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e9a5344e790afcc95593a34f110d1c8a62094aee877f7f16ba680b971995bb
-  data.tar.gz: e26356f2f69b06a562cb48cc7ea5007160a4acc2ebffd3bfb66d4d981f2669b3
+  metadata.gz: 8e0ab52b01e897648f607bf041e5359c2806e2b3e5c99ffd235bedd6b8b72409
+  data.tar.gz: 634201a3d407430d17ae551a1e424d997468a1cdf9653d74197d7be55453a73e
 SHA512:
-  metadata.gz: d22353e98712c35b62c6a326321c72e580ac4406bcdfb55db97a902b72a45eacd5c7e57885663d4cf0ac9317462fec23986bdb1ff6cf8e6df0405a8aa3111590
-  data.tar.gz: 87c85b43ac32b1ece0ff1f2a864e9e4124a4f18d33e4696f8a643c67bcaa4fd32f4ff7929591f6f10dd3d0813e77f7b73e68d6d56218f322f0295408400e6293
+  metadata.gz: 7083141582de9a0c31441f847b5d2058f2bff0622caa14972b65377c8767811525ddbde2b172f4dafeec784633a09913aee9b2bf85cad07d0362dcb42bb442e0
+  data.tar.gz: 6416d6961d28ae4ae105fad90ca2a3fb1478c19036ecbcd7179bd9ef3b802ef4a0a496a0fa841e185ce978dd39b28e050fb0b2a3b4aeb851f045a7502f340747

data/lib/theo-rails/theo.rb

@@ -6,29 +6,40 @@ module Theo
 
     ATTRIBUTE_NAME = /(?<name>[\w:@_%][-\w:@_.]*)/
     ATTRIBUTE_VALUE = /(?:(?:"(?<value>[^"]*)")|(?:'(?<value>[^']*)'))/
-    ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*=\s*#{attribute_value})|#{ATTRIBUTE_NAME.source})/
-    DYNAMIC_ATTRIBUTE = /(?:(?:#{ATTRIBUTE_NAME.source}\s*%=\s*#{attribute_value('dynvalue')})|(?:#{ATTRIBUTE_NAME.source}%))/
+    ATTRIBUTE = /(?:(?<=\s)(?:(?:#{ATTRIBUTE_NAME.source}\s*=\s*#{attribute_value})|#{ATTRIBUTE_NAME.source}))/
+    DYNAMIC_ATTRIBUTE = /(?:(?<=\s)(?:(?:#{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})/
+    # Source: https://meiert.com/blog/boolean-attributes-of-html/
+    BOOLEAN_ATTRIBUTE_NAME = %w[allowfullscreen alpha async autofocus autoplay checked controls default defer disabled formnovalidate inert ismap itemscope loop multiple muted nomodule novalidate open playsinline readonly required reversed selected shadowrootclonable shadowrootcustomelementregistry shadowrootdelegatesfocus shadowrootserializable]
+    CLASS_ATTRIBUTE = /(?:\s+class\s*=\s*#{attribute_value})/
+    STYLE_ATTRIBUTE = /(?:\s+style\s*=\s*#{attribute_value})/
     ATTRIBUTES = /(?<attrs>(?:\s+#{ATTRIBUTE.source})*)/
-    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
+    ATTRIBUTES_INCLUDING_DYNAMIC = /(?<attrs>(?:\s+(?:#{ATTRIBUTE.source}|#{DYNAMIC_ATTRIBUTE.source}))*)/
+    TAG_WITH_DYNAMIC_ATTRIBUTE = /(?:<(?<tagname>\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
+    VOID_TAGS = %i[area base br col embed hr img input link meta source track wbr]
+    IF_SPECIAL_ATTRIBUTE = /(?<special>\s%if\s*=\s*#{attribute_value('specvalue')})/
+    TAG_WITH_IF_SPECIAL_ATTRIBUTE = /(?:<(?<tag>\w+)#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*>.*?<\/\k<tag>>)|(?:<(?<tag>\w+)#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*\/>)|(?:<(?<tag>#{VOID_TAGS.join('|')})#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s*#{IF_SPECIAL_ATTRIBUTE.source}#{ATTRIBUTES_INCLUDING_DYNAMIC.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 = /^<%=([^%]*)%>$/
 
     class Theo
       def process(source)
+        # Specials
+        source = source.gsub(TAG_WITH_IF_SPECIAL_ATTRIBUTE) do |_|
+          match = Regexp.last_match
+
+          "<% if #{match[:specvalue]} %>\n#{match[0].sub(match[:special], '')}\n<% end %>" \
+        end
+
         # Attributes
         source = source.gsub(TAG_WITH_DYNAMIC_ATTRIBUTE) do |_|
           match = Regexp.last_match
 
           tag = match[0]
+          # TODO: maybe separate matching partials and non-partial attributes completely
+          is_partial = /^[_A-Z]/.match?(match[:tagname])
 
           remove_attributes = []
 
@@ -45,19 +56,19 @@ module Theo
 
               if class_attribute
                 remove_attributes += [class_attribute[0]]
-                next "#{name}=\"<%= (#{value}).to_s + ' #{class_attribute[:value]}' %>\""
+                value = "(#{value}).to_s + ' #{class_attribute[:value]}'"
               end
-            end
-
-            if name == 'style'
+            elsif name == 'style'
               style_attribute = STYLE_ATTRIBUTE.match(tag)
 
               if style_attribute
                 remove_attributes += [style_attribute[0]]
-                next "#{name}=\"<%= (#{value}).to_s + '; #{style_attribute[:value]}' %>\""
+                value = "(#{value}).to_s + '; #{style_attribute[:value]}'"
               end
             end
 
+            next "<% if #{value} %>#{name}<% end %>" if BOOLEAN_ATTRIBUTE_NAME.include?(name) unless is_partial
+
             "#{name}=\"<%= #{value} %>\""
           end
 
@@ -66,13 +77,6 @@ module Theo
           tag
         end
 
-        # Specials
-        source = source.gsub(TAG_WITH_IF_SPECIAL_ATTRIBUTE) do |_|
-          match = Regexp.last_match
-
-          "<% if #{match[:specvalue]} %>\n#{match[0].sub(match[:special], '')}\n<% end %>" \
-        end
-
         # Partials
         source.gsub(PARTIAL) do |_|
           match = Regexp.last_match

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: theo-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jarek Lipski
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +78,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/loomchild/theo-rails
   source_code_uri: https://github.com/loomchild/theo-rails
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Theo is HTML-like template language
 test_files: []