rblade 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a00aab0f9732f42b21921bda5f23b25ce2581f2b0f898c26c5665f0a51046d
-  data.tar.gz: 46db536cfc37cb9307c446d8e23ae7bde18ad7d9947d09f83d1db766d42a505d
+  metadata.gz: e633d7cbf716d70b0f9353e8d29990da0379f30171da143077c303e9557cdab8
+  data.tar.gz: ad29e9a1b4cbb0f493a7fa6dbe6fcb82ec64c822fe1c7351de65ab8d268cd1aa
 SHA512:
-  metadata.gz: 79920ad59e36a19996a5bceb55370560b6af5ba6075f4db9494c6844f7b729fc63339f7cb106c76a7fb2be4d410554ac5c69793b09e6a4729a1a30213b1c78cb
-  data.tar.gz: 0ba0f79cc1b8cae6997c02821ca724f3211f50c8978f4923bfe0692a626e63a5fc09fb4bcb3de3b206dbda47e6c825a95a6c2faa91784e83cd420e5d31ba0a35
+  metadata.gz: 261023b42b8ad6d163c3ac24fcc5d844a5d85c2915af94f26c40254f7ff3cd03b847e2107c97219f32967c402df09594583856c327ee071d9ac56f992a4fd1e2
+  data.tar.gz: 94e955703c7f041f6fc7e2dd5c40e143cb7779437ded8c4acbb5f7e81c0bc9cf424385093607c11a236560c83c389e201f1d1aa8a3f3e95de8aff3323921adf5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.1 [2024-10-31]
+- Fix issue with @props directive when defining multiple properties without braces
+
 ## 1.2.0 [2024-10-22]
 - Add support for custom directives (#2)
 - Add support for helper functions that use block content (#14)

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

@@ -14,11 +14,7 @@ module RBlade
       end
 
       def compileProps args, tokens
-        if args&.count != 1
-          raise StandardError.new "Props statement: wrong number of arguments (given #{args&.count || 0}, expecting 1)"
-        end
-
-        props = extractProps args[0]
+        props = extractProps args
         props.map do |key, value|
           # `_required` is deprecated. Use `required`. To be removed in 2.0.0
           compiled_code = if value == "_required" || value == "required"
@@ -41,13 +37,8 @@ module RBlade
 
       private
 
-      def extractProps prop_string
-        if prop_string.start_with?("{") && prop_string.end_with?("}")
-          prop_string = prop_string.delete_prefix("{").delete_suffix("}")
-        end
-
+      def extractProps prop_strings
         props = {}
-        prop_strings = Tokenizer.extractCommaSeparatedValues prop_string
 
         prop_strings.each do |prop|
           prop.strip!

data/lib/rblade/compiler/tokenizes_statements.rb

@@ -79,7 +79,7 @@ module RBlade
 
     def tokenizeStatement!(segments, i)
       statement_data = {name: segments[i + 1]}
-      segments.delete_at i + 1
+      statement_name = segments.delete_at i + 1
 
       # Remove optional whitespace
       if segments.count > i + 2 && segments[i + 1].match(/^[ \t]*$/) && segments[i + 2][0] == "("
@@ -87,7 +87,7 @@ module RBlade
       end
 
       if segments.count > i + 1 && segments[i + 1][0] == "("
-        arguments = tokenizeArguments! segments, i + 1
+        arguments = tokenizeArguments! statement_name, segments, i + 1
 
         if !arguments.nil?
           statement_data[:arguments] = arguments
@@ -107,7 +107,7 @@ module RBlade
       end
     end
 
-    def tokenizeArguments!(segments, segment_index)
+    def tokenizeArguments!(statement_name, segments, segment_index)
       success = expandSegmentToEndParenthesis! segments, segment_index
 
       # If no matching parentheses were found, so we combine the argument string with the next segment
@@ -120,7 +120,17 @@ module RBlade
         return nil
       end
 
-      arguments = Tokenizer.extractCommaSeparatedValues segments[segment_index][1..-2]
+      # Remove the parentheses from the argument string
+      argument_string = segments[segment_index][1..-2]
+
+      # Special case for the props statement: remove the wrapping braces if they exist
+      if statement_name == "props"
+        if argument_string.start_with?("{") && argument_string.end_with?("}")
+          argument_string = argument_string[1..-2]
+        end
+      end
+
+      arguments = Tokenizer.extractCommaSeparatedValues argument_string
       segments.delete_at segment_index
 
       arguments

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "1.2.0"
+  s.version = "1.2.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: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Simon J
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-31 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.5.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A component-first templating engine for Rails