rblade 1.2.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e633d7cbf716d70b0f9353e8d29990da0379f30171da143077c303e9557cdab8
-  data.tar.gz: ad29e9a1b4cbb0f493a7fa6dbe6fcb82ec64c822fe1c7351de65ab8d268cd1aa
+  metadata.gz: fb23406b9206cc5eb7d20f10d700375c1b49c588c2805ae77710aff217ab39f1
+  data.tar.gz: '0330179c0e5113c74d0678c54fa08a489820f0d72ea21eb179caa372c7e54a42'
 SHA512:
-  metadata.gz: 261023b42b8ad6d163c3ac24fcc5d844a5d85c2915af94f26c40254f7ff3cd03b847e2107c97219f32967c402df09594583856c327ee071d9ac56f992a4fd1e2
-  data.tar.gz: 94e955703c7f041f6fc7e2dd5c40e143cb7779437ded8c4acbb5f7e81c0bc9cf424385093607c11a236560c83c389e201f1d1aa8a3f3e95de8aff3323921adf5
+  metadata.gz: c592ebfb01c89d56e996c1e0c7815e50ab2363a2d9badb41a8573067b230796807392789418b81593eecbacfa1160b34843ba6bce102f600acd5ea08ca9a2521
+  data.tar.gz: dcb59ca067167dbbe63a4ea86b2fce0d04e25beb4fe728826abc1e19f33613a6d3a472a36896f55bbc0c97979d1c265fa4be8b20e8c0ec62569218099bb62d1a

data/.github/workflows/ruby.yml

@@ -22,15 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.2']
+        ruby-version: ['3.2.2']
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2.0.2 [2025-03-10]
+- Fix issue with empty component attributes
+
+## 2.0.1 [2025-03-10]
+- Fix broken gem build
+
+## 2.0.0 [2025-03-09]
+- Add check for unclosed tags
+- Add string interpolation for component attributes
+- Improve runtime performance
+- Switch to using @output_buffer for full ERB compatibility
+- Update dependencies
+- Fix issue with "end" inside multi-line print blocks
+- Fix frozen string literal warnings
+- Fix redundant unfreezing of interpolated string
+- Fix whitespace being removed for non-statements
+
 ## 1.2.1 [2024-10-31]
 - Fix issue with @props directive when defining multiple properties without braces
 

data/README.md

@@ -105,7 +105,7 @@ Hello, {!! @name !!}.
 
 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, `<%= ... %>`.
+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

data/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   blade:
-    image: ruby:3.3.4
+    image: ruby:3.4.2
     working_dir: /var/source
     volumes:
       - .:/var/source

data/lib/rblade/compiler/compiles_components.rb

@@ -4,9 +4,10 @@ require "rblade/component_store"
 
 module RBlade
   class CompilesComponents
-    def initialize
+    def initialize(component_store)
       @component_count = 0
       @component_stack = []
+      @component_store = component_store
     end
 
     def compile!(tokens)
@@ -25,60 +26,40 @@ module RBlade
       end
     end
 
+    def ensure_all_tags_closed
+      unless @component_stack.empty?
+        raise RBladeTemplateError.new("Unexpected end of document. Expecting </x-#{@component_stack.last[:name]}>")
+      end
+    end
+
     private
 
     def compile_token_start token
       component = {
-        name: token.value[:name],
-        index: @component_stack.count
+        name: token.value[:name]
       }
       @component_stack << component
 
       attributes = compile_attributes token.value[:attributes]
 
-      code = +"_c#{component[:index]}_swap=_out;_out=+'';"
-      code << "_c#{component[:index]}_attr={#{attributes.join(",")}};"
-
-      code
+      if component[:name].start_with? "slot::"
+        "_slot.call(:'#{RBlade.escape_quotes(component[:name].delete_prefix("slot::"))}', {#{attributes.join(",")}}) do;"
+      else
+        "#{@component_store.component(component[:name])}(RBlade::AttributesManager.new({#{attributes.join(",")}})) do |_slot|;"
+      end
     end
 
     def compile_token_end token
       component = @component_stack.pop
       if component.nil?
-        raise StandardError.new "Unexpected closing tag (#{token.value[:name]})"
-      end
-      if token.type == :component_end && token.value[:name] != component[:name]
-        raise StandardError.new "Unexpected closing tag (#{token.value[:name]}) expecting #{component[:name]}"
+        raise RBladeTemplateError.new "Unexpected closing tag </x-#{token.value[:name]}>"
       end
 
