antlers 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581b3e4990e2c5279c26989e05e545f61a80a3fb8590c8a4bfd058878f2684f8
-  data.tar.gz: 5135d9c10a19fa9bb80c79694f998287c1dad614514a6d22c915cfc371d54b71
+  metadata.gz: 181c1f53191d4d32c458d74cc67b1d97082d0c023631b0af0fe726dc0db86d9e
+  data.tar.gz: 010ab20070af4634c783f2aa8573f8fa69be674bf96451df15e59f434cc8fa90
 SHA512:
-  metadata.gz: 4e85dd8fc504c21fe4c71f692203dc695fd60834e2f2f33185c1daf6edbf3e64c4c8eccf29710d899f5beab1c348cac1c9fe6a8350778b7563cd4d879cef78e2
-  data.tar.gz: 5b4853ba5e0d0749d4305c57923d6488ddcd5b05892aa2e274dd3683519ae85fcbd9a84b117e9c453a9b1ab256c814cd6f6d35b71db76935e30f0c86d17852ba
+  metadata.gz: d50a398b59defec9de55b59e45c3bd1b57d56f846221b6e00bbd080522909225f6a9e62cd6bc7326b30d60322faf30fbaecf41cada8ed04caa076bafc44be1d0
+  data.tar.gz: 4c8e9d78e0ee5ce5fbb6dcdb1c76e3ebd91f1c2600cd6accbb066cce81ccad9038aed99f65c6f3c28c99265dcfe7a95729bae02f07ca17283d81821153e7f9ae

data/lib/lexer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'queries'
+require_relative 'support/queries'
 
 module Antlers
   extend Queries

data/lib/modules/props.rb

@@ -27,7 +27,7 @@ module Antlers
       evaluated_props = {}
 
       props.each do |name, value|
-        evaluated_props[name] = evaluate(name: value, current_binding:)
+        evaluated_props[name] = evaluate(name: value, current_binding:) || fallback(value)
       end
 
       evaluated_props

data/lib/modules/variables.rb

@@ -1,12 +1,16 @@
+require_relative '../support/queries'
+
 module Antlers
   module Variables
+    extend Queries
+
     # Evaluation limited to the following for security and to prevent a templating language becoming a programming language.
     #  1. An instance variable
     #  2. A method call/local variable
     #  3. A method chain
     #  4. A static string
     def evaluate(name:, current_binding:)
-      return @value.to_s unless current_binding
+      return name.to_s unless current_binding
 
       name, *chain = name.split('.')
 
@@ -14,9 +18,15 @@ module Antlers
       return method_chain(result:, chain:, current_binding:) if chain.count > 0
       return result if result
 
-      @value.to_s
-    rescue NameError
-      @value.to_s
+      nil
+    rescue StandardError
+      nil
+    end
+
+    def fallback(value)
+      return value[1..-2] if Queries.user_defined_string?(value)
+
+      value
     end
 
     private

data/lib/nodes/prop_node.rb

@@ -12,7 +12,10 @@ module Antlers
       event = create_render_event(props:)
 
       renderable_klass = class_from_namespace(namespace: namespace&.split('::') || [], name: @name)
-      renderable_instance = renderable_klass.new(event:)
+      # TODO: There's currently 2 results for "Lowkey[renderable_klass.to_s]", this should not be.
+      # TODO: Only provide args that are defined, similar to how render_template does it.
+      initialize_method = Lowkey[renderable_klass.to_s].first[renderable_klass.to_s][:initialize]
+      renderable_instance = initialize_method ? renderable_klass.new(event:, **props) : renderable_klass.new(event:)
 
       # Classes referenced via "<{ ChildNode }>" must implement class/instance render/render_template methods (See LowNode).
       return renderable_instance.render_template(event:, parent_binding:, props:) if renderable_klass.template

data/lib/nodes/var_node.rb

@@ -18,7 +18,7 @@ module Antlers
     end
 
     def render(current_binding: nil, parent_binding: nil, slot_node: nil, namespace: nil)
-      ERB::Util.html_escape(evaluate(name: @value, current_binding:) || @value)
+      ERB::Util.html_escape(evaluate(name: @value, current_binding:) || fallback(@value))
     end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Antlers
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: antlers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - maedi
@@ -59,7 +59,7 @@ files:
 - lib/nodes/var_node.rb
 - lib/nodes/yield_node.rb
 - lib/parser.rb
-- lib/queries.rb
+- lib/support/queries.rb
 - lib/version.rb
 homepage: https://codeberg.org/raindeer/antlers
 licenses: []