rblade 0.5.0 → 0.6.1

data/lib/rblade/compiler/compiles_components.rb

@@ -73,7 +73,7 @@ module RBlade
 
     def compile_component_end component
       code = "_slot=RBlade::SlotManager.new(_out);_out=_c#{component[:index]}_swap;"
-      code << "_out<<#{ComponentStore.component(component[:name])}(_slot,_c#{component[:index]}_attr);"
+      code << "_out<<#{ComponentStore.component(component[:name])}(_slot,_c#{component[:index]}_attr,params,session,flash,cookies);"
       code << "_slot=nil;_c#{component[:index]}_swap=nil;_c#{component[:index]}_attr=nil;"
 
       code

data/lib/rblade/compiler/compiles_ruby.rb

@@ -38,7 +38,7 @@ module RBlade
               segments[i] << ";"
             end
 
-            segments[i] = Token.new(type: :php, value: segments[i])
+            segments[i] = Token.new(type: :ruby, value: segments[i])
 
             i += 1
           elsif !segments[i].nil? && segments[i] != ""

data/lib/rblade/compiler/compiles_statements.rb

@@ -1,4 +1,5 @@
 require "rblade/compiler/statements/compiles_conditionals"
+require "rblade/compiler/statements/compiles_form"
 require "rblade/compiler/statements/compiles_html_attributes"
 require "rblade/compiler/statements/compiles_inline_ruby"
 require "rblade/compiler/statements/compiles_loops"
@@ -48,7 +49,12 @@ module RBlade
       handler_class, handler_method = @@statement_handlers[name.tr("_", "").downcase]
 
       if !handler_class&.method_defined?(handler_method)
-        raise StandardError.new "Unhandled statement: @#{name}"
+        if name.start_with? "end"
+          ## Fallback to the default end handler
+          handler_class, handler_method = @@statement_handlers["end"]
+        else
+          raise StandardError.new "Unhandled statement: @#{name}"
+        end
       end
 
       if handler_class == CompilesStatements