-      namespace = nil
-      name = component[:name]
-      if name.match? "::"
-        namespace, name = component[:name].split("::")
-      end
-
-      if namespace == "slot"
-        compile_slot_end name, component
-      else
-        compile_component_end component
+      if token.type == :component_end && token.value[:name] != component[:name]
+        raise RBladeTemplateError.new "Unexpected closing tag </x-#{token.value[:name]}>, expecting </x-#{component[:name]}>"
       end
-    end
-
-    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 << "_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 << "_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;"
-
-      code
+      "end;"
     end
 
     def compile_attributes attributes
@@ -91,7 +72,7 @@ module RBlade
         when "attributes"
           "**(#{attribute[:value]})"
         when "string"
-          "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"
+          "'#{attribute[:name]}': #{process_string_attribute(attribute[:value])}"
         when "ruby"
           "'#{attribute[:name]}': (#{attribute[:value]})"
         when "pass_through"
@@ -99,9 +80,21 @@ module RBlade
         when "empty"
           "'#{attribute[:name]}': true"
         else
-          raise StandardError.new "Component compiler: unexpected attribute type (#{attribute[:type]})"
+          raise RBladeTemplateError.new "Component compiler: unexpected attribute type (#{attribute[:type]})"
         end
       end
     end
+
+    def process_string_attribute(string)
+      result = string.split(/((?<!@)\{\{.*?\}\})/).map do |substring|
+        if substring.start_with?("{{") && substring.end_with?("}}")
+          "(#{substring[2..-3]}).to_s"
+        elsif !substring.empty?
+          "'#{RBlade.escape_quotes(substring.gsub(/@\{\{/, "{{"))}'"
+        end
+      end.compact.join("<<")
+
+      result.empty? ? "+''" : result.prepend("+")
+    end
   end
 end

data/lib/rblade/compiler/compiles_prints.rb

@@ -10,8 +10,8 @@ module RBlade
     private
 
     def compile_regular_prints!(tokens)
-      compile_prints! tokens, "{{", "}}", +"RBlade.e"
-      compile_prints! tokens, "<%=", "%>", +"RBlade.e"
+      compile_prints! tokens, "{{", "}}", true
+      compile_prints! tokens, "<%=", "%>", true
     end
 
     def compile_unsafe_prints!(tokens)
@@ -19,7 +19,7 @@ module RBlade
       compile_prints! tokens, "<%==", "%>"
     end
 
-    def compile_prints!(tokens, start_token, end_token, wrapper_function = nil)
+    def compile_prints!(tokens, start_token, end_token, escape_html = false)
       tokens.map! do |token|
         next(token) if token.type != :unprocessed
 
@@ -38,7 +38,7 @@ module RBlade
             segments.delete_at i
             segments.delete_at i + 1
 
-            segments[i] = create_token(segments[i], wrapper_function)
+            segments[i] = create_token(segments[i], escape_html)
 
             i += 1
           elsif !segments[i].nil? && segments[i] != ""
@@ -54,25 +54,27 @@ module RBlade
       end.flatten!
     end
 
-    def create_token expression, wrapper_function
-      if expression.match?(/
-        do\s*
+    def create_token(expression, escape_html)
+      # Don't try to print ends
+      if expression.match?(/\A\s*(?:}|end(?![[:alnum:]_]|[^\0-\177]))/i)
+        return Token.new(:print, "#{expression};")
+      end
+
+      segment_value = if escape_html
+        "@output_buffer.append=#{expression};"
+      # If this is a block, don't wrap in parentheses
+      elsif 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});"
+        \Z/x)
+        "@output_buffer.safe_expr_append=#{expression};"
       else
-        "_out<<(#{expression}).to_s;"
+        "@output_buffer.raw_buffer<<(#{expression}).to_s;"
       end
 
       Token.new(:print, segment_value)

data/lib/rblade/compiler/compiles_ruby.rb

@@ -40,13 +40,7 @@ module RBlade
               segments[i] << ";"
             end
 
-            # 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
+            segments[i] = Token.new(type: :ruby, value: segments[i])
 
             i += 1
           elsif !segments[i].nil? && segments[i] != ""

data/lib/rblade/compiler/compiles_statements.rb

@@ -38,7 +38,7 @@ module RBlade
         end
 
         token.value = if handler.is_a? Proc
-          "_out<<'#{RBlade.escape_quotes(handler.call(*handler_arguments).to_s)}';"
+          "@output_buffer.raw_buffer<<-'#{RBlade.escape_quotes(handler.call(*handler_arguments).to_s)}';"
         else
           handler.call(*handler_arguments)
         end
@@ -73,7 +73,7 @@ module RBlade
           ## Fallback to the default end handler
           handler_class, handler_method = @@statement_handlers["end"]
         else
