turbograft 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5a814c49eaff1fbe7cf0bb02f67ef8d96fe8ff9
-  data.tar.gz: dd94aabbd02817b9ce92f99f87651daa94975176
+  metadata.gz: c51f5ed8a155f29814d99f83a20387c3397a29a9
+  data.tar.gz: 92a13dac1c2aadc0526a40c78f5d67097e3a833e
 SHA512:
-  metadata.gz: 3cfa4e748a8278ab568aac8b985eaa46df40fbf6ca063785fd66be1408ad55221d146683d0edeeba1f047a1ede182dc45f000353639886d1ffc27df958320168
-  data.tar.gz: 262fa76bf7948cd31f889e881c3b63d8a88a41d697a8d1fc37ac06d5db306905fa3508512791b0435b2e95eb18eda1662ec6f1d7b278c61d3ef2132723992c16
+  metadata.gz: 85f28b6d5b0851b2c7d6684418eeccb1baf690d1a71eddc1498f8ce99acea81c7864834f7b7861d6e55888a5b399ae59d19dcdd714b5edd29a5eb9c2122948f4
+  data.tar.gz: 0d8cd7e44378440bffc0883520c0d35408cd9e52262d6f3284324172db8b0a457b27dbb41a8534b0787103f479b0413664133004878a3a9be045c7a802dd19fb

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

@@ -26,8 +26,7 @@ updateScriptTags = (activeDocument, newScripts, callback) ->
   )
 
 extractTrackedAssets = (doc) ->
-  for node in doc.head.children when node.dataset.turbolinksTrack?
-    node
+  [].slice.call(doc.querySelectorAll('[data-turbolinks-track]'))
 
 filterForNodeType = (nodeType) ->
   (node) -> node.nodeName == nodeType

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

@@ -130,27 +130,33 @@ class window.Turbolinks
   @loadPage: (url, xhr, options = {}) ->
     triggerEvent 'page:receive'
     options.updatePushState ?= true
-    if upstreamDocument = processResponse(xhr, options.partialReplace)
+    if upstreamDocument = processResponse(xhr)
       reflectNewUrl url if options.updatePushState
-
-      new TurboHead(document, upstreamDocument).update(
-        onHeadUpdateSuccess = ->
-          nodes = changePage(
-            upstreamDocument.querySelector('title')?.textContent,
-            removeNoscriptTags(upstreamDocument.querySelector('body')),
-            CSRFToken.get(upstreamDocument).token,
-            'runScripts',
-            options
-          )
-          reflectRedirectedUrl(xhr) if options.updatePushState
-          options.onLoadFunction?()
-          triggerEvent 'page:load', nodes
-        ,
-        onHeadUpdateError = ->
-          Turbolinks.fullPageNavigate(url.absolute)
-      )
+      if options.partialReplace
+        updateBody(upstreamDocument, xhr, options)
+      else
+        new TurboHead(document, upstreamDocument).update(
+          onHeadUpdateSuccess = ->
+            updateBody(upstreamDocument, xhr, options)
+          ,
+          onHeadUpdateError = ->
+            Turbolinks.fullPageNavigate(url.absolute)
+        )
     else
-      Turbolinks.fullPageNavigate(url.absolute)
+      triggerEvent 'page:error', xhr
+      Turbolinks.fullPageNavigate(url.absolute) if url?
+
+  updateBody = (upstreamDocument, xhr, options) ->
+    nodes = changePage(
+      upstreamDocument.querySelector('title')?.textContent,
+      removeNoscriptTags(upstreamDocument.querySelector('body')),
+      CSRFToken.get(upstreamDocument).token,
+      'runScripts',
+      options
+    )
+    reflectRedirectedUrl(xhr) if options.updatePushState
+    options.onLoadFunction?()
+    triggerEvent 'page:load', nodes
 
   changePage = (title, body, csrfToken, runScripts, options = {}) ->
     document.title = title if title
@@ -322,7 +328,7 @@ class window.Turbolinks
   pageChangePrevented = (url) ->
     !triggerEvent('page:before-change', url)
 
-  processResponse = (xhr, partial = false) ->
+  processResponse = (xhr) ->
     clientOrServerError = ->
       return false if xhr.status == 422 # we want to render form validations
       400 <= xhr.status < 600

data/lib/turbograft/version.rb

@@ -1,3 +1,3 @@
 module TurboGraft
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails