theo-rails 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8776f6ef2de8b4349c561ec52d66dd3d0b34c64ace4b2ca95c14f42182bb9dd3
-  data.tar.gz: 1451423cc6d8e8600b4f0553dcd74657ee52bae7bb68c2167b4123e6b4f693f2
+  metadata.gz: 6f522cd4a9045802867fb16443c798ed1cb1da0a07b20dfa00fe4c9b1f58c616
+  data.tar.gz: 8373f7e46efb666a7cbd07b15f51dd5001375131b2f8fec3bcdd7adb0957c812
 SHA512:
-  metadata.gz: 914a9a654082457ec89cda8d4fb01f09e01bd94e0aa43fff03b936622d6b972cce88e996e92c6a21445244782164a14a1521ff13bcb5a7f7911da4e7338188c4
-  data.tar.gz: d0158c52e718792bf613eaafd3b1e8c4b6054feaa02e6e39fb451adc5f681498c55674f1fc904bd29422f61219ad4c3630d889c26a47c3c49f7e765a0f3f760f
+  metadata.gz: '081b4756de992bdfc8fd63a17f6c593d639b2c586bd5a3bfc9cc8555757fac559d59f24e81142edd2b55333f07e1f22ef10147c3fc16b6dc1d53e30f427a7fbc'
+  data.tar.gz: 7221da0b1ef26ef372d5765a776bc89aa1af725b4595b02814b7832476edc05ee96ddde16d2877f9d8ffb16929f912bb82c7bf9014fc5efa56b4f9af541fc9d7

data/lib/theo-rails/theo.rb

@@ -5,7 +5,8 @@ module Theo
     ATTRIBUTE = /(?:(?:(?<name>#{ATTRIBUTE_NAME.source})\s*=\s*#{ATTRIBUTE_VALUE.source})|(?<name>#{ATTRIBUTE_NAME.source}))/
     DYNAMIC_ATTRIBUTE = /(?:(?<name>#{ATTRIBUTE_NAME.source})\s*%=\s*#{ATTRIBUTE_VALUE.source})/
     ATTRIBUTES = /(?<attrs>(?:\s+#{ATTRIBUTE.source})*)/
-    PARTIAL_TAG = /(?<partial>[\w-]+-partial)/
+    LITERAL_ATTRIBUTES = %i[path as yields].freeze
+    PARTIAL_TAG = /(?<partial>_[\w-]+)/
     PARTIAL = /(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*>(?<content>.*?)<\/\k<partial>>)|(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*\/>)/im
     DYNAMIC_EXPRESSION = /^<%=([^%]*)%>$/
 
@@ -17,22 +18,17 @@ module Theo
         # Partials
         source.gsub(PARTIAL) do |_|
           match = Regexp.last_match
-          partial = (match[:partial]).delete_suffix('-partial').underscore
+          partial = (match[:partial]).delete_prefix('_')
           attributes = match[:attrs] || ''
           content = match[:content]&.strip
 
-          attributes =
-            attributes
-            .gsub(ATTRIBUTE)
-            .map { Regexp.last_match }
-            .map { |attr| [attr[:name].to_sym, attr[:value] || ''] }
-            .to_h
+          attributes = process_attributes(attributes)
 
           partial = "#{attributes.delete(:path)}/#{partial}" if attributes[:path]
 
           collection = ''
           if attributes[:collection]
-            collection = attribute(attributes.delete(:collection))
+            collection = attributes.delete(:collection)
 
             as = ''
             if attributes[:as]
@@ -44,8 +40,6 @@ module Theo
 
           yields = "|#{attributes.delete(:yields)}|" if attributes[:yields]
 
-          attributes.transform_values! { |value| attribute(value) }
-
           if content
             output = "<%= render '#{partial}', {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} do #{yields || ''} %>#{process(content)}<% end %>"
           else
@@ -56,6 +50,19 @@ module Theo
         end
       end
 
+      def process_attributes(attributes)
+        attributes
+          .gsub(ATTRIBUTE)
+          .map { Regexp.last_match }
+          .map do |attr|
+            name = attr[:name].to_sym
+            value = attr[:value]
+            value = attribute(value) if LITERAL_ATTRIBUTES.exclude?(name)
+            [name, value]
+          end
+          .to_h
+      end
+
       def attribute(source)
         # TODO: support attributes like "a<%= b %>c
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theo-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jarek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-10 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies: []
 description: HTML-like template language for Rails with natural partial syntax
 email: jarek@jareklipski.com