rblade 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9124479cbf9e4fd7355470943bafcbd009c367abf8593d19bc3f8a967eb0e4cf
-  data.tar.gz: c0d9f34089ae943df7263298cb9e08951b23b2ebfcbc3a221c4e8a2940ee959c
+  metadata.gz: edaa1af6299a8281520a73611def0838ef1017f2ec7bb3fd8a125bcd02e5c7ce
+  data.tar.gz: 6363e44a009a29e8771c50ecf4768b0d365b0d2147ba998db72805e9b05c0390
 SHA512:
-  metadata.gz: 78e173dcbdb4e085fd46840597f828e08df016874d8cfecccd756155b254be37924d20c81682373c45146518754e3a079d4b35aa5443b57ce67de9ac10c162ce
-  data.tar.gz: e27154636512a2fc28c6f279c13bfcad0ca8639f1d404b73a91803435de93012d43aed89bcdd2aa02a76e59d3c485e7214a93dc710f8d20adabc285c5aae8208
+  metadata.gz: 996e77805b56530e9f136c087753938c10c8dc71d45b1fbaec10e81e890878b9a0da00a10fa024a650cb2e463e155fe8da723fb16a6eb690f5811915ce4fe879
+  data.tar.gz: 5bbe562c01ec5fb12e77cb53aa2991cebfd83792dd831a41957497e3b04e29df442511c890d48fcb05bef78107cf5347019c49c7c8dc9e5d3f9ef0557a63f940

data/.gitignore

@@ -1,2 +1,3 @@
 storage
 Gemfile.lock
