turbograft 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908ca189eb5f9c51f6e061d844528bde62953db6
-  data.tar.gz: 2b6f48a3f32d885e7d23ce33cd1f5fbdb2d2a6a2
+  metadata.gz: 1e699e8c4097b50cf1a8530b545dc15b0a285a5b
+  data.tar.gz: 60db5ecf8f5dc92ba320b3c88cfc97485255a953
 SHA512:
-  metadata.gz: 5bc193a959af440b4af8312deea19d8356ac11a640d2d8189e7f9cb6fe10debb5f245033f6eff715287b85f4d665ea989eb6118e583e91e6111052ac3b03ba28
-  data.tar.gz: 922997e629e3d77b3c6a2024273524149d8d5fceedb3d01d6c00d559eda8e8cf6ac3adacaa8bb49ac6b03180676d6a65650d5ceba61abf1ad4dd5761342678f7
+  metadata.gz: 9fd21cae920d11a5a6d755ed19e39fd50c6b0185e4bdbfcfb6e34485b90d810d15cc8a0f3a74b1eda351658f2b1983ebc3de5b1c986d89411c916cd02309c5ed
+  data.tar.gz: c0795f45590c5cea04be07a6aa0f91715fa22f3b3c0f19196e96c4179be0e89eb10e0cc33ffecc10288de3341f1d438d5542880112240fde4ab0da700d0d269a

data/README.md

@@ -28,6 +28,9 @@ Turbograft was built with simplicity in mind. It intends to offer the smallest a
 * Replace `//= require turbolinks` with `//= require turbograft` in _app/assets/javascripts/application.js_
 * Run `bundle install`
 
