rblade 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ff80cf4efc20f03172676c57e11c4fe325d5ce304cf855416a4b6d119a654a
-  data.tar.gz: 7283baf017d3b28a4609160551bc265f27355bb501d2f42a9303fe1bb825e837
+  metadata.gz: 388670a7f7f3d90c6249e149cd51e898dbadc66d182e0d0111948677cb85719c
+  data.tar.gz: 8dd2d5415191fb833a850b9ba9f2e0fd1d51a3722d466cd410c28c9c02e079dd
 SHA512:
-  metadata.gz: dce7d4c704f87acab8e1b2d9999acca4fd77aa5739845fa82417304e5223d6fed5dc5be5a52dc46fe003546635907346029ddc995656b6773bb63aaba19ab90e
-  data.tar.gz: 9336ac0fdb096d3d6c05992916db5bbb594e965ac4c036e99f86b65dd77062842b42f825979fa3b013b84a35f2d8913c3ef6a43a0ec3163cc2c491da521a16bb
+  metadata.gz: 65742f3fbb5ffca6bbbf05e94b4d9838cbf488ae835c1607abdb73cca9c04308a5de142a356ecdbd374019eb73ef3a6ccbe9dec732fceaa555ab580ca0a7ebec
+  data.tar.gz: 0bb1616971c4dc02d919f9c432bf478e2f18a2021116834aac10e7be340720e0f75855c997beb5a45fb8c456cb980d5dfeaa7e44e49681c28c1643b1b168d15d

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.2.0 [2024-07-23]
+- Fix slots being calculated without parent's context
+- Add @props statement
+- Add attributes, class and style manager
+
+## 0.1.0 [2024-07-22]
+- Initial release

data/lib/rblade/compiler/compiles_components.rb

@@ -2,6 +2,11 @@ require "rblade/component_store"
 
 module RBlade
   class CompilesComponents
+    def initialize
+      @component_count = 0
+      @component_stack = []
+    end
+
     def compile!(tokens)
       tokens.each do |token|
         if [:component, :component_start, :component_end].none? token.type
@@ -21,25 +26,50 @@ module RBlade
     private
 
     def compile_token_start token
-      attributes = compile_attributes token
-      "def _component(attributes={#{attributes[:arguments].join(",")}});#{attributes[:assignments].join}_out='';"
+      @component_count += 1
+
+      @component_stack << {
+        name: token.value[:name],
+        attributes: token.value[:attributes],
+        index: @component_count
+      }
+
+      "_comp_#{@component_count}_swap=_out;_out='';"
     end
 
     def compile_token_end token
-      code = "slot=_out;_out='';_stacks=[];"
+      component = @component_stack.pop
+      if 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;_out<<_component();"
+      code << "RBlade::StackManager.get(_stacks) + _out;end;"
+      code << "_slot=_out;_out=_comp_#{component[:index]}_swap;"
+      code << "_out<<_component(_slot,{#{attributes[:arguments].join(",")}});"
 
       code
     end
 
-    def compile_attributes token
+    def compile_attributes attributes
       attribute_arguments = []
       attribute_assignments = []
 
-      token.value[:attributes].each do |attribute|
-        if attribute[:type] == "class" || attribute[:type] == "style"
-          attribute_arguments.push "'#{attribute[:type]}': #{attribute[:value]}'"
+      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
@@ -49,7 +79,7 @@ module RBlade
         end
 
         if attribute[:type] == "ruby"
-          attribute_arguments.push "'#{attribute[:name]}': (#{attribute[:value]})'"
+          attribute_arguments.push "'#{attribute[:name]}': (#{attribute[:value]})"
         end
 
         if attribute[:type] == "pass_through"

data/lib/rblade/compiler/compiles_echos.rb

@@ -35,11 +35,12 @@ module RBlade
             segments.delete_at i
             segments.delete_at i + 1
             segment_value = "_out<<"
-            # Special case for slot - we want this to be able to output HTML
-            if !wrapper_function.nil? && segments[i] != "slot"
-              segment_value <<= wrapper_function
+            # Special case for slot and attributes - we want this to be able to output HTML
+            segment_value <<= if !wrapper_function.nil? && segments[i] != "slot" && !segments[i].start_with?("attributes")
+              wrapper_function + "(" + segments[i] + ");"
+            else
+              "(" + segments[i] + ").to_s;"
             end
