Revert to subscriber model

Author: BlakeWilliams

lib/view_component/base.rb

@@ -73,14 +73,16 @@ def render_in(view_context, &block)
       # TODO flag with initializer
       if !self.__vc_original_view_context
         view_context.original_output_buffer = ActionView::OutputBuffer.new if !view_context.output_buffer
-
-        if !view_context.output_buffer.is_a?(GlobalBuffer)
-          view_context.original_output_buffer = GlobalBuffer.new(view_context.output_buffer)
+        self.__vc_original_view_context ||= view_context
+        if self.__vc_original_view_context.global_buffer_coordinator.nil?
+          coordinator = self.__vc_original_view_context.global_buffer_coordinator = GlobalBuffer::Coordinator.new
+          coordinator.subscribers.push(self.__vc_original_view_context)
         end
       end
 
-      self.__vc_original_view_context ||= view_context
       @output_buffer = self.__vc_original_view_context.output_buffer
+      self.global_buffer_coordinator = self.__vc_original_view_context.global_buffer_coordinator
+      self.__vc_original_view_context.global_buffer_coordinator.subscribers.push(self)
 
       @lookup_context ||= view_context.lookup_context
 
@@ -112,14 +114,16 @@ def render_in(view_context, &block)
       @__vc_content_evaluated = false
       @__vc_render_in_block = block
 
-      before_render
+      self.__vc_original_view_context.capture do
+        before_render
 
-      if render?
-        capture do
-          render_template_for(@__vc_variant).to_s + _output_postamble
+        if render?
+          capture do
+            render_template_for(@__vc_variant).to_s + _output_postamble
+          end
+        else
+          ""
         end
-      else
-        ""
       end
     ensure
       @current_template = old_current_template

lib/view_component/global_buffer.rb

@@ -2,74 +2,53 @@
 
 module ViewComponent
   # TODO if things break, log each time an unsafe string method is called
-  class GlobalBuffer
-    def initialize(buffer)
-      @_buffer = buffer
-    end
-
-    def __swap_buffer__(buffer)
-      # TODO remove once this is debugged
-      raise 'oh no' if buffer.kind_of?(GlobalBuffer)
-      @_buffer = buffer
-    end
-
-    def __buffer__
-      @_buffer
-    end
-
-    def to_s
-      @_buffer.to_s
-    end
-
-    def html_safe?
-      @_buffer.html_safe?
-    end
-
-    # Necessary for cases like `output_buffer = output_buffer.class.new(output_buffer)` (yes, this happens)
-    def class
-      @_buffer.class
-    end
-
-    def method_missing(symbol, *args, **kwargs)
-      @_buffer.send(symbol, *args, **kwargs)
-    end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+  module GlobalBuffer
+    class Coordinator
+      def initialize
+        @subscribers = []
+      end
 
-    def respond_to_missing?(symbol, include_all)
-      @_buffer.respond_to?(symbol, include_all) || super
+      def subscribers
+        @subscribers
+      end
     end
 
     module Patch
       extend ActiveSupport::Concern
-
-      module SeparateGlobalModuleForHAMLCompat
-        def output_buffer=(new_buf)
-          # TODO make HAML work by falling back to super
-          @output_buffer.__swap_buffer__(new_buf)
-        end
-
+      module Compatibility
         def with_output_buffer(buf = nil) # :nodoc:
-          $count ||= 0
-          $count += 1
           unless buf
             buf = ActionView::OutputBuffer.new
             if output_buffer && output_buffer.respond_to?(:encoding)
               buf.force_encoding(output_buffer.encoding)
             end
           end
-
-          old_buffer = output_buffer.__buffer__
-          @output_buffer.__swap_buffer__(buf)
+          self.output_buffer, old_buffer = buf, output_buffer
+          global_buffer_coordinator&.subscribers&.each { |s| s.output_buffer = buf}
           yield
-          @output_buffer.__buffer__
+          output_buffer
         ensure
-          @output_buffer.__swap_buffer__(old_buffer)
+          self.output_buffer = old_buffer
+          global_buffer_coordinator&.subscribers&.each { |s| s.output_buffer = old_buffer }
+        end
+
+        def _run(method, template, locals, buffer, add_to_stack: true, &block)
+          _old_output_buffer, _old_virtual_path, _old_template = @output_buffer, @virtual_path, @current_template
+          @current_template = template if add_to_stack
+          @output_buffer = buffer
+          global_buffer_coordinator&.subscribers&.each { |s| s.output_buffer = buffer }
+          public_send(method, locals, buffer, &block)
+        ensure
+          @output_buffer, @virtual_path, @current_template = _old_output_buffer, _old_virtual_path, _old_template
+          global_buffer_coordinator&.subscribers&.each { |s| s.output_buffer = _old_output_buffer }
         end
       end
 
       included do
+        attr_accessor :global_buffer_coordinator
+
         alias_method(:original_output_buffer=, :output_buffer=)
-        prepend SeparateGlobalModuleForHAMLCompat
+        prepend Compatibility
 
         alias_method(:original_with_output_buffer, :with_output_buffer)
       end

test/sandbox/app/components/haml_component.html.haml

@@ -1,4 +1,3 @@
-- binding.pry
 .haml-div
   = content
   = @message