render_async 2.1.4 → 2.1.9

data/bin/integration-tests

@@ -11,3 +11,10 @@ cd spec/fixtures/rails-5-base-app
 ls
 bundle install
 bundle exec cucumber
+
+cd ../../../spec/fixtures/rails-6-base-app
+ls
+bundle install
+yarn install
+RAILS_ENV=test bundle exec rails webpacker:compile
+bundle exec cucumber

data/lib/render_async/configuration.rb

@@ -1,10 +1,13 @@
 module RenderAsync
   class Configuration
-    attr_accessor :jquery, :turbolinks
+    attr_accessor :jquery, :turbolinks, :turbo, :replace_container, :nonces
 
     def initialize
       @jquery = false
       @turbolinks = false
+      @turbo = false
+      @replace_container = true
+      @nonces = false
     end
   end
 end

data/lib/render_async/version.rb

@@ -1,3 +1,3 @@
 module RenderAsync
-  VERSION = "2.1.4".freeze
+  VERSION = "2.1.9".freeze
 end

data/lib/render_async/view_helper.rb

@@ -2,7 +2,6 @@ require 'securerandom'
 
 module RenderAsync
   module ViewHelper
-
     def render_async_cache_key(path)
       "render_async_#{path}"
     end
@@ -20,18 +19,17 @@ module RenderAsync
     def render_async(path, options = {}, &placeholder)
       event_name = options.delete(:event_name)
       placeholder = capture(&placeholder) if block_given?
-      retry_count = options.delete(:retry_count) || 0
-      html_options = options.delete(:html_options) || {}
 
       render 'render_async/render_async', **container_element_options(options),
                                           path: path,
-                                          html_options: html_options,
+                                          html_options: html_options(options),
                                           event_name: event_name,
                                           placeholder: placeholder,
                                           **request_options(options),
                                           **error_handling_options(options),
-                                          retry_count: retry_count,
-                                          **polling_options(options)
+                                          **retry_options(options),
+                                          **polling_options(options),
+                                          **content_for_options(options)
     end
 
     private
@@ -39,7 +37,16 @@ module RenderAsync
     def container_element_options(options)
       { html_element_name: options[:html_element_name] || 'div',
         container_id: options[:container_id] || generate_container_id,
-        container_class: options[:container_class] }
+        container_class: options[:container_class],
+        replace_container: replace_container(options) }
+    end
+
+    def html_options(options)
+      set_options = options.delete(:html_options) || {}
+
+      set_options[:nonce] = configuration.nonces if set_options[:nonce].nil?
+
+      set_options
     end
 
     def request_options(options)
@@ -53,15 +60,36 @@ module RenderAsync
         error_event_name: options[:error_event_name] }
     end
 
+    def retry_options(options)
+      {
+        retry_count: options.delete(:retry_count) || 0,
+        retry_delay: options.delete(:retry_delay)
+      }
+    end
+
     def polling_options(options)
       { interval: options[:interval],
         toggle: options[:toggle] }
     end
 
-    private
+    def content_for_options(options)
+      {
+        content_for_name: options[:content_for_name] || :render_async
+      }
+    end
 
     def generate_container_id
       "render_async_#{SecureRandom.hex(5)}#{Time.now.to_i}"
     end
+
+    def replace_container(options)
+      return options[:replace_container] unless options[:replace_container].nil?
+
+      configuration.replace_container
+    end
+
+    def configuration
+      RenderAsync.configuration
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: render_async
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.9
 platform: ruby
 authors:
 - Kasper Grubbe
 - nikolalsvk
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".all-contributorsrc"
+- ".github/CONTRIBUTING.md"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -85,7 +87,7 @@ homepage: https://github.com/renderedtext/render_async
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Render parts of the page asynchronously with AJAX
 test_files: []