rblade 1.2.1 → 2.0.2

data/lib/rblade/helpers/slot_manager.rb

@@ -1,21 +1,24 @@
 # frozen_string_literal: true
 
 require "rblade/helpers/attributes_manager"
-require "rblade/helpers/html_string"
 
 module RBlade
-  class SlotManager < HtmlString
+  class SlotManager
     def initialize content, attributes = nil
       @content = content
       @attributes = attributes && AttributesManager.new(attributes)
     end
 
+    def html_safe?
+      true
+    end
+
     def to_s
-      @content
+      self
     end
 
     def to_str
-      to_s
+      @content
     end
 
     def method_missing(method, *)

data/lib/rblade/helpers/stack_manager.rb

@@ -2,38 +2,38 @@
 
 module RBlade
   class StackManager
-    def self.initialize stack_name, before_stack
-      @@stacks[stack_name] ||= Stack.new
-      @@stacks[stack_name].set_before_stack before_stack
+    def initialize
+      @stacks = {}
     end
 
-    def self.clear
-      @@stacks = {}
+    def initialize_stack(stack_name, output_buffer)
+      @stacks[stack_name] ||= Stack.new
+      @stacks[stack_name].set_before_stack(-output_buffer.raw_buffer)
+      output_buffer.raw_buffer.clear
     end
 
-    def self.push stack_name, code
-      @@stacks[stack_name] ||= Stack.new
-      @@stacks[stack_name].push code.to_s
+    def clear
+      @stacks = {}
     end
 
-    def self.prepend stack_name, code
-      @@stacks[stack_name] ||= Stack.new
-      @@stacks[stack_name].prepend code.to_s
+    def push(stack_name, output_buffer, &)
+      @stacks[stack_name] ||= Stack.new
+      @stacks[stack_name].push output_buffer.capture(&)
     end
 
-    def self.get(stacks)
-      stacks.map do |name|
-        out = @@stacks[name].to_s
-        @@stacks.delete name
+    def prepend(stack_name, output_buffer, &)
+      @stacks[stack_name] ||= Stack.new
+      @stacks[stack_name].prepend output_buffer.capture(&)
+    end
 
-        out
+    def get(stacks)
+      stacks.map do |name|
+        @stacks.delete(name).to_s
       end.join
     end
 
     private
 
-    @@stacks = {}
-
     class Stack
       def initialize
         @prepends = +""

data/lib/rblade/rails_template.rb

@@ -12,8 +12,7 @@ require "rblade/helpers/style_manager"
 module RBlade
   class RailsTemplate
     def call(template, source = nil)
-      RBlade::ComponentStore.clear
-      RBlade::StackManager.clear
+      component_store = RBlade::ComponentStore.new
 
       unless template.nil?
         view_name = template.short_identifier
@@ -23,14 +22,10 @@ module RBlade
           .tr("/", ".")
 
         # Let the component store know about the current view for relative components
-        RBlade::ComponentStore.view_name(
-          "view::#{view_name}"
-        )
+        component_store.view_name("view::#{view_name}")
       end
-      setup = "_out=+'';_stacks=[];$_once_tokens=[];"
-      code = RBlade::Compiler.compileString(source || template.source)
-      setdown = "RBlade::StackManager.get(_stacks) + _out"
-      setup + ComponentStore.get + code + setdown
+
+      -"_stacks=[];@_rblade_once_tokens=[];@_rblade_stack_manager=RBlade::StackManager.new;#{component_store.get}#{RBlade::Compiler.compileString(source, component_store)}@output_buffer.raw_buffer.prepend(@_rblade_stack_manager.get(_stacks))"
     end
   end
 end

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "1.2.1"
+  s.version = "2.0.2"
   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"]
@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "minitest", "~> 5.0"
   s.add_development_dependency "minitest-reporters", "~> 1.1"
-  s.add_development_dependency "standard", "~> 1.3"
-  s.add_development_dependency "rails", "~> 7.0"
+  s.add_development_dependency "standard", ">= 1.3"
+  s.add_development_dependency "rails", ">= 7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Simon J
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -42,28 +42,28 @@ dependencies:
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
 description: RBlade is a simple, yet powerful templating engine for Ruby on Rails,
@@ -112,7 +112,6 @@ files:
 - lib/rblade/component_store.rb
 - lib/rblade/helpers/attributes_manager.rb
 - lib/rblade/helpers/class_manager.rb
-- lib/rblade/helpers/html_string.rb
 - lib/rblade/helpers/slot_manager.rb
 - lib/rblade/helpers/stack_manager.rb
 - lib/rblade/helpers/style_manager.rb

data/lib/rblade/helpers/html_string.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module RBlade
-  class HtmlString
-  end
-end