theo-rails 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08de40e9205127777dc501ee41131f7c56b5d49ce3d793171a4f5fee114c087
-  data.tar.gz: 7285c684000a300aefd5c71b9b287656153303fb7eea410a4d59af474e21d494
+  metadata.gz: 36c3ddae4b6c1dee1bbf309c1ab2c779c81ddaf511b35d7297a5f60b5b91d300
+  data.tar.gz: e3c6a104bca5f66f9f0aad687b6d295d55a0759a0cf816eaab0aff8d1408f647
 SHA512:
-  metadata.gz: b5e8ae5ee062f9891934034acaf20e6d652162acdb08c587a2330989b6b10a7fd19a674dbc4ad13a4ce7e370300f3b6cc18de1d990bb6d8ab452855ae4563108
-  data.tar.gz: aa2cee291cfc7ec96588b068cd52645e0502c53d87bec1f3c69d6e83e74879aede4aa47ef0b25c69219171a669d4ad6bcff430e3fef7de26efb6b9906c00de07
+  metadata.gz: 78a5be9f8c14fbe5125a321a1df522976fb5282210a1a704be86e35121f71cdd5ac21588348a078b11e218228d363d67ae788837dc50d63257b8abef7377e74d
+  data.tar.gz: 85fc477ad21b22d2cef02f9a72ff86d59612bbeb97af0b70c5ff50fb33738e8554d44ac3efbe7a4b1cc8584aabcb397323266f4f398f63c99aa335c582306087

data/lib/theo-rails/theo.rb

@@ -1,29 +1,35 @@
 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 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
+    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 = /^<%=([^%]*)%>$/
 
     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(TEMPLATE) do |_|
+        source.gsub(PARTIAL) do |_|
           match = Regexp.last_match
 
           partial = match[:partial]
-          component = match[:component]
 
           attributes = match[:attrs] || ''
           content = match[:content]
@@ -40,8 +46,11 @@ module Theo
 
           locals = attributes.empty? ? '' : attributes.map { |k, v| "'#{k}': #{v}" }.join(', ')
 
-          if partial
-            partial = partial.delete_prefix('_')
+          is_component = view_component_exists?(partial)
+          is_partial = !is_component
+
+          if is_partial
+            partial = partial.delete_prefix('_').underscore
 
             partial = "#{path}/#{partial}" if path
 
@@ -56,7 +65,7 @@ module Theo
               output = "<%= render partial: '#{partial}'#{collection}#{locals} %>"
             end
           else
-            component = "#{component}Component"
+            component = "#{partial}Component"
 
             if content
               output = "<%= render #{component}.new(#{locals}) do#{yields} %>#{process(content)}<% end %>"
@@ -94,6 +103,17 @@ module Theo
         "'#{source}'"
       end
 
+      def view_component_loaded?
+        @view_component_loaded ||= Object.const_defined?('ViewComponent')
+      end
+
+      def view_component_exists?(component)
+        return unless view_component_loaded?
+
+        is_capitalized = /^[A-Z]/.match?(component)
+        is_capitalized && Object.const_defined?("#{component}Component")
+      end
+
       def call(template, source = nil)
         theo = process(source)
 

metadata

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