rblade 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edaa1af6299a8281520a73611def0838ef1017f2ec7bb3fd8a125bcd02e5c7ce
-  data.tar.gz: 6363e44a009a29e8771c50ecf4768b0d365b0d2147ba998db72805e9b05c0390
+  metadata.gz: d1a00aab0f9732f42b21921bda5f23b25ce2581f2b0f898c26c5665f0a51046d
+  data.tar.gz: 46db536cfc37cb9307c446d8e23ae7bde18ad7d9947d09f83d1db766d42a505d
 SHA512:
-  metadata.gz: 996e77805b56530e9f136c087753938c10c8dc71d45b1fbaec10e81e890878b9a0da00a10fa024a650cb2e463e155fe8da723fb16a6eb690f5811915ce4fe879
-  data.tar.gz: 5bbe562c01ec5fb12e77cb53aa2991cebfd83792dd831a41957497e3b04e29df442511c890d48fcb05bef78107cf5347019c49c7c8dc9e5d3f9ef0557a63f940
+  metadata.gz: 79920ad59e36a19996a5bceb55370560b6af5ba6075f4db9494c6844f7b729fc63339f7cb106c76a7fb2be4d410554ac5c69793b09e6a4729a1a30213b1c78cb
+  data.tar.gz: 0ba0f79cc1b8cae6997c02821ca724f3211f50c8978f4923bfe0692a626e63a5fc09fb4bcb3de3b206dbda47e6c825a95a6c2faa91784e83cd420e5d31ba0a35

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.2.0 [2024-10-22]
+- Add support for custom directives (#2)
+- Add support for helper functions that use block content (#14)
+- Change to use frozen string literals
+- Fix issue with no space after starting ERB style tag
+- Ignore any @ directives that don't have a handler
+- Make @endruby directive case insensitive and allow underscore
+
+## 1.1.1 [2024-08-23]
+- Remove requirement for including braces in `@props` directive
+
 ## 1.1.0 [2024-08-23]
 - Add `@eachWithIndex` directive
 - Fix attribute manager output of attributes with no value (#10)

data/README.md

@@ -26,6 +26,7 @@ For a quick overview of RBlade's capabilities, refer to the [reference file](REF
   * [Table of Contents](#table-of-contents)
   * [Displaying Data](#displaying-data)
     + [HTML Entity Encoding](#html-entity-encoding)
+    + [ERB Compatbility and Rails Helper Methods](#erb-compatibility-and-rails-helper-methods)
     + [RBlade and JavaScript Frameworks](#rblade-and-javascript-frameworks)
       - [The `@verbatim` Directive](#the-at-verbatim-directive)
   * [RBlade Directives](#rblade-directives)
@@ -37,6 +38,7 @@ For a quick overview of RBlade's capabilities, refer to the [reference file](REF
     + [Additional Attributes](#additional-attributes)
     + [The `@once` Directive](#the-once-directive)
     + [Raw Ruby](#raw-ruby)
+    + [Custom Directives](#custom-directives)
     + [Comments](#comments)
   * [Components](#components)
     + [Rendering Components](#rendering-components)
@@ -66,14 +68,14 @@ You can display data that is passed to your RBlade views by wrapping the variabl
 
 ```ruby
 def index
-  name = "Samantha"
+  @name = "Samantha"
 end
 ```
 
 You can display the contents of the `name` variable like so:
 
 ```rblade
-Hello, {{ name }}.
+Hello, {{ @name }}.
 ```
 
 > [!NOTE]  
@@ -91,12 +93,20 @@ The current UNIX timestamp is {{ Time.now.to_i }}.
 By default, RBlade `{{ }}` directives are automatically sent through Rails' `h` function to prevent XSS attacks. If you do not want your data to be escaped, you can use the following syntax:
 
 ```rblade
-Hello, {!! name !!}.
+Hello, {!! @name !!}.
 ```
 
 > [!WARNING]  
 > Be very careful when printing content that is supplied by users of your application. You should typically use the escaped, double curly brace syntax to prevent XSS attacks when displaying user supplied data.
 
+
+<a name="erb-compatibility-and-rails-helper-methods"></a>
+### ERB Compatbility and Rails Helper Methods
+
+For the most part, RBlade templates are backwards compatible with the built in ERB templates. Anything that works in an ERB template should also work in an RBlade template.
+
+This includes helper methods, path helpers and methods from third party gems such as `simple_forms` or `vite-ruby`. It additionally includes the ERB syntax for outputting data, `<%= ... %>`, and running ruby code, `<%= ... %>`.
+
 <a name="rblade-and-javascript-frameworks"></a>
 ### RBlade and JavaScript Frameworks
 
@@ -419,6 +429,23 @@ In some situations, it's useful to embed Ruby code into your views. You can use
 @endRuby
 ```
 
+<a name="custom-directives"></a>
+### Custom Directives
+
+RBlade also allows you to define your own directives using the `RBlade.register_directive_handler`
+method. When the compiler encounters the custom directive, it will call the provided block and
+output the returned value.
+
+```rblade
+RBlade::register_directive_handler('sum') do |args|
+  args.inject(0) { |sum, num| sum + num.to_i }
+end
+
+@sum(1)       -> 1
+@sum(1, 2)    -> 3
+@sum(1, 2, 3) -> 6
+```
+
 <a name="comments"></a>
 ### Comments
 
@@ -491,7 +518,7 @@ You can define a component's data properties using a `@props` directive at the t
 
 ```rblade
 {{-- alert.rblade --}}
-@props({type: "warning", message: required})
+@props(type: "warning", message: required)
 <div class="{{ type }}">{{ message }}</div>
 ```
 
@@ -505,7 +532,7 @@ The `@props` directive accepts a Hash where the key is the name of the attribute
 All properties in the `@props` directive are automatically removed from `attributes`. Properties with names that aren't valid Ruby variable names or are Ruby reserved keywords are not created as local variables. However, you can reference them via the `attributes` local variable:
 
 ```rblade
-@props({"for": required, "data-value": nil})
+@props("for": required, "data-value": nil)
 <div>{{ attributes[:for] }} {{ attributes[:'data-value'] }}</div>
 ```
 
@@ -697,7 +724,7 @@ Sometimes a component may need to render multiple different slots in different l
 
 ```rblade
 {{-- /app/views/components/alert.rblade --}}
-@props({title: required})
+@props(title: required)
 <span class="alert-title">{{ title }}</span>
 <div class="alert alert-danger">
     {{ slot }}
@@ -752,10 +779,10 @@ Like RBlade components, you can assign additional [attributes](#component-attrib
 To interact with slot attributes, you can access the `attributes` property of the slot's variable. For more information on how to interact with attributes, please consult the documentation on [component attributes](#component-attributes):
 
 ```rblade
-@props({
+@props(
     "heading": required,
     "footer": required,
-})
+)
 
 <div {{ attributes.class('border') }}>
     <h1 {{ heading.attributes.class('text-lg') }}>
@@ -777,7 +804,7 @@ Sometimes, you may wish to return early from a component without printing anythi
 
 ```rblade
 {{-- components/error.rblade --}}
-@props({errors: []})
+@props(errors: [])
 @shouldRender(errors.present?)
 ...
 ```

data/REFERENCE.md

@@ -30,8 +30,8 @@ By default, RBlade will look for components in the `app/views/components` folder
 | `<x-name @style({'bg-red-600': is_error})/>`             | Conditionally pass styles to a component                                                                                                   |
 | `<x-name attribute/>`                                    | Pass an attribute to a component with value `true`                                                                                         |
 | `<x-name {{ attributes }}/>`                             | Pass attributes to a child component                                                                                                       |
-| `@props({header: "Header"})`                             | Remove `header` from the attributes Hash and introduce it as a local variable, using the specified value as a default                      |
-| `@props({header: required})`                             | Remove `header` from the attributes Hash and introduce it as a local variable, raising an error if it is not set                           |
+| `@props(header: "Header")`                               | Remove `header` from the attributes Hash and introduce it as a local variable, using the specified value as a default                      |
+| `@props(header: required)`                               | Remove `header` from the attributes Hash and introduce it as a local variable, raising an error if it is not set                           |
 | `{{ slot }}`                                             | Output the block content passed into the current component                                                                                 |
 | `<x-name><x-slot::header><h1>Header</h1><//>Content<//>` | Pass a named block to a component                                                                                                          |
 | `{{ header }}`                                           | Output the contents of a named block                                                                                                       |

data/lib/rblade/compiler/compiles_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesComments
     def compile!(tokens)

data/lib/rblade/compiler/compiles_components.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/component_store"
 
 module RBlade
@@ -34,7 +36,7 @@ module RBlade
 
       attributes = compile_attributes token.value[:attributes]
 
-      code = "_c#{component[:index]}_swap=_out;_out='';"
+      code = +"_c#{component[:index]}_swap=_out;_out=+'';"
       code << "_c#{component[:index]}_attr={#{attributes.join(",")}};"
 
       code
@@ -65,14 +67,14 @@ module RBlade
     def compile_slot_end name, component
       parent = @component_stack.last
 
-      code = "_c#{parent[:index]}_attr[:'#{RBlade.escape_quotes(name)}']=RBlade::SlotManager.new(_out,_c#{component[:index]}_attr);"
+      code = +"_c#{parent[:index]}_attr[:'#{RBlade.escape_quotes(name)}']=RBlade::SlotManager.new(_out,_c#{component[:index]}_attr);"
       code << "_out=_c#{component[:index]}_swap;_c#{component[:index]}_swap=nil;_c#{component[:index]}_attr=nil;"
 
       code
     end
 
     def compile_component_end component
-      code = "_slot=RBlade::SlotManager.new(_out);_out=_c#{component[:index]}_swap;"
+      code = +"_slot=RBlade::SlotManager.new(_out);_out=_c#{component[:index]}_swap;"
       code << "_out<<#{ComponentStore.component(component[:name])}(_slot,_c#{component[:index]}_attr,params,session,flash,cookies);"
       code << "_slot=nil;_c#{component[:index]}_swap=nil;_c#{component[:index]}_attr=nil;"
 

data/lib/rblade/compiler/compiles_prints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesPrints
     def compile!(tokens)
@@ -8,8 +10,8 @@ module RBlade
     private
 
     def compile_regular_prints!(tokens)
-      compile_prints! tokens, "{{", "}}", "RBlade.e"
-      compile_prints! tokens, "<%=", "%>", "RBlade.e"
+      compile_prints! tokens, "{{", "}}", +"RBlade.e"
+      compile_prints! tokens, "<%=", "%>", +"RBlade.e"
     end
 
     def compile_unsafe_prints!(tokens)
@@ -35,14 +37,8 @@ module RBlade
           elsif segments[i] == start_token
             segments.delete_at i
             segments.delete_at i + 1
-            segment_value = "_out<<"
 
-            segment_value <<= if !wrapper_function.nil?
-              wrapper_function + "(" + segments[i] + ");"
-            else
-              "(" + segments[i] + ").to_s;"
-            end
-            segments[i] = Token.new(:print, segment_value)
+            segments[i] = create_token(segments[i], wrapper_function)
 
             i += 1
           elsif !segments[i].nil? && segments[i] != ""
@@ -57,5 +53,29 @@ module RBlade
         segments
       end.flatten!
     end
+
+    def create_token expression, wrapper_function
+      if expression.match?(/
+        do\s*
+        (
+          \|\s*
+          [a-zA-Z0-9_]+\s*
+          (,\s*[a-zA-Z0-9_]+)?\s*
+          \|\s*
+        )?
+        $/x)
+        return Token.new(:print, "_out+=#{expression};_out=+'';")
+      elsif expression.match?(/^\s*end(?![a-zA-Z0-9_])/i)
+        return Token.new(:print, "_out;#{expression};")
+      end
+
+      segment_value = if !wrapper_function.nil?
+        "_out<<#{wrapper_function}(#{expression});"
+      else
+        "_out<<(#{expression}).to_s;"
+      end
+
+      Token.new(:print, segment_value)
+    end
   end
 end

data/lib/rblade/compiler/compiles_ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesRuby
     def compile!(tokens)
@@ -6,15 +8,15 @@ module RBlade
 
         segments = token.value.split(/
           # @ escapes blade style tags
-          (@)(@ruby.+?@endruby)
+          (@)(@ruby.+?@end_?ruby)
           |
           # <%% and %%> are escape ERB style tags
           (<%%)(.+?)(%%>)
           |
-          \s?(?<!\w)(@ruby)\s+(.+?)[\s;]*(@endruby)(?!\w)\s?
+          \s?(?<!\w)(@ruby)\s+(.+?)[\s;]*(@end_?ruby)(?!\w)\s?
           |
-          (<%)\s+(.+?)[\s;]*(%>)
-        /xm)
+          (<%)(?!=)\s*(.+?)[\s;]*(%>)
+        /xmi)
 
         i = 0
         while i < segments.count
@@ -29,7 +31,7 @@ module RBlade
             segments[i] = Token.new(type: :raw_text, value: "<%#{segments[i]}%>")
 
             i += 1
-          elsif segments[i] == "@ruby" || segments[i] == "<%"
+          elsif segments[i].downcase == "@ruby" || segments[i] == "<%"
             segments.delete_at i
             segments.delete_at i + 1
 
@@ -38,7 +40,13 @@ module RBlade
               segments[i] << ";"
             end
 
-            segments[i] = Token.new(type: :ruby, value: segments[i])
+            # Ensure _out is returned at the end of any blocks
+            # See also ./compiles_prints.rb
+            segments[i] = if segments[i].match?(/^end(?![a-zA-Z0-9_])/i)
+              Token.new(type: :ruby, value: "_out;#{segments[i]}")
+            else
+              Token.new(type: :ruby, value: segments[i])
+            end
 
             i += 1
           elsif !segments[i].nil? && segments[i] != ""

data/lib/rblade/compiler/compiles_statements.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/compiler/statements/compiles_component_helpers"
 require "rblade/compiler/statements/compiles_conditionals"
 require "rblade/compiler/statements/compiles_form"
@@ -13,6 +15,7 @@ module RBlade
       token_index = 0
       while token_index < tokens.count
         token = tokens[token_index]
+
         if token.type != :statement
           token_index += 1
           next
@@ -34,7 +37,11 @@ module RBlade
           end
         end
 
-        token.value = handler.call(*handler_arguments)
+        token.value = if handler.is_a? Proc
+          "_out<<'#{RBlade.escape_quotes(handler.call(*handler_arguments).to_s)}';"
+        else
+          handler.call(*handler_arguments)
+        end
         token_index += 1
       end
     end
@@ -43,11 +50,24 @@ module RBlade
       "end;"
     end
 
+    def self.has_handler(name)
+      name = name.downcase
+      @@statement_handlers[name.tr("_", "")].present? || name.start_with?("end")
+    end
+
+    def self.register_handler(name, &block)
+      @@statement_handlers[name.tr("_", "").downcase] = ["proc", block]
+    end
+
     private
 
     def getHandler(name)
       handler_class, handler_method = @@statement_handlers[name.tr("_", "").downcase]
 
+      if handler_class == "proc"
+        return handler_method
+      end
+
       if !handler_class&.method_defined?(handler_method)
         if name.start_with? "end"
           ## Fallback to the default end handler

data/lib/rblade/compiler/compiles_verbatim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesVerbatim
     def compile!(tokens)

data/lib/rblade/compiler/statements/compiles_component_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/helpers/tokenizer"
 
 module RBlade
@@ -18,17 +20,15 @@ module RBlade
 
         props = extractProps args[0]
         props.map do |key, value|
-          compiled_code = ""
-
           # `_required` is deprecated. Use `required`. To be removed in 2.0.0
-          compiled_code << if value == "_required" || value == "required"
+          compiled_code = if value == "_required" || value == "required"
             "if !attributes.has?(:'#{RBlade.escape_quotes(key)}');raise \"Props statement: #{key} is not defined\";end;"
           else
             "attributes.default(:'#{RBlade.escape_quotes(key)}', #{value});"
           end
 
           if isValidVariableName key
-            compiled_code << if variableIsSlot key, tokens
+            compiled_code += if variableIsSlot key, tokens
               "#{key}=RBlade::SlotManager.wrap(attributes.delete :'#{RBlade.escape_quotes(key)}');"
             else
               "#{key}=attributes.delete :'#{RBlade.escape_quotes(key)}';"
@@ -42,12 +42,12 @@ module RBlade
       private
 
       def extractProps prop_string
-        if !prop_string.start_with?("{") || !prop_string.end_with?("}")
-          raise StandardError.new "Props statement: expecting hash as parameter"
+        if prop_string.start_with?("{") && prop_string.end_with?("}")
+          prop_string = prop_string.delete_prefix("{").delete_suffix("}")
         end
 
         props = {}
-        prop_strings = Tokenizer.extractCommaSeparatedValues prop_string[1..-2]
+        prop_strings = Tokenizer.extractCommaSeparatedValues prop_string
 
         prop_strings.each do |prop|
           prop.strip!

data/lib/rblade/compiler/statements/compiles_conditionals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesConditionals

data/lib/rblade/compiler/statements/compiles_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesForm

data/lib/rblade/compiler/statements/compiles_html_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesHtmlAttributes

data/lib/rblade/compiler/statements/compiles_inline_ruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesInlineRuby

data/lib/rblade/compiler/statements/compiles_loops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesLoops

data/lib/rblade/compiler/statements/compiles_once.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesOnce
@@ -23,7 +25,7 @@ module RBlade
         once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
 
         "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};" \
-          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out='';"
+          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out=+'';"
       end
 
       def compileEndPushOnce args
@@ -42,7 +44,7 @@ module RBlade
         once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
 
         "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};" \
-          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out='';"
+          << "_p1_#{@once_counter}=#{args[0]};_p1_#{@once_counter}_b=_out;_out=+'';"
       end
 
       def compileEndPrependOnce args

data/lib/rblade/compiler/statements/compiles_stacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class CompilesStatements
     class CompilesStacks
@@ -10,7 +12,7 @@ module RBlade
           raise StandardError.new "Stack statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "RBlade::StackManager.initialize(#{args[0]}, _out);_stacks.push(#{args[0]});_out = '';"
+        "RBlade::StackManager.initialize(#{args[0]}, _out);_stacks.push(#{args[0]});_out=+'';"
       end
 
       def compilePrepend args
@@ -20,7 +22,7 @@ module RBlade
 
         @push_counter += 1
 
-        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
+        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out=+'';"
       end
 
       def compileEndPrepend args
@@ -56,7 +58,7 @@ module RBlade
 
         @push_counter += 1
 
-        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
+        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out=+'';"
       end
 
       def compilePushIf args

data/lib/rblade/compiler/tokenizes_components.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ripper"
 
 module RBlade

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/helpers/tokenizer"
 require "ripper"
 
@@ -18,7 +20,7 @@ module RBlade
             (?:
               (@)
               (\w+(?!\w)[!\?]?)
-              (?:[ \t]*
+              (?:([ \t]*)
                 (\(.*?\))
               )?
             )
@@ -44,8 +46,23 @@ module RBlade
 
           i += 1
         elsif segment == "@"
-          tokenizeStatement! segments, i
-          handleSpecialCases! segments, i
+          if CompilesStatements.has_handler(segments[i + 1])
+            tokenizeStatement! segments, i
+            handleSpecialCases! segments, i
+          else
+            # For unhandled statements, restore the original string
+            segments[i] = Token.new(type: :unprocessed, value: segments[i] + segments[i + 1])
+            segments.delete_at i + 1
+
+            if segments.count > i + 2 && segments[i + 1].match(/^[ \t]*$/) && segments[i + 2][0] == "("
+              segments[i].value += segments[i + 1] + segments[i + 2]
+              segments.delete_at i + 1
+              segments.delete_at i + 1
+            elsif segments.count > i + 1 && segments[i + 1][0] == "("
+              segments[i].value += segments[i + 1]
+              segments.delete_at i + 1
+            end
+          end
 
           i += 1
         elsif !segments[i].nil? && segments[i] != ""
@@ -64,6 +81,11 @@ module RBlade
       statement_data = {name: segments[i + 1]}
       segments.delete_at i + 1
 
+      # Remove optional whitespace
+      if segments.count > i + 2 && segments[i + 1].match(/^[ \t]*$/) && segments[i + 2][0] == "("
+        segments.delete_at i + 1
+      end
+
       if segments.count > i + 1 && segments[i + 1][0] == "("
         arguments = tokenizeArguments! segments, i + 1
 

data/lib/rblade/compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/compiler/compiles_comments"
 require "rblade/compiler/compiles_components"
 require "rblade/compiler/compiles_prints"
@@ -21,7 +23,7 @@ module RBlade
     string.gsub(/['\\\x0]/, '\\\\\0')
   end
 
-  def self.e string
+  def self.e(string)
     if string.is_a?(HtmlString) || string.is_a?(ActiveSupport::SafeBuffer)
       string
     else
@@ -29,6 +31,15 @@ module RBlade
     end
   end
 
+  # Register a new custom directive by providing a class and method that will compile the directive into ruby code.
+  #
+  # @param [String] name The directive tag without the "@", e.g. "if" for the "@if" directive
+  # @param [Proc] block The block that will return the compiled ruby code for the directive. Any arguments will be passed to this Proc as an array.
+  # @return [void]
+  def self.register_directive_handler(name, &)
+    CompilesStatements.register_handler(name, &)
+  end
+
   class Compiler
     def self.compileString(string_template)
       tokens = [Token.new(:unprocessed, string_template)]
@@ -56,13 +67,13 @@ module RBlade
     end
 
     def self.compileTokens tokens
-      output = ""
+      output = +""
 
-      tokens.each do |token, cake|
-        if token.type == :unprocessed || token.type == :raw_text
-          output << "_out<<'" << RBlade.escape_quotes(token.value) << "';"
+      tokens.each do |token|
+        output << if token.type == :unprocessed || token.type == :raw_text
+          "_out<<'#{RBlade.escape_quotes(token.value)}';"
         else
-          output << token.value
+          token.value
         end
       end
 

data/lib/rblade/component_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   FILE_EXTENSIONS = [".rblade", ".html.rblade"]
 
@@ -48,7 +50,7 @@ module RBlade
     end
 
     def self.clear
-      @@component_definitions = ""
+      @@component_definitions = +""
       @@component_method_names = {}
       @@component_name_stack = []
     end
@@ -78,12 +80,7 @@ module RBlade
 
       compiled_component = RBlade::Compiler.compileString(code)
 
-      @@component_definitions \
-        << "def #{@@component_method_names[name]}(slot,attributes,params,session,flash,cookies);_out='';" \
-        << "_stacks=[];" \
-        << "attributes=RBlade::AttributesManager.new(attributes);" \
-        << compiled_component \
-        << "RBlade::StackManager.get(_stacks) + _out;end;"
+      @@component_definitions << "def #{@@component_method_names[name]}(slot,attributes,params,session,flash,cookies);_out=+'';_stacks=[];attributes=RBlade::AttributesManager.new(attributes);#{compiled_component}RBlade::StackManager.get(_stacks) + _out;end;"
 
       @@component_method_names[name]
     end
@@ -91,7 +88,7 @@ module RBlade
 
     private
 
-    @@component_definitions = ""
+    @@component_definitions = +""
     @@component_name_stack = []
     @@component_method_names = {}
     @@template_paths = {}

data/lib/rblade/helpers/attributes_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/helpers/html_string"
 
 module RBlade

data/lib/rblade/helpers/class_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class ClassManager
     def initialize classes
@@ -6,7 +8,7 @@ module RBlade
       elsif classes.is_a? Array
         @classes = classes.join " "
       elsif classes.is_a? Hash
-        @classes = ""
+        @classes = +""
         classes.map do |value, predicate|
           if predicate
             @classes << "#{value} "

data/lib/rblade/helpers/html_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class HtmlString
   end

data/lib/rblade/helpers/slot_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rblade/helpers/attributes_manager"
 require "rblade/helpers/html_string"
 

data/lib/rblade/helpers/stack_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class StackManager
     def self.initialize stack_name, before_stack
@@ -34,8 +36,8 @@ module RBlade
 
     class Stack
       def initialize
-        @prepends = ""
-        @stack = ""
+        @prepends = +""
+        @stack = +""
       end
 
       def set_before_stack before_stack

data/lib/rblade/helpers/style_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class StyleManager
     def initialize styles
@@ -16,7 +18,7 @@ module RBlade
           style
         end.join
       elsif styles.is_a? Hash
-        @styles = ""
+        @styles = +""
         styles.each do |value, predicate|
           if predicate
             value = value.to_s.strip

data/lib/rblade/helpers/tokenizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBlade
   class Tokenizer
     def self.extractCommaSeparatedValues segment
@@ -36,7 +38,7 @@ module RBlade
             next
           end
 
-          argument = ""
+          argument = +""
 
           # Concatenate all lines up to this token's line, including the tail end of the current line
           if token[0][0] != current_line

data/lib/rblade/rails_template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 require "rblade/compiler"
 require "rblade/component_store"
@@ -25,7 +27,7 @@ module RBlade
           "view::#{view_name}"
         )
       end
-      setup = "_out='';_stacks=[];$_once_tokens=[];"
+      setup = "_out=+'';_stacks=[];$_once_tokens=[];"
       code = RBlade::Compiler.compileString(source || template.source)
       setdown = "RBlade::StackManager.get(_stacks) + _out"
       setup + ComponentStore.get + code + setdown

data/lib/rblade/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 require "rblade/rails_template"
 require "rblade/component_store"

data/lib/rblade.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "rails"
 require "rblade/railtie"

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.summary = "A component-first templating engine for Rails"
   s.description = "RBlade is a simple, yet powerful templating engine for Ruby on Rails, inspired by Laravel Blade."
   s.authors = ["Simon J"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Simon J
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: A component-first templating engine for Rails