async_partial 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4c400883e8ff1cec0398606d334935122be82c6a36dd368830fcd74ec6e2deb
-  data.tar.gz: 73556843fd3b3e53e90e98d50674b29b3efd94174511fc6b3081b32a7b93d203
+  metadata.gz: 166dac214e99eaf0c1740d70b233bdf4289ff06c2b53a7cf006ea5fa074d9833
+  data.tar.gz: a4dbfc18523e17f34c44d35fc974140f8d8dd21fc5ac340a7761db90f15c83e2
 SHA512:
-  metadata.gz: d4f82a499e4066ada256ea3b65e3e03064b43b397ac9371798caa9c1832c945685aac19a95a90753307637a8d84eeee4d4ddb78e4bf4623a6ac983b0279c1562
-  data.tar.gz: 120d2080bd0bbeb307bdf4e77fcbd0a495b0b5d20d50454c2c6efaeaaba6eb778333657bf9802c1fa272abae107b180b9e5d541f987a7202b99f2289bda7d04b
+  metadata.gz: 8bc6e8a27fd028a75cb9bdd25e9fcb0ed9c19ce8b4ff6c15e5482b3f672a91f8592fb5742c6de22c86a82c9bd93be09f6db0ad4cc7a90a3fae228c2171695e63
+  data.tar.gz: 531cee4e9c5426e8689e484de043cf57cd28bc1dc31c33afb20008ac242acf373a27ba08668e09ea0b6fea96f9b417bf9a64e54badcece812b8803b240143100

data/async_partial.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "async_partial"
-  spec.version       = '0.6.0'.freeze
+  spec.version       = '0.7.0'.freeze
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
 

data/lib/async_partial.rb

@@ -3,9 +3,28 @@
 require_relative 'async_partial/railtie'
 
 module AsyncPartial
-  module Renderer
-    def render(context, options, block)
-      if (options.delete(:async) || (options[:locals]&.delete(:async)))
+  module PartialRenderer
+    private
+
+    def render_partial
+      if @locals.delete :async
+        AsyncResult.new(Thread.new { super })
+      else
+        super
+      end
+    end
+
+    def collection_with_template
+      super.map do |v|
+        v.value if AsyncPartial::AsyncResult === v
+      end
+    end
+  end
+
+  module CollectionPartialTemplateRenderer
+    def render(view, locals, buffer = nil, &block)
+      locals = locals.dup
+      if locals.delete :async
         AsyncResult.new(Thread.new { super })
       else
         super
@@ -13,9 +32,19 @@ module AsyncPartial
     end
   end
 
+  module PerThreadBufferStack
+    def render(view, locals, buffer = nil, &block)
+      buffer ||= ActionView::OutputBuffer.new
+      (Thread.current[:output_buffers] ||= []).push buffer
+      result = super
+      Thread.current[:output_buffers].pop
+      result
+    end
+  end
+
   module CaptureHelper
     def capture(*args, &block)
-      buf = block.binding.local_variable_get :output_buffer
+      buf = Thread.current[:output_buffers].last
       value = nil
       buffer = with_output_buffer(buf) { value = block.call(*args) }
       if (string = buffer.presence || value) && string.is_a?(String)

data/lib/async_partial/handlers/erubi.rb

@@ -10,7 +10,7 @@ module ActionView
 
             # Dup properties so that we don't modify argument
             properties = Hash[properties]
-            properties[:preamble]   = "output_buffer = ActionView::OutputBuffer.new;"
+            properties[:preamble]   = "output_buffer ||= ActionView::OutputBuffer.new;"
             properties[:postamble]  = "output_buffer.to_s"
             properties[:bufvar]     = "output_buffer"
             properties[:escapefunc] = ""

data/lib/async_partial/handlers/haml.rb

@@ -5,6 +5,21 @@ module AsyncPartial
     def html_safe
       map {|v| AsyncPartial::AsyncResult === v ? v.value : v}.join.html_safe
     end
+
+    def rstrip!
+      if last.frozen?
+        if (stripped = last.dup.rstrip!)
+          self[-1] = stripped
+        end
+      else
+        last.rstrip!
+      end
+      if last.blank?
+        last.pop
+        rstrip!
+      end
+      self
+    end
   end
 
   module HamlArrayBufferizer

data/lib/async_partial/railtie.rb

@@ -4,9 +4,11 @@ module AsyncPartial
   class Railtie < ::Rails::Railtie
     initializer 'async_partial' do
       ActiveSupport.on_load :action_view do
-        ActionView::PartialRenderer.prepend AsyncPartial::Renderer
+        ActionView::PartialRenderer.prepend AsyncPartial::PartialRenderer
         ActionView::OutputBuffer.prepend AsyncPartial::ArrayBuffer
         ActionView::Base.prepend AsyncPartial::CaptureHelper
+        ActionView::Template.prepend AsyncPartial::PerThreadBufferStack
+        ActionView::Template.prepend AsyncPartial::CollectionPartialTemplateRenderer
 
         begin
           require 'action_view/template/handlers/erb/erubi'
@@ -23,18 +25,35 @@ module AsyncPartial
             raise 'No Erubi nor Erubis found.'
           end
         end
+      end
+    end
 
-        if Gem.loaded_specs.detect {|g| g[0] == 'haml'}
-          require 'haml/buffer'
-          require_relative 'handlers/haml'
-        end
+    if Gem.loaded_specs.detect {|g| g[0] == 'haml'}
+      initializer 'async_partial_haml', after: :haml do
+        require 'haml/buffer'
+        require_relative 'handlers/haml'
+      end
+    end
 
-        if Gem.loaded_specs.detect {|g| g[0] == 'slim'}
-          require 'temple/generators/rails_output_buffer'
-          require_relative 'handlers/slim'
+    if Gem.loaded_specs.detect {|g| g[0] == 'slim'}
+      initializer 'async_partial_slim', after: 'slim_rails.configure_template_digestor' do
+        require 'temple'
+        require 'slim'
+        require 'temple/generators/rails_output_buffer'
+        require_relative 'handlers/slim'
 
-          Temple::Templates::Rails(Slim::Engine, register_as: :slim, generator: Temple::Generators::ThreadedRailsOutputBuffer, disable_capture: true, streaming: true)
-        end
+        Temple::Templates::Rails(Slim::Engine, register_as: :slim, generator: Temple::Generators::ThreadedRailsOutputBuffer, disable_capture: true, streaming: true)
+      end
+    end
+
+    if Gem.loaded_specs.detect {|g| g[0] == 'faml'}
+      initializer 'async_partial_faml', after: :faml do
+        require 'temple'
+        require 'temple/generators/rails_output_buffer'
+        require_relative 'handlers/slim'
+
+        ActionView::Template.register_template_handler(:haml, ->(template) { Faml::Engine.new(use_html_safe: true, generator: Temple::Generators::ThreadedRailsOutputBuffer, filename: template.identifier).call(template.source) })
+        ActionView::Template.register_template_handler(:faml, ->(template) { Faml::Engine.new(use_html_safe: true, generator: Temple::Generators::ThreadedRailsOutputBuffer, filename: template.identifier).call(template.source) })
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async_partial
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Asynchronous partial renderer for Rails