rblade 0.2.5 → 0.4.0

data/lib/rblade/component_store.rb

@@ -1,28 +1,34 @@
 require "rblade/compiler"
 
 module RBlade
-  FILE_EXTENSIONS = [".blade", ".html.blade"]
+  FILE_EXTENSIONS = [".rblade", ".html.rblade"]
 
   class ComponentStore
-    def self.fetchComponent name
-      namespace = nil
-      path = name
+    # Retrieve the method name for a component, and compile it if it hasn't already been compiled
+    def self.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
+      end
 
-      if name.match? "::"
-        namespace, path = name.split("::")
+      # Ensure each component is only compiled once
+      unless @@component_method_names[full_name].nil?
+        return @@component_method_names[full_name]
       end
 
-      path.tr! ".", "/"
+      @@component_name_stack << full_name
 
-      @@template_paths[namespace]&.each do |base_path|
-        FILE_EXTENSIONS.each do |extension|
-          if File.exist? base_path + path + extension
-            return RBlade::Compiler.compileString File.read(base_path + path + extension)
-          end
-        end
+      namespace = nil
+      name = full_name
+
+      if name.match? "::"
+        namespace, name = full_name.split("::")
       end
 
-      raise StandardError.new "Unknown component #{name}"
+      method_name = compile_component full_name, File.read(find_component_file(namespace, name))
+      @@component_name_stack.pop
+
+      method_name
     end
 
     def self.add_path path, namespace = nil
@@ -35,8 +41,61 @@ module RBlade
       @@template_paths[namespace] << path
     end
 
+    def self.view_name view_name
+      @@component_name_stack.push view_name
+    end
+
+    def self.get
+      @@component_definitions
+    end
+
+    def self.clear
+      @@component_definitions = ""
+      @@component_method_names = {}
+      @@component_name_stack = []
+    end
+
+    def self.find_component_file namespace, name
+      file_path = name.tr ".", "/"
+
+      @@template_paths[namespace]&.each do |base_path|
+        FILE_EXTENSIONS.each do |extension|
+          if File.exist? base_path + file_path + extension
+            return "#{base_path}#{file_path}#{extension}"
+          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"
+            return "#{base_path}#{file_path}/index#{extension}"
+          end
+        end
+      end
+
+      raise StandardError.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}"
+
+      compiled_component = RBlade::Compiler.compileString(code)
+
+      @@component_definitions \
+        << "def #{@@component_method_names[name]}(slot,attributes);_out='';" \
+        << "_stacks=[];" \
+        << "attributes=RBlade::AttributesManager.new(attributes);" \
+        << compiled_component \
+        << "RBlade::StackManager.get(_stacks) + _out;end;"
+
+      @@component_method_names[name]
+    end
+    private_class_method :compile_component
+
     private
 
+    @@component_definitions = ""
+    @@component_name_stack = []
+    @@component_method_names = {}
     @@template_paths = {}
   end
 end

data/lib/rblade/helpers/attributes_manager.rb

@@ -3,15 +3,6 @@ module RBlade
     @attributes = {}
     def initialize attributes
       @attributes = attributes
-
-      if !@attributes[:_class].nil?
-        @attributes[:class] = mergeClasses(@attributes[:class], @attributes.delete(:_class))
-      end
-      if !@attributes[:_style].nil?
-        @attributes[:style] = mergeClasses(@attributes[:style], @attributes.delete(:_style))
-      end
-
-      @attributes
     end
 
     def default(key, default = nil)
@@ -26,23 +17,19 @@ module RBlade
       !@attributes[key].nil?
     end
 
-    def to_h
-      attributes = @attributes.dup
-      if !attributes[:class].nil?
-        attributes[:_class] = attributes.delete :class
-      end
-      if !attributes[:style].nil?
-        attributes[:_style] = attributes.delete :style
-      end
+    def method_missing(method, *)
+      @attributes.send(method, *)
+    end
 
-      attributes
+    def respond_to_missing?(method_name, *args)
+      @attributes.respond_to?(method_name) || super
     end
 
     def to_s attributes = nil
       attributes ||= @attributes
 
       attributes.map do |key, value|
-        "#{key}=\"#{h(value)}\""
+        "#{key}=\"#{(value == true) ? key : h(value)}\""
       end.join " "
     end
 

data/lib/rblade/helpers/class_manager.rb

@@ -19,5 +19,9 @@ module RBlade
     def to_s
       @classes
     end
+
+    def to_str
+      to_s
+    end
   end
 end

data/lib/rblade/helpers/style_manager.rb

@@ -33,5 +33,9 @@ module RBlade
     def to_s
       @styles
     end
+
+    def to_str
+      to_s
+    end
   end
 end

data/lib/rblade/rails_template.rb

@@ -1,5 +1,6 @@
 require "rails"
 require "rblade/compiler"
+require "rblade/component_store"
 require "rblade/helpers/attributes_manager"
 require "rblade/helpers/class_manager"
 require "rblade/helpers/stack_manager"
@@ -8,10 +9,25 @@ require "rblade/helpers/style_manager"
 module RBlade
   class RailsTemplate
     def call(template, source = nil)
+      RBlade::ComponentStore.clear
       RBlade::StackManager.clear
-      setup = "_out='';_stacks=[];"
+
+      unless template.nil?
+        view_name = template.short_identifier
+          .delete_prefix("app/views/")
+          .delete_suffix(".rblade")
+          .delete_suffix(".html")
+          .tr("/", ".")
+
+        # Let the component store know about the current view for relative components
+        RBlade::ComponentStore.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 + RBlade::Compiler.compileString(source || template.source) + setdown
+      setup + ComponentStore.get + code + setdown
     end
   end
 end

data/lib/rblade/railtie.rb

@@ -5,10 +5,11 @@ require "rblade/component_store"
 module RBlade
   class Railtie < ::Rails::Railtie
     initializer :rblade, before: :load_config_initializers do |app|
-      ActionView::Template.register_template_handler(:blade, RBlade::RailsTemplate.new)
+      ActionView::Template.register_template_handler(:rblade, RBlade::RailsTemplate.new)
 
       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
   end
 end

data/rblade.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.2.5"
-  s.summary = "Blade templates for ruby"
-  s.description = "A port of the Laravel blade templating engine to ruby"
+  s.version = "0.4.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"]
   s.email = "2857218+mwnciau@users.noreply.github.com"
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|storage)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Simon J
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -66,7 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description: A port of the Laravel blade templating engine to ruby
+description: RBlade is a simple, yet powerful templating engine for Ruby on Rails,
+  inspired by Laravel Blade.
 email: 2857218+mwnciau@users.noreply.github.com
 executables: []
 extensions: []
@@ -76,7 +77,10 @@ files:
 - ".standard.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE.md
+- README.md
 - Rakefile
+- TODO.md
 - do
 - docker-compose.yml
 - lib/rblade.rb
@@ -86,9 +90,12 @@ files:
 - lib/rblade/compiler/compiles_echos.rb
 - lib/rblade/compiler/compiles_ruby.rb
 - lib/rblade/compiler/compiles_statements.rb
+- lib/rblade/compiler/compiles_verbatim.rb
 - lib/rblade/compiler/statements/compiles_conditionals.rb
+- lib/rblade/compiler/statements/compiles_html_attributes.rb
 - lib/rblade/compiler/statements/compiles_inline_ruby.rb
 - lib/rblade/compiler/statements/compiles_loops.rb
+- lib/rblade/compiler/statements/compiles_once.rb
 - lib/rblade/compiler/statements/compiles_props.rb
 - lib/rblade/compiler/statements/compiles_stacks.rb
 - lib/rblade/compiler/tokenizes_components.rb
@@ -124,5 +131,5 @@ requirements: []
 rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
-summary: Blade templates for ruby
+summary: A component-first templating engine for Rails
 test_files: []