+## Dependencies
+
+Turbograft requires a browser that supports [`Promise`](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Promise), or a polyfill (e.g., [core-js](https://github.com/zloirock/core-js).)
 
 ## Usage
 

data/lib/assets/javascripts/turbograft/turbohead.coffee

@@ -2,6 +2,14 @@ TRACKED_ASSET_SELECTOR = '[data-turbolinks-track]'
 TRACKED_ATTRIBUTE_NAME = 'turbolinksTrack'
 ANONYMOUS_TRACK_VALUE = 'true'
 
+scriptPromises = {}
+resolvePreviousRequest = null
+
+waitForCompleteDownloads = ->
+  loadingPromises = Object.keys(scriptPromises).map (url) ->
+    scriptPromises[url]
+  Promise.all(loadingPromises)
+
 class window.TurboHead
   constructor: (@activeDocument, @upstreamDocument) ->
     @activeAssets = extractTrackedAssets(@activeDocument)
@@ -14,6 +22,12 @@ class window.TurboHead
       .filter(attributeMatches('nodeName', 'LINK'))
       .filter(noAttributeMatchesIn('href', @activeAssets))
 
+  @_testAPI: {
+    reset: ->
+      scriptPromises = {}
+      resolvePreviousRequest = null
+  }
+
   hasChangedAnonymousAssets: () ->
     anonymousUpstreamAssets = @upstreamAssets
       .filter(datasetMatches(TRACKED_ATTRIBUTE_NAME, ANONYMOUS_TRACK_VALUE))
@@ -39,9 +53,20 @@ class window.TurboHead
   hasAssetConflicts: () ->
     @hasNamedAssetConflicts() || @hasChangedAnonymousAssets()
 
-  insertNewAssets: (callback) ->
+  waitForAssets: () ->
+    resolvePreviousRequest?(isCanceled: true)
+
+    new Promise((resolve) =>
+      resolvePreviousRequest = resolve
+      waitForCompleteDownloads()
+        .then(@_insertNewAssets)
+        .then(waitForCompleteDownloads)
+        .then(resolve)
+    )
+
+  _insertNewAssets: () =>
     updateLinkTags(@activeDocument, @newLinks)
-    updateScriptTags(@activeDocument, @newScripts, callback)
+    updateScriptTags(@activeDocument, @newScripts)
 
 extractTrackedAssets = (doc) ->
   [].slice.call(doc.querySelectorAll(TRACKED_ASSET_SELECTOR))
@@ -76,37 +101,37 @@ noDatasetMatchesIn = (attribute, collection) ->
 updateLinkTags = (activeDocument, newLinks) ->
   # style tag load events don't work in all browsers
   # as such we just hope they load ¯\_(ツ)_/¯
-  newLinks.forEach((linkNode) -> insertLinkTask(activeDocument, linkNode)())
-
-updateScriptTags = (activeDocument, newScripts, callback) ->
-  asyncSeries(
-    newScripts.map((scriptNode) -> insertScriptTask(activeDocument, scriptNode)),
-    callback
+  newLinks.forEach((linkNode) ->
+    newNode = linkNode.cloneNode()
+    activeDocument.head.appendChild(newNode)
+    triggerEvent("page:after-link-inserted", newNode)
   )
 
-asyncSeries = (tasks, callback) ->
-  return callback() if tasks.length == 0
-  task = tasks.shift()
-  task(-> asyncSeries(tasks, callback))
+updateScriptTags = (activeDocument, newScripts) ->
+  promise = Promise.resolve()
+  newScripts.forEach (scriptNode) ->
+    promise = promise.then(-> insertScript(activeDocument, scriptNode))
+  promise
+
+insertScript = (activeDocument, scriptNode) ->
+  url = scriptNode.src
+  if scriptPromises[url]
+    return scriptPromises[url]
 
-insertScriptTask = (activeDocument, scriptNode) ->
-  # We need to clone script tags in order to ensure that the browser executes them.
+  # Clone script tags to guarantee browser execution.
   newNode = activeDocument.createElement('SCRIPT')
   newNode.setAttribute(attr.name, attr.value) for attr in scriptNode.attributes
   newNode.appendChild(activeDocument.createTextNode(scriptNode.innerHTML))
-  insertAssetTask(activeDocument, newNode, 'script')
 
-insertLinkTask = (activeDocument, node) ->
-  insertAssetTask(activeDocument, node.cloneNode(), 'link')
-
-insertAssetTask = (activeDocument, newNode, name) ->
-  (done) ->
+  scriptPromises[url] = new Promise((resolve) ->
     onAssetEvent = (event) ->
-      triggerEvent("page:#{name}-error", event) if event.type == 'error'
+      triggerEvent("page:#script-error", event) if event.type == 'error'
       newNode.removeEventListener('load', onAssetEvent)
       newNode.removeEventListener('error', onAssetEvent)
-      done() if typeof done == 'function'
+      resolve()
+
     newNode.addEventListener('load', onAssetEvent)
     newNode.addEventListener('error', onAssetEvent)
     activeDocument.head.appendChild(newNode)
-    triggerEvent("page:after-#{name}-inserted", newNode)
+    triggerEvent("page:after-script-inserted", newNode)
+  )

data/lib/assets/javascripts/turbograft/turbolinks.coffee

@@ -139,7 +139,9 @@ class window.Turbolinks
         if turbohead.hasAssetConflicts()
           return Turbolinks.fullPageNavigate(url.absolute)
         reflectNewUrl url if options.updatePushState
-        turbohead.insertNewAssets(-> updateBody(upstreamDocument, xhr, options))
+        turbohead.waitForAssets().then((result) ->
+          updateBody(upstreamDocument, xhr, options) unless result?.isCanceled
+        )
     else
       triggerEvent 'page:error', xhr
       Turbolinks.fullPageNavigate(url.absolute) if url?
@@ -303,6 +305,7 @@ class window.Turbolinks
       location = new ComponentUrl location
       preservedHash = if location.hasNoHash() then document.location.hash else ''
       Turbolinks.replaceState currentState, '', location.href + preservedHash
+
     return
 
   rememberReferer = ->

data/lib/turbograft/version.rb

@@ -1,3 +1,3 @@
 module TurboGraft
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails