rendry 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fda28c5a0d8a7165d77da8ad9eac00950005d67a91905ced6f2db63dceca246
-  data.tar.gz: 56072ac6f66932de96031dfea4168313db30f48a708397201463821f08122e0e
+  metadata.gz: 043bde156ddb2a1af19b6c8507e676330b4ad40a079cc8850ced810396559dfa
+  data.tar.gz: bf349c54a7025081672066beb879e8ca8fa4d5e2eecf81c80c4f23f2cec85d50
 SHA512:
-  metadata.gz: 29490b541d776a03fdab7b7feedf00c5033d8c1e985f01c2c69c7735e4acefa769b6e522c4a3de13289a81bcecc901a053c89f62140393ceedb7546fb3fdc73f
-  data.tar.gz: 620c4bb000dfc5b6ce4834bf2156b8b790c3a9480b98f3d6f8866d3a8acbdda87e30652625473ee4c475c4f81c86dac51198e149ad3b04c68947f07dec690d98
+  metadata.gz: 8912d9c980908d713576dc50307c2ef7b9bd09a9f0be7a3072ea8507b6d491c6af0236f84a428f9adc384702195fdfb6a966322a9f5422f709462699a9ad910b
+  data.tar.gz: 1dd76f09af3eccbf79b653abcbc0c1371b27a4f281699a35157264244e637799ac1124d50dfb8343fde8866225a2401d13de16dae7c39502ddb5a87780067e6d

data/lib/rendry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rendry
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/rendry.rb

@@ -69,15 +69,8 @@ module Rendry
       if block
         children = Builder.new(enabled: @enabled)
         result = Rendry.evaluate(children, &block)
-        output = children.render
-        if Rendry.appendable_result?(result) && !result.is_a?(SafeHTML)
-          output = output.dup if output.frozen?
-          output << CGI.escapeHTML(result.to_s)
-        elsif result.is_a?(SafeHTML)
-          output = output.dup if output.frozen?
-          output << result
-        end
-        content = SafeHTML.new(output)
+        children.append_result(result)
+        content = SafeHTML.new(children.render)
       end
 
       output = +"<#{name}#{format_attributes(attributes)}>"
@@ -153,15 +146,13 @@ module Rendry
         helper = context && context.respond_to?(name) ? context.method(name) : nil
         has_arguments = !(content.nil? && attributes.empty? && !block)
         if helper && !(helper.arity == 0 && has_arguments)
-          result = if content.nil? && attributes.empty? && !block
+          if content.nil? && attributes.empty? && !block
             context.public_send(name)
           elsif content.nil?
             context.public_send(name, **attributes, &block)
           else
             context.public_send(name, content, **attributes, &block)
           end
-          write_escaped_result(result)
-          self
         else
           tag(name.to_s.tr("_", "-"), content, **attributes, &block)
         end
@@ -174,18 +165,19 @@ module Rendry
       name.to_s.match?(/\A[a-z][a-z0-9_]*\z/) || super
     end
 
-    private
-
-    def write(string)
-      @output << string if @enabled
-    end
-
-    def write_escaped_result(result)
+    def append_result(result)
       if result.is_a?(SafeHTML)
         write result
       elsif Rendry.appendable_result?(result)
         write CGI.escapeHTML(result.to_s)
       end
+      self
+    end
+
+    private
+
+    def write(string)
+      @output << string if @enabled
     end
 
     def refresh_wrapper(html, config)
@@ -255,11 +247,7 @@ module Rendry
 
       builder = Builder.new
       result = Rendry.evaluate(builder, self, context: view_context, &block)
-      if result.is_a?(SafeHTML)
-        builder.output << result
-      elsif Rendry.appendable_result?(result)
-        builder.output << CGI.escapeHTML(result.to_s)
-      end
+      builder.append_result(result)
       SafeHTML.new(builder.render)
     end
   end
@@ -467,14 +455,15 @@ module Rendry
       Thread.current[:rendry_current_fragments] = fragments.map(&:to_s)
       Thread.current[:rendry_root_builder] = builder
       begin
-        evaluate(builder, &block)
+        result = evaluate(builder, &block)
       ensure
         Thread.current[:rendry_current_fragments] = previous_fragments
         Thread.current[:rendry_root_builder] = previous_root
       end
     else
-      evaluate(builder, &block)
+      result = evaluate(builder, &block)
     end
+    builder.append_result(result)
     SafeHTML.new(builder.render)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rendry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - NICE-DEV226