+*.gem

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.0 [2024-08-23]
+- Add `@eachWithIndex` directive
+- Fix attribute manager output of attributes with no value (#10)
+
+## 1.0.5 [2024-08-14]
+- Allow use of variables in @method directive
+
 ## 1.0.4 [2024-08-14]
 - Fix printing ruby member variables (#8)
 

data/README.md

@@ -222,6 +222,16 @@ In addition to conditional statements, RBlade provides simple directives for wor
     <p>This is user {{ user.id }}</p>
 @endEach
 
+{{-- Compiles to users.each_with_index do |user, index| ... --}}
+@eachWithIndex (user, index in users)
+    <p>This is user {{ index }} {{ user.name }}</p>
+@endEachWithIndex
+
+{{-- eachWithIndex has a special case for Hashes: in this example, the result is "Item 1: a A" --}}
+@eachWithIndex (key, value, index  in {a: 'A'})
+    Item #{{ index + 1 }}: {{ key }} {{ value }}
+@endEachWithIndex
+
 @forElse (name in [])
     <li>{{ name }}</li>
 @empty
@@ -234,6 +244,12 @@ In addition to conditional statements, RBlade provides simple directives for wor
     <p>No users</p>
 @endEachElse
 
+@eachWithIndexElse (user, index in users)
+    <li>{{ index }}: {{ user.name }}</li>
+@empty
+    <p>No users</p>
+@endEachWithIndexElse
+
 @while (true)
     <p>I'm looping forever.</p>
 @endWhile

data/REFERENCE.md

@@ -36,6 +36,7 @@ By default, RBlade will look for components in the `app/views/components` folder
 | `<x-name><x-slot::header><h1>Header</h1><//>Content<//>` | Pass a named block to a component                                                                                                          |
 | `{{ header }}`                                           | Output the contents of a named block                                                                                                       |
 | `<div {{ header.attributes }}>`                          | Output the attributes passed into a named block                                                                                            |
+| `@shouldRender(RUBY_EXPRESSION)`                         | Only renders the component if RUBY_EXPRESSION evaluates to true                                                                            |
 
 <a name="quick-reference-attributes"></a>
 ## Attributes
@@ -75,19 +76,22 @@ The attributes variable is an instance of a class that manages attributes. As we
 <a name="quick-reference-loops"></a>
 ## Loops
 
-| Syntax                                                | Description                                                                                                |
-|:------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------|
-| `@while( looping ) ... @endWhile`                     | Compiles to a Ruby while statement                                                                         |
-| `@until( finished ) ... @endUntil`                    | Compiles to a Ruby until statement                                                                         |
-| `@for( i in 1..10 ) ... @endFor`                      | Compiles to a Ruby for loop                                                                                |
-| `@each( i in 1..10 ) ... @endEach`                    | Calls `each` on the given collection, with `\|i\|` as the block argument                                   |
-| `@each( key, value in {a: 1} ) ... @endEach`          | Calls `each` on the given Hash, with `\|key, value\|` as the block arguments                               |
-| `@forElse( i in 1..10 ) ... @empty ... @endForElse`   | Compiles to a for loop as above, but the block after `@empty` is printed if the given collection is empty  |
-| `@eachElse( i in 1..10 ) ... @empty ... @endEachElse` | Compiles to a each loop as above, but the block after `@empty` is printed if the given collection is empty |
-| `@break`                                              | Break out of the current loop                                                                              |
-| `@next`                                               | Go to the next iteration in the current loop                                                               |
-| `@break( RUBY_EXPRESSION )`                           | Break out of the current loop if the expression evaluate to true                                           |
-| `@next( RUBY_EXPRESSION )`                            | Go to the next iteration in the current loop if the expression evaluate to true                            |
+| Syntax                                                                             | Description                                                                                                                 |
+|:-----------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------|
+| `@while( looping ) ... @endWhile`                                                  | Compiles to a Ruby while statement                                                                                          |
+| `@until( finished ) ... @endUntil`                                                 | Compiles to a Ruby until statement                                                                                          |
+| `@for( i in 1..10 ) ... @endFor`                                                   | Compiles to a Ruby for loop                                                                                                 |
+| `@each( i in 1..10 ) ... @endEach`                                                 | Calls `each` on the given collection, with `\|i\|` as the block argument                                                    |
+| `@each( key, value in {a: 1} ) ... @endEach`                                       | Calls `each` on the given Hash, with `\|key, value\|` as the block arguments                                                |
+| `@eachWithIndex( value, index in ['a', 'b'] ) ... @endEachWithIndex`               | Calls `each_with_index` on the given Array, with `\|value, index\|` as the block arguments                                  |
+| `@eachWithIndex( key, value, index in {a: 1} ) ... @endEachWithIndex`              | Calls `each_with_index` on the given Hash, where `key` is the Hash key, `value` is the Hash value, and `index` is the index |
+| `@forElse( i in 1..10 ) ... @empty ... @endForElse`                                | Compiles to a for loop as above, but the block after `@empty` is printed if the given collection is empty                   |
+| `@eachElse( i in 1..10 ) ... @empty ... @endEachElse`                              | Compiles to a each loop as above, but the block after `@empty` is printed if the given collection is empty                  |
+| `@eachWithIndexElse( value, index in 1..10 ) ... @empty ... @endEachWithIndexElse` | Compiles to a each_with_index loop as above, but the block after `@empty` is printed if the given collection is empty       |
+| `@break`                                                                           | Break out of the current loop                                                                                               |
+| `@next`                                                                            | Go to the next iteration in the current loop                                                                                |
+| `@break( RUBY_EXPRESSION )`                                                        | Break out of the current loop if the expression evaluate to true                                                            |
+| `@next( RUBY_EXPRESSION )`                                                         | Go to the next iteration in the current loop if the expression evaluate to true                                             |
 
 <a name="quick-reference-forms"></a>
 ## Forms

data/lib/rblade/compiler/compiles_statements.rb

@@ -81,6 +81,8 @@ module RBlade
       "elsif" => [CompilesConditionals, :compileElsif],
       "each" => [CompilesLoops, :compileEach],
       "eachelse" => [CompilesLoops, :compileEachElse],
+      "eachwithindex" => [CompilesLoops, :compileEachWithIndex],
+      "eachwithindexelse" => [CompilesLoops, :compileEachWithIndexElse],
       "empty" => [CompilesLoops, :compileEmpty],
       "empty?" => [CompilesConditionals, :compileEmpty],
       "end" => [CompilesStatements, :compileEnd],

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

@@ -5,9 +5,8 @@ module RBlade
         if args&.count != 1
           raise StandardError.new "Method 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}">';)
+        %(_out<<'<input type="hidden" name="_method" value="'<<#{args[0]}<<'">';)
       end
 
       def compileDelete args
@@ -15,7 +14,7 @@ module RBlade
           raise StandardError.new "Delete statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
-        compileMethod(["DELETE"])
+        compileMethod(["'DELETE'"])
       end
 
       def compilePatch args
@@ -23,7 +22,7 @@ module RBlade
           raise StandardError.new "Patch statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
-        compileMethod(["PATCH"])
+        compileMethod(["'PATCH'"])
       end
 
       def compilePut args
@@ -31,7 +30,7 @@ module RBlade
           raise StandardError.new "Put statement: wrong number of arguments (given #{args.count}, expecting 0)"
         end
 
-        compileMethod(["PUT"])
+        compileMethod(["'PUT'"])
       end
 
       def compileOld args

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

@@ -19,27 +19,74 @@ module RBlade
 
       def compileEach args
         if args.nil? || args.count > 2
-          raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
+          raise StandardError.new "Each statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 or 2)"
         end
-        # Allow variables to be a key, value pair
-        args = args.join ","
+        last_arg, collection = args.pop.split(" in ")
+        args.push(last_arg)
 
-        variables, collection = args.split(" in ")
+        if collection.nil?
+          raise StandardError.new "Each statement: collection not found (expecting 'in')"
+        end
 
-        "#{collection}.each do |#{variables}|;"
+        "#{collection}.each do |#{args.join(",")}|;"
+      end
+
+      def compileEachWithIndex args
+        if args.nil? || args.count > 3
+          raise StandardError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
+        end
+        last_arg, collection = args.pop.split(" in ")
+        args.push(last_arg)
+
+        if collection.nil?
+          raise StandardError.new "Each with index statement: collection not found (expecting 'in')"
+        end
+
+        # Special case for 3 arguments: the first 2 arguments are the key/value pair in a Hash, and
+        # the third is the index
+        if args.count == 3
+          "#{collection}.each_with_index do |_ivar,#{args[2]}|;#{args[0]},#{args[1]}=_ivar;"
+        else
+          "#{collection}.each_with_index do |#{args.join(",")}|;"
+        end
       end
 
       def compileEachElse args
         if args.nil? || args.count > 2
           raise StandardError.new "Each else statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
         end
-        # Allow variables to be a key, value pair
-        args = args.join ","
+        last_arg, collection = args.pop.split(" in ")
+        args.push(last_arg)
+
+        if collection.nil?
+          raise StandardError.new "Each else statement: collection not found (expecting 'in')"
+        end
+
         @loop_else_counter += 1
 
-        variables, collection = args.split(" in ")
+        "_looped_#{@loop_else_counter}=false;#{collection}.each do |#{args.join(",")}|;_looped_#{@loop_else_counter}=true;"
+      end
+
+      def compileEachWithIndexElse args
+        if args.nil? || args.count > 3
+          raise StandardError.new "Each with index statement: wrong number of arguments (given #{args&.count || 0}, expecting 1 to 3)"
+        end
+        last_arg, collection = args.pop.split(" in ")
+        args.push(last_arg)
+
+        if collection.nil?
+          raise StandardError.new "Each with index statement: collection not found (expecting 'in')"
+        end
+
+        @loop_else_counter += 1
 
-        "_looped_#{@loop_else_counter}=false;#{collection}.each do |#{variables}|;_looped_#{@loop_else_counter}=true;"
+        # Special case for 3 arguments: the first 2 arguments are the key/value pair in a Hash, and
+        # the third is the index
+        if args.count == 3
+          "_looped_#{@loop_else_counter}=false;#{collection}.each_with_index do |_ivar,#{args[2]}|;#{args[0]},#{args[1]}=_ivar;_looped_#{@loop_else_counter}=true;"
+        else
+          "_looped_#{@loop_else_counter}=false;#{collection}.each_with_index do |#{args.join(",")}|;_looped_#{@loop_else_counter}=true;"
+        end
       end
 
       def compileFor args

data/lib/rblade/helpers/attributes_manager.rb

@@ -37,7 +37,7 @@ module RBlade
       attributes ||= @attributes
 
       attributes.map do |key, value|
-        "#{key}=\"#{(value == true) ? key : h(value)}\""
+        (value == true) ? key : "#{key}=\"#{h(value)}\""
       end.join " "
     end
 

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "1.0.4"
+  s.version = "1.1.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: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon J
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: A component-first templating engine for Rails