compony 0.3.0 → 0.3.1

data/lib/compony/natural_ordering.rb

@@ -15,21 +15,25 @@ module Compony
   # collection.map(&:payload) # --> a_new_payload, b_payload, c_payload, d_payload
   # ```
   class NaturalOrdering < Array
-    def natural_push(name, payload, before: nil, **kwargs)
+    def natural_push(name, payload = :missing, before: nil, **kwargs)
       name = name.to_sym
       before_name = before&.to_sym
       old_kwargs = {}
+      old_payload = nil
 
       # Fetch existing element if any
       existing_index = find_index { |el| el.name == name }
       if existing_index.present?
         # Copy all non-mentionned kwargs from the element we are about to overwrite
         old_kwargs = self[existing_index].except(:name, :payload)
+        old_payload = self[existing_index].payload
 
         # Replacing an existing element with a before: directive - must delete before calculating indices
         if before_name.present?
           delete_at(existing_index)
         end
+      elsif payload == :missing
+        fail("Cannot insert new element #{name} without a payload (payload can only omitted if overriding another element) in #{inspect}.")
       end
 
       # Fetch before element
@@ -38,7 +42,7 @@ module Compony
       end
 
       # Create the element to insert
-      element = MethodAccessibleHash.new(name:, payload:, **old_kwargs.merge(kwargs))
+      element = MethodAccessibleHash.new(name:, payload: payload == :missing ? old_payload : payload, **old_kwargs.merge(kwargs))
 
       # Insert new element
       if before_index.present?

data/lib/compony/request_context.rb

@@ -46,8 +46,14 @@ module Compony
     def content(name)
       name = name.to_sym
       content_block = component.content_blocks.find { |el| el.name == name } || fail("Content block #{name.inspect} not found in #{component.inspect}.")
-      # A fresh RequestContext is needed due to Rails' buffer
-      concat Compony::RequestContext.new(component, controller, helpers:, locals: local_assigns).evaluate(&content_block.payload)
+      # We have to clear Rails' output_buffer to prevent double rendering of blocks. To achieve this, a fresh render context is instanciated.
+      concat controller.render_to_string(
+        type:   :dyny,
+        locals: { render_component: component, render_controller: controller, render_locals: local_assigns, render_block: content_block },
+        inline: <<~RUBY
+          Compony::RequestContext.new(render_component, render_controller, helpers: self, locals: local_assigns).evaluate_with_backfire(&render_block.payload)
+        RUBY
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compony
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sandro Kalbermatter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard