unpoly-rails 0.27.3 → 0.28.0

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

@@ -182,7 +182,7 @@ up.motion = (($) ->
         $element.css(animation)
         u.resolvedDeferred()
     else
-      u.error("Unknown animation type for %o", animation)
+      up.fail("Unknown animation type for %o", animation)
 
   ###*
   Extracts animation-related options from the given options hash.
@@ -203,7 +203,7 @@ up.motion = (($) ->
     consolidatedOptions
       
   findAnimation = (name) ->
-    animations[name] or u.error("Unknown animation %o", name)
+    animations[name] or up.fail("Unknown animation %o", name)
 
   GHOSTING_DEFERRED_KEY = 'up-ghosting-deferred'
   GHOSTING_CLASS = 'up-ghosting'
@@ -302,7 +302,7 @@ up.motion = (($) ->
     if u.isDeferred(object)
       object
     else
-      u.error("Did not return a promise with .then and .resolve methods: %o", source)
+      up.fail("Did not return a promise with .then and .resolve methods: %o", source)
 
   ###*
   Performs an animated transition between two elements.
@@ -407,14 +407,14 @@ up.motion = (($) ->
             )
           return morph($old, $new, transition, parsedOptions)
         else
-          u.error("Unknown transition %o", transitionOrName)
+          up.fail("Unknown transition %o", transitionOrName)
       else
         return skipMorph($old, $new, parsedOptions)
 
   ensureMorphable = ($element, transition) ->
     if transition && $element.parents('body').length == 0
       element = $element.get(0)
-      u.error("Can't morph a <%s> element (%o)", element.tagName, element)
+      up.fail("Can't morph a <%s> element (%o)", element.tagName, element)
 
   ###*
   This causes the side effects of a successful transition, but instantly.
@@ -724,7 +724,7 @@ up.motion = (($) ->
   animation: animation
   config: config
   isEnabled: isEnabled
-  defaults: -> u.error('up.motion.defaults(...) no longer exists. Set values on he up.motion.config property instead.')
+  defaults: -> up.fail('up.motion.defaults(...) no longer exists. Set values on he up.motion.config property instead.')
   none: none
   when: resolvableWhen
   prependCopy: prependCopy

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

@@ -221,7 +221,7 @@ up.navigation = (($) ->
   up.on 'up:framework:reset', reset
 
   config: config
-  defaults: -> u.error('up.navigation.defaults(...) no longer exists. Set values on he up.navigation.config property instead.')
+  defaults: -> up.fail('up.navigation.defaults(...) no longer exists. Set values on he up.navigation.config property instead.')
   markActive: markActive
   unmarkActive: unmarkActive
   withActiveMark: withActiveMark

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

@@ -144,7 +144,7 @@ up.popup = (($) ->
         css['top'] = linkBox.top - popupBox.height
         css['left'] = linkBox.left
       else
-        u.error("Unknown position option '%s'", state.position)
+        up.fail("Unknown position option '%s'", state.position)
 
     state.$popup.attr('up-position', state.position)
     state.$popup.css(css)
@@ -216,7 +216,7 @@ up.popup = (($) ->
 
   attachNow = (elementOrSelector, options) ->
     $anchor = $(elementOrSelector)
-    $anchor.length or u.error('Cannot attach popup to non-existing element %o', elementOrSelector)
+    $anchor.length or up.fail('Cannot attach popup to non-existing element %o', elementOrSelector)
 
     options = u.options(options)
     url = u.option(u.pluckKey(options, 'url'), $anchor.attr('up-href'), $anchor.attr('href'))

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

@@ -312,16 +312,12 @@ up.proxy = (($) ->
         show = function() { $element.show() };
         hide = function() { $element.hide() };
 
-        up.on('up:proxy:slow', show);
-        up.on('up:proxy:recover', hide);
-
         hide();
 
-        // Clean up when the element is removed from the DOM
-        return function() {
-          up.off('up:proxy:slow', show);
-          up.off('up:proxy:recover', hide);
-        };
+        return [
+          up.on('up:proxy:slow', show),
+          up.on('up:proxy:recover', hide)
+        ];
 
       });
 
@@ -552,7 +548,7 @@ up.proxy = (($) ->
   isBusy: isBusy
   isCachable: isCachable
   config: config
-  defaults: -> u.error('up.proxy.defaults(...) no longer exists. Set values on he up.proxy.config property instead.')
+  defaults: -> up.fail('up.proxy.defaults(...) no longer exists. Set values on he up.proxy.config property instead.')
   
 )(jQuery)
 

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

@@ -101,7 +101,8 @@ up.syntax = (($) ->
   or event handlers bound to the document root.
 
   Here is a version of `<clock>` that updates
-  the time every second, and cleans up once it's done:
+  the time every second, and cleans up once it's done. Note how it returns
+  a function that calls `clearInterval`:
 
       up.compiler('clock', function($element) {
 
@@ -279,10 +280,16 @@ up.syntax = (($) ->
     if compiler.keep
       value = if u.isString(compiler.keep) then compiler.keep else ''
       $jqueryElement.attr('up-keep', value)
-    destructor = compiler.callback.apply(nativeElement, [$jqueryElement, data($jqueryElement)])
-    if u.isFunction(destructor)
+    returnValue = compiler.callback.apply(nativeElement, [$jqueryElement, data($jqueryElement)])
+    if destructor = discoverDestructor(returnValue)
       addDestructor($jqueryElement, destructor)
 
+  discoverDestructor = (returnValue) ->
+    if u.isFunction(returnValue)
+      returnValue
+    else if u.isArray(returnValue) && u.all(returnValue, u.isFunction)
+      u.sequence(returnValue...)
+
   addDestructor = ($jqueryElement, destructor) ->
     $jqueryElement.addClass(DESTRUCTABLE_CLASS)
     destructors = $jqueryElement.data(DESTRUCTORS_KEY) || []
@@ -446,6 +453,3 @@ up.syntax = (($) ->
 
 up.compiler = up.syntax.compiler
 up.macro = up.syntax.macro
-
-up.ready = -> up.util.error('up.ready no longer exists. Please use up.hello instead.')
-up.awaken = -> up.util.error('up.awaken no longer exists. Please use up.compiler instead.')

data/lib/assets/javascripts/unpoly/toast.js.coffee

@@ -0,0 +1,66 @@
+###*
+Toast alerts
+============
+
+@class up.toast
+###
+up.toast = (($) ->
+
+  u = up.util
+  b = up.browser
+
+  VARIABLE_FORMATTER = (arg) -> "<span class='up-toast-variable'>#{u.escapeHtml(arg)}</span>"
+
+  state = u.config
+    $toast: null
+
+  reset = ->
+    close()
+    state.reset()
+
+  messageToHtml = (message) ->
+    if u.isArray(message)
+      message[0] = u.escapeHtml(message[0])
+      message = b.sprintfWithFormattedArgs(VARIABLE_FORMATTER, message...)
+    else
+      message = u.escapeHtml(message)
+    message
+
+  isOpen = ->
+    !!state.$toast
+    
+  addAction = ($actions, label, callback) ->
+    $action = $('<span class="up-toast-action"></span>').text(label)
+    $action.on 'click', callback
+    $action.appendTo($actions)
+  
+  open = (message, options = {}) ->
+    close()
+    $toast = $('<div class="up-toast"></div>').prependTo('body')
+    $message = $('<div class="up-toast-message"></div>').appendTo($toast)
+    $actions = $('<div class="up-toast-actions"></div>').appendTo($toast)
+
+    message = messageToHtml(message)
+    $message.html(message)
+
+    if action = (options.action || options.inspect)
+      addAction($actions, action.label, action.callback)
+
+    addAction($actions, 'Close', close)
+
+    state.$toast = $toast
+
+  close = ->
+    if isOpen()
+      state.$toast.remove()
+      state.$toast = null
+
+  # The framework is reset between tests
+  up.on 'up:framework:reset', reset
+
+  open: open
+  close: close
+  reset: reset
+  isOpen: isOpen
+
+)(jQuery)

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

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

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

@@ -545,7 +545,7 @@ up.util = (($) ->
 
   Returns the array.
 
-  @function up.util.isDeferred
+  @function up.util.toArray
   @param object
   @return {Array}
   @stable
@@ -1597,7 +1597,7 @@ up.util = (($) ->
     if isFormData(data)
       # Until FormData#entries is implemented in all major browsers
       # we must give up here
-      up.error('Cannot convert FormData into an array')
+      up.fail('Cannot convert FormData into an array')
     else
       query = requestDataAsQuery(data)
       array = []
@@ -1620,7 +1620,7 @@ up.util = (($) ->
     if isFormData(data)
       # Until FormData#entries is implemented in all major browsers
       # we must give up here
-      up.error('Cannot convert FormData into a query string')
+      up.fail('Cannot convert FormData into a query string')
     else if isPresent(data)
       query = $.param(data)
       query = query.replace(/\+/g, '%20')
@@ -1672,28 +1672,34 @@ up.util = (($) ->
     data
 
   ###*
-  Throws a fatal error with the given message.
+  Throws an [exception](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error)
+  with the given message.
+
+  The message will also be printed to the [error log](/up.log.error).
 
-  - 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
+  Also a notification will be shown at the bottom of the screen.
 
   \#\#\#\# Examples
 
-      up.error('Division by zero')
-      up.error('Unexpected result %o', result)
+      up.fail('Division by zero')
+      up.fail('Unexpected result %o', result)
 
+  @function up.fail
   @experimental
   ###
-  error = (args...) ->
-    up.log.error(args...)
-    whenReady().then ->
-      $error = presence($('.up-error')) || $('<div class="up-error"></div>').prependTo('body')
-      formatter = (arg) ->
-        "<span class='up-error-variable'>#{escapeHtml(arg)}</span>"
-      asHtml = up.browser.sprintfWithFormattedArgs(formatter, args...)
-      $error.html(asHtml)
-    asString = up.browser.sprintf(args...)
+  fail = (args...) ->
+    if isArray(args[0])
+      messageArgs = args[0]
+      toastOptions = args[1] || {}
+    else
+      messageArgs = args
+      toastOptions = {}
+
+    up.log.error(messageArgs...)
+
+    whenReady().then -> up.toast.open(messageArgs, toastOptions)
+
+    asString = up.browser.sprintf(messageArgs...)
     throw new Error(asString)
 
   ESCAPE_HTML_ENTITY_MAP =
@@ -1816,6 +1822,25 @@ up.util = (($) ->
       @queue = map(newTasks, previewable)
       @poke()
 
+  ###*
+  @function up.util.submittedValue
+  @internal
+  ###
+  submittedValue = (fieldOrSelector) ->
+    $field = $(fieldOrSelector)
+    if $field.is('[type=checkbox], [type=radio]') && !$field.is(':checked')
+      undefined
+    else
+      $field.val()
+
+  ###*
+  @function up.util.sequence
+  @internal
+  ###
+  sequence: (functions...) ->
+    ->
+      map functions, (f) -> f()
+
   isDetached: isDetached
   requestDataAsArray: requestDataAsArray
   requestDataAsQuery: requestDataAsQuery
@@ -1838,7 +1863,7 @@ up.util = (($) ->
   merge: merge
   options: options
   option: option
-  error: error
+  fail: fail
   each: each
   map: map
   times: times
@@ -1911,7 +1936,7 @@ up.util = (($) ->
   cache: cache
   unwrapElement: unwrapElement
   multiSelector: multiSelector
-  error: error
+  error: fail
   pluckData: pluckData
   pluckKey: pluckKey
   extractOptions: extractOptions
@@ -1922,7 +1947,8 @@ up.util = (($) ->
   identity: identity
   escapeHtml: escapeHtml
   DivertibleChain: DivertibleChain
+  submittedValue: submittedValue
 
 )($)
 
-up.error = up.util.error
+up.fail = up.util.fail

data/lib/assets/stylesheets/unpoly/toast.css.sass

@@ -0,0 +1,33 @@
+$highlight-color: #28b
+$text-color: #333
+
+.up-toast
+  border-top: 3px solid $highlight-color
+  background-color: white
+  color: $text-color
+  padding: 10px
+  font-family: monospace
+  font-size: 14px
+  line-height: 15px
+  position: fixed
+  left: 0
+  bottom: 0
+  right: 0
+  z-index: 99999999
+
+.up-toast-variable
+  font-weight: normal
+  color: $text-color + 80
+
+.up-toast-actions
+  margin-top: 7px
+
+.up-toast-action
+  display: inline-block
+  word-spacing: -4px
+  text-decoration: underline
+  color: $highlight-color
+  cursor: pointer
+
+  &+.up-toast-action
+    margin-left: 12px

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '0.27.3'
+    VERSION = '0.28.0'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.27.2)
+    unpoly-rails (0.27.3)
       rails (>= 3)
 
 GEM

data/spec_app/app/assets/javascripts/integration_test.coffee

@@ -1,2 +1,3 @@
 #= require jquery
+#= require jquery_ujs
 #= require unpoly

data/spec_app/app/assets/stylesheets/integration_test.sass

@@ -1,10 +1,19 @@
 //= require unpoly
 
+$block-spacing: 25px
+
+=block-spacing
+  margin-top: $block-spacing
+  margin-bottom: $block-spacing
+
 body
   margin: 0
   background: image-url('grid.png') repeat
   font-family: arial, sans-serif
 
+h1, h2, h3, h4, p
+  +block-spacing
+
 .page
   min-height: 3000px
 
@@ -24,6 +33,11 @@ body
 .example
   margin: 50px
 
+.area
+  +block-spacing
+  padding: 25px
+  border: 1px dashed #666
+
 .button
   display: inline-block
   height: 50px

data/spec_app/app/controllers/application_controller.rb

@@ -3,4 +3,12 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
+  before_action :print_authenticity_token
+
+  private
+
+  def print_authenticity_token
+    Rails.logger.info "*** Real token is #{send(:real_csrf_token, session)}"
+  end
+
 end