theo-rails 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b210d661f6fd028694497e83aa3b205c5fd89a6d3136fbc1faca2f4e4ddb29
-  data.tar.gz: 734ea63e9962dac3a87a207b0cb82d165c0f4d54a6d791b5398c46dfda15cbc4
+  metadata.gz: 36c3ddae4b6c1dee1bbf309c1ab2c779c81ddaf511b35d7297a5f60b5b91d300
+  data.tar.gz: e3c6a104bca5f66f9f0aad687b6d295d55a0759a0cf816eaab0aff8d1408f647
 SHA512:
-  metadata.gz: 85d866b6839ed5736b50dd5026b65e925f9dae25de88e24d47a9856e7454820fa9f7e8e855a022534ee636c2dfbc0b78584eb16f31543d97e327c1ff14a63b92
-  data.tar.gz: 0b21d4fddb3b4a3618117d23fc2e846881ffc2f7e2b5667187ff33d220cea790ea18c6728a7d2167e228cfea83bed0d7dcab86210eb9cfbf4365ab25a2c8692d
+  metadata.gz: 78a5be9f8c14fbe5125a321a1df522976fb5282210a1a704be86e35121f71cdd5ac21588348a078b11e218228d363d67ae788837dc50d63257b8abef7377e74d
+  data.tar.gz: 85fc477ad21b22d2cef02f9a72ff86d59612bbeb97af0b70c5ff50fb33738e8554d44ac3efbe7a4b1cc8584aabcb397323266f4f398f63c99aa335c582306087

data/lib/theo-rails/theo.rb

@@ -7,11 +7,8 @@ module Theo
     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
@@ -29,11 +26,10 @@ module Theo
         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]
@@ -50,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
 
@@ -66,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 %>"
@@ -104,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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: theo-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Jarek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-06 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