theo-rails 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8776f6ef2de8b4349c561ec52d66dd3d0b34c64ace4b2ca95c14f42182bb9dd3
-  data.tar.gz: 1451423cc6d8e8600b4f0553dcd74657ee52bae7bb68c2167b4123e6b4f693f2
+  metadata.gz: a08de40e9205127777dc501ee41131f7c56b5d49ce3d793171a4f5fee114c087
+  data.tar.gz: 7285c684000a300aefd5c71b9b287656153303fb7eea410a4d59af474e21d494
 SHA512:
-  metadata.gz: 914a9a654082457ec89cda8d4fb01f09e01bd94e0aa43fff03b936622d6b972cce88e996e92c6a21445244782164a14a1521ff13bcb5a7f7911da4e7338188c4
-  data.tar.gz: d0158c52e718792bf613eaafd3b1e8c4b6054feaa02e6e39fb451adc5f681498c55674f1fc904bd29422f61219ad4c3630d889c26a47c3c49f7e765a0f3f760f
+  metadata.gz: b5e8ae5ee062f9891934034acaf20e6d652162acdb08c587a2330989b6b10a7fd19a674dbc4ad13a4ce7e370300f3b6cc18de1d990bb6d8ab452855ae4563108
+  data.tar.gz: aa2cee291cfc7ec96588b068cd52645e0502c53d87bec1f3c69d6e83e74879aede4aa47ef0b25c69219171a669d4ad6bcff430e3fef7de26efb6b9906c00de07

data/lib/theo-rails/theo.rb

@@ -5,62 +5,91 @@ 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)/
-    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, '\k<name>="<%= \k<value> %>"')
 
         # Partials
-        source.gsub(PARTIAL) do |_|
+        source.gsub(TEMPLATE) do |_|
           match = Regexp.last_match
-          partial = (match[:partial]).delete_suffix('-partial').underscore
+
+          partial = match[:partial]
+          component = match[:component]
+
           attributes = match[:attrs] || ''
-          content = match[:content]&.strip
+          content = match[:content]
 
-          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]
+          path = attributes.delete(:path)
 
-          collection = ''
-          if attributes[:collection]
-            collection = attribute(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
 
-          attributes.transform_values! { |value| attribute(value) }
+            as = as ? ", as: '#{as}'" : ''
+            collection = ", collection: #{collection}#{as}" if collection
 
-          if content
-            output = "<%= render '#{partial}', {#{attributes.map {|k,v| "'#{k}': #{v}"}.join(', ')}} do #{yields || ''} %>#{process(content)}<% end %>"
+            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
         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) unless LITERAL_ATTRIBUTES.include?(name)
+            [name, value]
+          end
+          .to_h
+      end
+
       def attribute(source)
         # 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.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jarek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-10 00:00:00.000000000 Z
-dependencies: []
+date: 2024-09-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML-like template language for Rails with natural partial syntax
 email: jarek@jareklipski.com
 executables: []