-          raise StandardError.new "Unhandled statement: @#{name}"
+          raise RBladeTemplateError.new "Unhandled statement: @#{name}"
         end
       end
 
@@ -106,12 +106,6 @@ module RBlade
       "empty" => [CompilesLoops, :compileEmpty],
       "empty?" => [CompilesConditionals, :compileEmpty],
       "end" => [CompilesStatements, :compileEnd],
-      "endprepend" => [CompilesStacks, :compileEndPrepend],
-      "endprependif" => [CompilesStacks, :compileEndPrependIf],
-      "endprependonce" => [CompilesOnce, :compileEndPrependOnce],
-      "endpush" => [CompilesStacks, :compileEndPush],
-      "endpushif" => [CompilesStacks, :compileEndPushIf],
-      "endpushonce" => [CompilesOnce, :compileEndPushOnce],
       "env" => [CompilesConditionals, :compileEnv],
       "for" => [CompilesLoops, :compileFor],
       "forelse" => [CompilesLoops, :compileForElse],

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

@@ -7,7 +7,7 @@ module RBlade
     class CompilesComponentHelpers
       def compileShouldRender args
         if args&.count != 1
-          raise StandardError.new "Should render statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Should render statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "unless(#{args[0]});return'';end;"
@@ -43,7 +43,7 @@ module RBlade
         prop_strings.each do |prop|
           prop.strip!
 
-          key, value = prop.split(/^
+          key, value = prop.split(/\A
             (?:
               '(.+)':
               |
@@ -63,7 +63,7 @@ module RBlade
           /x).reject(&:empty?)
 
           if key.nil? || value.nil?
-            raise StandardError.new "Props statement: invalid property hash"
+            raise RBladeTemplateError.new "Props statement: invalid property hash"
           end
           props[key] = value
         end
@@ -74,7 +74,7 @@ module RBlade
       RUBY_RESERVED_KEYWORDS = %w[__FILE__ __LINE__ alias and begin BEGIN break case class def defined? do else elsif end 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].freeze
 
       def isValidVariableName key
-        return false unless key.match?(/^[a-zA-Z_][a-zA-Z0-9_]*$/)
+        return false unless key.match?(/\A[a-zA-Z_][a-zA-Z0-9_]*\Z/)
 
         return false if RUBY_RESERVED_KEYWORDS.include? key
 
@@ -83,7 +83,7 @@ module RBlade
 
       # Automatically detect if a variable is a slot by looking for "<var>.attributes"
       def variableIsSlot name, tokens
-        tokens.any? { |token| token.value.to_s.match "#{name}.attributes" }
+        tokens.any? { |token| token.value.to_s.match? "#{name}.attributes" }
       end
     end
   end

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

@@ -5,7 +5,7 @@ module RBlade
     class CompilesConditionals
       def compileIf args
         if args&.count != 1
-          raise StandardError.new "If statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "If statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if #{args[0]};"
@@ -13,7 +13,7 @@ module RBlade
 
       def compileBlank args
         if args&.count != 1
-          raise StandardError.new "Blank? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Blank? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if (#{args[0]}).blank?;"
@@ -21,7 +21,7 @@ module RBlade
 
       def compileDefined args
         if args&.count != 1
-          raise StandardError.new "Defined? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Defined? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if defined? #{args[0]};"
@@ -29,7 +29,7 @@ module RBlade
 
       def compileEmpty args
         if args&.count != 1
-          raise StandardError.new "Empty? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Empty? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if (#{args[0]}).empty?;"
@@ -37,7 +37,7 @@ module RBlade
 
       def compileNil args
         if args&.count != 1
-          raise StandardError.new "Nil? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Nil? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if (#{args[0]}).nil?;"
@@ -45,7 +45,7 @@ module RBlade
 
       def compilePresent args
         if args&.count != 1
-          raise StandardError.new "Present? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Present? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "if (#{args[0]}).present?;"
@@ -53,7 +53,7 @@ module RBlade
 
       def compileElsif args
         if args&.count != 1
-          raise StandardError.new "Elsif statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Elsif statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "elsif #{args[0]};"
@@ -61,7 +61,7 @@ module RBlade
 
       def compileElse args
         unless args.nil?
-          raise StandardError.new "Else statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Else statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         "else;"
@@ -69,7 +69,7 @@ module RBlade
 
       def compileUnless args
         if args&.count != 1
-          raise StandardError.new "Unless statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Unless statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "unless #{args[0]};"
@@ -77,7 +77,7 @@ module RBlade
 
       def compileCase args
         if args&.count != 1
-          raise StandardError.new "Case statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Case statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "case #{args[0]};"
@@ -85,7 +85,7 @@ module RBlade
 
       def compileWhen args
         if args.nil?
-          raise StandardError.new "When statement: wrong number of arguments (given 0, expecting at least 1)"
+          raise RBladeTemplateError.new "When statement: wrong number of arguments (given 0, expecting at least 1)"
         end
 
         "when #{args.join ","};"
@@ -93,47 +93,47 @@ module RBlade
 
       def compileChecked args
         if args&.count != 1
-          raise StandardError.new "Checked statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Checked statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "if #{args[0]};_out<<'checked';end;"
+        "if #{args[0]};@output_buffer.raw_buffer<<-'checked';end;"
       end
 
       def compileDisabled args
         if args&.count != 1
-          raise StandardError.new "Disabled statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Disabled statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "if #{args[0]};_out<<'disabled';end;"
+        "if #{args[0]};@output_buffer.raw_buffer<<-'disabled';end;"
       end
 
       def compileReadonly args
         if args&.count != 1
-          raise StandardError.new "Readonly statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Readonly statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "if #{args[0]};_out<<'readonly';end;"
+        "if #{args[0]};@output_buffer.raw_buffer<<-'readonly';end;"
       end
 
       def compileRequired args
         if args&.count != 1
-          raise StandardError.new "Required statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Required statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "if #{args[0]};_out<<'required';end;"
+        "if #{args[0]};@output_buffer.raw_buffer<<-'required';end;"
       end
 
       def compileSelected args
         if args&.count != 1
-          raise StandardError.new "Selected statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Selected statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "if #{args[0]};_out<<'selected';end;"
+        "if #{args[0]};@output_buffer.raw_buffer<<-'selected';end;"
       end
 
       def compileEnv args
         if args&.count != 1
-          raise StandardError.new "Env statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Env statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         environments = args[0].strip
@@ -143,7 +143,7 @@ module RBlade
 
       def compileProduction args
         unless args.nil?
-          raise StandardError.new "Production statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Production statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         "if Rails.env.production?;"

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

@@ -5,15 +5,15 @@ module RBlade
     class CompilesForm
       def compileMethod args
         if args&.count != 1
-          raise StandardError.new "Method statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Method statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        %(_out<<'<input type="hidden" name="_method" value="'<<#{args[0]}<<'">';)
+        %(@output_buffer.raw_buffer<<-"<input type=\\"hidden\\" name=\\"_method\\" value=\\"\#{#{args[0]}}\\">";)
       end
 
       def compileDelete args
         unless args.nil?
-          raise StandardError.new "Delete statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Delete statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         compileMethod(["'DELETE'"])
@@ -21,7 +21,7 @@ module RBlade
 
       def compilePatch args
         unless args.nil?
-          raise StandardError.new "Patch statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Patch statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         compileMethod(["'PATCH'"])
@@ -29,7 +29,7 @@ module RBlade
 
       def compilePut args
         unless args.nil?
-          raise StandardError.new "Put statement: wrong number of arguments (given #{args.count}, expecting 0)"
+          raise RBladeTemplateError.new "Put statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         compileMethod(["'PUT'"])
@@ -37,12 +37,12 @@ module RBlade
 
       def compileOld args
         if args.nil? || args.count > 2
-          raise StandardError.new "Old statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
+          raise RBladeTemplateError.new "Old statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
 
         default_value = args[1] || "''"
 
-        "_out<<params.fetch(#{args[0]},#{default_value});"
+        "@output_buffer.raw_buffer<<params.fetch(#{args[0]},#{default_value});"
       end
     end
   end

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

@@ -5,18 +5,18 @@ module RBlade
     class CompilesHtmlAttributes
       def compileClass args
         if args&.count != 1
-          raise StandardError.new "Class statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Class statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "_out<<'class=\"'<<RBlade::ClassManager.new(#{args[0]})<<'\"';"
+        %`@output_buffer.raw_buffer<<-"class=\\"\#{RBlade::ClassManager.new(#{args[0]})}\\"";`
       end
 
       def compileStyle args
         if args&.count != 1
-          raise StandardError.new "Style statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Style statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
-        "_out<<'style=\"'<<RBlade::StyleManager.new(#{args[0]})<<'\"';"
+        %`@output_buffer.raw_buffer<<-"style=\\"\#{RBlade::StyleManager.new(#{args[0]})}\\"";`
       end
     end
   end

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

@@ -5,7 +5,7 @@ module RBlade
     class CompilesInlineRuby
       def compile args
         if args&.count != 1
-          raise StandardError.new "Ruby statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise RBladeTemplateError.new "Ruby statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         arg = args[0].strip