herb 0.9.0-arm-linux-gnu → 0.9.2-arm-linux-gnu

data/lib/herb/ast/nodes.rb

@@ -34,7 +34,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -108,7 +114,7 @@ module Herb
       #: (String, Location, Array[Herb::Errors::Error], String) -> void
       def initialize(type, location, errors, content)
         super(type, location, errors)
-        @content = content.force_encoding("utf-8")
+        @content = content&.force_encoding("utf-8")
       end
 
       #: () -> serialized_literal_node
@@ -683,7 +689,7 @@ module Herb
       #: (String, Location, Array[Herb::Errors::Error], String, (Herb::AST::ERBIfNode | Herb::AST::ERBUnlessNode), Herb::AST::HTMLOpenTagNode, Array[Herb::AST::Node], (Herb::AST::HTMLCloseTagNode | Herb::AST::HTMLOmittedCloseTagNode), (Herb::AST::ERBIfNode | Herb::AST::ERBUnlessNode), Herb::Token, String) -> void
       def initialize(type, location, errors, condition, open_conditional, open_tag, body, close_tag, close_conditional, tag_name, element_source)
         super(type, location, errors)
-        @condition = condition.force_encoding("utf-8")
+        @condition = condition&.force_encoding("utf-8")
         @open_conditional = open_conditional
         @open_tag = open_tag
         @body = body
@@ -1036,7 +1042,7 @@ module Herb
       #: (String, Location, Array[Herb::Errors::Error], String) -> void
       def initialize(type, location, errors, content)
         super(type, location, errors)
-        @content = content.force_encoding("utf-8")
+        @content = content&.force_encoding("utf-8")
       end
 
       #: () -> serialized_ruby_literal_node
@@ -1101,8 +1107,8 @@ module Herb
       #: (String, Location, Array[Herb::Errors::Error], String, String) -> void
       def initialize(type, location, errors, content, prefix)
         super(type, location, errors)
-        @content = content.force_encoding("utf-8")
-        @prefix = prefix.force_encoding("utf-8")
+        @content = content&.force_encoding("utf-8")
+        @prefix = prefix&.force_encoding("utf-8")
       end
 
       #: () -> serialized_ruby_html_attributes_splat_node
@@ -1259,7 +1265,7 @@ module Herb
       #: (String, Location, Array[Herb::Errors::Error], String) -> void
       def initialize(type, location, errors, content)
         super(type, location, errors)
-        @content = content.force_encoding("utf-8")
+        @content = content&.force_encoding("utf-8")
       end
 
       #: () -> serialized_html_text_node
@@ -1726,7 +1732,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2010,7 +2022,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2139,7 +2157,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2353,7 +2377,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2487,7 +2517,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2615,7 +2651,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2731,7 +2773,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -2847,7 +2895,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -3154,7 +3208,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -3303,7 +3363,13 @@ module Herb
         return nil unless prism_node
         return nil unless source
 
-        require "prism"
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
         Prism.load(source, prism_node).value
       end
 
@@ -3397,6 +3463,316 @@ module Herb
       end
     end
 
