theo-rails 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4463e090916210fce56a8da009ebb09f945ba3013dc46121c66c43f4cfc9a2
-  data.tar.gz: 545c9cc533c9a89aa3d4d1a53d0598dc7a21aadd0608e26fad742da9b9cb0c7f
+  metadata.gz: 6681a53dbf50c16328a4e7fdd336e4796f816f2b378144ac1fa159a77b84f271
+  data.tar.gz: 8a8dd2a5918fb52dbf7a7aa193654921cf91615ea031017c595be10c445a8555
 SHA512:
-  metadata.gz: 9e9bbb695426ff687b337ef025a0741324b0defa1778b3b3183d8e674b3928577b534f49c2a267cdd7d43b8184a4fbda5f2ff8895ce3b31a63fdaa186761bada
-  data.tar.gz: 71688b266300bfe8863fb73e2ed260f2d317d24254d9fe0db9069e4e9327c97a856cf18751a688292ed77ab59815c0d7ca98f8db36b70b5ce6521d658421a768
+  metadata.gz: 3b09043ae8e7a6fdd0291f50aff9ae4b3c902b9bec12799c3578f5b01fdb4eae40a0a36fe02c145c577c9afca4e0e54418c51b164c7eeff70d40d32c9ac6a689
+  data.tar.gz: 17f3b1401babf88a7849db263b3ec502037a6b8c91fa23a181cbe1be9f0d60eaf8f2a097abee6404aeff84066400d1d14ab8710489079ae029d6376c49f80644

data/lib/theo-rails/theo.rb

@@ -1,50 +1,53 @@
 module Theo
   module Rails
-    TX = '\s*([a-z0-9-]+-partial)\s*([^>]*?)(?<![%/])'.freeze
-    RX = %r{(?:<#{TX}>(.*?)</\1>)|(?:<#{TX}/>)}im
-    LX = /\s*([^=%\s]+)\s*(?:(%)?=\s*"([^"]*)")?/
-    RXA = /^<%=([^%]*)%>$/
+    ATTRIBUTE_NAME = /[\w\-:@]+/
+    ATTRIBUTE_VALUE = /(?:(?:"(?<value>[^"]*)")|(?:'(?<value>[^']*)'))/
+    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)/
+    PARTIAL = /(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*>(?<content>.*?)<\/\k<partial>>)|(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*\/>)/im
+    DYNAMIC_EXPRESSION = /^<%=([^%]*)%>$/
 
     class Theo
       def process(source)
-        source.gsub(RX) do |_|
-          match = Regexp.last_match
-          partial = (match[1] || match[4]).delete_suffix('-partial').underscore
-          attributes = match[2] || match[5] || ''
-          content = match[3]&.strip 
+        # Attributes
+        source = source.gsub(DYNAMIC_ATTRIBUTE, '\k<name>="<%=\k<value>%>"')
 
-          attributes = attributes
-            .scan(LX)
-            .map { |name, literal, value| [name.to_sym, attribute(value || '', literal:)] }
+        # Partials
+        source.gsub(PARTIAL) do |_|
+          match = Regexp.last_match
+          partial = (match[:partial]).delete_suffix('-partial').underscore
+          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
 
-          if attributes[:path]
-            path = attributes.delete(:path).delete_prefix("'").delete_suffix("'")
-            partial = "#{path}/#{partial}"
-          end
+          partial = "#{attributes.delete(:path)}/#{partial}" if attributes[:path]
 
           collection = ''
           if attributes[:collection]
-            collection = attributes.delete(:collection).delete_prefix("'").delete_suffix("'")
+            collection = attribute(attributes.delete(:collection))
 
             as = ''
             if attributes[:as]
-              as = attributes.delete(:as).delete_prefix("'").delete_suffix("'")
+              as = attributes.delete(:as)
               as = ", as: '#{as}'"
             end
             collection = ", collection: #{collection}#{as}"
           end
 
-          arg = nil
-          if attributes[:arg]
-            arg = attributes.delete(:arg)
-            raise 'arg %= syntax is required' if arg.start_with?("'")
+          arg = "|#{attributes.delete(:arg)}|" if attributes[:arg]
 
-            arg = "|#{arg}|"
-          end
+          attributes.transform_values! { |value| attribute(value) }
 
           if content
-            output = "<%= render '#{partial}', {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} do #{ arg || '' } %>#{process(content)}<% end %>"
+            output = "<%= render '#{partial}', {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} do #{arg || ''} %>#{process(content)}<% end %>"
           else
             output = "<%= render partial: '#{partial}'#{collection}, locals: {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} %>"
           end
@@ -53,15 +56,13 @@ module Theo
         end
       end
 
-      def attribute(source, literal: false)
-        #TODO: support attributes like "a<%= b %>c
-
-        return source if literal
+      def attribute(source)
+        # TODO: support attributes like "a<%= b %>c
 
-        match = RXA.match(source)
+        match = DYNAMIC_EXPRESSION.match(source)
         return match[1] if match
 
-        "'" + source + "'"
+        "'#{source}'"
       end
 
       def call(template, source = nil)

metadata

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