nexaas-async-collector 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0ace8ebdcf15e52a1a8e73205906d70fe843189d
-  data.tar.gz: d64ad488388958efbce193c40e980770e3003027
+SHA256:
+  metadata.gz: 842bb99f8a3e92981689ee7978d4fd93b39e62294053ddc93770266378137b52
+  data.tar.gz: 00b1fefc5c70c5cc67edd3b235529e65ec4a20907f493a38c458e09b5da9162c
 SHA512:
-  metadata.gz: 6bce043a62b74c58571e0587104470d2e4c0ec8ceeb2a275961611d7613a1c425b0ac9bc2463308fa18f2ff220edea9faa63e78a688831a32d11f154a15f3080
-  data.tar.gz: 590d33cb22ae3e4775a7ac6b9cf2857cc60dfd5a387d36f0c5299e24e52f0fdc2123302cac96bdbaa11a884f9160e4cc6e09be66e68161b971b30c1a87ca819b
+  metadata.gz: 5812d59457d8b3a630838ef360e82c10fcd287edc99d028c7ec81bcc13a9afaf22817787be83ad469f7e7a52a689c500faf52fdadf382f59da8393c7d04346b3
+  data.tar.gz: 2fefb161bc113d27519ab3fd285f61e6075d12fef116a0bae7655cd60c7812484b0ea3fb737737b510f36050418760c1b57520c21018034ede7d2b15038abeb0

data/app/views/nexaas/async/collector/async_resource/_show.html.erb

@@ -1,16 +1,44 @@
 <script type="text/javascript" id="js-nexaas-async-collector-<%= unique_id %>">
-  if (!!window.nexaas_async_interval)
-    clearInterval(window.nexaas_async_interval);
-
-  var requestContent = function() {
-    $.ajax({
-      url: '<%= nexaas_async_collector.async_resource_path(collect_id) %>',
-      dataType: 'script',
-      data: { unique_id: '<%= unique_id %>' }
-    })
-  }
-
-  window.nexaas_async_interval = setInterval(requestContent, 3000);
+  (function registerCollector(id, path) {
+    window.nexaas_async_collector = window.nexaas_async_collector || {};
+
+    var collector = window.nexaas_async_collector[id];
+    var isCollectorPresent = !!collector;
+
+    if (isCollectorPresent) {
+      clearInterval(collector.interval);
+    }
+
+    var requestContent = function() {
+      $.ajax({
+        url: path,
+        dataType: 'script',
+        data: { unique_id: id }
+      })
+    };
+
+    var removeLoader = function(self) {
+      clearInterval(self.interval);
+      $('#js-nexaas-async-collector-loading-' + id).remove();
+      $('#js-nexaas-async-collector-style-' +  id).remove();
+    };
+
+    window.nexaas_async_collector[id] = {
+      interval: setInterval(requestContent, 3000),
+
+      collectHTML: function(html) {
+        removeLoader(this);
+        var $collector = $('#js-nexaas-async-collector-' + id);
+        $collector.parent().append(html);
+        $collector.remove();
+      },
+
+      collectUrl: function(url) {
+        removeLoader(this);
+        window.location.href = url;
+      }
+    };
+  })('<%= unique_id %>', '<%= nexaas_async_collector.async_resource_path(collect_id) %>');
 </script>
 
 <%= render partial: "nexaas/async/collector/async_resource/loading", locals: { unique_id: unique_id } %>

data/app/views/nexaas/async/collector/async_resource/show.js.erb

@@ -1,13 +1,11 @@
 <% if @result.content_is_ready? %>
-  clearInterval(window.nexaas_async_interval);
-
   <% if @result.is_file? %>
-    $('#js-nexaas-async-collector-loading-<%= @unique_id %>').remove();
-    window.location.href = '<%= nexaas_async_collector.async_resource_path(params[:id], format: @result.extension) %>';
+    window.nexaas_async_collector['<%= @unique_id %>'].collectUrl(
+      '<%= nexaas_async_collector.async_resource_path(params[:id], format: @result.extension) %>'
+    );
   <% else %>
-    $('#js-nexaas-async-collector-loading-<%= @unique_id %>').remove();
-    $('#js-nexaas-async-collector-<%= @unique_id %>').parent().append("<%= escape_javascript(@result.content.force_encoding('UTF-8').html_safe) %>");
-    $('#js-nexaas-async-collector-<%= @unique_id %>').remove()
-    $('#js-nexaas-async-collector-style-<%= @unique_id %>').remove()
+    window.nexaas_async_collector['<%= @unique_id %>'].collectHTML(
+      '<%= escape_javascript(@result.content.force_encoding('UTF-8').html_safe) %>'
+    );
   <% end %>
 <% end %>

data/lib/nexaas/async/collector/version.rb

@@ -1,7 +1,7 @@
 module Nexaas
   module Async
     module Collector
-      VERSION = '3.3.2'
+      VERSION = '3.3.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexaas-async-collector
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Eduardo Hertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Collect and generate async content.