refactor(Controller hooks) use around-actions

Author: rmosolgo

lib/react/rails/component_mount.rb

@@ -18,9 +18,6 @@ def setup(controller)
       end
 
       def teardown(controller)
-        if controller.__prerenderer
-          React::ServerRendering.checkin_renderer(controller.__prerenderer)
-        end
       end
 
       # Render a UJS-type HTML tag annotated with data attributes, which
@@ -60,12 +57,15 @@ module ControllerHelpers
           attr_accessor :__prerenderer
         end
 
-        # If you want a per-request renderer, add this method as a before-action
+        # If you want a per-request renderer, add this method as an around-action
         #
         # @example Having one renderer instance for each controller action
-        #   before_action :checkout_renderer
-        def checkout_prerenderer
-          self.__prerenderer = React::ServerRendering.checkout_renderer
+        #   around_action :per_request_react_prerenderer
+        def per_request_react_prerenderer
+          React::ServerRendering.with_renderer do |renderer|
+            self.__prerenderer = renderer
+            yield
+          end
         end
       end
 

lib/react/rails/controller_lifecycle.rb

@@ -7,22 +7,19 @@ module ControllerLifecycle
 
       included do
         # use both names to support Rails 3..5
-        before_action_with_fallback = respond_to?(:before_action) ? :before_action : :before_filter
-        after_action_with_fallback = respond_to?(:after_action) ? :after_action : :after_filter
-        public_send(before_action_with_fallback, :setup_react_component_helper)
-        public_send(after_action_with_fallback, :teardown_react_component_helper)
+        around_action_with_fallback = respond_to?(:around_action) ? :around_action : :around_filter
+        public_send(around_action_with_fallback, :use_react_component_helper)
         attr_reader :__react_component_helper
       end
 
       # Instantiate the ViewHelper implementation and call its #setup method
-      def setup_react_component_helper
+      # then let the controller action run,
+      # then call the ViewHelper implementation's #teardown method
+      def use_react_component_helper
         new_helper = React::Rails::ViewHelper.helper_implementation_class.new
         new_helper.setup(self)
         @__react_component_helper = new_helper
-      end
-
-      # Call the ViewHelper implementation's #teardown method
-      def teardown_react_component_helper
+        yield
         @__react_component_helper.teardown(self)
       end
     end

lib/react/server_rendering.rb

@@ -21,12 +21,9 @@ def self.render(component_name, props, prerender_options)
       end
     end
 
-    def self.checkout_renderer
-      @@pool.checkout
-    end
-
-    def self.checkin_renderer(renderer)
-      @@pool.checkin
+    # Yield a renderer for an arbitrary block
+    def self.with_renderer
+      @@pool.with { |renderer| yield(renderer) }
     end
 
     class PrerenderError < RuntimeError