turbolinks 0.5.2 → 0.6.0

data/README.md

@@ -50,7 +50,11 @@ Also, Turbolinks is installed as the last click handler for links. So if you ins
 Asset change detection
 ----------------------
 
-Turbolinks will remember what assets were linked or referenced in the head of the initial page. If those assets change, either more or added or existing ones have a new URL, the page will do a full reload instead of going through Turbolinks. This ensures that all Turbolinks sessions will always be running off your latest JavaScript and CSS.
+You can track certain assets, like application.js and application.css, that you want to ensure are always of the latest version inside a Turbolinks session. This is done by marking those asset links with data-turbolinks-track, like so:
+
+  <link href="/assets/application.css?9bd64a86adb3cd9ab3b16e9dca67a33a.css" media="screen" rel="stylesheet" type="text/css" data-turbolinks-track>
+
+If those assets change URLs (embed an md5 stamp to ensure this), the page will do a full reload instead of going through Turbolinks. This ensures that all Turbolinks sessions will always be running off your latest JavaScript and CSS.
 
 When this happens, you'll technically be requesting the same page twice. Once through Turbolinks to detect that the assets changed, and then again when we do a full redirect to that page.
 
@@ -73,6 +77,14 @@ Full speed for pushState browsers, graceful fallback for everything else
 Like pjax, this naturally only works with browsers capable of pushState. But of course we fall back gracefully to full page reloads for browsers that do not support it.
 
 
+Compatibility
+-------------
+
+Turbolinks is designed to work with any browser that fully supports pushState and all the related APIs. This includes Safari 6.0+ (but not Safari 5.1.x!), IE10, and latest Chromes and Firefoxes.
+
+Do note that existing JavaScript libraries may not all be compatible with Turbolinks out of the box due to the change in instantiation cycle. You might very well have to modify them to work with Turbolinks' new set of events.
+
+
 Installation
 ------------
 

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

@@ -1,7 +1,7 @@
 initialized    = false
 currentState   = null
 referer        = document.location.href
-assets         = []
+trackingAssets = []
 pageCache      = {}
 createDocument = null
 
@@ -72,7 +72,16 @@ changePage = (title, body, runScripts) ->
   triggerEvent 'page:change'
 
 executeScriptTags = ->
-  eval(script.innerHTML) for script in document.body.getElementsByTagName 'script' when script.type in ['', 'text/javascript']
+  for script in document.body.getElementsByTagName 'script' when script.type in ['', 'text/javascript']
+    if script.src? and script.src isnt '' and not script.getAttribute('data-turbolinks-evaluated')?
+      copy = document.createElement 'script'
+      copy.setAttribute attr.name, attr.value for attr in script.attributes
+      copy.setAttribute 'data-turbolinks-evaluated', ''
+      parent = script.parentNode
+      parent.removeChild script
+      parent.insertBefore copy, parent.childNodes[0]
+    else
+      window.eval(script.innerHTML)
 
 
 reflectNewUrl = (url) ->
@@ -81,8 +90,8 @@ reflectNewUrl = (url) ->
     window.history.pushState { turbolinks: true, position: currentState.position + 1 }, '', url
 
 reflectRedirectedUrl = (xhr) ->
-  if (location = xhr.getResponseHeader('X-XHR-Current-Location'))
-    window.history.replaceState currentState, '', location
+  unless (location = xhr.getResponseHeader 'X-XHR-Current-Location') is document.location.pathname + document.location.search
+    window.history.replaceState currentState, '', location + document.location.hash
 
 rememberCurrentUrl = ->
   window.history.replaceState { turbolinks: true, position: Date.now() }, '', document.location.href
@@ -90,8 +99,8 @@ rememberCurrentUrl = ->
 rememberCurrentState = ->
   currentState = window.history.state
 
-rememberCurrentAssets = ->
-  assets = extractAssets document
+rememberCurrentTrackingAssets = ->
+  trackingAssets = extractTrackAssets document
 
 rememberInitialPage = ->
   unless initialized
@@ -112,13 +121,13 @@ triggerEvent = (name) ->
   event.initEvent name, true, true
   document.dispatchEvent event
 
+extractTrackAssets = (doc) ->
+  (node.src || node.href) for node in doc.head.childNodes when node.getAttribute?('data-turbolinks-track')?
 
-extractAssets = (doc) ->
-  (node.src || node.href) for node in doc.head.childNodes when node.src or node.href
 
 assetsChanged = (doc)->
-  extractedAssets = extractAssets doc
-  extractedAssets.length isnt assets.length or intersection(extractedAssets, assets).length != assets.length
+  extractedTrackAssets = extractTrackAssets doc
+  extractedTrackAssets.length isnt trackingAssets.length or intersection(extractedTrackAssets, trackingAssets).length != trackingAssets.length
 
 intersection = (a, b) ->
   [a, b] = [b, a] if a.length > b.length
@@ -163,7 +172,7 @@ handleClick = (event) ->
 
 extractLink = (event) ->
   link = event.target
-  link = link.parentNode until link is document or !link or link.nodeName is 'A'
+  link = link.parentNode until !link.parentNode or link.nodeName is 'A'
   link
 
 crossOriginLink = (link) ->
@@ -196,7 +205,7 @@ browserSupportsPushState =
   window.history and window.history.pushState and window.history.replaceState and window.history.state != undefined
 
 if browserSupportsPushState
-  rememberCurrentAssets()
+  rememberCurrentTrackingAssets()
   document.addEventListener 'click', installClickHandlerLast, true
 
   window.addEventListener 'popstate', (event) ->

data/test/index.html

@@ -16,10 +16,10 @@
     <li><a href="/other.html"><span>Wrapped link</span></a></li>
     <li><a href="http://www.google.com/">Cross origin</a></li>
     <li><a href="/other.html" onclick="if(!confirm('follow link?')) { return false}">Confirm Fire Order</a></li>
-    <li><a href="/reload.html"><span>Asset Change</span></a></li>
+    <li><a href="/reload.html"><span>New assets track </span></a></li>
     <li><a href="/dummy.gif?12345">Query Param Image Link</a></li>
     <li><a href="#">Hash link</a></li>
-    <li><a href="/reload.html#foo">Asset Change with hash link</a></li>
+    <li><a href="/reload.html#foo">New assets track with hash link</a></li>
   </ul>
 
   <div style="background:#ccc;height:5000px;width:200px;">

data/test/reload.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>Home</title>
-  <script type="text/javascript" src="/js/turbolinks.js?1"></script>
+  <script type="text/javascript" src="/js/turbolinks.js?1" data-turbolinks-track='true'></script>
   <script type="text/javascript">
     document.addEventListener("page:change", function() {
       console.log("page changed");

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks
 version: !ruby/object:Gem::Version
-  version: 0.5.2
   prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: coffee-rails
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: 
 email: david@loudthinking.com
 executables: []
@@ -49,17 +49,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23