theo-rails 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a401291f906304981468d40dce7137ceebdc0342631ff1424cae4c6b6db8312
-  data.tar.gz: ae1852a3117b671fe5b89afd7ed533db4b02b04ef05a291c040116f13c78199e
+  metadata.gz: 325afc2480b7d874e0c16a991ce5764bd74d114aa2296dce19ad536965a06a2f
+  data.tar.gz: 9282ab1407aa342bad6789b92e47041db23cc2833d8b4be2eada142ae3761ea2
 SHA512:
-  metadata.gz: 97b3dedf124cd25ef17cff1368e754a43c9ac6829eb459ca4a601716e0e7c9cf1226a6743dec34cc760c8c62078e938f429560b68ca559520ba0095ede37c912
-  data.tar.gz: 0006e7e118e3d963ed79c9811911ea6e80dd9f9ad9d66313fd0afcba4994a90d035afadb36573374673f2a4fbbaa3e3f5ee8b46fb4242cb4d58c8ee31cd7458c
+  metadata.gz: 0d3df600392370eeff52f2ddca2b3a9bdc52ef39045e652da28639eea9e3668da38e1d7d16ae616c93ff31811c9f582578500c07ac2e1340c0e19f1bdd307a9e
+  data.tar.gz: 3388d724991ef2872aff7c603f37a1dbd9979bf12c2f13f4aa24a23dbc18d89264d2263e5043d56a14bf782d17b07c82cb03055a48faac2de7bce74980408fd8

data/app/views/application/_image.html.erb

@@ -1,3 +1,3 @@
 <%# locals: (src:, **attributes) -%>
 
-<%= image_tag(src), **attributes %>
+<%= image_tag src, **attributes %>

data/lib/theo-rails/theo.rb

@@ -5,8 +5,12 @@ module Theo
     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}%))/
     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.source})/
+    STYLE_ATTRIBUTE=/(?:\s+style\s*=\s*#{ATTRIBUTE_VALUE.source})/
     ATTRIBUTES = /(?<attrs>(?:\s+#{ATTRIBUTE.source})*)/
+    ATTRIBUTES_INCLUDING_DYNAMIC = /(?<attrs>(?:\s+#{ATTRIBUTE.source}|#{DYNAMIC_ATTRIBUTE.source})*)/
     LITERAL_ATTRIBUTES = %i[path as yields collection].freeze
+    TAG_WITH_DYNAMIC_ATTRIBUTE = /(?:<\w+#{ATTRIBUTES_INCLUDING_DYNAMIC.source}\s+#{DYNAMIC_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 = /^<%=([^%]*)%>$/
@@ -14,15 +18,45 @@ 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]
 
-          # 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 = []
 
-          "#{name}=\"<%= #{value} %>\""
+          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[:value] || (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
+
+          remove_attributes.each { |remove_attribute| tag = tag.sub(remove_attribute, '') }
+
+          tag
         end
 
         # Partials

metadata

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