turbograft 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e699e8c4097b50cf1a8530b545dc15b0a285a5b
-  data.tar.gz: 60db5ecf8f5dc92ba320b3c88cfc97485255a953
+  metadata.gz: 9334d30bbf9e86dd7baae353ac711bc9688f70ff
+  data.tar.gz: 92bc6bf6eb003c707d82b1b28d7b71bd67e59ada
 SHA512:
-  metadata.gz: 9fd21cae920d11a5a6d755ed19e39fd50c6b0185e4bdbfcfb6e34485b90d810d15cc8a0f3a74b1eda351658f2b1983ebc3de5b1c986d89411c916cd02309c5ed
-  data.tar.gz: c0795f45590c5cea04be07a6aa0f91715fa22f3b3c0f19196e96c4179be0e89eb10e0cc33ffecc10288de3341f1d438d5542880112240fde4ab0da700d0d269a
+  metadata.gz: 6625a059b2940513077f90ab4e11645e807cd57a62074815ed36f89710d28c3702a0277a90c62f243a079a0cc042011f8845cacd077f7881db43e576d478e5dd
+  data.tar.gz: 02850cbe00f2c90a16a34fd2932fb458fe542f578b766e7b1709ff9c938a75d706c5b439639a6338d93be44c6e86a0d4d3a80af20ce0e9a8760b2b7544fc9f24

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

@@ -0,0 +1,11 @@
+TurboGraft.Document =
+  create: (html) ->
+    if /<(html|body)/i.test(html)
+      doc = document.documentElement.cloneNode()
+      doc.innerHTML = html
+    else
+      doc = document.documentElement.cloneNode(true)
+      doc.querySelector('body').innerHTML = html
+    doc.head = doc.querySelector('head')
+    doc.body = doc.querySelector('body')
+    doc

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

@@ -0,0 +1,23 @@
+class TurboGraft.Response
+  constructor: (@xhr) ->
+
+  valid: -> @hasRenderableHttpStatus() && @hasValidContent()
+
+  document: ->
+    if @valid()
+      TurboGraft.Document.create(@xhr.responseText)
+
+  hasRenderableHttpStatus: ->
+    return true if @xhr.status == 422 # we want to render form validations
+    !(400 <= @xhr.status < 600)
+
+  hasValidContent: ->
+    if contentType = @xhr.getResponseHeader('Content-Type')
+      contentType.match(/^(?:text\/html|application\/xhtml\+xml|application\/xml)(?:;|$)/)
+    else
+      throw new Error("Error encountered for XHR Response: #{this}")
+
+  toString: () ->
+    "URL: #{@xhr.responseURL}, " +
+    "ReadyState: #{@xhr.readyState}, " +
+    "Headers: #{@xhr.getAllResponseHeaders()}"

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

@@ -10,7 +10,7 @@ waitForCompleteDownloads = ->
     scriptPromises[url]
   Promise.all(loadingPromises)
 
-class window.TurboHead
+class TurboGraft.TurboHead
   constructor: (@activeDocument, @upstreamDocument) ->
     @activeAssets = extractTrackedAssets(@activeDocument)
     @upstreamAssets = extractTrackedAssets(@upstreamDocument)

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

@@ -1,14 +1,15 @@
 xhr = null
+activeDocument = document
 
 installDocumentReadyPageEventTriggers = ->
-  document.addEventListener 'DOMContentLoaded', ( ->
+  activeDocument.addEventListener 'DOMContentLoaded', ( ->
     triggerEvent 'page:change'
     triggerEvent 'page:update'
   ), true
 
 installJqueryAjaxSuccessPageUpdateTrigger = ->
   if typeof jQuery isnt 'undefined'
-    jQuery(document).on 'ajaxSuccess', (event, xhr, settings) ->
+    jQuery(activeDocument).on 'ajaxSuccess', (event, xhr, settings) ->
       return unless jQuery.trim xhr.responseText
       triggerEvent 'page:update'
 
@@ -20,20 +21,20 @@ browserSupportsPushState =
   window.history and window.history.pushState and window.history.replaceState and historyStateIsDefined
 
 window.triggerEvent = (name, data) ->
-  event = document.createEvent 'Events'
+  event = activeDocument.createEvent 'Events'
   event.data = data if data
   event.initEvent name, true, true
-  document.dispatchEvent event
+  activeDocument.dispatchEvent event
 
 window.triggerEventFor = (name, node, data) ->
-  event = document.createEvent 'Events'
+  event = activeDocument.createEvent 'Events'
   event.data = data if data
   event.initEvent name, true, true
   node.dispatchEvent event
 
 popCookie = (name) ->
-  value = document.cookie.match(new RegExp(name+"=(\\w+)"))?[1].toUpperCase() or ''
-  document.cookie = name + '=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/'
+  value = activeDocument.cookie.match(new RegExp(name+"=(\\w+)"))?[1].toUpperCase() or ''
+  activeDocument.cookie = name + '=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/'
   value
 
 requestMethodIsSafe =
@@ -42,7 +43,7 @@ requestMethodIsSafe =
 browserSupportsTurbolinks = browserSupportsPushState and requestMethodIsSafe
 
 browserSupportsCustomEvents =
-  document.addEventListener and document.createEvent
+  activeDocument.addEventListener and activeDocument.createEvent
 
 if browserSupportsCustomEvents
   installDocumentReadyPageEventTriggers()
@@ -61,7 +62,6 @@ removeNode = (node) ->
 # TODO: clean up everything above me ^
 # TODO: decide on the public API
 class window.Turbolinks
-  createDocument = null
   currentState = null
   referer = null
 
@@ -80,8 +80,11 @@ class window.Turbolinks
     fetchReplacement url, options
 
   @fullPageNavigate: (url) ->
-    triggerEvent('page:before-full-refresh', url: url)
-    document.location.href = url
+    if url?
+      url = (new ComponentUrl(url)).absolute
+      triggerEvent('page:before-full-refresh', url: url)
+      activeDocument.location.href = url
+    return
 
   @pushState: (state, title, url) ->
     window.history.pushState(state, title, url)
@@ -89,6 +92,10 @@ class window.Turbolinks
   @replaceState: (state, title, url) ->
     window.history.replaceState(state, title, url)
 
+  @document: (documentToUse) ->
+    activeDocument = documentToUse if documentToUse
+    activeDocument
+
   fetchReplacement = (url, options) ->
     triggerEvent 'page:fetch', url: url.absolute
 
@@ -111,7 +118,7 @@ class window.Turbolinks
 
     xhr.onload = ->
       if xhr.status >= 500
-        Turbolinks.fullPageNavigate(url.absolute)
+        Turbolinks.fullPageNavigate(url)
       else
         Turbolinks.loadPage(url, xhr, options)
       xhr = null
@@ -121,7 +128,7 @@ class window.Turbolinks
       if xhr.statusText == "abort"
         xhr = null
         return
-      Turbolinks.fullPageNavigate(url.absolute)
+      Turbolinks.fullPageNavigate(url)
 
     xhr.send()
 
@@ -130,21 +137,21 @@ class window.Turbolinks
   @loadPage: (url, xhr, options = {}) ->
     triggerEvent 'page:receive'
     options.updatePushState ?= true
-    if upstreamDocument = processResponse(xhr)
+    if upstreamDocument = new TurboGraft.Response(xhr).document()
       if options.partialReplace
         reflectNewUrl url if options.updatePushState
         updateBody(upstreamDocument, xhr, options)
       else
-        turbohead = new TurboHead(document, upstreamDocument)
+        turbohead = new TurboGraft.TurboHead(activeDocument, upstreamDocument)
         if turbohead.hasAssetConflicts()
-          return Turbolinks.fullPageNavigate(url.absolute)
+          return Turbolinks.fullPageNavigate(url)
         reflectNewUrl url if options.updatePushState
         turbohead.waitForAssets().then((result) ->
           updateBody(upstreamDocument, xhr, options) unless result?.isCanceled
         )
     else
       triggerEvent 'page:error', xhr
-      Turbolinks.fullPageNavigate(url.absolute) if url?
+      Turbolinks.fullPageNavigate(url)
 
   updateBody = (upstreamDocument, xhr, options) ->
     nodes = changePage(
@@ -159,7 +166,7 @@ class window.Turbolinks
     triggerEvent 'page:load', nodes
 
   changePage = (title, body, csrfToken, runScripts, options = {}) ->
-    document.title = title if title
+    activeDocument.title = title if title
     options.onlyKeys ?= []
     options.exceptKeys ?= []
 
@@ -177,7 +184,7 @@ class window.Turbolinks
         deleteRefreshNeverNodes(body)
 
       triggerEvent 'page:before-replace'
-      replaceNode(body, document.body)
+      replaceNode(body, activeDocument.body)
       CSRFToken.update csrfToken if csrfToken?
       setAutofocusElement()
       executeScriptTags() if runScripts
@@ -190,14 +197,14 @@ class window.Turbolinks
   getNodesMatchingRefreshKeys = (keys) ->
     matchingNodes = []
     for key in keys
-      for node in TurboGraft.querySelectorAllTGAttribute(document, 'refresh', key)
+      for node in TurboGraft.querySelectorAllTGAttribute(activeDocument, 'refresh', key)
         matchingNodes.push(node)
 
     return matchingNodes
 
   getNodesWithRefreshAlways = ->
     matchingNodes = []
-    for node in TurboGraft.querySelectorAllTGAttribute(document, 'refresh-always')
+    for node in TurboGraft.querySelectorAllTGAttribute(activeDocument, 'refresh-always')
       matchingNodes.push(node)
 
     return matchingNodes
@@ -210,8 +217,8 @@ class window.Turbolinks
     false
 
   setAutofocusElement = ->
-    autofocusElement = (list = document.querySelectorAll 'input[autofocus], textarea[autofocus]')[list.length - 1]
-    if autofocusElement and document.activeElement isnt autofocusElement
+    autofocusElement = (list = activeDocument.querySelectorAll 'input[autofocus], textarea[autofocus]')[list.length - 1]
+    if autofocusElement and activeDocument.activeElement isnt autofocusElement
       autofocusElement.focus()
 
   deleteRefreshNeverNodes = (body) ->
@@ -260,7 +267,7 @@ class window.Turbolinks
   persistStaticElements = (body) ->
     allNodesToKeep = []
 
-    nodes = TurboGraft.querySelectorAllTGAttribute(document, 'tg-static')
+    nodes = TurboGraft.querySelectorAllTGAttribute(activeDocument, 'tg-static')
     allNodesToKeep.push(node) for node in nodes
 
     keepNodes(body, allNodesToKeep)
@@ -270,22 +277,22 @@ class window.Turbolinks
     allNodesToKeep = []
 
     for key in keys
-      for node in TurboGraft.querySelectorAllTGAttribute(document, 'refresh', key)
+      for node in TurboGraft.querySelectorAllTGAttribute(activeDocument, 'refresh', key)
         allNodesToKeep.push(node)
 
     keepNodes(body, allNodesToKeep)
     return
 
   executeScriptTags = ->
-    scripts = Array::slice.call document.body.querySelectorAll 'script:not([data-turbolinks-eval="false"])'
+    scripts = Array::slice.call activeDocument.body.querySelectorAll 'script:not([data-turbolinks-eval="false"])'
     for script in scripts when script.type in ['', 'text/javascript']
       executeScriptTag(script)
     return
 
   executeScriptTag = (script) ->
-    copy = document.createElement 'script'
+    copy = activeDocument.createElement 'script'
     copy.setAttribute attr.name, attr.value for attr in script.attributes
-    copy.appendChild document.createTextNode script.innerHTML
+    copy.appendChild activeDocument.createTextNode script.innerHTML
     { parentNode, nextSibling } = script
     parentNode.removeChild script
     parentNode.insertBefore copy, nextSibling
@@ -303,16 +310,16 @@ class window.Turbolinks
   reflectRedirectedUrl = (xhr) ->
     if location = xhr.getResponseHeader 'X-XHR-Redirected-To'
       location = new ComponentUrl location
-      preservedHash = if location.hasNoHash() then document.location.hash else ''
+      preservedHash = if location.hasNoHash() then activeDocument.location.hash else ''
       Turbolinks.replaceState currentState, '', location.href + preservedHash
 
     return
 
   rememberReferer = ->
-    referer = document.location.href
+    referer = activeDocument.location.href
 
   @rememberCurrentUrl: ->
-    Turbolinks.replaceState { turbolinks: true, url: document.location.href }, '', document.location.href
+    Turbolinks.replaceState { turbolinks: true, url: activeDocument.location.href }, '', activeDocument.location.href
 
   @rememberCurrentState: ->
     currentState = window.history.state
@@ -321,26 +328,14 @@ class window.Turbolinks
     window.scrollTo page.positionX, page.positionY
 
   resetScrollPosition = ->
-    if document.location.hash
-      document.location.href = document.location.href
+    if activeDocument.location.hash
+      activeDocument.location.href = activeDocument.location.href
     else
       window.scrollTo 0, 0
 
   pageChangePrevented = (url) ->
     !triggerEvent('page:before-change', url)
 
-  processResponse = (xhr) ->
-    clientOrServerError = ->
-      return false if xhr.status == 422 # we want to render form validations
-      400 <= xhr.status < 600
-
-    validContent = ->
-      xhr.getResponseHeader('Content-Type').match /^(?:text\/html|application\/xhtml\+xml|application\/xml)(?:;|$)/
-
-    if !clientOrServerError() && validContent()
-      upstreamDocument = createDocument(xhr.responseText)
-      return upstreamDocument
-
   installHistoryChangeHandler = (event) ->
     if event.state?.turbolinks
       Turbolinks.visit event.target.location.href
@@ -350,26 +345,15 @@ class window.Turbolinks
   bypassOnLoadPopstate = (fn) ->
     setTimeout fn, 500
 
-  createDocument = (html) ->
-    if /<(html|body)/i.test(html)
-      doc = document.documentElement.cloneNode()
-      doc.innerHTML = html
-    else
-      doc = document.documentElement.cloneNode(true)
-      doc.querySelector('body').innerHTML = html
-    doc.head = doc.querySelector('head')
-    doc.body = doc.querySelector('body')
-    doc
-
   if browserSupportsTurbolinks
     @visit = fetch
     @rememberCurrentUrl()
     @rememberCurrentState()
 
-    document.addEventListener 'click', Click.installHandlerLast, true
+    activeDocument.addEventListener 'click', Click.installHandlerLast, true
 
     bypassOnLoadPopstate ->
       window.addEventListener 'popstate', installHistoryChangeHandler, false
 
   else
-    @visit = (url) -> document.location.href = url
+    @visit = (url) -> activeDocument.location.href = url

data/lib/turbograft.rb

@@ -35,10 +35,8 @@ module TurboGraft
       end
 
       ActiveSupport.on_load(:action_view) do
-        (ActionView::RoutingUrlFor rescue ActionView::Helpers::UrlHelper).module_eval do
-          prepend XHRUrlFor
-        end
-      end unless RUBY_VERSION =~ /^1\.8/
+        (ActionView::RoutingUrlFor rescue ActionView::Helpers::UrlHelper).prepend(XHRUrlFor)
+      end
     end
   end
 end

data/lib/turbograft/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -224,10 +224,12 @@ files:
 - lib/assets/javascripts/turbograft/click.coffee
 - lib/assets/javascripts/turbograft/component_url.coffee
 - lib/assets/javascripts/turbograft/csrf_token.coffee
+- lib/assets/javascripts/turbograft/document.coffee
 - lib/assets/javascripts/turbograft/initializers.coffee
 - lib/assets/javascripts/turbograft/link.coffee
 - lib/assets/javascripts/turbograft/page.coffee
 - lib/assets/javascripts/turbograft/remote.coffee
+- lib/assets/javascripts/turbograft/response.coffee
 - lib/assets/javascripts/turbograft/turbohead.coffee
 - lib/assets/javascripts/turbograft/turbolinks.coffee
 - lib/turbograft.rb
@@ -247,9 +249,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="