arbo 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c0a3eb2a4490fa5d3b138183059102e6d1a15c7847ef5edb04e63e8e1d6fbe
-  data.tar.gz: 17a4bde22b028a37aa8965414e3d0817b746bcc8b2013721094797579248e40b
+  metadata.gz: 9fc8f9df79eaf407fe50152a5f444651cd0129cfd042f2093fb7afa482eb03d1
+  data.tar.gz: 9580449853d83c9b810c8c09f7df489ca935de09c699d79afb982f30d73a5310
 SHA512:
-  metadata.gz: 93a735d6096c6ba7665e4c6b201ee155d1abae7faf4f5d135dc90ad725800669be7780894a4ce050444989720afe835e6af317dd84d09a8c25fb7891a926288d
-  data.tar.gz: f29cc81e17e22569d4c1030b8dd0e628ed14c52e5aca7d56bf30fbbaa8941938be3e13e957466227f68e2112a02c92d733cad6dc01002ccba0c592d7a8e15f21
+  metadata.gz: 3bc89f575d5e3c056864185ce33ba2967fb360e54251910bd4c96bcc3dfc8de4f78138cce2f173ccc6e6514ee333f0207e46213c65628a89afc63b7078008192
+  data.tar.gz: 7086a9c362056322b207faa3074a3fec9a7046f29cebd545daeb1cecdb908b5090d29f27c79cd75e69a2b5e29144d6547c2304a359dcf1ce6093a56becacd0a4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.1 [☰](https://github.com/varyonic/arbo/compare/v1.3.0...v1.3.1)
+
+* Fix patch of ActionView capture: OutputBuffer. [#5] by [@varyonic]
+
 ## 1.3.0 [☰](https://github.com/varyonic/arbo/compare/v1.2.0...v1.3.0)
 
 * Support Rails 7.1. [#3] by [@varyonic]
@@ -85,6 +89,7 @@ Initial release and extraction from Active Admin
 [#2]: https://github.com/varyonic/arbo/pull/2
 [#3]: https://github.com/varyonic/arbo/pull/3
 [#4]: https://github.com/varyonic/arbo/pull/4
+[#5]: https://github.com/varyonic/arbo/pull/5
 
 [@aramvisser]: https://github.com/aramvisser
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez

data/lib/arbo/context.rb

@@ -11,7 +11,7 @@ module Arbo
   #       h1 "Hello World"
   #     end
   #
-  #     html.to_s #=> "<h1>Hello World</h1>"
+  #     html.render_in #=> "<h1>Hello World</h1>"
   #
   # The contents of the block are instance eval'd within the Context
   # object. This means that you lose context to the outside world from
@@ -22,7 +22,7 @@ module Arbo
   #       h1 "Your number #{one}"
   #     end
   #
-  #     html.to_s #=> "Your number 1"
+  #     html.render_in #=> "Your number 1"
   #
   class Context < Element
 
@@ -46,6 +46,11 @@ module Arbo
       instance_eval(&block) if block_given?
     end
 
+    # Override default implementation, which would call deprecated Element#to_s
+    def inspect
+      "#<#{self.class}:0x#{(object_id << 1).to_s(16)}"
+    end
+
     def arbo_context
       self
     end

data/lib/arbo/rails/template_handler.rb

@@ -5,13 +5,18 @@ ActionView::Base.class_eval do
     value = nil
     buffer = with_output_buffer { value = yield(*args) }
 
-    # Override to handle Arbo elements inside helper blocks.
-    # See https://github.com/rails/rails/issues/17661
-    # and https://github.com/rails/rails/pull/18024#commitcomment-8975180
-    value = value.to_s if value.is_a?(Arbo::Element)
-
-    if (string = buffer.presence || value) && string.is_a?(String)
-      ERB::Util.html_escape string
+    case string = buffer.presence || value
+    when ActionView::OutputBuffer
+      string.to_s
+    when ActiveSupport::SafeBuffer
+      string
+    when Arbo::Element
+      # Override to handle Arbo elements inside helper blocks.
+      # See https://github.com/rails/rails/issues/17661
+      # and https://github.com/rails/rails/pull/18024#commitcomment-8975180
+      value.render_in
+    when String
+      ERB::Util.html_escape(string)
     end
   end
 end

data/lib/arbo/version.rb

@@ -1,3 +1,3 @@
 module Arbo
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Piers Chambers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport