upjs-rails 0.3.3 → 0.4.0

data/lib/assets/javascripts/up/motion.js.coffee

@@ -82,10 +82,10 @@ up.motion = (->
     else if u.isHash(animation)
       u.cssAnimate($element, animation, options)
     else
-      u.error("Unknown animation type", animation)
+      u.error("Unknown animation type %o", animation)
       
   findAnimation = (name) ->
-    animations[name] or u.error("Unknown animation", animation)
+    animations[name] or u.error("Unknown animation %o", animation)
     
   GHOSTING_PROMISE_KEY = 'up-ghosting-promise'
 
@@ -134,14 +134,14 @@ up.motion = (->
   
   finishGhosting = ($element) ->
     if existingGhosting = $element.data(GHOSTING_PROMISE_KEY)
-      console.log("EXISTING", existingGhosting)
+      u.debug('Canceling existing ghosting on %o', $element)
       existingGhosting.resolve?()
       
   assertIsDeferred = (object, origin) ->
     if u.isDeferred(object)
       object
     else
-      u.error("Did not return a promise with .then and .resolve methods: ", origin)
+      u.error("Did not return a promise with .then and .resolve methods: %o", origin)
 
   ###*
   Performs a transition between two elements.
@@ -178,8 +178,10 @@ up.motion = (->
       $new = $(target)
       finish($old)
       finish($new)
-      transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
-      if transition
+      if transitionOrName == 'none'
+        # don't create ghosts if we aren't really transitioning
+        none()
+      else if transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
         withGhosts $old, $new, ($oldGhost, $newGhost) ->
           assertIsDeferred(transition($oldGhost, $newGhost, options), transitionOrName)
       else if animation = animations[transitionOrName]
@@ -194,7 +196,7 @@ up.motion = (->
           )
         morph($old, $new, transition, options)
       else
-        u.error("Unknown transition: #{transitionOrName}")
+        u.error("Unknown transition %o", transitionOrName)
     else
       # Skip ghosting and all the other stuff that can go wrong
       # in ancient browsers

data/lib/assets/javascripts/up/navigation.js.coffee

@@ -29,7 +29,7 @@ up.navigation = (->
 
   CLASS_ACTIVE = 'up-active'
   CLASS_CURRENT = 'up-current'
-  SELECTOR_SECTION = 'a[href], a[up-target], [up-follow], [up-modal], [up-popup]'
+  SELECTOR_SECTION = 'a[href], a[up-target], [up-follow], [up-modal], [up-popup], [up-source]'
   SELECTOR_ACTIVE = ".#{CLASS_ACTIVE}"
   
   normalizeUrl = (url) ->
@@ -38,19 +38,29 @@ up.navigation = (->
         search: false
         stripTrailingSlash: true
       )
+    
+  sectionUrls = ($section) ->
+    urls = []
+    if $link = up.link.resolve($section)
+      for attr in ['href', 'up-follow', 'up-source']
+        if url = u.presentAttr($link, attr)
+          url = normalizeUrl(url)
+          urls.push(url)
+    urls
 
   locationChanged = ->
-    windowLocation = normalizeUrl(up.browser.url())
-    modalLocation = normalizeUrl(up.modal.source())
-    popupLocation = normalizeUrl(up.popup.source())
+    currentUrls = u.stringSet [
+      normalizeUrl(up.browser.url()),
+      normalizeUrl(up.modal.source()),
+      normalizeUrl(up.popup.source())
+    ]
     
     u.each $(SELECTOR_SECTION), (section) ->
       $section = $(section)
       # if $section is marked up with up-follow,
       # the actual link might be a child element.
-      url = up.link.resolveUrl($section)
-      url = normalizeUrl(url)
-      if url == windowLocation || url == modalLocation || url == popupLocation
+      urls = sectionUrls($section)
+      if currentUrls.includesAny(urls)
         $section.addClass(CLASS_CURRENT)
       else
         $section.removeClass(CLASS_CURRENT)

data/lib/assets/javascripts/up/popup.js.coffee

@@ -54,7 +54,7 @@ up.popup = (->
         left: linkBox.left
         bottom: linkBox.top
       else
-        u.error("Unknown origin", origin)
+        u.error("Unknown origin %o", origin)
     $popup.attr('up-origin', origin)
     $popup.css(css)
     ensureInViewport($popup)
@@ -116,7 +116,7 @@ up.popup = (->
   ###
   open = (linkOrSelector, options) ->
     $link = $(linkOrSelector)
-
+    
     options = u.options(options)
     url = u.option($link.attr('href'))
     selector = u.option(options.target, $link.attr('up-popup'), 'body')
@@ -128,8 +128,6 @@ up.popup = (->
     close()
     $popup = createHiddenPopup($link, selector, sticky)
     
-#    console.log("before replace", $link, $popup)
-    
     up.replace(selector, url,
       history: history
       # source: true

data/lib/assets/javascripts/up/proxy.js.coffee

@@ -0,0 +1,179 @@
+###*
+Caching and preloading
+======================
+
+Document me.
+
+@class up.proxy  
+###
+up.proxy = (->
+
+  config =
+    preloadDelay: 50
+    cacheSize: 70
+    cacheExpiry: 1000 * 60 * 5
+
+  ###*
+  @method up.proxy.defaults
+  @param {Number} [preloadDelay]
+  @param {Number} [cacheSize]
+  @param {Number} [cacheExpiry]
+    The number of milliseconds until a cache entry expires.
+  ###
+  defaults = (options) ->
+    u.extend(config, options)
+  
+  cache = {}
+  
+  u = up.util
+  
+  $waitingLink = null
+  delayTimer = null
+  
+  cacheKey = (request) ->
+    normalizeRequest(request)
+    [ request.url, 
+      request.method, 
+      request.selector
+    ].join('|')
+    
+  trim = ->
+    keys = u.keys(cache)
+    if keys.length > config.cacheSize
+      oldestKey = null
+      oldestTimestamp = null
+      u.each keys, (key) ->
+        promise = cache[key] # we don't need to call cacheKey here
+        timestamp = promise.timestamp
+        if !oldestTimestamp || oldestTimestamp > timestamp
+          oldestKey = key
+          oldestTimestamp = timestamp
+      delete cache[oldestKey] if oldestKey
+    
+  timestamp = ->
+    (new Date()).valueOf()
+    
+  normalizeRequest = (request) ->
+    debugger unless u.isHash(request)
+    unless request._requestNormalized
+      request.method = u.normalizeMethod(request.method)
+      request.url = u.normalizeUrl(request.url) if request.url
+      request.selector ||= 'body'
+      request._requestNormalized = true
+    request
+    
+  alias = (oldRequest, newRequest) ->
+    u.debug("Aliasing %o to %o", oldRequest, newRequest)
+    if promise = get(oldRequest)
+      set(newRequest, promise)
+  
+  ###
+  @method up.proxy.ajax
+  @param {String} options.url
+  @param {String} [options.method='GET']
+  @param {String} [options.selector]
+  ###
+  ajax = (request) ->
+    if !isIdempotent(request)
+      clear()
+      # We don't cache non-GET responses
+      promise = u.ajax(request)
+    else if promise = get(request)
+      touch(promise)
+    else
+      promise = u.ajax(request)
+      set(request, promise)
+    promise
+    
+  isIdempotent = (request) ->
+    normalizeRequest(request)
+    request.method == 'GET'
+    
+  ensureIsIdempotent = (request) ->
+    isIdempotent(request) or u.error("Won't preload non-GET request %o", request)
+    
+  isFresh = (promise) ->
+    timeSinceTouch = timestamp() - promise.timestamp
+    timeSinceTouch < config.cacheExpiry
+    
+  touch = (promise) ->
+    promise.timestamp = timestamp()
+    
+  get = (request) ->
+    key = cacheKey(request)
+    if promise = cache[key]
+      if !isFresh(promise)
+        u.debug("Discarding stale cache entry for %o (%o)", request.url, request)
+        remove(request)
+        undefined
+      else
+        u.debug("Cache hit for %o (%o)", request.url, request)
+#        $('body').css('background-color': 'green')
+        promise
+    else
+      u.debug("Cache miss for %o (%o)", request.url, request)
+#      $('body').css('background-color': 'yellow')
+      undefined
+      
+  set = (request, promise) ->
+    trim()
+    key = cacheKey(request)
+    cache[key] = promise
+    touch(promise)
+    promise
+    
+  remove = (request) ->
+    key = cacheKey(request)
+    delete cache[key]
+    
+  clear = ->
+    cache = {}
+  
+  checkPreload = ($link) ->
+    delay = parseInt(u.presentAttr($link, 'up-delay')) || config.preloadDelay 
+    unless $link.is($waitingLink)
+      $waitingLink = $link
+      cancelDelay()
+      curriedPreload = -> preload($link)
+      startDelay(curriedPreload, delay)
+      
+  startDelay = (block, delay) ->
+    delayTimer = setTimeout(block, delay)
+    
+  cancelDelay = ->
+    clearTimeout(delayTimer)
+    delayTimer = null
+
+  preload = (link, options) ->
+    options = u.options()
+    ensureIsIdempotent(options)
+    u.debug("Preloading %o", link)
+    options.preload = true
+    up.link.follow(link, options)
+    
+  reset = ->
+    cancelDelay()
+    cache = {}
+
+  up.bus.on 'framework:reset', reset
+
+  ###
+  @method [up-preload]
+  @ujs
+  ###
+  up.on 'mouseover mousedown touchstart', '[up-preload]', (event, $element) ->
+    # Don't do anything if we are hovering over the child
+    # of a link. The actual link will receive the event
+    # and bubble in a second.
+    unless up.link.childClicked(event, $element) 
+      checkPreload(up.link.resolve($element))
+
+  preload: preload
+  ajax: ajax
+  get: get
+  set: set
+  alias: alias
+  clear: clear
+  defaults: defaults
+  
+)()

data/lib/assets/javascripts/up/tooltip.js.coffee

@@ -31,7 +31,7 @@ up.tooltip = (->
         left: linkBox.left + 0.5 * (linkBox.width - tooltipBox.width)
         top: linkBox.top + linkBox.height
       else
-        u.error("Unknown origin", origin)
+        u.error("Unknown origin %o", origin)
     $tooltip.attr('up-origin', origin)
     $tooltip.css(css)
 
@@ -51,7 +51,7 @@ up.tooltip = (->
   ###
   open = (linkOrSelector, options = {}) ->
     $link = $(linkOrSelector)
-    html = u.option(options.html, $link.attr('up-tooltip'))
+    html = u.option(options.html, $link.attr('up-tooltip'), $link.attr('title'))
     origin = u.option(options.origin, $link.attr('up-origin'), 'top')
     animation = u.option(options.animation, $link.attr('up-animation'), 'fade-in')
     close()
@@ -78,6 +78,10 @@ up.tooltip = (->
   Displays a tooltip when hovering the mouse over this element:
 
       <a href="/decks" up-tooltip="Show all decks">Decks</a>
+  
+  You can also make an existing `title` attribute appear as a tooltip:
+  
+      <a href="/decks" title="Show all decks" up-tooltip>Decks</a>
 
   @method [up-tooltip]
   @ujs

data/lib/assets/javascripts/up/util.js.coffee

@@ -1,3 +1,4 @@
+
 ###*
 Utility functions
 =================
@@ -57,6 +58,16 @@ up.util = (->
     normalized += anchor.search unless options?.search == false
     normalized
 
+  ###
+  @method up.util.normalizeMethod
+  @protected
+  ###
+  normalizeMethod = (method) ->
+    if method
+      method.toUpperCase()
+    else
+      'GET'
+
   $createElementFromSelector = (selector) ->
     path = selector.split(/[ >]/)
     $root = null
@@ -87,15 +98,55 @@ up.util = (->
     element = document.createElement(tagName)
     element.innerHTML = html if isPresent(html)
     element
+    
+  debug = (args...) ->
+    args = toArray(args)
+    message = args.shift()
+    message = "[UP] #{message}"
+    placeHolderCount = message.match(CONSOLE_PLACEHOLDERS)?.length || 0
+    if isFunction(last(args)) && placeHolderCount < args.length
+      group = args.pop()
+    value = console.debug(message, args...)
+    if group
+      console.groupCollapsed()
+      try
+        value = group()
+      finally
+        console.groupEnd()
+    value
 
   error = (args...) ->
-    console.log("[UP] Error", args...)
-    asString = if args.length == 1 && up.util.isString(args[0]) then args[0] else JSON.stringify(args)
-    alert asString
+    args[0] = "[UP] #{args[0]}"
+    console.error(args...)
+    asString = stringifyConsoleArgs(args)
+    $error = presence($('.up-error')) || $('<div class="up-error"></div>').prependTo('body')
+    # $error = $('body')
+    $error.addClass('up-error')
+    $error.text(asString)
+    # alert "#{asString}\n\nOpen the developer console for details."
     throw asString
+    
+  CONSOLE_PLACEHOLDERS = /\%[odisf]/g
+    
+  stringifyConsoleArgs = (args) ->
+    message = args[0]
+    i = 0
+    maxLength = 30
+    message.replace CONSOLE_PLACEHOLDERS, ->
+      i += 1
+      arg = args[i]
+      argType = (typeof arg)
+      if argType == 'string'
+        arg = arg.replace(/\s+/g, ' ')
+        arg = "#{arg.substr(0, maxLength)}…" if arg.length > maxLength
+        "\"#{arg}\""
+      else if argType == 'number'
+        arg.toString()
+      else
+        "(#{argType})"
 
   createSelectorFromElement = ($element) ->
-    console.log("Creating selector from element", $element)
+    debug("Creating selector from element %o", $element)
     classes = if classString = $element.attr("class") then classString.split(" ") else []
     id = $element.attr("id")
     selector = $element.prop("tagName").toLowerCase()
@@ -216,6 +267,9 @@ up.util = (->
   # https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray
   isArray = Array.isArray || 
       (object) -> Object.prototype.toString.call(object) == '[object Array]'
+        
+  toArray = (object) ->
+    Array.prototype.slice.call(object)
 
   copy = (object)  ->
     if isArray(object)
@@ -298,8 +352,11 @@ up.util = (->
     
   temporaryCss = ($element, css, block) ->
     oldCss = $element.css(keys(css))
+#    debug("Stored old CSS", oldCss)
     $element.css(css)
-    memo = -> $element.css(oldCss)
+    memo = ->
+#      debug("Restoring CSS %o on %o", oldCss, $element)
+      $element.css(oldCss)
     if block
       block()
       memo()
@@ -451,7 +508,10 @@ up.util = (->
     String(object) == "false"
     
   locationFromXhr = (xhr) ->
-    xhr.getResponseHeader('X-Up-Current-Location')
+    xhr.getResponseHeader('X-Up-Location')
+    
+  methodFromXhr = (xhr) ->
+    xhr.getResponseHeader('X-Up-Method')
     
 #  willChangeHistory = (historyOption) ->
 #    isPresent(historyOption) && !castsToFalse(historyOption)
@@ -477,6 +537,27 @@ up.util = (->
       each deferreds, (deferred) -> deferred.resolve?()
     joined
 
+  stringSet = (array) ->
+    set = {}
+    
+    includes = (string) ->
+      set[key(string)]
+      
+    includesAny = (strings) ->
+      detect strings, includes
+      
+    put = (string) ->
+      set[key(string)] = true
+      
+    key = (string) ->
+      "_#{string}"
+      
+    put(string) for string in array
+    
+    put: put
+    includes: includes
+    includesAny: includesAny
+
 #  memoArray = ->
 #    array = []
 #    defaults = []
@@ -496,6 +577,7 @@ up.util = (->
   presentAttr: presentAttr
   createElement: createElement
   normalizeUrl: normalizeUrl
+  normalizeMethod: normalizeMethod
   createElementFromHtml: createElementFromHtml
   $createElementFromSelector: $createElementFromSelector
   createSelectorFromElement: createSelectorFromElement
@@ -507,6 +589,7 @@ up.util = (->
   options: options
   option: option
   error: error
+  debug: debug
   each: each
   detect: detect
   select: select
@@ -540,9 +623,11 @@ up.util = (->
   findWithSelf: findWithSelf
   contains: contains
   isArray: isArray
+  toArray: toArray
   castsToTrue: castsToTrue
   castsToFalse: castsToFalse
   locationFromXhr: locationFromXhr
+  methodFromXhr: methodFromXhr
   clientSize: clientSize
   only: only
   trim: trim
@@ -550,5 +635,6 @@ up.util = (->
   resolvedPromise: resolvedPromise
   resolvedDeferred: resolvedDeferred
   resolvableWhen: resolvableWhen
+  stringSet: stringSet
 
 )()

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

@@ -6,6 +6,7 @@
 #= require up/magic
 #= require up/history
 #= require up/motion
+#= require up/proxy
 #= require up/link
 #= require up/form
 #= require up/popup
@@ -15,8 +16,10 @@
 #= require up/marker
 #= require_self
 
-if up.browser.isSupported()
+up.browser.ensureRecentJquery()
 
+if up.browser.isSupported()
+  
   up.browser.ensureConsoleExists()
 
   up.bus.emit('framework:ready')

data/lib/assets/stylesheets/up/error.css.sass

@@ -0,0 +1,15 @@
+.up-error
+  background-color: #e10
+  color: white
+  padding: 5px
+  font-family: arial, helvetica, sans-serif
+  font-weight: bold
+  font-size: 14px
+  line-height: 18px
+  position: fixed
+  left: 0
+  top: 0
+  max-width: 100%
+  box-sizing: border-box
+  z-index: 99999999
+  

data/lib/assets/stylesheets/up/tooltip.css.sass

@@ -9,6 +9,7 @@ $background: #666
   background-color: $background
   color: white
   padding: 6px 9px
+  white-space: nowrap
   //box-shadow: 0 0 4px rgba(0, 0, 0, 0.2)
   
   &[up-origin=top]

data/lib/upjs/rails/current_location.rb

@@ -9,7 +9,8 @@ module Upjs
       private
       
       def set_header_for_current_location
-        headers['X-Up-Current-Location'] = request.fullpath
+        headers['X-Up-Location'] = request.original_url
+        headers['X-Up-Method'] = request.method
       end
 
       ActionController::Base.include(self)

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.3.2)
+    upjs-rails (0.3.3)
       rails (>= 3)
 
 GEM

data/spec_app/spec/javascripts/up/flow_spec.js.coffee

@@ -14,18 +14,20 @@ describe 'up.flow', ->
           affix('.before').text('old-before')
           affix('.middle').text('old-middle')
           affix('.after').text('old-after')
-    
+
+          @responseText =
+            """
+            <div class="before">new-before</div>
+            <div class="middle">new-middle</div>
+            <div class="after">new-after</div>
+            """
+
           @respond = ->
             jasmine.Ajax.requests.mostRecent().respondWith
               status: 200
               contentType: 'text/html'
-              responseText:
-                """
-                <div class="before">new-before</div>
-                <div class="middle">new-middle</div>
-                <div class="after">new-after</div>
-                """      
-        
+              responseText: @responseText
+
         it 'replaces the given selector with the same selector from a freshly fetched page', (done) ->
           @request = up.replace('.middle', '/path')
           @respond()
@@ -57,7 +59,34 @@ describe 'up.flow', ->
             expect($('.middle')).toHaveText('new-middle')
             expect($('.after')).toHaveText('new-after')
             done()
-            
+
+        it 'executes those script-tags in the response that get inserted into the DOM', (done) ->
+          window.scriptTagExecuted = jasmine.createSpy('scriptTagExecuted')
+
+          @responseText =
+            """
+            <div class="before">
+              new-before
+              <script type="text/javascript">
+                window.scriptTagExecuted('before')
+              </script>
+            </div>
+            <div class="middle">
+              new-middle
+              <script type="text/javascript">
+                window.scriptTagExecuted('middle')
+              </script>
+            </div>
+            """
+
+          @request = up.replace('.middle', '/path')
+          @respond()
+
+          @request.then ->
+            expect(window.scriptTagExecuted).not.toHaveBeenCalledWith('before')
+            expect(window.scriptTagExecuted).toHaveBeenCalledWith('middle')
+            done()
+
       else
         
         it 'makes a full page load', ->

data/spec_app/spec/javascripts/up/form_spec.js.coffee

@@ -72,12 +72,12 @@ describe 'up.form', ->
             expect($('body')).not.toHaveText('text-after')
             done()
         
-        it 'respects a X-Up-Current-Location header that the server sends in case of a redirect', (done) ->
+        it 'respects a X-Up-Location header that the server sends in case of a redirect', (done) ->
     
           @request.respondWith
             status: 200
             contentType: 'text/html'
-            responseHeaders: { 'X-Up-Current-Location': '/other/path' }
+            responseHeaders: { 'X-Up-Location': '/other/path' }
             responseText:
               """
               <div class="response">