rblade 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89abc20ace497e0f051bb38ed620c44bf4bc7067cfeb20d7d7af9f13b98337ae
-  data.tar.gz: '0971c951b39f2cf94833a1d3d55eb3c561666995049d7d6f4fff553837615676'
+  metadata.gz: 418e9e009d866abaf770d8fee42675919627c041fdb6753a628710d41875d75d
+  data.tar.gz: 4f51870487d92dadbc8fddcd413c26cbcade77cc5bdd16b3be664912c0de70ac
 SHA512:
-  metadata.gz: 73f515630bcfc90ea39862b6014d4b4a4afb4b29b33a09ae8ac58e8ead98786e26be03c4e63d5711c82a6728afd37e02549b56417bf5833d833d8f7ee473ed34
-  data.tar.gz: 8965f3fe015315e49c3dfe5b31b8aa949f0f609ffd7664a87ab875ca9a2f0cf494ac0a2236896479dfe007e2ebe45e5acdafbdb9d6384197acc9390383f7365e
+  metadata.gz: 99a62b7cd0e707fce89b84cc082daaff2776b32d16b170f502db8b5b42dc2dd89d0c821d78a24ac2ebb0c8ef99442373b5ca2464a726d037b9fded893e625659
+  data.tar.gz: bf2d3d6ae6437ecf9a770180ea9cf8d3becd1223375313d3027ce16252d0083cb91b712067bb1a0da7e157e98041c8251edfc043229e1824c85e119640e60427

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.5 [2024-07-23]
+- Improve how @props sets local variables
+
 ## 0.2.4 [2024-07-23]
 - Improve merging of classes
 

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

@@ -11,9 +11,9 @@ module RBlade
         props = extractProps args[0]
         props.map do |key, value|
           if value == "_required"
-            "if !defined?(#{key});raise \"Props statement: #{key} is not defined\";end;"
+            "if !defined?(#{key})&&!attributes.has?(:'#{RBlade::escape_quotes(key)}');raise \"Props statement: #{key} is not defined\";end;#{key.sub /[^a-zA-Z0-9_]/, '_'}=attributes.default(:'#{RBlade::escape_quotes(key)}');"
           else
-            "if !defined?(#{key});#{key}=#{value};end;"
+            "#{key.sub /[^a-zA-Z0-9_]/, '_'}=attributes.default(:'#{RBlade::escape_quotes(key)}',#{value});"
           end
         end.join
       end

data/lib/rblade/helpers/attributes_manager.rb

@@ -11,7 +11,19 @@ module RBlade
         @attributes[:style] = mergeClasses(@attributes[:style], @attributes.delete(:_style))
       end
 
-      @attributes.freeze
+      @attributes
+    end
+
+    def default(key, default = nil)
+      if @attributes[key].nil? && !default.nil?
+        @attributes[key] = default
+      end
+
+      @attributes[key]
+    end
+
+    def has?(key)
+      !@attributes[key].nil?
     end
 
     def to_h

data/rblade.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rblade"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
   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.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Simon J