rblade 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3810116e4f41e107ce2a017836d4c16272a59c6abdd3e44430d1012069511a7
-  data.tar.gz: 40e715cd082834c83b4ccf7eb65ba2a96c4b656974b8ead1c217c05b24298ce4
+  metadata.gz: 89abc20ace497e0f051bb38ed620c44bf4bc7067cfeb20d7d7af9f13b98337ae
+  data.tar.gz: '0971c951b39f2cf94833a1d3d55eb3c561666995049d7d6f4fff553837615676'
 SHA512:
-  metadata.gz: 471317c2ab315af661a02787968e56e8adafad586153cd9a8b7e26d04c61dd86bc183d1538f3e9b63e6d913f25a27f38a54fece06b524df665146e3a598d794b
-  data.tar.gz: 73cbf2f77bf9eb05b144bfe98b6841d9fbf73b31eb658c8f8a78058cb981b8b599bc13c7008166a59c6636fbc14b5d9dbac9ba5a31dabeab75bb755e1ec4cbf4
+  metadata.gz: 73f515630bcfc90ea39862b6014d4b4a4afb4b29b33a09ae8ac58e8ead98786e26be03c4e63d5711c82a6728afd37e02549b56417bf5833d833d8f7ee473ed34
+  data.tar.gz: 8965f3fe015315e49c3dfe5b31b8aa949f0f609ffd7664a87ab875ca9a2f0cf494ac0a2236896479dfe007e2ebe45e5acdafbdb9d6384197acc9390383f7365e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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/helpers/attributes_manager.rb

@@ -3,10 +3,27 @@ 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.freeze
     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 +59,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 +73,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.4"
   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.4
 platform: ruby
 authors:
 - Simon J