-            segment_value <<= "(" + segments[i] + ");"
             segments[i] = Token.new(:echo, segment_value)
 
             i += 1

data/lib/rblade/compiler/compiles_statements.rb

@@ -1,6 +1,7 @@
 require "rblade/compiler/statements/compiles_conditionals"
 require "rblade/compiler/statements/compiles_inline_ruby"
 require "rblade/compiler/statements/compiles_loops"
+require "rblade/compiler/statements/compiles_props"
 require "rblade/compiler/statements/compiles_stacks"
 
 module RBlade
@@ -88,6 +89,7 @@ module RBlade
       "next" => [CompilesLoops, :compileNext],
       "nextif" => [CompilesLoops, :compileNextIf],
       "prepend" => [CompilesStacks, :compilePrepend],
+      "props" => [CompilesProps, :compileProps],
       "push" => [CompilesStacks, :compilePush],
       "readonly" => [CompilesConditionals, :compileReadonly],
       "required" => [CompilesConditionals, :compileRequired],

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

@@ -0,0 +1,61 @@
+require "rblade/helpers/tokenizer"
+
+module RBlade
+  class CompilesStatements
+    class CompilesProps
+      def compileProps args
+        if args.nil?
+          raise StandardError.new "Props statement: wrong number of arguments (given #{args&.count}, expecting 1)"
+        end
+
+        props = extractProps args[0]
+        props.map do |key, value|
+          if value == "_required"
+            "if !defined?(#{key});raise \"Props statement: #{key} is not defined\";end;"
+          else
+            "if !defined?(#{key});#{key}=#{value};end;"
+          end
+        end.join
+      end
+
+      def extractProps prop_string
+        if !prop_string.start_with?("{") || !prop_string.end_with?("}")
+          raise StandardError.new "Props statement: expecting hash as parameter"
+        end
+
+        props = {}
+        prop_strings = Tokenizer.extractCommaSeparatedValues prop_string[1..-2]
+
+        prop_strings.each do |prop|
+          prop.strip!
+
+          key, value = prop.split(/^
+            (?:
+              ('.+'):
+              |
+              (".+"):
+              |
+              ([^ :]+):
+              |
+              :(?:
+                '(.+?)'
+                |
+                "(.+?)"
+                |
+                ([^"' ]+)
+              )\s*=>
+            )
+            \s*(.+?)$
+          /x).reject(&:empty?)
+
+          if key.nil? || value.nil?
+            raise StandardError.new "Props statement: invalid property hash"
+          end
+          props[key] = value
+        end
+
+        props
+      end
+    end
+  end
+end

data/lib/rblade/compiler/tokenizes_components.rb

@@ -128,7 +128,7 @@ module RBlade
                       |
                       '[^\']*'
                       |
-                      [^'"=<>\s]+
+                      [^'"=<>\s\/]+
                     )
                   )?
                 )
@@ -175,7 +175,7 @@ module RBlade
                 |
                 '([^\']*)'
                 |
-                ([^'"=<>\s]+)
+                ([^'"=<>\s\/]+)
               )
             )?
           )

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -1,3 +1,4 @@
+require "rblade/helpers/tokenizer"
 require "ripper"
 
 module RBlade
@@ -80,7 +81,7 @@ module RBlade
         return nil
       end
 
-      arguments = extractArguments segments[segment_index]
+      arguments = Tokenizer.extractCommaSeparatedValues segments[segment_index][1..-2]
       segments.delete_at segment_index
 
       arguments
@@ -110,62 +111,5 @@ module RBlade
 
       parentheses_difference.zero?
     end
-
-    def extractArguments(segment)
-      # Add a comma to the end to delimit the end of the last argument
-      segment = segment[1..-2] + ","
-      segment_lines = segment.lines
-
-      tokens = Ripper.lex segment
-      arguments = []
-
-      current_line = 1
-      current_index = 0
-      bracket_count = {
-        "[]": 0,
-        "{}": 0,
-        "()": 0
-      }
-      tokens.each do |token|
-        case token[1]
-        when :on_lbracket
-          bracket_count[:[]] += 1
-        when :on_rbracket
-          bracket_count[:[]] -= 1
-        when :on_lbrace
-          bracket_count[:"{}"] += 1
-        when :on_rbrace
-          bracket_count[:"{}"] -= 1
-        when :on_lparen
-          bracket_count[:"()"] += 1
-        when :on_rparen
-          bracket_count[:"()"] -= 1
-        when :on_comma
-          if bracket_count[:[]] != 0 || bracket_count[:"{}"] != 0 || bracket_count[:"()"] != 0
-            next
-          end
-
-          argument = ""
-
-          # Concatenate all lines up to this token's line, including the tail end of the current line
-          if token[0][0] != current_line
-            (current_line...token[0][0]).each do |i|
-              argument << (segment_lines[i - 1].slice(current_index..-1) || "")
-              current_index = 0
-            end
-            current_line = token[0][0]
-          end
-          argument <<= segment_lines[current_line - 1].slice(current_index...token[0][1])
-
-          arguments.push argument.strip
-
-          current_index = token[0][1] + 1
-        end
-      end
-
-      return nil if arguments.count == 1 && arguments.first == ""
-
-      arguments
-    end
   end
 end

data/lib/rblade/component_store.rb

@@ -8,13 +8,13 @@ module RBlade
       namespace = nil
       path = name
 
-      if name.match '::'
-        namespace, path = name.split('::')
+      if name.match? "::"
+        namespace, path = name.split("::")
       end
 
-      path.gsub! '.', '/'
+      path.tr! ".", "/"
 
-      @@templatePaths[namespace]&.each do |base_path|
+      @@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)
@@ -28,15 +28,15 @@ module RBlade
     def self.add_path path, namespace = nil
       path = path.to_s
       if !path.end_with? "/"
-        path = path + "/"
+        path += "/"
       end
 
-      @@templatePaths[namespace] ||= []
-      @@templatePaths[namespace] << path
+      @@template_paths[namespace] ||= []
+      @@template_paths[namespace] << path
     end
 
     private
 
-    @@templatePaths = {}
+    @@template_paths = {}
   end
 end

data/lib/rblade/helpers/attributes_manager.rb

@@ -0,0 +1,62 @@
+module RBlade
+  class AttributesManager
+    @attributes = {}
+    def initialize attributes
+      @attributes = attributes
+    end
+
+    def to_s attributes = nil
+      attributes ||= @attributes
+
+      attributes.map do |key, value|
+        "#{key}=\"#{h(value)}\""
+      end.join " "
+    end
+
+    def only(keys)
+      keys = if keys.is_a? Array
+        keys.map(&:to_sym)
+      else
+        [keys.to_sym]
+      end
+
+      self.class.new @attributes.slice(*keys)
+    end
+
+    def except(keys)
+      keys = if keys.is_a? Array
+        keys.map(&:to_sym)
+      else
+        [keys.to_sym]
+      end
+
+      self.class.new @attributes.except(*keys)
+    end
+
+    def merge(default_attributes)
+      new_attributes = default_attributes
+
+      @attributes.each do |key, value|
+        if key == :class && !new_attributes[key].nil?
+          unless new_attributes[key].end_with? " "
+            new_attributes[key] << " "
+          end
+          new_attributes[key] << value.to_s
+          next
+        end
+
+        if key == :style && !new_attributes[key].nil?
+          unless new_attributes[key].end_with? ";"
+            new_attributes[key] << ";"
+          end
+          new_attributes[key] << value.to_s
+          next
+        end
+
+        new_attributes[key] = value
+      end
+
+      self.class.new new_attributes
+    end
+  end
+end

data/lib/rblade/helpers/class_manager.rb

@@ -0,0 +1,23 @@
+module RBlade
+  class ClassManager
+    def initialize classes
+      if classes.is_a? String
+        @classes = classes
+      elsif classes.is_a? Array
+        @classes = classes.join " "
+      elsif classes.is_a? Hash
+        @classes = ""
+        classes.map do |value, predicate|
+          if predicate
+            @classes << "#{value} "
+          end
+        end
+        @classes.rstrip!
+      end
+    end
+
+    def to_s
+      @classes
+    end
+  end
+end

data/lib/rblade/helpers/style_manager.rb

@@ -0,0 +1,37 @@
+module RBlade
+  class StyleManager
+    def initialize styles
+      if styles.is_a? String
+        @styles = styles.strip
+        unless @styles == "" || @styles.end_with?(";")
+          @styles << ";"
+        end
+      elsif styles.is_a? Array
+        @styles = styles.map do |style|
+          style = style.strip
+          unless style.end_with? ";"
+            style << ";"
+          end
+
+          style
+        end.join
+      elsif styles.is_a? Hash
+        @styles = ""
+        styles.each do |value, predicate|
+          if predicate
+            value = value.to_s.strip
+            unless value.end_with? ";"
+              value << ";"
+            end
+
+            @styles << value
+          end
+        end
+      end
+    end
+
+    def to_s
+      @styles
+    end
+  end
+end

data/lib/rblade/helpers/tokenizer.rb

@@ -0,0 +1,63 @@
+module RBlade
+  class Tokenizer
+    def self.extractCommaSeparatedValues segment
+      unless segment.match?(/,\s*\z/)
+        # Add a comma to the end to delimit the end of the last argument
+        segment += ","
+      end
+      segment_lines = segment.lines
+
+      tokens = Ripper.lex segment
+      arguments = []
+
+      current_line = 1
+      current_index = 0
+      bracket_count = {
+        "[]": 0,
+        "{}": 0,
+        "()": 0
+      }
+      tokens.each do |token|
+        case token[1]
+        when :on_lbracket
+          bracket_count[:[]] += 1
+        when :on_rbracket
+          bracket_count[:[]] -= 1
+        when :on_lbrace
+          bracket_count[:"{}"] += 1
+        when :on_rbrace
+          bracket_count[:"{}"] -= 1
+        when :on_lparen
+          bracket_count[:"()"] += 1
+        when :on_rparen
+          bracket_count[:"()"] -= 1
+        when :on_comma
+          if bracket_count[:[]] != 0 || bracket_count[:"{}"] != 0 || bracket_count[:"()"] != 0
+            next
+          end
+
+          argument = ""
+
+          # Concatenate all lines up to this token's line, including the tail end of the current line
+          if token[0][0] != current_line
+            (current_line...token[0][0]).each do |i|
+              argument << (segment_lines[i - 1].slice(current_index..-1) || "")
+              current_index = 0
+            end
+            current_line = token[0][0]
+          end
+          argument <<= segment_lines[current_line - 1].slice(current_index...token[0][1])
+          argument.strip!
+
+          arguments.push argument
+
+          current_index = token[0][1] + 1
+        end
+      end
+
+      return nil if arguments.count == 1 && arguments.first == ""
+
+      arguments
+    end
+  end
+end

data/lib/rblade/rails_template.rb

@@ -1,12 +1,15 @@
 require "rails"
 require "rblade/compiler"
+require "rblade/helpers/attributes_manager"
+require "rblade/helpers/class_manager"
 require "rblade/helpers/stack_manager"
+require "rblade/helpers/style_manager"
 
 module RBlade
   class RailsTemplate
     def call(template, source = nil)
       RBlade::StackManager.clear
-      setup = "foo = 'FOO';bar = 'BAR';_out='';_stacks=[];"
+      setup = "_out='';_stacks=[];"
       setdown = "RBlade::StackManager.get(_stacks) + _out"
       setup + RBlade::Compiler.compileString(source || template.source) + setdown
     end

data/rblade.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
   s.summary = "Blade templates for ruby"
   s.description = "A port of the Laravel blade templating engine to ruby"
   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)/}) }
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
   s.homepage = "https://rubygems.org/gems/rblade"
   s.license = "MIT"
   s.required_ruby_version = ">= 3.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon J
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -74,6 +74,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".standard.yml"
+- CHANGELOG.md
 - Gemfile
 - Rakefile
 - do
@@ -88,11 +89,16 @@ files:
 - lib/rblade/compiler/statements/compiles_conditionals.rb
 - lib/rblade/compiler/statements/compiles_inline_ruby.rb
 - lib/rblade/compiler/statements/compiles_loops.rb
+- lib/rblade/compiler/statements/compiles_props.rb
 - lib/rblade/compiler/statements/compiles_stacks.rb
 - lib/rblade/compiler/tokenizes_components.rb
 - lib/rblade/compiler/tokenizes_statements.rb
 - lib/rblade/component_store.rb
+- lib/rblade/helpers/attributes_manager.rb
+- lib/rblade/helpers/class_manager.rb
 - lib/rblade/helpers/stack_manager.rb
+- lib/rblade/helpers/style_manager.rb
+- lib/rblade/helpers/tokenizer.rb
 - lib/rblade/rails_template.rb
 - lib/rblade/railtie.rb
 - rblade.gemspec