Support helpers with kwargs (activeadmin#202).

Author: deivid-rodriguez

lib/arbre/context.rb

@@ -74,11 +74,21 @@ def respond_to_missing?(method, include_all)
     # Webservers treat Arbre::Context as a string. We override
     # method_missing to delegate to the string representation
     # of the html.
-    def method_missing(method, *args, &block)
-      if cached_html.respond_to? method
-        cached_html.send method, *args, &block
-      else
-        super
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.a")
+      def method_missing(method, *args, **kwargs, &block)
+        if cached_html.respond_to? method
+          cached_html.send method, *args, **kwargs, &block
+        else
+          super
+        end
+      end
+    else
+      def method_missing(method, *args, &block)
+        if cached_html.respond_to? method
+          cached_html.send method, *args, &block
+        else
+          super
+        end
       end
     end
 

lib/arbre/element.rb

@@ -189,26 +189,34 @@ def clear_children!
     #  3. Call the method on the helper object
     #  4. Call super
     #
-    def method_missing(name, *args, &block)
-      if current_arbre_element.respond_to?(name)
-        current_arbre_element.send name, *args, &block
-      elsif assigns && assigns.has_key?(name)
-        assigns[name]
-      elsif helpers.respond_to?(name)
-        helper_capture(name, *args, &block)
-      else
-        super
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.a")
+      def method_missing(name, *args, **kwargs, &block)
+        if current_arbre_element.respond_to?(name)
+          current_arbre_element.send name, *args, **kwargs, &block
+        elsif assigns && assigns.has_key?(name)
+          assigns[name]
+        elsif helpers.respond_to?(name)
+          s = ""
+          within(Element.new) { s = helpers.send(name, *args, **kwargs, &block) }
+          s.is_a?(Element) ? s.to_s : s
+        else
+          super
+        end
+      end
+    else
+      def method_missing(name, *args, &block)
+        if current_arbre_element.respond_to?(name)
+          current_arbre_element.send name, *args, &block
+        elsif assigns && assigns.has_key?(name)
+          assigns[name]
+        elsif helpers.respond_to?(name)
+          s = ""
+          within(Element.new) { s = helpers.send(name, *args, &block) }
+          s.is_a?(Element) ? s.to_s : s
+        else
+          super
+        end
       end
-    end
-
-    # The helper might have a block that builds Arbre elements
-    # which will be rendered (#to_s) inside ActionView::Base#capture.
-    # We do not want such elements added to self, so we push a dummy
-    # current_arbre_element.
-    def helper_capture(name, *args, &block)
-      s = ""
-      within(Element.new) { s = helpers.send(name, *args, &block) }
-      s.is_a?(Element) ? s.to_s : s
     end
 
     def method_distance(name)