@@ -63,47 +69,49 @@ module RBlade
     @@handler_instances = {}
 
     @@statement_handlers = {
+      "blank?" => [CompilesConditionals, :compileBlank],
       "break" => [CompilesLoops, :compileBreak],
       "breakif" => [CompilesLoops, :compileBreakIf],
       "case" => [CompilesConditionals, :compileCase],
       "checked" => [CompilesConditionals, :compileChecked],
       "class" => [CompilesHtmlAttributes, :compileClass],
+      "defined?" => [CompilesConditionals, :compileDefined],
+      "delete" => [CompilesForm, :compileDelete],
       "disabled" => [CompilesConditionals, :compileDisabled],
       "else" => [CompilesConditionals, :compileElse],
       "elsif" => [CompilesConditionals, :compileElsif],
       "each" => [CompilesLoops, :compileEach],
       "eachelse" => [CompilesLoops, :compileEachElse],
       "empty" => [CompilesLoops, :compileEmpty],
+      "empty?" => [CompilesConditionals, :compileEmpty],
       "end" => [CompilesStatements, :compileEnd],
-      "endcase" => [CompilesStatements, :compileEnd],
-      "endeach" => [CompilesStatements, :compileEnd],
-      "endeachelse" => [CompilesStatements, :compileEnd],
-      "endenv" => [CompilesStatements, :compileEnd],
-      "endfor" => [CompilesStatements, :compileEnd],
-      "endforelse" => [CompilesStatements, :compileEnd],
-      "endif" => [CompilesStatements, :compileEnd],
-      "endonce" => [CompilesStatements, :compileEnd],
       "endprepend" => [CompilesStacks, :compileEndPrepend],
+      "endprependif" => [CompilesStacks, :compileEndPrependIf],
       "endprependonce" => [CompilesOnce, :compileEndPrependOnce],
-      "endproduction" => [CompilesStatements, :compileEnd],
       "endpush" => [CompilesStacks, :compileEndPush],
+      "endpushif" => [CompilesStacks, :compileEndPushIf],
       "endpushonce" => [CompilesOnce, :compileEndPushOnce],
-      "endunless" => [CompilesStatements, :compileEnd],
-      "enduntil" => [CompilesStatements, :compileEnd],
-      "endwhile" => [CompilesStatements, :compileEnd],
       "env" => [CompilesConditionals, :compileEnv],
       "for" => [CompilesLoops, :compileFor],
       "forelse" => [CompilesLoops, :compileForElse],
       "if" => [CompilesConditionals, :compileIf],
+      "method" => [CompilesForm, :compileMethod],
       "next" => [CompilesLoops, :compileNext],
       "nextif" => [CompilesLoops, :compileNextIf],
+      "nil?" => [CompilesConditionals, :compileNil],
+      "old" => [CompilesForm, :compileOld],
       "once" => [CompilesOnce, :compileOnce],
+      "patch" => [CompilesForm, :compilePatch],
       "prepend" => [CompilesStacks, :compilePrepend],
+      "prependif" => [CompilesStacks, :compilePrependIf],
       "prependonce" => [CompilesOnce, :compilePrependOnce],
+      "present?" => [CompilesConditionals, :compilePresent],
       "production" => [CompilesConditionals, :compileProduction],
       "props" => [CompilesProps, :compileProps],
       "push" => [CompilesStacks, :compilePush],
+      "pushif" => [CompilesStacks, :compilePushIf],
       "pushonce" => [CompilesOnce, :compilePushOnce],
+      "put" => [CompilesForm, :compilePut],
       "readonly" => [CompilesConditionals, :compileReadonly],
       "required" => [CompilesConditionals, :compileRequired],
       "ruby" => [CompilesInlineRuby, :compile],

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

@@ -9,6 +9,46 @@ module RBlade
         "if #{args[0]};"
       end
 
+      def compileBlank args
+        if args&.count != 1
+          raise StandardError.new "Blank? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "if (#{args[0]}).blank?;"
+      end
+
+      def compileDefined args
+        if args&.count != 1
+          raise StandardError.new "Defined? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "if defined? #{args[0]};"
+      end
+
+      def compileEmpty args
+        if args&.count != 1
+          raise StandardError.new "Empty? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "if (#{args[0]}).empty?;"
+      end
+
+      def compileNil args
+        if args&.count != 1
+          raise StandardError.new "Nil? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "if (#{args[0]}).nil?;"
+      end
+
+      def compilePresent args
+        if args&.count != 1
+          raise StandardError.new "Present? statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+
+        "if (#{args[0]}).present?;"
+      end
+
       def compileElsif args
         if args&.count != 1
           raise StandardError.new "Elsif statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"

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

@@ -0,0 +1,48 @@
+module RBlade
+  class CompilesStatements
+    class CompilesForm
+      def compileMethod args
+        if args&.count != 1
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+        end
+        method = RBlade.h(args[0].tr "\"'", "")
+
+        %[_out<<'<input type="hidden" name="_method" value="#{method}">';]
+      end
+
+      def compileDelete args
+        if !args.nil?
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0)"
+        end
+
+        compileMethod(['DELETE'])
+      end
+
+      def compilePatch args
+        if !args.nil?
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0)"
+        end
+
+        compileMethod(['PATCH'])
+      end
+
+      def compilePut args
+        if !args.nil?
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0)"
+        end
+
+        compileMethod(['PUT'])
+      end
+
+      def compileOld args
+        if args.nil? || args.count > 2
+          raise StandardError.new "Once statement: wrong number of arguments (given #{args.count}, expecting 0)"
+        end
+
+        default_value = args[1] || "''"
+
+        "_out<<params.fetch(#{args[0]},#{default_value});"
+      end
+    end
+  end
+end

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

@@ -14,17 +14,13 @@ module RBlade
       end
 
       def compilePrepend args
-        if args.nil? || args.count > 2
-          raise StandardError.new "Prepend statement: wrong number of arguments (given #{args&.count}, expecting 1 or 2)"
+        if args&.count != 1
+          raise StandardError.new "Prepend statement: wrong number of arguments (given #{args&.count}, expecting 1)"
         end
 
-        if args.count == 2
-          "RBlade::StackManager.prepend(#{args[0]}, #{args[1]});"
-        else
-          @push_counter += 1
+        @push_counter += 1
 
-          "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
-        end
+        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
       end
 
       def compileEndPrepend args
@@ -37,18 +33,38 @@ module RBlade
         "RBlade::StackManager.prepend(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
       end
 
+      def compilePrependIf args
+        if args&.count != 2
+          raise StandardError.new "Prepend if statement: wrong number of arguments (given #{args&.count}, expecting 2)"
+        end
+
+        "if #{args[0]};" + compilePrepend([args[1]])
+      end
+
+      def compileEndPrependIf args
+        if !args.nil?
+          raise StandardError.new "End push if statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        end
+
+        "end;" + compileEndPush(nil)
+      end
+
       def compilePush args
-        if args.nil? || args.count > 2
-          raise StandardError.new "Push statement: wrong number of arguments (given #{args&.count}, expecting 1 or 2)"
+        if args&.count != 1
+          raise StandardError.new "Push statement: wrong number of arguments (given #{args&.count}, expecting 1)"
         end
 
-        if args.count == 2
-          "RBlade::StackManager.push(#{args[0]}, #{args[1]});"
-        else
-          @push_counter += 1
+        @push_counter += 1
 
-          "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
+        "_p_#{@push_counter}=#{args[0]};_p_#{@push_counter}_b=_out;_out='';"
+      end
+
+      def compilePushIf args
+        if args&.count != 2
+          raise StandardError.new "Push if statement: wrong number of arguments (given #{args&.count}, expecting 2)"
         end
+
+        "if #{args[0]};" + compilePush([args[1]])
       end
 
       def compileEndPush args
@@ -60,6 +76,14 @@ module RBlade
 
         "RBlade::StackManager.push(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
       end
+
+      def compileEndPushIf args
+        if !args.nil?
+          raise StandardError.new "End push if statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        end
+
+        "end;" + compileEndPush(nil)
+      end
     end
   end
 end

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -12,12 +12,12 @@ module RBlade
           (?:
             (?:
               (@@)
-              (\w+(?!\w))
+              (\w+(?!\w)[!\?]?)
             )
             |
             (?:
               (@)
-              (\w+(?!\w))
+              (\w+(?!\w)[!\?]?)
               (?:[ \t]*
                 (\(.*?\))
               )?
@@ -45,6 +45,7 @@ module RBlade
           i += 1
         elsif segment == "@"
           tokenizeStatement! segments, i
+          handleSpecialCases! segments, i
 
           i += 1
         elsif !segments[i].nil? && segments[i] != ""
@@ -74,6 +75,16 @@ module RBlade
       segments[i] = Token.new(type: :statement, value: statement_data)
     end
 
+    def handleSpecialCases!(segments, i)
+      case segments[i][:value][:name]
+      when "case"
+        # Remove any whitespace before a when statement
+        until segments[i + 1].nil? || segments[i + 1] == '@'
+          segments.delete_at i + 1
+        end
+      end
+    end
+
     def tokenizeArguments!(segments, segment_index)
       success = expandSegmentToEndParenthesis! segments, segment_index
 

data/lib/rblade/component_store.rb

@@ -81,7 +81,7 @@ module RBlade
       compiled_component = RBlade::Compiler.compileString(code)
 
       @@component_definitions \
-        << "def #{@@component_method_names[name]}(slot,attributes);_out='';" \
+        << "def #{@@component_method_names[name]}(slot,attributes,params,session,flash,cookies);_out='';" \
         << "_stacks=[];" \
         << "attributes=RBlade::AttributesManager.new(attributes);" \
         << compiled_component \

data/lib/rblade/helpers/attributes_manager.rb

@@ -19,12 +19,16 @@ module RBlade
       !@attributes[key].nil?
     end
 
-    def method_missing(method, *)
-      @attributes.send(method, *)
+    def method_missing(method, *, &block)
+      if [:select, :filter, :slice].include? method
+        AttributesManager.new @attributes.send(method, *, &block)
+      else
+        @attributes.send(method, *, &block)
+      end
     end
 
     def respond_to_missing?(method_name, *args)
-      @attributes.respond_to?(method_name) || super
+      @attributes.respond_to?(method_name)
     end
 
     def to_s attributes = nil
@@ -46,7 +50,7 @@ module RBlade
         [keys.to_sym]
       end
 
-      self.class.new @attributes.slice(*keys)
+      AttributesManager.new @attributes.slice(*keys)
     end
 
     def except(keys)
@@ -56,7 +60,15 @@ module RBlade
         [keys.to_sym]
       end
 
-      self.class.new @attributes.except(*keys)
+      AttributesManager.new @attributes.except(*keys)
+    end
+
+    def class(new_classes)
+      new_classes = ClassManager.new(new_classes).to_s
+      attributes = @attributes.dup
+      attributes[:class] = mergeClasses attributes[:class], new_classes
+
+      AttributesManager.new attributes
     end
 
     def merge(default_attributes)
@@ -76,7 +88,19 @@ module RBlade
         new_attributes[key] = value
       end
 
-      self.class.new new_attributes
+      AttributesManager.new new_attributes
+    end
+
+    def has?(*keys)
+      keys.map!(&:to_sym)
+
+      keys.all? { |key| @attributes.has_key? key }
+    end
+
+    def has_any?(*keys)
+      keys.map!(&:to_sym)
+
+      keys.any? { |key| @attributes.has_key? key }
     end
 
     private

data/lib/rblade/helpers/slot_manager.rb

@@ -16,6 +16,14 @@ module RBlade
       to_s
     end
 
+    def method_missing(method, *)
+      @content.send(method, *)
+    end
+
+    def respond_to_missing?(method_name, *args)
+      @content.respond_to?(method_name)
+    end
+
     def attributes
       @attributes
     end

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.5.0"
+  s.version = "0.6.1"
   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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Simon J
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -80,7 +80,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- TODO.md
 - do
 - docker-compose.yml
 - lib/rblade.rb
@@ -92,6 +91,7 @@ files:
 - lib/rblade/compiler/compiles_statements.rb
 - lib/rblade/compiler/compiles_verbatim.rb
 - lib/rblade/compiler/statements/compiles_conditionals.rb
+- lib/rblade/compiler/statements/compiles_form.rb
 - lib/rblade/compiler/statements/compiles_html_attributes.rb
 - lib/rblade/compiler/statements/compiles_inline_ruby.rb
 - lib/rblade/compiler/statements/compiles_loops.rb
@@ -115,7 +115,7 @@ homepage: https://rubygems.org/gems/rblade
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: A component-first templating engine for Rails
 test_files: []

data/TODO.md

@@ -1,2 +0,0 @@
-Add @shouldRender? Or say you can use return (return _out) to exit early? @return? @exitComponent?
-