rblade 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3810116e4f41e107ce2a017836d4c16272a59c6abdd3e44430d1012069511a7
-  data.tar.gz: 40e715cd082834c83b4ccf7eb65ba2a96c4b656974b8ead1c217c05b24298ce4
+  metadata.gz: 418e9e009d866abaf770d8fee42675919627c041fdb6753a628710d41875d75d
+  data.tar.gz: 4f51870487d92dadbc8fddcd413c26cbcade77cc5bdd16b3be664912c0de70ac
 SHA512:
-  metadata.gz: 471317c2ab315af661a02787968e56e8adafad586153cd9a8b7e26d04c61dd86bc183d1538f3e9b63e6d913f25a27f38a54fece06b524df665146e3a598d794b
-  data.tar.gz: 73cbf2f77bf9eb05b144bfe98b6841d9fbf73b31eb658c8f8a78058cb981b8b599bc13c7008166a59c6636fbc14b5d9dbac9ba5a31dabeab75bb755e1ec4cbf4
+  metadata.gz: 99a62b7cd0e707fce89b84cc082daaff2776b32d16b170f502db8b5b42dc2dd89d0c821d78a24ac2ebb0c8ef99442373b5ca2464a726d037b9fded893e625659
+  data.tar.gz: bf2d3d6ae6437ecf9a770180ea9cf8d3becd1223375313d3027ce16252d0083cb91b712067bb1a0da7e157e98041c8251edfc043229e1824c85e119640e60427

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.5 [2024-07-23]
+- Improve how @props sets local variables
+
+## 0.2.4 [2024-07-23]
+- Improve merging of classes
+
 ## 0.2.3 [2024-07-23]
 - Fix attributes in components that have multiple lines
 

data/lib/rblade/compiler/compiles_components.rb

@@ -77,8 +77,7 @@ module RBlade
           next
         end
         if attribute[:type] == "attributes"
-          attribute_arguments.push "**attributes.to_h"
-          attribute_assignments.push "_style = attributes[:style];"
+          attribute_arguments.push "**(#{attribute[:value]}).to_h"
 
           next
         end

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

@@ -3,10 +3,39 @@ module RBlade
     @attributes = {}
     def initialize attributes
       @attributes = attributes
+
+      if !@attributes[:_class].nil?
+        @attributes[:class] = mergeClasses(@attributes[:class], @attributes.delete(:_class))
+      end
+      if !@attributes[:_style].nil?
+        @attributes[:style] = mergeClasses(@attributes[:style], @attributes.delete(:_style))
+      end
+
+      @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
-      @attributes
+      attributes = @attributes.dup
+      if !attributes[:class].nil?
+        attributes[:_class] = attributes.delete :class
+      end
+      if !attributes[:style].nil?
+        attributes[:_style] = attributes.delete :style
+      end
+
+      attributes
     end
 
     def to_s attributes = nil
@@ -42,18 +71,12 @@ module RBlade
 
       @attributes.each do |key, value|
         if key == :class && !new_attributes[key].nil?
-          unless new_attributes[key].end_with? " "
-            new_attributes[key] << " "
-          end
-          new_attributes[key] << value.to_s
+          new_attributes[key] = mergeClasses(new_attributes[key], value.to_s)
           next
         end
 
         if key == :style && !new_attributes[key].nil?
-          unless new_attributes[key].end_with? ";"
-            new_attributes[key] << ";"
-          end
-          new_attributes[key] << value.to_s
+          new_attributes[key] = mergeStyles(new_attributes[key], value.to_s)
           next
         end
 
@@ -62,5 +85,41 @@ module RBlade
 
       self.class.new new_attributes
     end
+
+    private
+
+    def mergeClasses(classes_1, classes_2)
+      if classes_1.nil?
+        return classes_2
+      end
+      if classes_2.nil?
+        return classes_1
+      end
+
+      classes_combined = classes_1
+      unless classes_combined.end_with? " "
+        classes_combined << " "
+      end
+      classes_combined << classes_2.to_s
+
+      classes_combined
+    end
+
+    def mergeStyles(styles_1, styles_2)
+      if styles_1.nil?
+        return styles_2
+      end
+      if styles_2.nil?
+        return styles_1
+      end
+
+      styles_combined = styles_1
+      unless styles_combined.end_with? ";"
+        styles_combined << ";"
+      end
+      styles_combined << styles_2.to_s
+
+      styles_combined
+    end
   end
 end

data/rblade.gemspec

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