ilex 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbd721cabba89d7f34b23841b6afcfd3d38b79bb35d947a620161e67e6f38cfd
-  data.tar.gz: 3aca8a08c6ae10f7918bcb239bbe103cd03073d18e1c30fc746a509c30c127f9
+  metadata.gz: 4f98672db74bb9e94ee80eb636e5878900d5a348fd4879633d5e44dcbc289053
+  data.tar.gz: 6cccb6d5f4a506995fe4549f249ba0cd5150d8e3b26955985f1a5b25d9d4b359
 SHA512:
-  metadata.gz: cb7d4800158d6b0dfb093ffd0f44abbb6009bc8bb8c706125e108fe89c5dbff0e16c50a1d8502b12c846416f8986a61d6b7a5fa9c5e52a5ca0f0600ae8df2816
-  data.tar.gz: af85c50eedefbbe3ce29849e07c80f38de08037277a57bc71477bd04d67326d8f8af7ae973fb18ddd93d0b13e11c15acf09d588389a46ad65b843f9808dc84a2
+  metadata.gz: 97243cd6826be3e81e93dd847adcbc50a36045865bc67c325524a4945dc7690479a9a15037b061edfd7b2c18c377ebda444d80a44b009a8afca2c2b78a022d81
+  data.tar.gz: db12e3bb02e3e7277bbf2a15e40839616b64b283733fe9ba1cf17bf28029383ca9b2c246aaa7eef2ddaa56a1cd5f0c1009605d040853133416e3d64732f92a87

data/.versionrc.json

@@ -3,5 +3,5 @@
     "tag": true
   },
   "NAME": "Ilex",
-  "VERSION": "0.1.0"
+  "VERSION": "0.1.6"
 }

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.6](https://github.com/joshleblanc/cedar/compare/v0.1.5...v0.1.6) (2021-04-18)
+
+
+### Bug Fixes
+
+* allow rendering form helpers with blocks ([9a24ed7](https://github.com/joshleblanc/cedar/commit/9a24ed7388c60f7a7ed4398dc4871974302c87f3)), closes [activeadmin/arbre#64](https://github.com/activeadmin/arbre/issues/64)
+
 ### [0.1.5](https://github.com/joshleblanc/cedar/compare/v0.1.4...v0.1.5) (2021-04-17)
 
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ilex (0.1.5)
+    ilex (0.1.6)
       arbre
+      rails (>= 5.2, < 7.0)
 
 GEM
   remote: https://rubygems.org/

data/cedar.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
   spec.add_dependency "arbre"
+  spec.add_dependency "rails", [">= 5.2", "< 7.0"]
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/ilex.rb

@@ -6,8 +6,12 @@ require_relative "ilex/component_warden"
 require_relative "ilex/component_wardens"
 require_relative "ilex/context"
 require_relative "ilex/component"
+require_relative "ilex/arbre_ext/element"
+require_relative "ilex/rails_ext/action_view/base"
+require_relative "ilex/engine"
 
 module Ilex
   class Error < StandardError; end
   # Your code goes here...
 end
+

data/lib/ilex/arbre_ext/element.rb

@@ -0,0 +1,27 @@
+module Ilex
+  module ArbreExt
+    module Element
+      ruby2_keywords 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
+        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
+end

data/lib/ilex/engine.rb

@@ -0,0 +1,9 @@
+module Ilex
+  class Engine < ::Rails::Engine
+
+    config.to_prepare do
+      ActionView::Base.prepend RailsExt::ActionView::Base
+      Arbre::Element.prepend ArbreExt::Element
+    end
+  end
+end

data/lib/ilex/rails_ext/action_view/base.rb

@@ -0,0 +1,21 @@
+module Ilex
+  module RailsExt
+    module ActionView
+      module Base
+        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
+    end
+  end
+end

data/lib/ilex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ilex
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilex
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Joshua LeBlanc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-17 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -24,6 +24,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Extends view components to allow rendering inline arbre templates
 email:
 - jleblanc@hey.com
@@ -46,10 +66,13 @@ files:
 - bin/setup
 - cedar.gemspec
 - lib/ilex.rb
+- lib/ilex/arbre_ext/element.rb
 - lib/ilex/component.rb
 - lib/ilex/component_warden.rb
 - lib/ilex/component_wardens.rb
 - lib/ilex/context.rb
+- lib/ilex/engine.rb
+- lib/ilex/rails_ext/action_view/base.rb
 - lib/ilex/version.rb
 homepage: https://github.com/joshleblanc/ilex
 licenses: