rblade 0.2.4 → 0.3.0

data/lib/rblade/compiler/compiles_components.rb

@@ -9,13 +9,13 @@ module RBlade
 
     def compile!(tokens)
       tokens.each do |token|
-        if [:component, :component_start, :component_end].none? token.type
+        if [:component, :component_start, :component_end, :component_unsafe_end].none? token.type
           next
         end
 
         token.value = if token.type == :component_start
           compile_token_start token
-        elsif token.type == :component_end
+        elsif token.type == :component_end || token.type == :component_unsafe_end
           compile_token_end token
         else
           compile_token_start(token) + compile_token_end(token)
@@ -30,11 +30,15 @@ module RBlade
 
       @component_stack << {
         name: token.value[:name],
-        attributes: token.value[:attributes],
         index: @component_count
       }
 
-      "_comp_#{@component_count}_swap=_out;_out='';"
+      attributes = compile_attributes token.value[:attributes]
+
+      code = "_c#{@component_count}_swap=_out;_out='';"
+      code << "_c#{@component_count}_attr={#{attributes.join(",")}};"
+
+      code
     end
 
     def compile_token_end token
@@ -42,72 +46,42 @@ module RBlade
       if component.nil?
         raise StandardError.new "Unexpected closing tag (#{token.value[:name]})"
       end
-      if token.value[:name] != component[:name]
+      if token.type == :component_end && token.value[:name] != component[:name]
         raise StandardError.new "Unexpected closing tag (#{token.value[:name]}) expecting #{component[:name]}"
       end
 
-      attributes = compile_attributes component[:attributes]
-
-      code = "def _component(slot,attributes);#{attributes[:assignments].join}_out='';"
-      code << "_stacks=[];"
-      code << "attributes=RBlade::AttributesManager.new(attributes);"
-      code << ComponentStore.fetchComponent(token.value[:name])
-      code << "RBlade::StackManager.get(_stacks) + _out;end;"
-      code << "_slot=_out;_out=_comp_#{component[:index]}_swap;"
-      code << "_out<<_component(_slot,{#{attributes[:arguments].join(",")}});"
+      code = "_slot=_out;_out=_c#{component[:index]}_swap;"
+      code << "_out<<#{ComponentStore.component(component[:name])}(_slot,_c#{component[:index]}_attr);"
+      code << "_slot=nil;_c#{component[:index]}_swap=nil;"
 
       code
     end
 
-    def compile_attributes attributes
-      attribute_arguments = []
-      attribute_assignments = []
-
-      attributes.each do |attribute|
-        if attribute[:type] == "class"
-          attribute_arguments.push "'class': RBlade::ClassManager.new(#{attribute[:value]})"
-          attribute_assignments.push "_class = attributes[:class];"
-
-          next
-        end
-        if attribute[:type] == "style"
-          attribute_arguments.push "'style': RBlade::StyleManager.new(#{attribute[:value]})"
-          attribute_assignments.push "_style = attributes[:style];"
-
-          next
-        end
-        if attribute[:type] == "attributes"
-          attribute_arguments.push "**(#{attribute[:value]}).to_h"
-
-          next
-        end
-
-        if attribute[:type] == "string"
-          attribute_arguments.push "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"
-        end
-
-        if attribute[:type] == "ruby"
-          attribute_arguments.push "'#{attribute[:name]}': (#{attribute[:value]})"
-        end
-
-        if attribute[:type] == "pass_through"
-          attribute_arguments.push "#{attribute[:name]}:"
-        end
-
-        if attribute[:type] == "empty"
-          attribute_arguments.push "'#{attribute[:name]}': true"
-        end
-
-        variable_name = attribute[:name]&.tr("-", "_")
-        if !variable_name.nil? && variable_name.match(/^[A-Za-z_][A-Za-z0-9_]*$/)
-          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 attributes _out slot]
-          next if keywords.include? variable_name
+    def get_method_name name
+      name.gsub(/[^a-zA-Z0-9_]/, "_")
+    end
 
-          attribute_assignments.push "#{variable_name} = attributes[:'#{attribute[:name]}'];"
+    def compile_attributes attributes
+      attributes.map do |attribute|
+        case attribute[:type]
+        when "class"
+          "'class': RBlade::ClassManager.new(#{attribute[:value]})"
+        when "style"
+          "'style': RBlade::StyleManager.new(#{attribute[:value]})"
+        when "attributes"
+          "**(#{attribute[:value]})"
+        when "string"
+          "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"
+        when "ruby"
+          "'#{attribute[:name]}': (#{attribute[:value]})"
+        when "pass_through"
+          "#{attribute[:name]}:"
+        when "empty"
+          "'#{attribute[:name]}': true"
+        else
+          raise StandardError.new "Component compiler: unexpected attribute type (#{attribute[:type]})"
         end
       end
-
-      {arguments: attribute_arguments, assignments: attribute_assignments}
     end
   end
 end

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

@@ -22,24 +22,28 @@ module RBlade
       end
 
       def compileEach args
-        if args&.count != 1
+        if args.nil? || args.count > 2
           raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
+        # Allow variables to be a key, value pair
+        args = args.join ","
 
-        variables, collection = args[0].split(" in ")
+        variables, collection = args.split(" in ")
 
         "#{collection}.each do |#{variables}|;"
       end
 
       def compileEachElse args
-        if args&.count != 1
-          raise StandardError.new "Each else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        if args.nil? || args.count > 2
+          raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
+        # Allow variables to be a key, value pair
+        args = args.join ","
         @loop_else_counter += 1
 
-        variables, collection = args[0].split(" in ")
+        variables, collection = args.split(" in ")
 
-        "_looped_#{@loop_else_counter}=true;#{collection}.each do |#{variables}|;_looped_#{@loop_else_counter}=false;"
+        "_looped_#{@loop_else_counter}=false;#{collection}.each do |#{variables}|;_looped_#{@loop_else_counter}=true;"
       end
 
       def compileFor args
@@ -56,13 +60,13 @@ module RBlade
         end
         @loop_else_counter += 1
 
-        "_looped_#{@loop_else_counter}=true;for #{args[0]};_looped_#{@loop_else_counter}=false;"
+        "_looped_#{@loop_else_counter}=false;for #{args[0]};_looped_#{@loop_else_counter}=true;"
       end
 
       def compileEmpty
         @loop_else_counter -= 1
 
-        "end;if _looped_#{@loop_else_counter + 1};"
+        "end;if !_looped_#{@loop_else_counter + 1};"
       end
 
       def compileNext args

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

@@ -11,9 +11,9 @@ module RBlade
         props = extractProps args[0]
         props.map do |key, value|
           if value == "_required"
-            "if !defined?(#{key});raise \"Props statement: #{key} is not defined\";end;"
+            "if !defined?(#{key})&&!attributes.has?(:'#{RBlade.escape_quotes(key)}');raise \"Props statement: #{key} is not defined\";end;#{key.sub(/[^a-zA-Z0-9_]/, "_")}=attributes.default(:'#{RBlade.escape_quotes(key)}');"
           else
-            "if !defined?(#{key});#{key}=#{value};end;"
+            "#{key.sub(/[^a-zA-Z0-9_]/, "_")}=attributes.default(:'#{RBlade.escape_quotes(key)}',#{value});"
           end
         end.join
       end

data/lib/rblade/compiler/tokenizes_components.rb

@@ -6,7 +6,7 @@ module RBlade
       tokens.map! do |token|
         next(token) if token.type != :unprocessed
 
-        segments = tokenizeComponentOpeningTags token.value
+        segments = tokenizeComponentTags token.value
 
         i = 0
         while i < segments.count
@@ -15,6 +15,9 @@ module RBlade
 
             segments.delete_at i + 1
             i += 1
+          elsif segments[i] == "<//>"
+            segments[i] = Token.new(type: :component_unsafe_end)
+            i += 1
           elsif segments[i] == "<" && segments[i + 1]&.match(/x[-:]/)
             name = segments[i + 1][2..]
             raw_attributes = (segments[i + 2] != ">") ? tokenizeAttributes(segments[i + 2]) : nil
@@ -97,7 +100,7 @@ module RBlade
       attributes
     end
 
-    def tokenizeComponentOpeningTags value
+    def tokenizeComponentTags value
       value.split(%r/
         # Opening and self-closing tags
         (?:
@@ -147,6 +150,8 @@ module RBlade
             \s*
           >
         )
+        |
+        (<\/\/>)
       /xm)
     end
 

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,34 +3,33 @@ module RBlade
     @attributes = {}
     def initialize attributes
       @attributes = attributes
+    end
 
-      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))
+    def default(key, default = nil)
+      if @attributes[key].nil? && !default.nil?
+        @attributes[key] = default
       end
 
-      @attributes.freeze
+      @attributes[key]
     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 has?(key)
+      !@attributes[key].nil?
+    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/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,22 @@ require "rblade/helpers/style_manager"
 module RBlade
   class RailsTemplate
     def call(template, source = nil)
-      RBlade::StackManager.clear
+      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=[];"
+      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,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
   s.summary = "Blade templates for ruby"
   s.description = "A port of the Laravel blade templating engine to ruby"
   s.authors = ["Simon J"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon J
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -76,6 +76,7 @@ files:
 - ".standard.yml"
 - CHANGELOG.md
 - Gemfile
+- README.md
 - Rakefile
 - do
 - docker-compose.yml