+    #: type serialized_ruby_render_local_node = {
+    #|  name: Herb::Token?,
+    #|  value: Herb::AST::RubyLiteralNode?,
+    #| }
+    class RubyRenderLocalNode < Node
+      include Colors
+
+      attr_reader :name #: Herb::Token?
+      attr_reader :value #: Herb::AST::RubyLiteralNode?
+
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::AST::RubyLiteralNode) -> void
+      def initialize(type, location, errors, name, value)
+        super(type, location, errors)
+        @name = name
+        @value = value
+      end
+
+      #: () -> serialized_ruby_render_local_node
+      def to_hash
+        super.merge({
+          name: name,
+          value: value,
+        }) #: Herb::serialized_ruby_render_local_node
+      end
+
+      #: (Visitor) -> void
+      def accept(visitor)
+        visitor.visit_ruby_render_local_node(self)
+      end
+
+      #: () -> Array[Herb::AST::Node?]
+      def child_nodes
+        [value]
+      end
+
+      #: () -> Array[Herb::AST::Node]
+      def compact_child_nodes
+        child_nodes.compact
+      end
+
+      #: () -> String
+      def inspect
+        tree_inspect.rstrip.gsub(/\s+$/, "")
+      end
+
+      #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
+      def tree_inspect(indent: 0, depth: 0, depth_limit: 10)
+        output = +""
+
+        output += white("@ #{bold(yellow(node_name.to_s))} #{dimmed("(location: #{location.tree_inspect})")}")
+        output += "\n"
+
+        if depth >= depth_limit
+          output += dimmed("└── [depth limit reached ...]\n\n")
+
+          return output.gsub(/^/, "    " * indent)
+        end
+
+        output += inspect_errors(prefix: "│   ")
+
+        output += white("├── name: ")
+        output += name ? name.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("└── value: ")
+        if value
+          output += "\n"
+          output += "    └── "
+          output += value.tree_inspect(indent: indent, depth: depth + 1, depth_limit: depth_limit).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, "    ").delete_prefix("    ")
+        else
+          output += magenta("∅\n")
+        end
+        output += "\n"
+
+        output.gsub(/^/, "    " * indent)
+      end
+    end
+
+    #: type serialized_erb_render_node = {
+    #|  tag_opening: Herb::Token?,
+    #|  content: Herb::Token?,
+    #|  tag_closing: Herb::Token?,
+    #|  analyzed_ruby: nil,
+    #|  prism_node: String?,
+    #|  partial: Herb::Token?,
+    #|  template_path: Herb::Token?,
+    #|  layout: Herb::Token?,
+    #|  file: Herb::Token?,
+    #|  inline_template: Herb::Token?,
+    #|  body: Herb::Token?,
+    #|  plain: Herb::Token?,
+    #|  html: Herb::Token?,
+    #|  renderable: Herb::Token?,
+    #|  collection: Herb::Token?,
+    #|  object: Herb::Token?,
+    #|  as_name: Herb::Token?,
+    #|  spacer_template: Herb::Token?,
+    #|  formats: Herb::Token?,
+    #|  variants: Herb::Token?,
+    #|  handlers: Herb::Token?,
+    #|  content_type: Herb::Token?,
+    #|  locals: Array[Herb::AST::RubyRenderLocalNode]?,
+    #| }
+    class ERBRenderNode < Node
+      include Colors
+
+      attr_reader :tag_opening #: Herb::Token?
+      attr_reader :content #: Herb::Token?
+      attr_reader :tag_closing #: Herb::Token?
+      attr_reader :analyzed_ruby #: nil
+      attr_reader :prism_node #: String?
+      attr_reader :partial #: Herb::Token?
+      attr_reader :template_path #: Herb::Token?
+      attr_reader :layout #: Herb::Token?
+      attr_reader :file #: Herb::Token?
+      attr_reader :inline_template #: Herb::Token?
+      attr_reader :body #: Herb::Token?
+      attr_reader :plain #: Herb::Token?
+      attr_reader :html #: Herb::Token?
+      attr_reader :renderable #: Herb::Token?
+      attr_reader :collection #: Herb::Token?
+      attr_reader :object #: Herb::Token?
+      attr_reader :as_name #: Herb::Token?
+      attr_reader :spacer_template #: Herb::Token?
+      attr_reader :formats #: Herb::Token?
+      attr_reader :variants #: Herb::Token?
+      attr_reader :handlers #: Herb::Token?
+      attr_reader :content_type #: Herb::Token?
+      attr_reader :locals #: Array[Herb::AST::RubyRenderLocalNode]?
+
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, nil, String, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::RubyRenderLocalNode]) -> void
+      def initialize(type, location, errors, tag_opening, content, tag_closing, analyzed_ruby, prism_node, partial, template_path, layout, file, inline_template, body, plain, html, renderable, collection, object, as_name, spacer_template, formats, variants, handlers, content_type, locals)
+        super(type, location, errors)
+        @tag_opening = tag_opening
+        @content = content
+        @tag_closing = tag_closing
+        @analyzed_ruby = analyzed_ruby
+        @prism_node = prism_node
+        @partial = partial
+        @template_path = template_path
+        @layout = layout
+        @file = file
+        @inline_template = inline_template
+        @body = body
+        @plain = plain
+        @html = html
+        @renderable = renderable
+        @collection = collection
+        @object = object
+        @as_name = as_name
+        @spacer_template = spacer_template
+        @formats = formats
+        @variants = variants
+        @handlers = handlers
+        @content_type = content_type
+        @locals = locals
+      end
+
+      #: () -> Prism::node?
+      def deserialized_prism_node
+        prism_node = @prism_node
+        return nil unless prism_node
+        return nil unless source
+
+        begin
+          require "prism"
+        rescue LoadError
+          warn "The 'prism' gem is required to deserialize Prism nodes. Add it to your Gemfile or install it with: gem install prism"
+          return nil
+        end
+
+        Prism.load(source, prism_node).value
+      end
+
+      #: () -> serialized_erb_render_node
+      def to_hash
+        super.merge({
+          tag_opening: tag_opening,
+          content: content,
+          tag_closing: tag_closing,
+          analyzed_ruby: analyzed_ruby,
+          prism_node: prism_node,
+          partial: partial,
+          template_path: template_path,
+          layout: layout,
+          file: file,
+          inline_template: inline_template,
+          body: body,
+          plain: plain,
+          html: html,
+          renderable: renderable,
+          collection: collection,
+          object: object,
+          as_name: as_name,
+          spacer_template: spacer_template,
+          formats: formats,
+          variants: variants,
+          handlers: handlers,
+          content_type: content_type,
+          locals: locals,
+        }) #: Herb::serialized_erb_render_node
+      end
+
+      #: (Visitor) -> void
+      def accept(visitor)
+        visitor.visit_erb_render_node(self)
+      end
+
+      #: () -> Array[Herb::AST::Node?]
+      def child_nodes
+        [*(locals || [])]
+      end
+
+      #: () -> Array[Herb::AST::Node]
+      def compact_child_nodes
+        child_nodes.compact
+      end
+
+      #: () -> String
+      def inspect
+        tree_inspect.rstrip.gsub(/\s+$/, "")
+      end
+
+      #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
+      def tree_inspect(indent: 0, depth: 0, depth_limit: 10)
+        output = +""
+
+        output += white("@ #{bold(yellow(node_name.to_s))} #{dimmed("(location: #{location.tree_inspect})")}")
+        output += "\n"
+
+        if depth >= depth_limit
+          output += dimmed("└── [depth limit reached ...]\n\n")
+
+          return output.gsub(/^/, "    " * indent)
+        end
+
+        output += inspect_errors(prefix: "│   ")
+
+        output += white("├── tag_opening: ")
+        output += tag_opening ? tag_opening.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── content: ")
+        output += content ? content.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── tag_closing: ")
+        output += tag_closing ? tag_closing.tree_inspect : magenta("∅")
+        output += "\n"
+        if prism_node && source
+          output += white("├── prism_node: ")
+          output += Herb::PrismInspect.inspect_prism_serialized(prism_node, source, "│   ")
+          output += "\n"
+        end
+        output += white("├── partial: ")
+        output += partial ? partial.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── template_path: ")
+        output += template_path ? template_path.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── layout: ")
+        output += layout ? layout.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── file: ")
+        output += file ? file.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── inline_template: ")
+        output += inline_template ? inline_template.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── body: ")
+        output += body ? body.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── plain: ")
+        output += plain ? plain.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── html: ")
+        output += html ? html.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── renderable: ")
+        output += renderable ? renderable.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── collection: ")
+        output += collection ? collection.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── object: ")
+        output += object ? object.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── as_name: ")
+        output += as_name ? as_name.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── spacer_template: ")
+        output += spacer_template ? spacer_template.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── formats: ")
+        output += formats ? formats.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── variants: ")
+        output += variants ? variants.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── handlers: ")
+        output += handlers ? handlers.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("├── content_type: ")
+        output += content_type ? content_type.tree_inspect : magenta("∅")
+        output += "\n"
+        output += white("└── locals: ")
+        output += inspect_array(locals, prefix: "    ", indent: indent, depth: depth + 1, depth_limit: depth_limit)
+        output += "\n"
+
+        output.gsub(/^/, "    " * indent)
+      end
+    end
+
     #: type serialized_erb_yield_node = {
     #|  tag_opening: Herb::Token?,
     #|  content: Herb::Token?,

data/lib/herb/engine/compiler.rb

@@ -10,9 +10,6 @@ module Herb
 
         @engine = engine
         @escape = options.fetch(:escape) { options.fetch(:escape_html, false) }
-        @attrfunc = options.fetch(:attrfunc, @escape ? "__herb.attr" : "::Herb::Engine.attr")
-        @jsfunc = options.fetch(:jsfunc, @escape ? "__herb.js" : "::Herb::Engine.js")
-        @cssfunc = options.fetch(:cssfunc, @escape ? "__herb.css" : "::Herb::Engine.css")
         @tokens = [] #: Array[untyped]
         @element_stack = [] #: Array[String]
         @context_stack = [:html_content]
@@ -28,26 +25,16 @@ module Herb
             @engine.send(:add_text, value)
           when :code
             @engine.send(:add_code, value)
-          when :expr
-            if [:attribute_value, :script_content, :style_content].include?(context)
-              add_context_aware_expression(value, context)
-            else
-              indicator = @escape ? "==" : "="
-              @engine.send(:add_expression, indicator, value)
-            end
-          when :expr_escaped
-            if [:attribute_value, :script_content, :style_content].include?(context)
-              add_context_aware_expression(value, context)
+          when :expr, :expr_escaped
+            indicator = indicator_for(type)
+
+            if context_aware_context?(context)
+              @engine.send(:add_context_aware_expression, indicator, value, context)
             else
-              indicator = @escape ? "=" : "=="
               @engine.send(:add_expression, indicator, value)
             end
-          when :expr_block
-            indicator = @escape ? "==" : "="
-            @engine.send(:add_expression_block, indicator, value)
-          when :expr_block_escaped
-            indicator = @escape ? "=" : "=="
-            @engine.send(:add_expression_block, indicator, value)
+          when :expr_block, :expr_block_escaped
+            @engine.send(:add_expression_block, indicator_for(type), value)
           when :expr_block_end
             @engine.send(:add_expression_block_end, value, escaped: escaped)
           end
@@ -342,27 +329,6 @@ module Herb
         @context_stack.pop
       end
 
-      def add_context_aware_expression(code, context)
-        closing = code.include?("#") ? "\n))" : "))"
-
-        case context
-        when :attribute_value
-          @engine.send(:with_buffer) {
-            @engine.src << " << #{@attrfunc}((" << code << closing
-          }
-        when :script_content
-          @engine.send(:with_buffer) {
-            @engine.src << " << #{@jsfunc}((" << code << closing
-          }
-        when :style_content
-          @engine.send(:with_buffer) {
-            @engine.src << " << #{@cssfunc}((" << code << closing
-          }
-        else
-          @engine.send(:add_expression_result_escaped, code)
-        end
-      end
-
       def process_erb_tag(node, skip_comment_check: false)
         opening = node.tag_opening.value
 
@@ -503,6 +469,16 @@ module Herb
         @trim_next_whitespace = true if has_right_trim
       end
 
+      def indicator_for(type)
+        escaped = [:expr_escaped, :expr_block_escaped].include?(type)
+
+        escaped ^ @escape ? "==" : "="
+      end
+
+      def context_aware_context?(context)
+        [:attribute_value, :script_content, :style_content].include?(context)
+      end
+
       def should_escape_output?(opening)
         is_double_equals = opening == "<%=="
         is_double_equals ? !@escape : @escape