arbre 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9702ea598ff503038115048f407b05a69f1cf441cb061b33ca2586197b6fa6a9
-  data.tar.gz: 3c5ce4c57dd03b32fe470aad04075d1daa9e7f195fa2bae26e562bc85bd1767b
+  metadata.gz: 27066f3cf1264e3ec0cb4e5498c05b706565055fe69fbc25afe98825c90915bd
+  data.tar.gz: efe323ea9b3faddac096ca11d796231fd5d0872f8f4e1ffec71c2bbf452a5cd1
 SHA512:
-  metadata.gz: fed97f8796827e8d807b8878cee2a55d32c05c1d8d730b49b77ced63fd94ad8aae8812dd8f79f2ee7981ea7a732b60de5bc70b5711d3c3b25ccfc0575eb8ee5f
-  data.tar.gz: fdc92e7b702113922416fe6b3ac0c4d669d34e8068e176aa87a47d65025bb379c462fad30b17b6a8e1d36e5b76d9434916056b34139611ccdf31ba457651b27f
+  metadata.gz: d40b99ace19107c5b2d9089d183cce4b2eebc5229475f1ac8965df1fb6a31412d5dc0787ad618063d966ef4821ce679bd0d77ddf16a38048f13dde26192d3acc
+  data.tar.gz: 2346922bcc1c31da78a980ca68f20f7c8335a4fdf14c6cd90e766c23fea5cd70f0ec44aabf3ab989b9ae2f863f3b332c1e351fdb2096b59df56bef656ef324f6

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master (unreleased)
 
+## 1.2.1 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0...v1.2.1)
+
+* Revert [#64][] to fix several regressions, at the cost of reintroducing [#46][]. [#121][] by [@deivid-rodriguez][]
+
 ## 1.2.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0.rc1...v1.2.0)
 
 _No changes_.
@@ -72,11 +76,13 @@ Initial release and extraction from Active Admin
 [#36]: https://github.com/activeadmin/arbre/issues/36
 [#39]: https://github.com/activeadmin/arbre/issues/39
 [#40]: https://github.com/activeadmin/arbre/issues/40
+[#46]: https://github.com/activeadmin/arbre/issues/46
 [#49]: https://github.com/activeadmin/arbre/issues/49
 [#59]: https://github.com/activeadmin/arbre/issues/59
 [#64]: https://github.com/activeadmin/arbre/pull/64
 [#78]: https://github.com/activeadmin/arbre/pull/78
 [#110]: https://github.com/activeadmin/arbre/pull/110
+[#121]: https://github.com/activeadmin/arbre/pull/121
 
 [@aramvisser]: https://github.com/aramvisser
 [@LTe]: https://github.com/LTe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arbre (1.2.0)
+    arbre (1.2.1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -104,8 +104,8 @@ GEM
     nokogiri (1.10.2-java)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -169,7 +169,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.66.0)
+    rubocop (0.67.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

data/lib/arbre/element.rb

@@ -178,20 +178,11 @@ module Arbre
       elsif assigns && assigns.has_key?(name)
         assigns[name]
       elsif helpers.respond_to?(name)
-        helper_capture(name, *args, &block)
+        helpers.send(name, *args, &block)
       else
         super
       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
   end
 end

data/lib/arbre/rails/template_handler.rb

@@ -1,21 +1,3 @@
-# frozen_string_literal: true
-
-ActionView::Base.class_eval do
-  def capture(*args)
-    value = nil
-    buffer = with_output_buffer { value = yield(*args) }
-
-    # Override to handle Arbre 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?(Arbre::Element)
-
-    if (string = buffer.presence || value) && string.is_a?(String)
-      ERB::Util.html_escape string
-    end
-  end
-end
-
 module Arbre
   module Rails
     class TemplateHandler

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/rails/integration/rendering_spec.rb

@@ -30,10 +30,6 @@ class TestController < ActionController::Base
     @my_instance_var = "From Instance Var"
     render "arbre/page_with_arb_partial_and_assignment"
   end
-
-  def render_page_with_helpers
-    render "arbre/page_with_helpers"
-  end
 end
 
 
@@ -100,15 +96,4 @@ describe TestController, "Rendering with Arbre", type: :request do
     expect(body).to have_selector("p", text: "Partial: From Instance Var")
   end
 
-  it "should render a page with helpers" do
-    get "/test/render_page_with_helpers"
-    expect(response).to be_successful
-    expect(body).to eq <<~HTML
-      <span>before h1 link</span>
-      <h1><a href="/h1_link_path">h1 link text</a></h1>
-      <span>before link_to block</span>
-      <a href="/link_path">  <i class=\"link-class\">Link text</i>
-      </a><span>at end</span>
-    HTML
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,7 +94,6 @@ files:
 - spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb
 - spec/rails/templates/arbre/page_with_assignment.arb
 - spec/rails/templates/arbre/page_with_erb_partial.arb
-- spec/rails/templates/arbre/page_with_helpers.arb
 - spec/rails/templates/arbre/page_with_partial.arb
 - spec/rails/templates/arbre/simple_page.arb
 - spec/rails/templates/erb/_partial.erb

data/spec/rails/templates/arbre/page_with_helpers.arb

@@ -1,7 +0,0 @@
-span { 'before h1 link' }
-h1 { link_to('/h1_link_path') { 'h1 link text' } }
-
-span { 'before link_to block' }
-text_node link_to('/link_path') { i("Link text", class: 'link-class') }
-
-span { 'at end' }