rblade 1.2.1 → 2.0.2

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

@@ -9,7 +9,7 @@ module RBlade
 
       def compileBreak args
         if args&.count&.> 1
-          raise StandardError.new "Break statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
+          raise RBladeTemplateError.new "Break statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
         end
 
         if args.nil?
@@ -21,13 +21,13 @@ module RBlade
 
       def compileEach args
         if args.nil? || args.count > 2
-          raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
+          raise RBladeTemplateError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
         last_arg, collection = args.pop.split(" in ")
         args.push(last_arg)
 
         if collection.nil?
-          raise StandardError.new "Each statement: collection not found (expecting 'in')"
+          raise RBladeTemplateError.new "Each statement: collection not found (expecting 'in')"
         end
 
         "#{collection}.each do |#{args.join(",")}|;"
@@ -35,13 +35,13 @@ module RBlade
 
       def compileEachWithIndex args
         if args.nil? || args.count > 3
-          raise StandardError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
+          raise RBladeTemplateError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
         end
         last_arg, collection = args.pop.split(" in ")
         args.push(last_arg)
 
         if collection.nil?
-          raise StandardError.new "Each with index statement: collection not found (expecting 'in')"
+          raise RBladeTemplateError.new "Each with index statement: collection not found (expecting 'in')"
         end
 
         # Special case for 3 arguments: the first 2 arguments are the key/value pair in a Hash, and
@@ -55,13 +55,13 @@ module RBlade
 
       def compileEachElse args
         if args.nil? || args.count > 2
-          raise StandardError.new "Each else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Each else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
         last_arg, collection = args.pop.split(" in ")
         args.push(last_arg)
 
         if collection.nil?
-          raise StandardError.new "Each else statement: collection not found (expecting 'in')"
+          raise RBladeTemplateError.new "Each else statement: collection not found (expecting 'in')"
         end
 
         @loop_else_counter += 1
@@ -71,13 +71,13 @@ module RBlade
 
       def compileEachWithIndexElse args
         if args.nil? || args.count > 3
-          raise StandardError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
+          raise RBladeTemplateError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
         end
         last_arg, collection = args.pop.split(" in ")
         args.push(last_arg)
 
         if collection.nil?
-          raise StandardError.new "Each with index statement: collection not found (expecting 'in')"
+          raise RBladeTemplateError.new "Each with index statement: collection not found (expecting 'in')"
         end
 
         @loop_else_counter += 1
@@ -93,7 +93,7 @@ module RBlade
 
       def compileFor args
         if args&.count != 1
-          raise StandardError.new "For statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "For statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "for #{args[0]};"
@@ -101,7 +101,7 @@ module RBlade
 
       def compileForElse args
         if args&.count != 1
-          raise StandardError.new "For else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "For else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
         @loop_else_counter += 1
 
@@ -110,7 +110,7 @@ module RBlade
 
       def compileEmpty args
         unless args.nil?
-          raise StandardError.new "Empty statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Empty statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         @loop_else_counter -= 1
@@ -120,7 +120,7 @@ module RBlade
 
       def compileNext args
         if args&.count&.> 1
-          raise StandardError.new "Next statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
+          raise RBladeTemplateError.new "Next statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
         end
 
         if args.nil?
@@ -132,7 +132,7 @@ module RBlade
 
       def compileUntil args
         if args&.count != 1
-          raise StandardError.new "Until statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Until statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "until #{args[0]};"
@@ -140,7 +140,7 @@ module RBlade
 
       def compileWhile args
         if args&.count != 1
-          raise StandardError.new "While statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "While statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "while #{args[0]};"

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

@@ -9,50 +9,32 @@ module RBlade
 
       def compileOnce args
         if args&.count&.> 1
-          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
+          raise RBladeTemplateError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0 or 1)"
         end
 
         once_id = args.nil? ? ":_#{@once_counter += 1}" : args[0]
 
-        "unless $_once_tokens.include? #{once_id};$_once_tokens<<#{once_id};"
+        "unless @_rblade_once_tokens.include? #{once_id};@_rblade_once_tokens<<#{once_id};"
       end
 
       def compilePushOnce args
         if args&.count != 1 && args&.count != 2
-          raise StandardError.new "Push once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
+          raise RBladeTemplateError.new "Push once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
         @once_counter += 1
         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=+'';"
-      end
-
-      def compileEndPushOnce args
-        unless args.nil?
-          raise StandardError.new "End push once statement: wrong number of arguments (given #{args.count}, expecting 0)"
-        end
-
-        "RBlade::StackManager.push(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"
+        "(@_rblade_once_tokens.include? #{once_id}) || @_rblade_once_tokens<<#{once_id} && @_rblade_stack_manager.push(#{args[0]}, @output_buffer) do;"
       end
 
       def compilePrependOnce args
         if args&.count != 1 && args&.count != 2
-          raise StandardError.new "Prepend once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
+          raise RBladeTemplateError.new "Prepend once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
         @once_counter += 1
         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=+'';"
-      end
-
-      def compileEndPrependOnce args
-        unless args.nil?
-          raise StandardError.new "End prepend once statement: wrong number of arguments (given #{args.count}, expecting 0)"
-        end
-
-        "RBlade::StackManager.prepend(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"
+        "(@_rblade_once_tokens.include? #{once_id}) || @_rblade_once_tokens<<#{once_id} && @_rblade_stack_manager.prepend(#{args[0]}, @output_buffer) do;"
       end
     end
   end

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

@@ -3,88 +3,44 @@
 module RBlade
   class CompilesStatements
     class CompilesStacks
-      def initialize
-        @push_counter = 0
-      end
-
       def compileStack args
         if args&.count != 1
-          raise StandardError.new "Stack statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.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_stack_manager.initialize_stack(#{args[0]}, @output_buffer);_stacks.push(#{args[0]});"
       end
 
       def compilePrepend args
         if args&.count != 1
-          raise StandardError.new "Prepend statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Prepend statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        @push_counter += 1
-
-        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out=+'';"
-      end
-
-      def compileEndPrepend args
-        unless args.nil?
-          raise StandardError.new "End prepend statement: wrong number of arguments (given #{args&.count}, expecting 0)"
-        end
-
-        @push_counter -= 1
-
-        "RBlade::StackManager.prepend(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
+        "@_rblade_stack_manager.prepend(#{args[0]}, @output_buffer) do;"
       end
 
       def compilePrependIf args
         if args&.count != 2
-          raise StandardError.new "Prepend if statement: wrong number of arguments (given #{args&.count}, expecting 2)"
-        end
-
-        "if #{args[0]};" + compilePrepend([args[1]])
-      end
-
-      def compileEndPrependIf args
-        unless args.nil?
-          raise StandardError.new "End prepend if statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Prepend if statement: wrong number of arguments (given #{args&.count}, expecting 2)"
         end
 
-        "end;" + compileEndPush(nil)
+        "(#{args[0]}) && @_rblade_stack_manager.prepend(#{args[1]}, @output_buffer) do;"
       end
 
       def compilePush args
         if args&.count != 1
-          raise StandardError.new "Push statement: wrong number of arguments (given #{args&.count}, expecting 1)"
+          raise RBladeTemplateError.new "Push statement: wrong number of arguments (given #{args&.count}, expecting 1)"
         end
 
-        @push_counter += 1
-
-        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out=+'';"
+        "@_rblade_stack_manager.push(#{args[0]}, @output_buffer) do;"
       end
 
       def compilePushIf args
         if args&.count != 2
-          raise StandardError.new "Push if statement: wrong number of arguments (given #{args&.count || 0}, expecting 2)"
-        end
-
-        "if #{args[0]};" + compilePush([args[1]])
-      end
-
-      def compileEndPush args
-        unless args.nil?
-          raise StandardError.new "End push statement: wrong number of arguments (given #{args.count}, expecting 0)"
-        end
-
-        @push_counter -= 1
-
-        "RBlade::StackManager.push(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
-      end
-
-      def compileEndPushIf args
-        unless args.nil?
-          raise StandardError.new "End push if statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Push if statement: wrong number of arguments (given #{args&.count || 0}, expecting 2)"
         end
 
-        "end;" + compileEndPush(nil)
+        "(#{args[0]}) && @_rblade_stack_manager.push(#{args[1]}, @output_buffer) do;"
       end
     end
   end

data/lib/rblade/compiler/tokenizes_components.rb

@@ -12,7 +12,7 @@ module RBlade
 
         i = 0
         while i < segments.count
-          if segments[i] == "</" && segments[i + 1]&.match(/x[-:]/)
+          if segments[i] == "</" && segments[i + 1]&.match?(/x[-:]/)
             segments[i] = Token.new(type: :component_end, value: {name: segments[i + 1][2..]})
 
             segments.delete_at i + 1
@@ -20,7 +20,7 @@ module RBlade
           elsif segments[i] == "<//>"
             segments[i] = Token.new(type: :component_unsafe_end)
             i += 1
-          elsif segments[i] == "<" && segments[i + 1]&.match(/x[-:]/)
+          elsif segments[i] == "<" && segments[i + 1]&.match?(/x[-:]/)
             name = segments[i + 1][2..]
             raw_attributes = (segments[i + 2] != ">") ? tokenizeAttributes(segments[i + 2]) : nil
 
@@ -66,7 +66,7 @@ module RBlade
           attributes.push({type: "attributes", value: raw_attributes[i + 1]})
           i += 3
         else
-          attribute = {name:}
+          attribute = {}
 
           if raw_attributes[i + 1] == "="
             attribute[:value] = raw_attributes[i + 2]
@@ -78,18 +78,28 @@ module RBlade
           # The "::" at the start of attributes is used to escape attribute names beginning with ":"
           if name[0..1] == "::"
             attribute[:type] = "string"
-            attribute[:name].delete_prefix! ":"
+            attribute[:name] = name[1..]
+            attributes.push(attribute)
+            next
+          end
+
+          # If the entire value is a single interpolated string, make this a ruby value
+          if attribute[:value]&.match?(/\A\{\{([^}]|(?!\}\})\})*\}\}\Z/)
+            attribute[:type] = "ruby"
+            attribute[:name] = name
+            attribute[:value] = attribute[:value][2..-3]
             attributes.push(attribute)
             next
           end
 
           if name[0] == ":"
             attribute[:type] = attribute[:value].nil? ? "pass_through" : "ruby"
-            attribute[:name].delete_prefix! ":"
+            attribute[:name] = name[1..]
             attributes.push(attribute)
             next
           end
 
+          attribute[:name] = name
           attribute[:type] = if attribute[:value].nil?
             "empty"
           else
@@ -129,11 +139,11 @@ module RBlade
                   (?:
                     =
                     (?:
-                      "[^"]*"
+                      "(?:[^"{]*?|(?<!@)\{\{.*?\}\}|\{)*"
                       |
-                      '[^\']*'
+                      '(?:[^'{]*?|(?<!@)\{\{.*?\}\}|\{)*'
                       |
-                      [^'"=<>\s\/]+
+                      (?:[^'"=<>\s\/{]+|(?<!@)\{\{.*?\}\}|\{)*
                     )
                   )?
                 )
@@ -178,11 +188,11 @@ module RBlade
             (?:
               (=)
               (?:
-                "([^"]*)"
+                "((?:[^"{]*?|(?<!@)\{\{.*?\}\}|\{)*)"
                 |
-                '([^\']*)'
+                '((?:[^'{]*?|(?<!@)\{\{.*?\}\}|\{)*)'
                 |
-                ([^'"=<>\s\/]+)
+                ((?:[^'"=<>\s\/{]+|(?<!@)\{\{.*?\}\}|\{)*)
               )
             )?
           )

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -10,7 +10,7 @@ module RBlade
         next(token) if token.type != :unprocessed
 
         segments = token.value.split(/
-          \s?(?<!\w)
+          (\s)?(?<!\w)
           (?:
             (?:
               (@@)
@@ -25,7 +25,7 @@ module RBlade
               )?
             )
           )
-          \s?
+          (\s)?
         /mx)
 
         parseSegments! segments
@@ -49,12 +49,18 @@ module RBlade
           if CompilesStatements.has_handler(segments[i + 1])
             tokenizeStatement! segments, i
             handleSpecialCases! segments, i
+
+            segments.delete_at(i + 1) if segments[i + 1]&.match?(/\A\s\Z/)
+            if segments[i - 1].is_a?(Token) && segments[i - 1].type == :unprocessed && segments[i - 1].value.match?(/\A\s\Z/)
+              segments.delete_at i - 1
+              i -= 1
+            end
           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] == "("
+            if segments.count > i + 2 && segments[i + 1].match?(/\A[ \t]*\Z/) && segments[i + 2][0] == "("
               segments[i].value += segments[i + 1] + segments[i + 2]
               segments.delete_at i + 1
               segments.delete_at i + 1
@@ -82,7 +88,7 @@ module RBlade
       statement_name = segments.delete_at i + 1
 
       # Remove optional whitespace
-      if segments.count > i + 2 && segments[i + 1].match(/^[ \t]*$/) && segments[i + 2][0] == "("
+      if segments.count > i + 2 && segments[i + 1].match?(/\A[ \t]*\Z/) && segments[i + 2][0] == "("
         segments.delete_at i + 1
       end
 

data/lib/rblade/compiler.rb

@@ -8,7 +8,6 @@ require "rblade/compiler/compiles_verbatim"
 require "rblade/compiler/compiles_statements"
 require "rblade/compiler/tokenizes_components"
 require "rblade/compiler/tokenizes_statements"
-require "rblade/helpers/html_string"
 require "active_support/core_ext/string/output_safety"
 
 Token = Struct.new(:type, :value)
@@ -23,13 +22,7 @@ module RBlade
     string.gsub(/['\\\x0]/, '\\\\\0')
   end
 
-  def self.e(string)
-    if string.is_a?(HtmlString) || string.is_a?(ActiveSupport::SafeBuffer)
-      string
-    else
-      h(string)
-    end
-  end
+  class RBladeTemplateError < StandardError; end
 
   # Register a new custom directive by providing a class and method that will compile the directive into ruby code.
   #
@@ -41,7 +34,7 @@ module RBlade
   end
 
   class Compiler
-    def self.compileString(string_template)
+    def self.compileString(string_template, component_store)
       tokens = [Token.new(:unprocessed, string_template)]
 
       CompilesVerbatim.new.compile! tokens
@@ -51,7 +44,10 @@ module RBlade
       CompilesPrints.new.compile! tokens
       TokenizesStatements.new.tokenize! tokens
       CompilesStatements.new.compile! tokens
-      CompilesComponents.new.compile! tokens
+
+      component_compiler = CompilesComponents.new(component_store)
+      component_compiler.compile! tokens
+      component_compiler.ensure_all_tags_closed
 
       compileTokens tokens
     end
@@ -69,12 +65,25 @@ module RBlade
     def self.compileTokens tokens
       output = +""
 
-      tokens.each do |token|
-        output << if token.type == :unprocessed || token.type == :raw_text
-          "_out<<'#{RBlade.escape_quotes(token.value)}';"
+      i = 0
+      while i < tokens.count
+        token = tokens[i]
+        if token.type == :unprocessed || token.type == :raw_text
+          output << "@output_buffer.raw_buffer<<-'"
+
+          # Merge together consecutive prints
+          while tokens[i + 1]&.type == :unprocessed || tokens[i + 1]&.type == :raw_text
+            output << RBlade.escape_quotes(token.value)
+            i += 1
+            token = tokens[i]
+          end
+
+          output << RBlade.escape_quotes(token.value)
+          output << "';"
         else
-          token.value
+          output << token.value
         end
+        i += 1
       end
 
       output

data/lib/rblade/component_store.rb

@@ -1,22 +1,28 @@
 # frozen_string_literal: true
 
 module RBlade
-  FILE_EXTENSIONS = [".rblade", ".html.rblade"]
-
   class ComponentStore
+    FILE_EXTENSIONS = [".rblade", ".html.rblade"]
+
+    def initialize
+      @component_definitions = +""
+      @component_name_stack = []
+      @component_method_names = {}
+    end
+
     # Retrieve the method name for a component, and compile it if it hasn't already been compiled
-    def self.component full_name
+    def component(full_name)
       # If this is a relative path, prepend with the previous component name's base
       if full_name.start_with? "."
-        full_name = @@component_name_stack.last.gsub(/\.[^\.]+$/, "") + full_name
+        full_name = @component_name_stack.last.gsub(/\.[^\.]+\Z/, "") + full_name
       end
 
       # Ensure each component is only compiled once
-      unless @@component_method_names[full_name].nil?
-        return @@component_method_names[full_name]
+      unless @component_method_names[full_name].nil?
+        return @component_method_names[full_name]
       end
 
-      @@component_name_stack << full_name
+      @component_name_stack << full_name
 
       namespace = nil
       name = full_name
@@ -26,36 +32,32 @@ module RBlade
       end
 
       method_name = compile_component full_name, File.read(find_component_file(namespace, name))
-      @@component_name_stack.pop
+      @component_name_stack.pop
 
       method_name
     end
 
-    def self.add_path path, namespace = nil
+    def self.add_path(path, namespace = nil)
       path = path.to_s
-      if !path.end_with? "/"
-        path += "/"
+      unless path.end_with? "/"
+        path << "/"
       end
 
       @@template_paths[namespace] ||= []
       @@template_paths[namespace] << path
     end
 
-    def self.view_name view_name
-      @@component_name_stack.push view_name
+    def view_name(view_name)
+      @component_name_stack.push view_name
     end
 
-    def self.get
-      @@component_definitions
+    def get
+      @component_definitions
     end
 
-    def self.clear
-      @@component_definitions = +""
-      @@component_method_names = {}
-      @@component_name_stack = []
-    end
+    private
 
-    def self.find_component_file namespace, name
+    def find_component_file(namespace, name)
       file_path = name.tr ".", "/"
 
       @@template_paths[namespace]&.each do |base_path|
@@ -65,32 +67,30 @@ module RBlade
           end
           if File.exist? base_path + file_path + "/index" + extension
             # Account for index files for relative components
-            @@component_name_stack << @@component_name_stack.pop + ".index"
+            @component_name_stack << @component_name_stack.pop + ".index"
             return "#{base_path}#{file_path}/index#{extension}"
           end
         end
       end
 
-      raise StandardError.new "Unknown component #{namespace}::#{name}"
+      raise RBladeTemplateError.new "Unknown component #{namespace}::#{name}"
     end
-    private_class_method :find_component_file
 
-    def self.compile_component(name, code)
-      @@component_method_names[name] = "_c#{@@component_method_names.count}"
+    def compile_component(name, template)
+      escaped_name = name.gsub(/[^0-9a-zA-Z_]/) do |match|
+        # Convert invalid characters to hex
+        (match == ".") ? "__" : "_#{match.unpack1("H*")}_"
+      end
 
-      compiled_component = RBlade::Compiler.compileString(code)
+      compiled_component = RBlade::Compiler.compileString(template, self)
 
-      @@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;"
+      slot_assignment = compiled_component.match?(/\Wslot\W/) ? "slot=" : ""
 
-      @@component_method_names[name]
-    end
-    private_class_method :compile_component
+      @component_definitions << "def self._rblade_component_#{escaped_name}(attributes,&);#{slot_assignment}if block_given?;RBlade::SlotManager.new(@output_buffer.capture(->(name, slot_attributes, &slot_block)do;attributes[name]=RBlade::SlotManager.new(@output_buffer.capture(&slot_block), slot_attributes);end,&));end;_stacks=[];@output_buffer.raw_buffer<<@output_buffer.capture do;#{compiled_component}@output_buffer.raw_buffer.prepend(@_rblade_stack_manager.get(_stacks));end;end;"
 
-    private
+      @component_method_names[name] = "_rblade_component_#{escaped_name}"
+    end
 
-    @@component_definitions = +""
-    @@component_name_stack = []
-    @@component_method_names = {}
     @@template_paths = {}
   end
 end

data/lib/rblade/helpers/attributes_manager.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require "rblade/helpers/html_string"
-
 module RBlade
-  class AttributesManager < HtmlString
+  class AttributesManager
     @attributes = {}
     def initialize attributes
       @attributes = attributes
@@ -35,16 +33,20 @@ module RBlade
       @attributes.respond_to?(method_name)
     end
 
-    def to_s attributes = nil
+    def html_safe?
+      true
+    end
+
+    def to_str attributes = nil
       attributes ||= @attributes
 
       attributes.map do |key, value|
         (value == true) ? key : "#{key}=\"#{h(value)}\""
-      end.join " "
+      end.join(" ")
     end
 
-    def to_str
-      to_s
+    def to_s
+      self
     end
 
     def only(keys)
@@ -111,7 +113,7 @@ module RBlade
         return classes_1
       end
 
-      classes_combined = classes_1
+      classes_combined = +classes_1
       unless classes_combined.end_with? " "
         classes_combined << " "
       end
@@ -128,7 +130,7 @@ module RBlade
         return styles_1
       end
 
-      styles_combined = styles_1
+      styles_combined = +styles_1
       unless styles_combined.end_with? ";"
         styles_combined << ";"
       end