rblade 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388670a7f7f3d90c6249e149cd51e898dbadc66d182e0d0111948677cb85719c
-  data.tar.gz: 8dd2d5415191fb833a850b9ba9f2e0fd1d51a3722d466cd410c28c9c02e079dd
+  metadata.gz: aef0eb02d400c2a6af0c114d0952d9871cb83866fa6fbdf43d72eddd555344c2
+  data.tar.gz: 72c5ae0785f172248afd031acd15f3608f6f7cb2e313fcfeeaaa432dcf5bc344
 SHA512:
-  metadata.gz: 65742f3fbb5ffca6bbbf05e94b4d9838cbf488ae835c1607abdb73cca9c04308a5de142a356ecdbd374019eb73ef3a6ccbe9dec732fceaa555ab580ca0a7ebec
-  data.tar.gz: 0bb1616971c4dc02d919f9c432bf478e2f18a2021116834aac10e7be340720e0f75855c997beb5a45fb8c456cb980d5dfeaa7e44e49681c28c1643b1b168d15d
+  metadata.gz: 0425f57b22af0ced7dbe28fe25a88da21d5d5cfd4960ebb22a6fd6b53108cb9af6eb2e01b31e9fae919478cc38ddca9bffe23f05439e58f3f4dbb2665ee39fa2
+  data.tar.gz: 64c90f0edddc6b534f1104240788bb8fe7afc7dd78a06ca037d24228b5127746380d41fabb7473c827c7327abe26362c97a8ad5e2090393b68887061e0d3fbad

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.2 [2024-07-23]
+- Change comments to be compiled first
+
+## 0.2.1 [2024-07-23]
+- Add support for attributes pass through in components
+
 ## 0.2.0 [2024-07-23]
 - Fix slots being calculated without parent's context
 - Add @props statement

data/lib/rblade/compiler/compiles_components.rb

@@ -39,6 +39,9 @@ module RBlade
 
     def compile_token_end token
       component = @component_stack.pop
+      if component.nil?
+        raise StandardError.new "Unexpected closing tag (#{token.value[:name]})"
+      end
       if token.value[:name] != component[:name]
         raise StandardError.new "Unexpected closing tag (#{token.value[:name]}) expecting #{component[:name]}"
       end
@@ -73,6 +76,12 @@ module RBlade
 
           next
         end
+        if attribute[:type] == "attributes"
+          attribute_arguments.push "**attributes.to_h"
+          attribute_assignments.push "_style = attributes[:style];"
+
+          next
+        end
 
         if attribute[:type] == "string"
           attribute_arguments.push "'#{attribute[:name]}': '#{RBlade.escape_quotes(attribute[:value])}'"

data/lib/rblade/compiler/tokenizes_components.rb

@@ -57,9 +57,9 @@ module RBlade
         if name == "@class" || name == "@style"
           attributes.push({type: name[1..], value: raw_attributes[i + 1][1..-2]})
           i += 2
-        elsif name[0..1] == "{{"
-          attributes.push({type: "attributes", value: raw_attributes[i + 1][2..-2]})
-          i += 1
+        elsif name == "{{"
+          attributes.push({type: "attributes", value: raw_attributes[i + 1]})
+          i += 3
         else
           attribute = {name:}
 
@@ -116,7 +116,7 @@ module RBlade
                 )
                 |
                 (
-                  \{\{\s*attributes(?:[^}]+?)?\s*\}\}
+                  \{\{\s*attributes.*?\s*\}\}
                 )
                 |
                 (?:
@@ -163,7 +163,7 @@ module RBlade
           )
           |
           (?:
-            (\{\{)\s*attributes([^}]+?)?\s*(\}\})
+            (\{\{)\s*(attributes.*?)\s*(\}\})
           )
           |
           (?:

data/lib/rblade/compiler.rb

@@ -23,10 +23,10 @@ module RBlade
       tokens = [Token.new(:unprocessed, string_template)]
 
       CompilesComments.new.compile! tokens
-      CompilesEchos.new.compile! tokens
       CompilesRuby.new.compile! tokens
       TokenizesComponents.new.tokenize! tokens
       TokenizesStatements.new.tokenize! tokens
+      CompilesEchos.new.compile! tokens
       CompilesStatements.new.compile! tokens
       CompilesComponents.new.compile! tokens
 

data/lib/rblade/helpers/attributes_manager.rb

@@ -5,6 +5,10 @@ module RBlade
       @attributes = attributes
     end
 
+    def to_h
+      @attributes
+    end
+
     def to_s attributes = nil
       attributes ||= @attributes
 

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
   s.summary = "Blade templates for ruby"
   s.description = "A port of the Laravel blade templating engine to ruby"
   s.authors = ["Simon J"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rblade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Simon J