ilex 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0270cc4a6ad17198cccaa8dfe059fc68a8acb05d9d690ac54d2b4590bed94e16
-  data.tar.gz: faa95ab242ab07977737971bb7b98c76afbf5b3a7f5450c919716a92fcdc393c
+  metadata.gz: 52dca54a1d2d71e2ef66b74507d0ac0e6d72c68ade1c7993cfd524564869636a
+  data.tar.gz: 765e2c30ac981634ea6fcb4b07f484ef6fecdf9cb99947ccb783d816e5787e74
 SHA512:
-  metadata.gz: 7730bd1a0fd1552619a659347437fc206ca393c57859ff85e3270002274d9619005a2c97f813e591b29fd0488cc89d1a4b9802c1332a795baea90d272da0f2dd
-  data.tar.gz: 7b8dfb00406cb0916000945feb3c0df9188f6d4c941777e64bde12a16ecdbcf19524913bdad2ec382c254677a9be67e8a735251aaa1af08b35c802717273efb2
+  metadata.gz: 55d1bbc9f3153568d3d13e03fd4c11a7aef6450bdd30c16065ef1a0e6e95967158418817d8fe2bed8a5975fef03c4b4eee1a9e8908882b5cbba7f72f615a4e89
+  data.tar.gz: 29074aba634643602d17ab0a3f4a7841711fa525fd33836dbf3c1c8fcd2eae7f4e5985ba25c9df692fc71043715a5c2f70f38a498dfecd32a6d325a8a3c0bd5c

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.9](https://github.com/joshleblanc/ilex/compare/v0.1.8...v0.1.9) (2021-07-24)
+
+
+### Bug Fixes
+
+* when block returns an arbre element, render context ([e3eda72](https://github.com/joshleblanc/ilex/commit/e3eda728fd30bcb15ebb3f5234229b644bbcf59a))
+
 ### [0.1.8](https://github.com/joshleblanc/ilex/compare/v0.1.7...v0.1.8) (2021-06-16)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ilex (0.1.8)
+    ilex (0.1.9)
       arbre
       rails (>= 5.2, < 7.0)
 
@@ -142,7 +142,7 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

data/lib/ilex/component.rb

@@ -21,8 +21,8 @@ module Ilex
 
     def render(*args, &blk)
       define_method :call do
-        ctx = Context.new(self)
-        ctx.instance_eval(&blk).to_s
+        @ctx = Context.new(self)
+        @ctx.instance_eval(&blk).html_safe
       end
     end
 
@@ -42,7 +42,6 @@ module Ilex
           adjusted_name = name.chomp("Component").underscore
           raise(NameError, "undefined local variable or method `#{adjusted_name}` for #{self}")
         end
-
       end
     end
   end

data/lib/ilex/context.rb

@@ -28,28 +28,8 @@ module Ilex
       @component_wardens ||= ComponentWardens.new(@component)
     end
 
-    # This is overriding arbre::rails::rendering
-    # It performs the same actions, but returns html_safe on a passed block
-    #
-    # Not 100% sure this is needed, but view_components won't render their
-    # contents without it, when rendered in an arbre tree
-    def render(*args)
-      rendered = helpers.render(*args) do
-        if block_given?
-          contents = yield
-          if contents.is_a? Array
-            contents.join.html_safe
-          else
-            contents.html_safe
-          end
-        end
-      end
-      case rendered
-      when Arbre::Context
-        current_arbre_element.add_child rendered
-      else
-        text_node rendered
-      end
+    def render(*args, &blk)
+      helpers.render(*args, &blk)
     end
 
     def respond_to_missing?(method, include_all)

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

@@ -5,11 +5,18 @@ module Ilex
         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 args.first&.respond_to? :ctx 
+          #   value = args.first.ctx.children.to_s
+          # end
+          # We're only capturing the last returned arbre element
+          # This uses that element to get the current context, and 
+          # get the html for the whole tree
+          # We have to collect the children manually because 
+          # `content` is overridden 
+          if value.is_a? Arbre::Element
+            value = value.arbre_context.children.to_s
+          end
 
           if (string = buffer.presence || value) && string.is_a?(String)
             ERB::Util.html_escape string

data/lib/ilex/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilex
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Joshua LeBlanc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre