theo-rails 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f522cd4a9045802867fb16443c798ed1cb1da0a07b20dfa00fe4c9b1f58c616
-  data.tar.gz: 8373f7e46efb666a7cbd07b15f51dd5001375131b2f8fec3bcdd7adb0957c812
+  metadata.gz: f2b210d661f6fd028694497e83aa3b205c5fd89a6d3136fbc1faca2f4e4ddb29
+  data.tar.gz: 734ea63e9962dac3a87a207b0cb82d165c0f4d54a6d791b5398c46dfda15cbc4
 SHA512:
-  metadata.gz: '081b4756de992bdfc8fd63a17f6c593d639b2c586bd5a3bfc9cc8555757fac559d59f24e81142edd2b55333f07e1f22ef10147c3fc16b6dc1d53e30f427a7fbc'
-  data.tar.gz: 7221da0b1ef26ef372d5765a776bc89aa1af725b4595b02814b7832476edc05ee96ddde16d2877f9d8ffb16929f912bb82c7bf9014fc5efa56b4f9af541fc9d7
+  metadata.gz: 85d866b6839ed5736b50dd5026b65e925f9dae25de88e24d47a9856e7454820fa9f7e8e855a022534ee636c2dfbc0b78584eb16f31543d97e327c1ff14a63b92
+  data.tar.gz: 0b21d4fddb3b4a3618117d23fc2e846881ffc2f7e2b5667187ff33d220cea790ea18c6728a7d2167e228cfea83bed0d7dcab86210eb9cfbf4365ab25a2c8692d

data/lib/theo-rails/theo.rb

@@ -1,49 +1,81 @@
 module Theo
   module Rails
-    ATTRIBUTE_NAME = /[\w\-:@]+/
+    ATTRIBUTE_NAME = /(?<name>[a-z][\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})/
+    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
     ATTRIBUTES = /(?<attrs>(?:\s+#{ATTRIBUTE.source})*)/
-    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
+    LITERAL_ATTRIBUTES = %i[path as yields collection].freeze
+    PARTIAL_TAG = /(?<partial>_\w+)/
+    PARTIAL = /(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*>(?<content>.*?)<\/\k<partial>>)|(?:<#{PARTIAL_TAG.source}#{ATTRIBUTES.source}\s*\/>)/
+    COMPONENT_TAG = /(?<component>[A-Z]\w+)/
+    COMPONENT = /(?:<#{COMPONENT_TAG.source}#{ATTRIBUTES.source}\s*>(?<content>.*?)<\/\k<component>>)|(?:<#{COMPONENT_TAG.source}#{ATTRIBUTES.source}\s*\/>)/
+    TEMPLATE = /(?:#{PARTIAL.source})|(?:#{COMPONENT.source})/m
     DYNAMIC_EXPRESSION = /^<%=([^%]*)%>$/
 
     class Theo
       def process(source)
         # Attributes
-        source = source.gsub(DYNAMIC_ATTRIBUTE, '\k<name>="<%=\k<value>%>"')
+        source = source.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)
+
+          "#{name}=\"<%= #{value} %>\""
+        end
 
         # Partials
-        source.gsub(PARTIAL) do |_|
+        source.gsub(TEMPLATE) do |_|
           match = Regexp.last_match
-          partial = (match[:partial]).delete_prefix('_')
+
+          partial = match[:partial]
+          component = match[:component]
+
           attributes = match[:attrs] || ''
-          content = match[:content]&.strip
+          content = match[:content]
 
           attributes = process_attributes(attributes)
 
-          partial = "#{attributes.delete(:path)}/#{partial}" if attributes[:path]
+          path = attributes.delete(:path)
 
-          collection = ''
-          if attributes[:collection]
-            collection = attributes.delete(:collection)
+          collection = attributes.delete(:collection)
+          as = attributes.delete(:as)
 
-            as = ''
-            if attributes[:as]
-              as = attributes.delete(:as)
-              as = ", as: '#{as}'"
-            end
-            collection = ", collection: #{collection}#{as}"
-          end
+          yields = attributes.delete(:yields)
+          yields = " |#{yields}|" if yields
+
+          locals = attributes.empty? ? '' : attributes.map { |k, v| "'#{k}': #{v}" }.join(', ')
+
+          if partial
+            partial = partial.delete_prefix('_')
 
-          yields = "|#{attributes.delete(:yields)}|" if attributes[:yields]
+            partial = "#{path}/#{partial}" if path
 
-          if content
-            output = "<%= render '#{partial}', {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} do #{yields || ''} %>#{process(content)}<% end %>"
+            as = as ? ", as: '#{as}'" : ''
+            collection = ", collection: #{collection}#{as}" if collection
+
+            if content
+              locals = ", {#{locals}}" unless locals.empty?
+              output = "<%= render '#{partial}'#{locals} do#{yields} %>#{process(content)}<% end %>"
+            else
+              locals = ", locals: {#{locals}}" unless locals.empty?
+              output = "<%= render partial: '#{partial}'#{collection}#{locals} %>"
+            end
           else
-            output = "<%= render partial: '#{partial}'#{collection}, locals: {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} %>"
+            component = "#{component}Component"
+
+            if content
+              output = "<%= render #{component}.new(#{locals}) do#{yields} %>#{process(content)}<% end %>"
+            elsif collection
+              locals = ", #{locals}" unless locals.empty?
+              output = "<%= render #{component}.with_collection(#{collection}#{locals}) %>"
+            else
+              output = "<%= render #{component}.new(#{locals}) %>"
+            end
           end
 
           output
@@ -57,7 +89,7 @@ module Theo
           .map do |attr|
             name = attr[:name].to_sym
             value = attr[:value]
-            value = attribute(value) if LITERAL_ATTRIBUTES.exclude?(name)
+            value = attribute(value) unless LITERAL_ATTRIBUTES.include?(name)
             [name, value]
           end
           .to_h
@@ -67,7 +99,7 @@ module Theo
         # TODO: support attributes like "a<%= b %>c
 
         match = DYNAMIC_EXPRESSION.match(source)
-        return match[1] if match
+        return match[1].strip if match
 
         "'#{source}'"
       end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: theo-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jarek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
-dependencies: []
+date: 2024-10-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: HTML-like template language for Rails with natural partial syntax
 email: jarek@jareklipski.com
 executables: []