rblade 2.0.2 → 3.0.0

data/lib/rblade/helpers/tokenizer.rb

@@ -2,8 +2,8 @@
 
 module RBlade
   class Tokenizer
-    def self.extractCommaSeparatedValues segment
-      unless segment.match?(/,\s*\z/)
+    def self.extract_comma_separated_values(segment)
+      unless segment.match?(/,\s*+\z/)
         # Add a comma to the end to delimit the end of the last argument
         segment += ","
       end
@@ -17,7 +17,7 @@ module RBlade
       bracket_count = {
         "[]": 0,
         "{}": 0,
-        "()": 0
+        "()": 0,
       }
       tokens.each do |token|
         case token[1]
@@ -48,7 +48,7 @@ module RBlade
             end
             current_line = token[0][0]
           end
-          argument <<= segment_lines[current_line - 1].slice(current_index...token[0][1])
+          argument << segment_lines[current_line - 1].slice(current_index...token[0][1])
           argument.strip!
 
           arguments.push argument
@@ -57,7 +57,7 @@ module RBlade
         end
       end
 
-      return nil if arguments.count == 1 && arguments.first == ""
+      return nil if arguments.count == 1 && arguments[0] == ""
 
       arguments
     end

data/lib/rblade/rails_template.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "rails"
 require "rblade/compiler"
 require "rblade/component_store"
 require "rblade/helpers/attributes_manager"
@@ -25,7 +24,15 @@ module RBlade
         component_store.view_name("view::#{view_name}")
       end
 
-      -"_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))"
+      preamble = +"_stacks=[];@_rblade_once_tokens=[];@_rblade_stack_manager=RBlade::StackManager.new;"
+      if RBlade.direct_component_rendering
+        # If the attributes and slot are already set, we don't need to assign them
+        unless template&.locals&.include?("attributes") && template.locals.include?("slot")
+          preamble << "attributes=RBlade::AttributesManager.new(local_assigns);slot||=yield if block_given?;slot=attributes.delete(:slot) if slot.blank?;"
+        end
+      end
+
+      -"#{preamble}#{component_store.get}#{RBlade::Compiler.compile_string(source, component_store)}@output_buffer.raw_buffer.prepend(@_rblade_stack_manager.get(_stacks));@output_buffer;"
     end
   end
 end

data/lib/rblade/railtie.rb

@@ -2,16 +2,48 @@
 
 require "rails"
 require "rblade/rails_template"
-require "rblade/component_store"
 
 module RBlade
+  # Enables support for rendering RBlade components directly. This should be enabled if you want to use RBlade components within ERB or other templating languages.
+  #
+  # When enabled, attributes is set from local_assigns, the slot variable is set from the given block, and @props statements will look for content using content_for
+  mattr_accessor :direct_component_rendering, default: false
+
+  # The name of the view helper method used for rendering RBlade components in other templates
+  mattr_accessor :component_helper_method_name, default: :component
+
   class Railtie < ::Rails::Railtie
-    initializer :rblade, before: :load_config_initializers do |app|
+    initializer :rblade, after: :load_config_initializers do |app|
       ActionView::Template.register_template_handler(:rblade, RBlade::RailsTemplate.new)
+      setup_component_view_helper(ActionView::Helpers)
 
       RBlade::ComponentStore.add_path(Rails.root.join("app", "views", "components"))
       RBlade::ComponentStore.add_path(Rails.root.join("app", "views", "layouts"), "layout")
       RBlade::ComponentStore.add_path(Rails.root.join("app", "views"), "view")
     end
+
+    def setup_component_view_helper(mod)
+      mod.send(:define_method, RBlade.component_helper_method_name) do |component_name, current_view = nil, **attributes, &block|
+        # If this is a relative path, prepend with the previous component name's base
+        if !current_view.nil? && component_name.start_with?(".")
+          component_name = current_view.sub(/[^\.]++\z/, "") + component_name.delete_prefix(".")
+        end
+
+        path = RBlade::ComponentStore.find_component_file(component_name)
+
+        # Find the relative template path without the file type
+        view_paths.each do |view_path|
+          break unless path.delete_prefix!(view_path.to_s).nil?
+        end
+        path.sub!(/(?:\.[^.]++)?\.rblade\z/, "")
+
+        locals = {
+          slot: block.nil? ? attributes.delete(:slot) || -"" : capture(&block),
+          attributes: RBlade::AttributesManager.new(attributes),
+        }
+
+        render template: path, locals:
+      end
+    end
   end
 end

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "2.0.2"
+  s.version = "3.0.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"]
@@ -15,5 +15,8 @@ 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 "rubocop", ">= 1.73"
   s.add_development_dependency "rails", ">= 7.0"
