upjs-rails 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0282df3df026ad3d48b9f10614eb73790b146243
-  data.tar.gz: 1fd5ddad76f7ab45668da13b90e7727a24d7f4ac
+  metadata.gz: 6d1b52fa522fbde804ecf3db0de54efa03a5efa5
+  data.tar.gz: 2f8c0c4b0589ffb165a1237caa492a41922a3157
 SHA512:
-  metadata.gz: 5b2c33b0c3835ebac5f42bd58f90536da481cce4ab252b3295f1b6d727ba875ec2a0543fc3e28baa16500ae8cd6767d3fe1af41625afd9740017c5f982dd24b9
-  data.tar.gz: 10773603d25db7f0aaf99eea17926ab4b253378834900780f95627c4b71eeec7f87e9cbb515eee1151b7ff4b26b682ff9fa5a4a1f36c2ed3e8e88876c7b2c8d6
+  metadata.gz: 688084094aeea1ae88a73f96d5243e632e82b089376e95d3ee0cf37e77b57ef5b10259bdc0ae3f1ddf25b3d005b7bd07ee43d1530f012b9f8c6dd51bcd5660ec
+  data.tar.gz: af2131873f4c54165dc49780fb724b96bb4ab6b5ae0c830abb18d7469e3b01b9da6cf689066579089c0dd5325c33cd61a5b9f8f1d5b847b2629f6c0e61aef412

data/CHANGELOG.md

@@ -10,9 +10,18 @@ Unreleased
 
 ### Compatible changes
 
+
 ### Breaking changes
 
 
+0.18.1
+------
+
+### Compatible changes
+
+- The logging output to the developer console is now much quieter and more useful
+
+
 0.18.0
 ------
 

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

@@ -1,5 +1,6 @@
 #= require up/module
 #= require up/util
+#= require up/log
 #= require up/browser
 #= require up/bus
 #= require up/syntax
@@ -17,4 +18,3 @@
 #= require up/rails
 
 up.boot()
-

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

@@ -56,9 +56,43 @@ up.browser = (($) ->
       console[stream](args...)
     else
       # IE <= 9 cannot pass varargs to console.log using Function#apply because IE
-      message = u.evalConsoleTemplate(args...)
+      message = sprintf(args...)
       console[stream](message)
 
+  CONSOLE_PLACEHOLDERS = /\%[odisf]/g
+
+  ###*
+  See https://developer.mozilla.org/en-US/docs/Web/API/Console#Using_string_substitutions
+
+  @function up.browser.sprintf
+  @internal
+  ###
+  sprintf = (message, args...) ->
+    i = 0
+    maxLength = 80
+    message.replace CONSOLE_PLACEHOLDERS, ->
+      arg = args[i]
+      argType = (typeof arg)
+      if argType == 'string'
+        arg = arg.replace(/\s+/g, ' ')
+        arg = "#{arg.substr(0, maxLength)}…" if arg.length > maxLength
+        arg = "\"#{arg}\""
+      else if argType == 'undefined'
+        # JSON.stringify(undefined) is actually undefined
+        arg = 'undefined'
+      else if argType == 'number' || argType == 'function'
+        arg = arg.toString()
+      else
+        arg = JSON.stringify(arg)
+      if arg.length > maxLength
+        arg = "#{arg.substr(0, maxLength)} …"
+        # For truncated objects or functions, add a trailing brace so
+        # long log lines are easier to parse visually
+        if argType == 'object' || argType == 'function'
+          arg += " }"
+      i += 1
+      arg
+
   url = ->
     location.href
 
@@ -193,6 +227,14 @@ up.browser = (($) ->
   isSupported = ->
     (!isIE8OrWorse()) && isRecentJQuery()
 
+  ###*
+  @internal
+  ###
+  installPolyfills = ->
+    console.group ||= (args...) -> puts('group', args...)
+    console.groupCollapsed ||= (args...) -> puts('groupCollapsed', args...)
+    console.groupEnd ||= (args...) -> puts('groupEnd', args...)
+
   url: url
   loadPage: loadPage
   confirm: confirm
@@ -201,6 +243,8 @@ up.browser = (($) ->
   canInputEvent: canInputEvent
   canLogSubstitution: canLogSubstitution
   isSupported: isSupported
+  installPolyfills: installPolyfills
   puts: puts
+  sprintf: sprintf
 
 )(jQuery)

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

@@ -234,15 +234,41 @@ up.bus = (($) ->
     or `stopPropagation()`.
   @param {jQuery} [eventProps.$element=$(document)]
     The element on which the event is triggered.
+  @param {String|Array} [eventProps.message]
+    A message to print to the console when the event is emitted.
+    If omitted, a default message is printed.
+    Set this to `false` to prevent any console output.
   @experimental
   ###
   emit = (eventName, eventProps = {}) ->
     event = $.Event(eventName, eventProps)
-    $target = eventProps.$element || $(document)
-    u.debug("Emitting %o on %o with props %o", eventName, $target, eventProps)
+    if $target = eventProps.$element
+      delete eventProps.$element
+    else
+      $target = $(document)
+    logEmission(eventName, eventProps)
     $target.trigger(event)
     event
 
+  logEmission = (eventName, eventProps) ->
+    if eventProps.hasOwnProperty('message')
+      niceMessage = eventProps.message
+      delete eventProps.message
+      if u.isArray(niceMessage)
+        [niceMessage, niceMessageArgs...] = niceMessage
+      else
+        niceMessageArgs = []
+      if niceMessage
+        if u.isPresent(eventProps)
+          up.puts "#{niceMessage} (%s (%o))", niceMessageArgs..., eventName, eventProps
+        else
+          up.puts "#{niceMessage} (%s)", niceMessageArgs..., eventName
+    else
+      if u.isPresent(eventProps)
+        up.puts 'Emitted event %s (%o)', eventName, eventProps
+      else
+        up.puts 'Emitted event %s', eventName
+
   ###*
   [Emits an event](/up.emit) and returns whether any listener
   has prevented the default action.
@@ -250,11 +276,16 @@ up.bus = (($) ->
   @function up.bus.nobodyPrevents
   @param {String} eventName
   @param {Object} eventProps
+  @param {String|Array} [eventProps.message]
   @experimental
   ###
   nobodyPrevents = (args...) ->
     event = emit(args...)
-    not event.isDefaultPrevented()
+    if event.isDefaultPrevented()
+      up.puts "An observer prevented the event %s", args[0]
+      false
+    else
+      true
 
   ###*
   Registers an event listener to be called when the user
@@ -281,7 +312,7 @@ up.bus = (($) ->
   ###
   snapshot = ->
     for description in liveUpDescriptions
-      description._isDefault = true
+      description.isDefault = true
 
   ###*
   Resets the list of registered event listeners to the
@@ -290,7 +321,7 @@ up.bus = (($) ->
   @internal
   ###
   restoreSnapshot = ->
-    doomedDescriptions = u.reject(liveUpDescriptions, (description) -> description._isDefault)
+    doomedDescriptions = u.reject(liveUpDescriptions, (description) -> description.isDefault)
     unbind(description...) for description in doomedDescriptions
 
   ###*
@@ -305,7 +336,7 @@ up.bus = (($) ->
   @experimental
   ###
   emitReset = ->
-    up.emit('up:framework:reset')
+    up.emit('up:framework:reset', message: 'Resetting framework')
 
   ###*
   This event is [emitted](/up.emit) when Up.js is [reset](/up.reset) during unit tests.
@@ -329,7 +360,10 @@ up.bus = (($) ->
   ###
   boot = ->
     if up.browser.isSupported()
-      up.emit('up:framework:boot')
+      # Can't decouple this via the event bus, since up.bus would require
+      # up.browser.isSupported() and up.browser would require up.on()
+      up.browser.installPolyfills()
+      up.emit('up:framework:boot', message: 'Booting framework')
 
   ###*
   This event is [emitted](/up.emit) when Up.js [boots](/up.boot).

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

@@ -49,7 +49,7 @@ up.flow = (($) ->
           originSelector = u.selectorForElement(origin)
           selector = selector.replace(/\&/, originSelector)
         else
-          u.error("Found origin reference %o in selector %o, but options.origin is missing", '&', selector)
+          u.error("Found origin reference (%s) in selector %s, but options.origin is missing", '&', selector)
     else
       selector = u.selectorForElement(selectorOrElement)
     selector
@@ -177,8 +177,7 @@ up.flow = (($) ->
   @stable
   ###
   replace = (selectorOrElement, url, options) ->
-    u.debug("Replace %o with %o (options %o)", selectorOrElement, url, options)
-
+    up.puts "Replacing %s from %s (%o)", selectorOrElement, url, options
     options = u.options(options)
     target = resolveSelector(selectorOrElement, options.origin)
     failTarget = u.option(options.failTarget, 'body')
@@ -206,14 +205,12 @@ up.flow = (($) ->
 
     promise.fail (xhr, textStatus, errorThrown) ->
       processResponse(false, failTarget, url, request, xhr, options)
-
     promise
 
   ###*
   @internal
   ###
   processResponse = (isSuccess, selector, url, request, xhr, options) ->
-
     options.method = u.normalizeMethod(u.option(u.methodFromXhr(xhr), options.method))
     options.title = u.option(u.titleFromXhr(xhr), options.title)
     isReloadable = (options.method == 'GET')
@@ -326,7 +323,7 @@ up.flow = (($) ->
 
   oldFragmentNotFound = (selector, options) ->
     if options.requireMatch
-      message = 'Could not find selector %o in current body HTML'
+      message = 'Could not find selector %s in current body HTML'
       if message[0] == '#'
         message += ' (avoid using IDs)'
       u.error(message, selector)
@@ -344,7 +341,7 @@ up.flow = (($) ->
       if child = $.find(selector, htmlElement)[0]
         $(child)
       else if options.requireMatch
-        u.error("Could not find selector %o in response %o", selector, html)
+        u.error("Could not find selector %s in response %o", selector, html)
 
   elementsInserted = ($new, options) ->
     if options.history
@@ -401,7 +398,7 @@ up.flow = (($) ->
         $new.insertBefore($old)
         elementsInserted($new, options)
         if $old.is('body') && transition != 'none'
-          u.error('Cannot apply transitions to body-elements (%o)', transition)
+          u.error('Cannot apply transitions to body-elements')
         # Morphing will also process options.reveal
         up.morph($old, $new, transition, options)
 
@@ -417,7 +414,7 @@ up.flow = (($) ->
     for selectorAtom, i in disjunction
       # Splitting the atom
       selectorParts = selectorAtom.match(/^(.+?)(?:\:(before|after))?$/)
-      selectorParts or u.error('Could not parse selector atom %o', selectorAtom)
+      selectorParts or u.error('Could not parse selector atom "%s"', selectorAtom)
       selector = selectorParts[1]
       if selector == 'html'
         # If someone really asked us to replace the <html> root, the best
@@ -501,7 +498,10 @@ up.flow = (($) ->
   ###
   destroy = (selectorOrElement, options) ->
     $element = $(selectorOrElement)
-    if up.bus.nobodyPrevents('up:fragment:destroy', $element: $element)
+    unless $element.is('.up-placeholder, .up-tooltip, .up-modal, .up-popup')
+      destroyMessage = ['Destroying fragment %o', $element.get(0)]
+      destroyedMessage = ['Destroyed fragment %o', $element.get(0)]
+    if up.bus.nobodyPrevents('up:fragment:destroy', $element: $element, message: destroyMessage)
       options = u.options(options, animation: false)
       animateOptions = up.motion.animateOptions(options)
       $element.addClass('up-destroying')
@@ -515,7 +515,7 @@ up.flow = (($) ->
       animationDeferred.then ->
         # Emit this while $element is still part of the DOM, so event
         # listeners bound to the document will receive the event.
-        up.emit('up:fragment:destroyed', $element: $element)
+        up.emit 'up:fragment:destroyed', $element: $element, message: destroyedMessage
         $element.remove()
       animationDeferred
     else

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

@@ -218,7 +218,7 @@ up.form = (($) ->
     callback = null
 
     if u.isGiven(options.change)
-      up.error('up.observe now takes the change callback as the last argument')
+      u.error('up.observe now takes the change callback as the last argument')
 
     rawCallback = u.option(u.presentAttr($element, 'op-observe'), callbackArg)
     if u.isString(rawCallback)
@@ -334,7 +334,7 @@ up.form = (($) ->
         $field.closest(resolvedDefault).length
       )
     if u.isBlank(target)
-      error('Could not find default validation target for %o (tried ancestors %o)', $field, config.validateTargets)
+      u.error('Could not find default validation target for %o (tried ancestors %o)', $field.get(0), config.validateTargets)
     unless u.isString(target)
       target = u.selectorForElement(target)
     target
@@ -387,16 +387,12 @@ up.form = (($) ->
       else
         values = [':unchecked', ':blank']
     else if $field.is('input[type=radio]')
-      console.log('-- it is a radio button --')
       $checkedButton = $field.closest('form, body').find("input[type='radio'][name='#{$field.attr('name')}']:checked")
-      console.log('checked button is %o', $checkedButton)
-      console.log('checked button val is %o', $checkedButton.val())
       if $checkedButton.length
         values = [':checked', ':present', $checkedButton.val()]
       else
         values = [':unchecked', ':blank']
     else
-      console.log('-- else -- for %o', $field)
       value = $field.val()
       if u.isPresent(value)
         values = [':present', value]
@@ -450,7 +446,7 @@ up.form = (($) ->
     $field = $(fieldOrSelector)
     options = u.options(options)
     targets = u.option(options.target, $field.attr('up-toggle'))
-    u.isPresent(targets) or u.error("No toggle target given for %o", $field)
+    u.isPresent(targets) or u.error("No toggle target given for %o", $field.get(0))
     fieldValues = currentValuesForToggle($field)
     $(targets).each ->
       $target = $(this)
@@ -781,7 +777,7 @@ up.form = (($) ->
 
   @selector [up-hide-for]
   @param up-hide-for
-    A space-separated list of values for which to show this element.
+    A space-separated list of values for which to hide this element.
   @stable
   ###
 

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

@@ -106,6 +106,7 @@ up.history = (($) ->
   @experimental
   ###
   push = (url, options) ->
+    up.puts("Current location is now %s", url)
     manipulate('push', url, options)
 
   manipulate = (method, url, options) ->
@@ -114,9 +115,6 @@ up.history = (($) ->
       if up.browser.canPushState()
         fullMethod = "#{method}State" # resulting in either pushState or replaceState
         state = buildState()
-        # console.log("[#{method}] URL %o with state %o", url, state)
-        u.debug("Changing history to URL %o (%o)", url, method)
-        # previousUrl = url
         window.history[fullMethod](state, '', url)
         observeNewUrl(currentUrl())
       else
@@ -126,25 +124,25 @@ up.history = (($) ->
     fromUp: true
 
   restoreStateOnPop = (state) ->
-    url = currentUrl()
-    u.debug "Restoring state %o (now on #{url})", state
-    popSelector = config.popTargets.join(', ')
-    up.replace popSelector, url,
-      history: false,
-      reveal: false,
-      transition: 'none',
-      saveScroll: false # since the URL was already changed by the browser, don't save scroll state
-      restoreScroll: config.restoreScroll
+    if state?.fromUp
+      url = currentUrl()
+      up.log.group "Restoring URL %s", url, ->
+        popSelector = config.popTargets.join(', ')
+        up.replace popSelector, url,
+          history: false,
+          reveal: false,
+          transition: 'none',
+          saveScroll: false # since the URL was already changed by the browser, don't save scroll state
+          restoreScroll: config.restoreScroll
+    else
+      up.puts 'Ignoring a state not pushed by Up.js (%o)', state
 
   pop = (event) ->
-    u.debug("History state popped to URL %o", currentUrl())
-    observeNewUrl(currentUrl())
-    up.layout.saveScroll(url: previousUrl)
-    state = event.originalEvent.state
-    if state?.fromUp
+    up.log.group "History state popped to URL %s", currentUrl(), ->
+      observeNewUrl(currentUrl())
+      up.layout.saveScroll(url: previousUrl)
+      state = event.originalEvent.state
       restoreStateOnPop(state)
-    else
-      u.debug 'Discarding unknown state %o', state
 
   # up.on 'framework:ready', ->
   if up.browser.canPushState()

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

@@ -157,7 +157,7 @@ up.layout = (($) ->
       $obstructor = $(obstructor)
       anchorPosition = $obstructor.css(cssAttr)
       unless u.isPresent(anchorPosition)
-        u.error("Fixed element %o must have a CSS attribute %o", $obstructor, cssAttr)
+        u.error("Fixed element %o must have a CSS attribute %s", $obstructor.get(0), cssAttr)
       parseInt(anchorPosition) + $obstructor.height()
 
     fixedTopBottoms = for obstructor in $(config.fixedTop.join(', '))
@@ -213,9 +213,9 @@ up.layout = (($) ->
   @stable
   ###
   reveal = (elementOrSelector, options) ->
-    u.debug('Revealing %o', elementOrSelector)
-    options = u.options(options)
     $element = $(elementOrSelector)
+    up.puts 'Revealing fragment %o', elementOrSelector.get(0)
+    options = u.options(options)
     $viewport = if options.viewport then $(options.viewport) else viewportOf($element)
 
     snap = u.option(options.snap, config.snap)
@@ -359,7 +359,7 @@ up.layout = (($) ->
   saveScroll = (options = {}) ->
     url = u.option(options.url, up.history.url())
     tops = u.option(options.tops, scrollTops())
-    u.debug('Saving scroll positions for URL %o: %o', url, tops)
+    up.puts('Saving scroll positions for URL %s (%o)', url, tops)
     lastScrollTops.set(url, tops)
 
   ###*
@@ -390,16 +390,15 @@ up.layout = (($) ->
 
     tops = lastScrollTops.get(url)
 
-    u.debug('Restoring scroll positions for URL %o (viewports are %o, saved tops are %o)', url, $viewports, tops)
+    up.log.group 'Restoring scroll positions for URL %s to %o', url, tops, ->
+      for key, scrollTop of tops
+        right = if key == 'document' then document else key
+        $matchingViewport = $viewports.filter(right)
+        scroll($matchingViewport, scrollTop, duration: 0)
 
-    for key, scrollTop of tops
-      right = if key == 'document' then document else key
-      $matchingViewport = $viewports.filter(right)
-      scroll($matchingViewport, scrollTop, duration: 0)
-
-    # Since scrolling happens without animation, we don't need to
-    # join promises from the up.scroll call above
-    u.resolvedDeferred()
+      # Since scrolling happens without animation, we don't need to
+      # join promises from the up.scroll call above
+      u.resolvedDeferred()
 
   ###*
   @function up.layout.revealOrRestoreScroll

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

@@ -0,0 +1,72 @@
+up.log = (($) ->
+
+  prefix = (message) ->
+    "ᴜᴘ #{message}"
+
+  ###*
+  Prints a debugging message to the browser console.
+
+  @function up.debug
+  @param {String} message
+  @param {Array} args...
+  @internal
+  ###
+  debug = (message, args...) ->
+    if message
+      up.browser.puts('debug', prefix(message), args...)
+
+  ###*
+  Prints a logging message to the browser console.
+
+  @function up.puts
+  @param {String} message
+  @param {Array} args...
+  @internal
+  ###
+  puts = (message, args...) ->
+    if message
+      up.browser.puts('log', prefix(message), args...)
+
+  ###*
+  @function up.log.warn
+  @internal
+  ###
+  warn = (message, args...) ->
+    if message
+      up.browser.puts('warn', prefix(message), args...)
+
+  ###*
+  - Makes sure the group always closes
+  - Does not make a group if the message is nil
+
+  @function up.log.group
+  @internal
+  ###
+  group = (message, args...) ->
+    block = args.pop() # Coffeescript copies the arguments array
+    if message
+      up.browser.puts('groupCollapsed', prefix(message), args...)
+      try
+        block()
+      finally
+        console.groupEnd() if message
+    else
+      block()
+
+  ###*
+  @function up.log.error
+  @internal
+  ###
+  error = (message, args...) ->
+    if message
+      up.browser.puts('error', prefix(message), args...)
+
+  puts: puts
+  debug: debug
+  error: error
+  warn: warn
+  group: group
+
+)(jQuery)
+
+up.puts = up.log.puts

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

@@ -168,8 +168,7 @@ up.modal = (($) ->
     $content = $modal.find('.up-modal-content')
     # Create an empty element that will match the
     # selector that is being replaced.
-    $placeholder = u.$createElementFromSelector(target)
-    $placeholder.appendTo($content)
+    u.$createPlaceholder(target, $content)
     $modal.appendTo(document.body)
     $modal
 
@@ -310,7 +309,7 @@ up.modal = (($) ->
     animateOptions = up.motion.animateOptions(options, $link)
 
     up.browser.confirm(options.confirm).then ->
-      if up.bus.nobodyPrevents('up:modal:open', url: url)
+      if up.bus.nobodyPrevents('up:modal:open', url: url, message: 'Opening modal')
         wasOpen = isOpen()
         close(animation: false) if wasOpen
         options.beforeSwap = -> createFrame(target, options)
@@ -319,7 +318,7 @@ up.modal = (($) ->
           promise = promise.then ->
             up.animate($('.up-modal'), options.animation, animateOptions)
         promise = promise.then ->
-          up.emit('up:modal:opened')
+          up.emit('up:modal:opened', message: 'Modal opened')
         promise
       else
         # Although someone prevented opening the modal, keep a uniform API for
@@ -360,7 +359,7 @@ up.modal = (($) ->
   close = (options) ->
     $modal = $('.up-modal')
     if $modal.length
-      if up.bus.nobodyPrevents('up:modal:close', $element: $modal)
+      if up.bus.nobodyPrevents('up:modal:close', $element: $modal, message: 'Closing modal')
         options = u.options(options,
           animation: config.closeAnimation,
           url: $modal.attr('up-covered-url')
@@ -370,7 +369,7 @@ up.modal = (($) ->
         promise = up.destroy($modal, options)
         promise = promise.then ->
           unshiftElements()
-          up.emit('up:modal:closed')
+          up.emit('up:modal:closed', message: 'Modal closed')
         promise
       else
         # Although someone prevented the destruction,

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

@@ -270,7 +270,7 @@ up.motion = (($) ->
   
   finishGhosting = ($element) ->
     if existingGhosting = $element.data(GHOSTING_PROMISE_KEY)
-      u.debug('Canceling existing ghosting on %o', $element)
+      up.puts('Canceling existing ghosting on %o', $element)
       existingGhosting.resolve?()
       
   assertIsDeferred = (object, source) ->
@@ -343,40 +343,42 @@ up.motion = (($) ->
   @stable
   ###  
   morph = (source, target, transitionOrName, options) ->
+    if transitionOrName == 'none'
+      transitionOrName = false
 
-    u.debug('Morphing %o to %o (using %o)', source, target, transitionOrName)
+    up.log.group ('Morphing %o to %o (using %o)' if transitionOrName), source, target, transitionOrName, ->
 
-    $old = $(source)
-    $new = $(target)
+      $old = $(source)
+      $new = $(target)
 
-    parsedOptions = u.only(options, 'reveal', 'restoreScroll', 'source')
-    parsedOptions = u.extend(parsedOptions, animateOptions(options))
+      parsedOptions = u.only(options, 'reveal', 'restoreScroll', 'source')
+      parsedOptions = u.extend(parsedOptions, animateOptions(options))
 
-    if isEnabled()
-      finish($old)
-      finish($new)
-
-      if transitionOrName == 'none' || transitionOrName == false
-        return skipMorph($old, $new, parsedOptions)
-      else if animation = animations[transitionOrName]
-        skipMorph($old, $new, parsedOptions)
-        return animate($new, animation, parsedOptions)
-      else if transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
-        return withGhosts $old, $new, parsedOptions, ($oldGhost, $newGhost) ->
-          transitionPromise = transition($oldGhost, $newGhost, parsedOptions)
-          assertIsDeferred(transitionPromise, transitionOrName)
-      else if u.isString(transitionOrName) && transitionOrName.indexOf('/') >= 0
-        parts = transitionOrName.split('/')
-        transition = ($old, $new, options) ->
-          resolvableWhen(
-            animate($old, parts[0], options),
-            animate($new, parts[1], options)
-          )
-        return morph($old, $new, transition, parsedOptions)
+      if isEnabled()
+        finish($old)
+        finish($new)
+
+        if !transitionOrName
+          return skipMorph($old, $new, parsedOptions)
+        else if animation = animations[transitionOrName]
+          skipMorph($old, $new, parsedOptions)
+          return animate($new, animation, parsedOptions)
+        else if transition = u.presence(transitionOrName, u.isFunction) || transitions[transitionOrName]
+          return withGhosts $old, $new, parsedOptions, ($oldGhost, $newGhost) ->
+            transitionPromise = transition($oldGhost, $newGhost, parsedOptions)
+            assertIsDeferred(transitionPromise, transitionOrName)
+        else if u.isString(transitionOrName) && transitionOrName.indexOf('/') >= 0
+          parts = transitionOrName.split('/')
+          transition = ($old, $new, options) ->
+            resolvableWhen(
+              animate($old, parts[0], options),
+              animate($new, parts[1], options)
+            )
+          return morph($old, $new, transition, parsedOptions)
+        else
+          u.error("Unknown transition %o", transitionOrName)
       else
-        u.error("Unknown transition %o", transitionOrName)
-    else
-      return skipMorph($old, $new, parsedOptions)
+        return skipMorph($old, $new, parsedOptions)
 
   ###*
   This causes the side effects of a successful transition, but instantly.

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

@@ -109,7 +109,7 @@ up.popup = (($) ->
         left: linkBox.left
         bottom: linkBox.top
       else
-        u.error("Unknown position %o", position)
+        u.error("Unknown position option '%s'", position)
     $popup = $('.up-popup')
     $popup.attr('up-position', position)
     $popup.css(css)
@@ -153,8 +153,7 @@ up.popup = (($) ->
     $popup.attr('up-covered-title', document.title)
     # Create an empty element that will match the
     # selector that is being replaced.
-    $placeholder = u.$createElementFromSelector(target)
-    $placeholder.appendTo($popup)
+    u.$createPlaceholder(target, $popup)
     $popup.appendTo(document.body)
     $popup
 
@@ -214,7 +213,7 @@ up.popup = (($) ->
     animateOptions = up.motion.animateOptions(options, $link)
 
     up.browser.confirm(options.confirm).then ->
-      if up.bus.nobodyPrevents('up:popup:open', url: url)
+      if up.bus.nobodyPrevents('up:popup:open', url: url, message: 'Opening popup')
         wasOpen = isOpen()
         close(animation: false) if wasOpen
         options.beforeSwap = -> createFrame(target, options)
@@ -225,7 +224,7 @@ up.popup = (($) ->
           promise = promise.then ->
             up.animate($('.up-popup'), options.animation, animateOptions)
         promise = promise.then ->
-          up.emit('up:popup:opened')
+          up.emit('up:popup:opened', message: 'Popup opened')
         promise
       else
         # Although someone prevented the destruction, keep a uniform API for
@@ -274,7 +273,7 @@ up.popup = (($) ->
         )
         currentUrl = undefined
         deferred = up.destroy($popup, options)
-        deferred.then -> up.emit('up:popup:closed')
+        deferred.then -> up.emit('up:popup:closed', message: 'Popup closed')
         deferred
       else
         # Although someone prevented the destruction,

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

@@ -122,7 +122,7 @@ up.proxy = (($) ->
     size: -> config.cacheSize
     expiry: -> config.cacheExpiry
     key: cacheKey
-    log: 'up.proxy'
+    # log: 'up.proxy'
 
   ###*
   Returns a cached response for the given request.
@@ -254,6 +254,7 @@ up.proxy = (($) ->
     ignoreCache = (options.cache == false)
 
     request = u.only(options, 'url', 'method', 'data', 'target', 'headers', '_normalized')
+    request = normalizeRequest(request)
 
     pending = true
 
@@ -267,6 +268,7 @@ up.proxy = (($) ->
     # we use it unless `options.cache` is explicitly set to `false`.
     # The promise might still be pending.
     else if (promise = get(request)) && !ignoreCache
+      up.puts 'Re-using cached response for %s %s', request.method, request.url
       pending = (promise.state() == 'pending')
     # If no existing promise is available, we make a network request.
     else
@@ -289,6 +291,8 @@ up.proxy = (($) ->
       loadStarted()
       promise.always(loadEnded)
 
+    console.groupEnd()
+
     promise
 
   ###*
@@ -329,7 +333,7 @@ up.proxy = (($) ->
       # we wrap the mission in a function for scheduling below.
       emission = ->
         if busy() # a fast response might have beaten the delay
-          up.emit('up:proxy:busy')
+          up.emit('up:proxy:busy', message: 'Proxy is busy')
           busyEventEmitted = true
       if config.busyDelay > 0
         busyDelayTimer = setTimeout(emission, config.busyDelay)
@@ -358,7 +362,7 @@ up.proxy = (($) ->
   loadEnded = ->
     pendingCount -= 1
     if idle() && busyEventEmitted
-      up.emit('up:proxy:idle')
+      up.emit('up:proxy:idle', message: 'Proxy is idle')
       busyEventEmitted = false
 
   ###*
@@ -376,7 +380,7 @@ up.proxy = (($) ->
       queue(request)
 
   queue = (request) ->
-    u.debug('Queuing URL %o', request.url)
+    up.puts('Queuing request for %s %s', request.method, request.url)
     deferred = $.Deferred()
     entry =
       deferred: deferred
@@ -385,8 +389,7 @@ up.proxy = (($) ->
     deferred.promise()
 
   load = (request) ->
-    u.debug('Fetching %o via %o', request.url, request.method)
-    up.emit('up:proxy:load', request)
+    up.emit('up:proxy:load', u.merge(request, message: ['Loading %s %s', request.method, request.url]))
 
     # We will modify the request below for features like method wrapping.
     # Let's not change the original request which would confuse API clients
@@ -404,11 +407,14 @@ up.proxy = (($) ->
       request.method = 'POST'
 
     promise = $.ajax(request)
-    promise.always ->
-      up.emit('up:proxy:received', request)
-      pokeQueue()
+    promise.done (data, textStatus, xhr) -> responseReceived(request, xhr)
+    promise.fail (xhr, textStatus, errorThrown) -> responseReceived(request, xhr)
     promise
 
+  responseReceived = (request, xhr) ->
+    up.emit('up:proxy:received', u.merge(request, message: ['Server responded with %s %s (%d bytes)', xhr.status, xhr.statusText, xhr.responseText?.length]))
+    pokeQueue()
+
   pokeQueue = ->
     if entry = queuedRequests.shift()
       promise = load(entry.request)
@@ -468,11 +474,11 @@ up.proxy = (($) ->
 
     method = up.link.followMethod($link, options)
     if isIdempotent(method: method)
-      u.debug("Preloading %o", $link)
-      options.preload = true
-      up.follow($link, options)
+      up.log.group "Preloading link %o", $link, ->
+        options.preload = true
+        up.follow($link, options)
     else
-      u.debug("Won't preload %o due to unsafe method %o", $link, method)
+      up.puts("Won't preload %o due to unsafe method %s", $link, method)
       u.resolvedPromise()
 
   ###*

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

@@ -195,7 +195,6 @@ up.syntax = (($) ->
   @stable
   ###
   compilers = []
-  defaultCompilers = null
 
   compiler = (selector, args...) ->
     # Silently discard any compilers that are registered on unsupported browsers
@@ -208,21 +207,22 @@ up.syntax = (($) ->
       batch: options.batch
   
   applyCompiler = (compiler, $jqueryElement, nativeElement) ->
-    u.debug "Applying compiler %o on %o", compiler.selector, nativeElement
+    up.puts ("Compiling '%s' on %o" unless compiler.isDefault), compiler.selector, nativeElement
     destroyer = compiler.callback.apply(nativeElement, [$jqueryElement, data($jqueryElement)])
     if u.isFunction(destroyer)
       $jqueryElement.addClass(DESTROYABLE_CLASS)
       $jqueryElement.data(DESTROYER_KEY, destroyer)
 
   compile = ($fragment) ->
-    u.debug "Compiling fragment %o", $fragment
-    for compiler in compilers
-      $matches = u.findWithSelf($fragment, compiler.selector)
-      if $matches.length
-        if compiler.batch
-          applyCompiler(compiler, $matches, $matches.get())
-        else
-          $matches.each -> applyCompiler(compiler, $(this), this)
+    up.log.group "Compiling fragment %o", $fragment.get(0), ->
+      for compiler in compilers
+        $matches = u.findWithSelf($fragment, compiler.selector)
+        if $matches.length
+          up.log.group ("Compiling '%s' on %d element(s)" unless compiler.isDefault), compiler.selector, $matches.length, ->
+            if compiler.batch
+              applyCompiler(compiler, $matches, $matches.get())
+            else
+              $matches.each -> applyCompiler(compiler, $(this), this)
 
   runDestroyers = ($fragment) ->
     u.findWithSelf($fragment, ".#{DESTROYABLE_CLASS}").each ->
@@ -274,7 +274,8 @@ up.syntax = (($) ->
   @internal
   ###
   snapshot = ->
-    defaultCompilers = u.copy(compilers)
+    for compiler in compilers
+      compiler.isDefault = true
 
   ###*
   Resets the list of registered compiler directives to the
@@ -283,7 +284,7 @@ up.syntax = (($) ->
   @internal
   ###
   reset = ->
-    compilers = u.copy(defaultCompilers)
+    compilers = u.select compilers, (compiler) -> compiler.isDefault
 
   ###*
   Compiles a page fragment that has been inserted into the DOM
@@ -311,7 +312,9 @@ up.syntax = (($) ->
   ###
   hello = (selectorOrElement, options) ->
     $element = $(selectorOrElement)
-    eventAttrs = u.options(options, $element: $element)
+    eventAttrs = u.options options,
+      $element: $element
+      message: ['Inserted fragment %o', $element.get(0)]
     up.emit('up:fragment:inserted', eventAttrs)
     $element
 

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

@@ -65,7 +65,7 @@ up.tooltip = (($) ->
         left: linkBox.left + 0.5 * (linkBox.width - tooltipBox.width)
         top: linkBox.top + linkBox.height
       else
-        u.error("Unknown position %o", position)
+        u.error("Unknown position option '%s'", position)
     $tooltip.attr('up-position', position)
     $tooltip.css(css)
 

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

@@ -135,77 +135,13 @@ up.util = (($) ->
     element
 
   ###*
-  Prints a debugging message to the browser console.
-
-  @function up.debug
-  @param {String} message
-  @param {Array} args...
-  @internal
-  ###
-  debug = (message, args...) ->
-    message = "[UP] #{message}"
-    up.browser.puts('debug', message, args...)
-
-  ###*
-  @function up.warn
-  @internal
-  ###
-  warn = (message, args...) ->
-    message = "[UP] #{message}"
-    up.browser.puts('warn', message, args...)
-
-  ###*
-  Throws a fatal error with the given message.
-
-  - The error will be printed to the [error console](https://developer.mozilla.org/en-US/docs/Web/API/Console/error)
-  - An [`Error`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error) (exception) will be thrown, unwinding the current call stack
-  - The error message will be printed in a corner of the screen
-
-  \#\#\#\# Examples
-
-      up.error('Division by zero')
-      up.error('Unexpected result %o', result)
-
-  @function up.error
-  @internal
+  @function $create
   ###
-  error = (args...) ->
-    args[0] = "[UP] #{args[0]}"
-    up.browser.puts('error', args...)
-    asString = evalConsoleTemplate(args...)
-    $error = presence($('.up-error')) || $('<div class="up-error"></div>').prependTo('body')
-    $error.addClass('up-error')
-    $error.text(asString)
-    throw new Error(asString)
-
-  CONSOLE_PLACEHOLDERS = /\%[odisf]/g
-    
-  evalConsoleTemplate = (args...) ->
-    message = args[0]
-    i = 0
-    maxLength = 80
-    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 = "\"#{arg}\""
-      else if argType == 'undefined'
-        # JSON.stringify(undefined) is actually undefined
-        arg = 'undefined'
-      else if argType == 'number' || argType == 'function'
-        arg = arg.toString()
-      else
-        arg = JSON.stringify(arg)
-      if arg.length > maxLength
-        arg = "#{arg.substr(0, maxLength)} …"
-        # For truncated objects or functions, add a trailing brace so
-        # long log lines are easier to parse visually
-        if argType == 'object' || argType == 'function'
-          arg += " }"
-      arg
+  $createPlaceholder = (selector, container = document.body) ->
+    $placeholder = $createElementFromSelector(selector)
+    $placeholder.addClass('up-placeholder')
+    $placeholder.appendTo(container)
+    $placeholder
 
   ###*
   Returns a CSS selector that matches the given element as good as possible.
@@ -227,7 +163,7 @@ up.util = (($) ->
     $element = $(element)
     selector = undefined
 
-    debug("Creating selector from element %o", $element.get(0))
+    # up.puts("Creating selector from element %o", $element.get(0))
 
     if upId = presence($element.attr("up-id"))
       selector = "[up-id='#{upId}']"
@@ -1336,7 +1272,7 @@ up.util = (($) ->
     log = (args...) ->
       if config.log
         args[0] = "[#{config.log}] #{args[0]}"
-        debug(args...)
+        up.puts(args...)
 
     keys = ->
       Object.keys(store)
@@ -1382,7 +1318,7 @@ up.util = (($) ->
         delete store[oldestKey] if oldestKey
 
     alias = (oldKey, newKey) ->
-      value = get(oldKey)
+      value = get(oldKey, silent: true)
       if isDefined(value)
         set(newKey, value)
 
@@ -1407,19 +1343,19 @@ up.util = (($) ->
       else
         true
 
-    get = (key, fallback = undefined) ->
+    get = (key, options = {}) ->
       storeKey = normalizeStoreKey(key)
       if entry = store[storeKey]
         if isFresh(entry)
-          log("Cache hit for %o", key)
+          log("Cache hit for '%s'", key) unless options.silent
           entry.value
         else
-          log("Discarding stale cache entry for %o", key)
+          log("Discarding stale cache entry for '%s'", key) unless options.silent
           remove(key)
-          fallback
+          undefined
       else
-        log("Cache miss for %o", key)
-        fallback
+        log("Cache miss for '%s'", key) unless options.silent
+        undefined
 
     alias: alias
     get: get
@@ -1526,6 +1462,28 @@ up.util = (($) ->
         query += encodeURIComponent(field.name) + '=' + encodeURIComponent(field.value)
     query
 
+  ###*
+  Throws a fatal error with the given message.
+
+  - The error will be printed to the [error console](https://developer.mozilla.org/en-US/docs/Web/API/Console/error)
+  - An [`Error`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error) (exception) will be thrown, unwinding the current call stack
+  - The error message will be printed in a corner of the screen
+
+  \#\#\#\# Examples
+
+      up.error('Division by zero')
+      up.error('Unexpected result %o', result)
+
+  @experimental
+  ###
+  error = (args...) ->
+    up.log.error(args...)
+    asString = up.browser.sprintf(args...)
+    $error = presence($('.up-error')) || $('<div class="up-error"></div>').prependTo('body')
+    $error.addClass('up-error')
+    $error.text(asString)
+    throw new Error(asString)
+
   requestDataAsArray: requestDataAsArray
   requestDataAsQueryString: requestDataAsQueryString
   offsetParent: offsetParent
@@ -1537,6 +1495,7 @@ up.util = (($) ->
   normalizeMethod: normalizeMethod
   createElementFromHtml: createElementFromHtml
   $createElementFromSelector: $createElementFromSelector
+  $createPlaceholder: $createPlaceholder
   selectorForElement: selectorForElement
   extend: extend
   copy: copy
@@ -1544,8 +1503,6 @@ up.util = (($) ->
   options: options
   option: option
   error: error
-  debug: debug
-  warn: warn
   each: each
   map: map
   times: times
@@ -1612,10 +1569,8 @@ up.util = (($) ->
   cache: cache
   unwrapElement: unwrapElement
   multiSelector: multiSelector
-  evalConsoleTemplate: evalConsoleTemplate
+  error: error
 
 )($)
 
 up.error = up.util.error
-up.warn = up.util.warn
-up.debug = up.util.debug

data/lib/upjs/rails/version.rb

@@ -4,6 +4,6 @@ module Upjs
     # The current version of the upjs-rails gem.
     # This version number is also used for releases of the Up.js
     # frontend code.
-    VERSION = '0.18.0'
+    VERSION = '0.18.1'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    upjs-rails (0.17.0)
+    upjs-rails (0.18.0)
       rails (>= 3)
 
 GEM
@@ -210,3 +210,6 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   upjs-rails!
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.11.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,6 +102,7 @@ files:
 - lib/assets/javascripts/up/history.js.coffee
 - lib/assets/javascripts/up/layout.js.coffee
 - lib/assets/javascripts/up/link.js.coffee
+- lib/assets/javascripts/up/log.js.coffee
 - lib/assets/javascripts/up/modal.js.coffee
 - lib/assets/javascripts/up/module.js.coffee
 - lib/assets/javascripts/up/motion.js.coffee