rblade 0.5.0 → 1.0.0

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

@@ -17,7 +17,7 @@ module RBlade
 
       def compilePushOnce args
         if args&.count != 1 && args&.count != 2
-          raise StandardError.new "Push once statement: wrong number of arguments (given #{args.count}, expecting 1 or 2)"
+          raise StandardError.new "Push once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
         @once_counter += 1
         once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
@@ -27,8 +27,8 @@ module RBlade
       end
 
       def compileEndPushOnce args
-        if !args.nil?
-          raise StandardError.new "End push once statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        unless args.nil?
+          raise StandardError.new "End push once statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         "RBlade::StackManager.push(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"
@@ -36,7 +36,7 @@ module RBlade
 
       def compilePrependOnce args
         if args&.count != 1 && args&.count != 2
-          raise StandardError.new "Prepend once statement: wrong number of arguments (given #{args.count}, expecting 1 or 2)"
+          raise StandardError.new "Prepend once statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
         @once_counter += 1
         once_id = args[1].nil? ? ":_#{@once_counter}" : args[1]
@@ -46,8 +46,8 @@ module RBlade
       end
 
       def compileEndPrependOnce args
-        if !args.nil?
-          raise StandardError.new "End prepend once statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        unless args.nil?
+          raise StandardError.new "End prepend once statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         "RBlade::StackManager.prepend(_p1_#{@once_counter}, _out);_out=_p1_#{@once_counter}_b;end;"

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

@@ -7,28 +7,24 @@ module RBlade
 
       def compileStack args
         if args&.count != 1
-          raise StandardError.new "Stack statement: wrong number of arguments (given #{args&.count}, expecting 1)"
+          raise StandardError.new "Stack statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
 
         "RBlade::StackManager.initialize(#{args[0]}, _out);_stacks.push(#{args[0]});_out = '';"
       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 || 0}, 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
-        if !args.nil?
+        unless args.nil?
           raise StandardError.new "End prepend statement: wrong number of arguments (given #{args&.count}, expecting 0)"
         end
 
@@ -37,29 +33,57 @@ 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
+        unless args.nil?
+          raise StandardError.new "End prepend 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 || 0}, expecting 2)"
         end
+
+        "if #{args[0]};" + compilePush([args[1]])
       end
 
       def compileEndPush args
-        if !args.nil?
-          raise StandardError.new "End push statement: wrong number of arguments (given #{args&.count}, expecting 0)"
+        unless args.nil?
+          raise StandardError.new "End push statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
         @push_counter -= 1
 
         "RBlade::StackManager.push(_p_#{@push_counter + 1}, _out);_out=_p_#{@push_counter + 1}_b;"
       end
+
+      def compileEndPushIf args
+        unless 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/compiler.rb

@@ -1,6 +1,6 @@
 require "rblade/compiler/compiles_comments"
 require "rblade/compiler/compiles_components"
-require "rblade/compiler/compiles_echos"
+require "rblade/compiler/compiles_prints"
 require "rblade/compiler/compiles_ruby"
 require "rblade/compiler/compiles_verbatim"
 require "rblade/compiler/compiles_statements"
@@ -37,7 +37,7 @@ module RBlade
       CompilesRuby.new.compile! tokens
       TokenizesComponents.new.tokenize! tokens
       TokenizesStatements.new.tokenize! tokens
-      CompilesEchos.new.compile! tokens
+      CompilesPrints.new.compile! tokens
       CompilesStatements.new.compile! tokens
       CompilesComponents.new.compile! tokens
 
@@ -49,7 +49,7 @@ module RBlade
 
       CompilesComments.compile!(tokens)
       CompilesRuby.compile! tokens
-      CompilesEchos.compile!(tokens)
+      CompilesPrints.compile!(tokens)
 
       compileTokens tokens
     end

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

@@ -15,16 +15,22 @@ module RBlade
       @attributes[key]
     end
 
-    def has?(key)
-      !@attributes[key].nil?
+    def has?(*keys)
+      keys.map!(&:to_sym)
+
+      keys.all? { |key| @attributes.has_key? key }
     end
 
-    def method_missing(method, *)
-      @attributes.send(method, *)
+    def method_missing(method, *, &)
+      if [:select, :filter, :slice].include? method
+        AttributesManager.new @attributes.send(method, *, &)
+      else
+        @attributes.send(method, *, &)
+      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 +52,7 @@ module RBlade
         [keys.to_sym]
       end
 
-      self.class.new @attributes.slice(*keys)
+      AttributesManager.new @attributes.slice(*keys)
     end
 
     def except(keys)
@@ -56,7 +62,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 +90,13 @@ module RBlade
         new_attributes[key] = value
       end
 
-      self.class.new new_attributes
+      AttributesManager.new new_attributes
+    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,8 +16,14 @@ module RBlade
       to_s
     end
 
-    def attributes
-      @attributes
+    def method_missing(method, *)
+      @content.send(method, *)
     end
+
+    def respond_to_missing?(method_name, *args)
+      @content.respond_to?(method_name)
+    end
+
+    attr_reader :attributes
   end
 end

data/rblade.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Simon J
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -79,24 +79,32 @@ files:
 - Gemfile
 - LICENSE.md
 - README.md
+- REFERENCE.md
 - Rakefile
-- TODO.md
 - do
 - docker-compose.yml
+- examples/README.md
+- examples/application/home.rblade
+- examples/components/content/alert.rblade
+- examples/components/content/hero.rblade
+- examples/components/h1.rblade
+- examples/components/p.rblade
+- examples/layouts/app.rblade
 - lib/rblade.rb
 - lib/rblade/compiler.rb
 - lib/rblade/compiler/compiles_comments.rb
 - lib/rblade/compiler/compiles_components.rb
-- lib/rblade/compiler/compiles_echos.rb
+- lib/rblade/compiler/compiles_prints.rb
 - lib/rblade/compiler/compiles_ruby.rb
 - lib/rblade/compiler/compiles_statements.rb
 - lib/rblade/compiler/compiles_verbatim.rb
+- lib/rblade/compiler/statements/compiles_component_helpers.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
 - 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
 - lib/rblade/compiler/tokenizes_statements.rb
@@ -115,7 +123,7 @@ homepage: https://rubygems.org/gems/rblade
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +138,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?
-