+  s.add_development_dependency "benchmark-ips"
+  s.add_development_dependency "kalibera"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Simon J
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.73'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.73'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kalibera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RBlade is a simple, yet powerful templating engine for Ruby on Rails,
   inspired by Laravel Blade.
 email: 2857218+mwnciau@users.noreply.github.com
@@ -75,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".standard.yml"
 - CHANGELOG.md
 - Gemfile
@@ -95,8 +138,7 @@ files:
 - lib/rblade/compiler.rb
 - lib/rblade/compiler/compiles_comments.rb
 - lib/rblade/compiler/compiles_components.rb
-- lib/rblade/compiler/compiles_prints.rb
-- lib/rblade/compiler/compiles_ruby.rb
+- lib/rblade/compiler/compiles_injections.rb
 - lib/rblade/compiler/compiles_statements.rb
 - lib/rblade/compiler/compiles_verbatim.rb
 - lib/rblade/compiler/statements/compiles_component_helpers.rb
@@ -124,7 +166,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/mwnciau/rblade
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: A component-first templating engine for Rails
 test_files: []

data/lib/rblade/compiler/compiles_prints.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module RBlade
-  class CompilesPrints
-    def compile!(tokens)
-      compile_unsafe_prints!(tokens)
-      compile_regular_prints!(tokens)
-    end
-
-    private
-
-    def compile_regular_prints!(tokens)
-      compile_prints! tokens, "{{", "}}", true
-      compile_prints! tokens, "<%=", "%>", true
-    end
-
-    def compile_unsafe_prints!(tokens)
-      compile_prints! tokens, "{!!", "!!}"
-      compile_prints! tokens, "<%==", "%>"
-    end
-
-    def compile_prints!(tokens, start_token, end_token, escape_html = false)
-      tokens.map! do |token|
-        next(token) if token.type != :unprocessed
-
-        start_token_escaped = Regexp.escape start_token
-        end_token_escaped = Regexp.escape end_token
-        segments = token.value.split(/(?:(@)(#{start_token_escaped}.+?#{end_token_escaped})|(#{start_token_escaped})\s*(.+?)\s*(#{end_token_escaped}))/m)
-
-        i = 0
-        while i < segments.count
-          if segments[i] == "@"
-            segments.delete_at i
-            segments[i] = Token.new(type: :raw_text, value: segments[i])
-
-            i += 1
-          elsif segments[i] == start_token
-            segments.delete_at i
-            segments.delete_at i + 1
-
-            segments[i] = create_token(segments[i], escape_html)
-
-            i += 1
-          elsif !segments[i].nil? && segments[i] != ""
-            segments[i] = Token.new(type: :unprocessed, value: segments[i])
-
-            i += 1
-          else
-            segments.delete_at i
-          end
-        end
-
-        segments
-      end.flatten!
-    end
-
-    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*
-        )?
-        \Z/x)
-        "@output_buffer.safe_expr_append=#{expression};"
-      else
-        "@output_buffer.raw_buffer<<(#{expression}).to_s;"
-      end
-
-      Token.new(:print, segment_value)
-    end
-  end
-end

data/lib/rblade/compiler/compiles_ruby.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-module RBlade
-  class CompilesRuby
-    def compile!(tokens)
-      tokens.map! do |token|
-        next(token) if token.type != :unprocessed
-
-        segments = token.value.split(/
-          # @ escapes blade style tags
-          (@)(@ruby.+?@end_?ruby)
-          |
-          # <%% and %%> are escape ERB style tags
-          (<%%)(.+?)(%%>)
-          |
-          \s?(?<!\w)(@ruby)\s+(.+?)[\s;]*(@end_?ruby)(?!\w)\s?
-          |
-          (<%)(?!=)\s*(.+?)[\s;]*(%>)
-        /xmi)
-
-        i = 0
-        while i < segments.count
-          if segments[i] == "@"
-            segments.delete_at i
-            segments[i] = Token.new(type: :raw_text, value: segments[i])
-
-            i += 1
-          elsif segments[i] == "<%%"
-            segments.delete_at i
-            segments.delete_at i + 1
-            segments[i] = Token.new(type: :raw_text, value: "<%#{segments[i]}%>")
-
-            i += 1
-          elsif segments[i].downcase == "@ruby" || segments[i] == "<%"
-            segments.delete_at i
-            segments.delete_at i + 1
-
-            segments[i].strip!
-            if segments[i][-1] != ";"
-              segments[i] << ";"
-            end
-
-            segments[i] = Token.new(type: :ruby, value: segments[i])
-
-            i += 1
-          elsif !segments[i].nil? && segments[i] != ""
-            segments[i] = Token.new(type: :unprocessed, value: segments[i])
-
-            i += 1
-          else
-            segments.delete_at i
-          end
-        end
-
-        segments
-      end.flatten!
-    end
-  end
-end