upjs-rails 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac926c02b81da3c61c247b6657a4849b98f317e
-  data.tar.gz: bbd3180804f3fc221d15bbea1ed1f018807f472b
+  metadata.gz: 3eb33da9d6d267e5f81bbf2b99705cd6040d43c2
+  data.tar.gz: ef207a1688fc627ed3426acdb565ce2786e2d9af
 SHA512:
-  metadata.gz: 9569a9e5ddf7f4895cb33db0cd1f2dd458259ab685e78b78d5575e20122537c9dab2eaa67677fe540801eda4a80df501344a9db9c1289ff3e28dd3ce723957ed
-  data.tar.gz: cec466a2165adfefbdf3f5e21a16cde88f749a6c3479376c28ef7de0d5d67eec896b571d4cdd26042612cec9ea44bf83500ed032209b7ca28093f6483998ddc7
+  metadata.gz: 2bbb0a472c1b7d96f332aa3de98009b6fe7589a474279ed548e5b4d9113a7ce3127fc2af1e3fe06bb74146bc2a5701ad3b44d602714f018fdfdd30f6a1004498
+  data.tar.gz: 085ed31b540ef88a215441d3c3b4b2016d83cf9e8d14a2b86c2ecd1c316bea1c6ce26cdb6d7d7ecd81b698b8720904715851764b5710fe757e9784aa7ae0020c

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 This project mostly adheres to [Semantic Versioning](http://semver.org/).
 
 
+0.12.3
+------
+
+Refactored internals. No API changes.
+
+
 0.12.2
 ------
 

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

@@ -117,7 +117,7 @@ up.browser = (($) ->
   On older browsers Up.js will prevent itself from booting, leaving you with
   a classic server-side application.
 
-  @up.browser.isSupported
+  @method up.browser.isSupported
   ###
   isSupported = ->
     (!isIE8OrWorse()) && isRecentJQuery()

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

@@ -14,7 +14,7 @@ This event is triggered after Up.js has inserted an HTML fragment into the DOM t
       console.log("Looks like we have a new %o!", $fragment);
     });
 
-The event is triggered *before* Up has compiled the fragment with your [custom behavior](/up.magic).
+The event is triggered *before* Up has compiled the fragment with your [custom elements](/up.syntax).
 Upon receiving the event, Up.js will start compilation.
 
 
@@ -36,8 +36,6 @@ animation before removing the fragment from the DOM.
   
 We need to work on this page:
 
-- Decide whether to refactor this into document events
-- Decide whether `fragment:enter` and `fragment:leave` would be better names
 - Decide if we wouldn't rather document events in the respective module (e.g. proxy).
 
 @class up.bus
@@ -46,6 +44,107 @@ up.bus = (($) ->
   
   u = up.util
 
+  liveDescriptions = []
+  defaultLiveDescriptions = null
+
+  ###*
+  # Convert an Up.js style listener (second argument is the event target
+  # as a jQuery collection) to a vanilla jQuery listener
+  ###
+  upListenerToJqueryListener = (upListener) ->
+    (event) ->
+      $me = event.$element || $(this)
+      upListener.apply($me.get(0), [event, $me, up.syntax.data($me)])
+
+  ###*
+  Listens to an event on `document`.
+
+  The given event listener which will be executed whenever the
+  given event is [triggered](/up.emit) on the given selector:
+
+      up.on('click', '.button', function(event, $element) {
+        console.log("Someone clicked the button %o", $element);
+      });
+
+  This is roughly equivalent to binding an event listener to `document`:
+
+      $(document).on('click', '.button', function(event) {
+        console.log("Someone clicked the button %o", $(this));
+      });
+
+  Other than jQuery, Up.js will silently discard event listeners
+  on [browsers that it doesn't support](/up.browser.isSupported).
+
+
+  \#\#\#\# Attaching structured data
+
+  In case you want to attach structured data to the event you're observing,
+  you can serialize the data to JSON and put it into an `[up-data]` attribute:
+
+      <span class="person" up-data="{ age: 18, name: 'Bob' }">Bob</span>
+      <span class="person" up-data="{ age: 22, name: 'Jim' }">Jim</span>
+
+  The JSON will parsed and handed to your event handler as a third argument:
+
+      up.on('click', '.person', function(event, $element, data) {
+        console.log("This is %o who is %o years old", data.name, data.age);
+      });
+
+
+  \#\#\#\# Migrating jQuery event handlers to `up.on`
+
+  Within the event handler, Up.js will bind `this` to the
+  native DOM element to help you migrate your existing jQuery code to
+  this new syntax.
+
+  So if you had this before:
+
+      $(document).on('click', '.button', function() {
+        $(this).something();
+      });
+
+  ... you can simply copy the event handler to `up.on`:
+
+      up.on('click', '.button', function() {
+        $(this).something();
+      });
+
+  @method up.on
+  @param {String} events
+    A space-separated list of event names to bind.
+  @param {String} [selector]
+    The selector of an element on which the event must be triggered.
+    Omit the selector to listen to all events with that name, regardless
+    of the event target.
+  @param {Function(event, $element, data)} behavior
+    The handler that should be called.
+    The function takes the affected element as the first argument (as a jQuery object).
+    If the element has an `up-data` attribute, its value is parsed as JSON
+    and passed as a second argument.
+  @return {Function}
+    A function that unbinds the event listeners when called.
+  ###
+  live = (args...) ->
+    # Silently discard any event handlers that are registered on unsupported
+    # browsers and return a no-op destructor
+    return (->) unless up.browser.isSupported()
+
+    description = u.copy(args)
+    lastIndex = description.length - 1
+    behavior = description[lastIndex]
+    description[lastIndex] = upListenerToJqueryListener(behavior)
+
+    # Remember the descriptions we registered, so we can
+    # clean up after ourselves during a reset
+    liveDescriptions.push(description)
+
+    $document = $(document)
+    $document.on(description...)
+
+    # Return destructor
+    -> $document.off(description...)
+
+
   ###*
   Emits an event with the given name and properties.
 
@@ -77,6 +176,7 @@ up.bus = (($) ->
     $target.trigger(event)
     event
 
+
   ###*
   [Emits an event](/up.emit) and returns whether any listener has prevented the default action.
 
@@ -89,6 +189,32 @@ up.bus = (($) ->
     event = emit(args...)
     not event.isDefaultPrevented()
 
+  onEscape = (handler) ->
+    live('keydown', 'body', (event) ->
+      if u.escapePressed(event)
+        handler(event)
+    )
+
+  ###*
+  Makes a snapshot of the currently registered event listeners,
+  to later be restored through [`up.bus.reset`](/up.bus.reset).
+
+  @private
+  ###
+  snapshot = ->
+    defaultLiveDescriptions = u.copy(liveDescriptions)
+
+  ###*
+  Resets the list of registered event listeners to the
+  moment when the framework was booted.
+
+  @private
+  ###
+  restoreSnapshot = ->
+    for description in liveDescriptions
+      unless u.contains(defaultLiveDescriptions, description)
+        $(document).off(description...)
+    liveDescriptions = u.copy(defaultLiveDescriptions)
 
   ###*
   Resets Up.js to the state when it was booted.
@@ -101,14 +227,20 @@ up.bus = (($) ->
   @protected
   @method up.reset
   ###
-  reset = ->
+  emitReset = ->
     up.emit('up:framework:reset')
 
+  live 'up:framework:boot', snapshot
+  live 'up:framework:reset', restoreSnapshot
+
+  on: live # can't name symbols `on` in Coffeescript
   emit: emit
   nobodyPrevents: nobodyPrevents
-  reset: reset
+  onEscape: onEscape
+  emitReset: emitReset
 
 )(jQuery)
 
-up.reset = up.bus.reset
+up.on = up.bus.on
 up.emit = up.bus.emit
+up.reset = up.bus.emitReset

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

@@ -2,16 +2,11 @@
 Changing page fragments programmatically
 ========================================
   
-This module contains Up's core functions to insert, change
-or destroy page fragments.
+This module contains Up.js's core functions to [change](/up.replace) or [destroy](/up.destroy)
+  page fragments via Javascript.
 
-\#\#\# Incomplete documentation!
-  
-We need to work on this page:
-  
-- Explain the UJS approach vs. pragmatic approach
-- Examples
-  
+All the other Up.js modules (like [`up.link`](/up.link) or [`up.modal`](/up.modal))
+are based on this module.
   
 @class up.flow
 ###

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

@@ -76,7 +76,7 @@ Read on
 - You can [open fragments in popups or modal dialogs](/up.modal).
 - You can give users [immediate feedback](/up.navigation) when a link is clicked or becomes current, without waiting for the server.
 - [Controlling Up.js pragmatically through Javascript](/up.flow)
-- [Defining custom tags and event handlers](/up.magic)
+- [Defining custom tags](/up.syntax)
 
   
 @class up.link

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

@@ -411,7 +411,7 @@ up.modal = (($) ->
   )
 
   # Close the pop-up overlay when the user presses ESC.
-  up.magic.onEscape(-> close())
+  up.bus.onEscape(-> close())
 
   ###*
   When this element is clicked, closes a currently open dialog.

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

@@ -1,26 +1,30 @@
 ###*
-Animation and transitions
-=========================
+Animation
+=========
   
-Any fragment change in Up.js can be animated.
+Whenever you change a page fragment (through methods like
+[`up.replace`](/up.replace) or UJS attributes like [`up-target`](/up-target))
+you can animate the change.
 
-    <a href="/users" data-target=".list" up-transition="cross-fade">Show users</a>
+For instance, when you replace a selector `.list` with a new `.list`
+from the server, you can add an `up-transition="cross-fade"` attribute
+to smoothly fade out the old `.list` while fading in the new `.list`:
 
-Or a dialog open:
+    <a href="/users" up-target=".list" up-transition="cross-fade">Show users</a>
+
+When we morph between an old an new element, we call it a *transition*.
+In contrast, when we animate a new element without simultaneously removing an
+old element, we call it an *animation*.
+
+An example for an animation is opening a new dialog, which we can animate
+using the `up-animation` attribute:
 
     <a href="/users" up-modal=".list" up-animation="move-from-top">Show users</a>
 
-Up.js ships with a number of predefined animations and transitions,
-and you can easily define your own using Javascript or CSS. 
-  
-  
-\#\#\# Incomplete documentation!
-  
-We need to work on this page:
-  
-- Explain the difference between transitions and animations
-- Demo the built-in animations and transitions
-- Explain ghosting
+Up.js ships with a number of predefined [animations](/up.animate#named-animation)
+and [transitions](/up.morph#named-animation).
+You can also easily [define your own animations](/up.animation)
+or [transitions](/up.transition) using Javascript or CSS.
 
   
 @class up.motion
@@ -265,7 +269,25 @@ up.motion = (($) ->
   
   - `move-to-bottom/fade-in`
   - `move-to-left/move-from-top`
-  
+
+  \#\#\#\# Implementation details
+
+  During a transition both the old and new element occupy
+  the same position on the screen.
+
+  Since the CSS layout flow will usually not allow two elements to
+  overlay the same space, Up.js:
+
+  - The old and new elements are cloned
+  - The old element is removed from the layout flow using `display: hidden`
+  - The new element is hidden, but still leaves space in the layout flow by setting `visibility: hidden`
+  - The clones are [absolutely positioned](https://developer.mozilla.org/en-US/docs/Web/CSS/position#Absolute_positioning)
+    over the original elements.
+  - The transition is applied to the cloned elements.
+    At no point will the hidden, original elements be animated.
+  - When the transition has finished, the clones are removed from the DOM and the new element is shown.
+    The old element remains hidden in the DOM.
+
   @method up.morph
   @param {Element|jQuery|String} source
   @param {Element|jQuery|String} target
@@ -316,7 +338,7 @@ up.motion = (($) ->
       skipMorph($old, $new, parsedOptions)
 
   ###*
-  Cause the side effects of a successful transitions, but instantly.
+  This causes the side effects of a successful transition, but instantly.
   We use this to skip morphing for old browsers, or when the developer
   decides to only animate the new element (i.e. no real ghosting or transition)   .
 
@@ -455,7 +477,8 @@ up.motion = (($) ->
   Returns a new promise that resolves once all promises in arguments resolve.
 
   Other then [`$.when` from jQuery](https://api.jquery.com/jquery.when/),
-  the combined promise will have a `resolve` method.
+  the combined promise will have a `resolve` method. This `resolve` method
+  will resolve all the wrapped promises.
 
   @method up.motion.when
   @param promises...

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

@@ -253,7 +253,7 @@ up.popup = (($) ->
   )
   
   # Close the pop-up overlay when the user presses ESC.
-  up.magic.onEscape(-> close())
+  up.bus.onEscape(-> close())
 
   ###*
   When an element with this attribute is clicked,

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

@@ -10,13 +10,13 @@ making requests to these URLs return insantly.
 The cache is cleared whenever the user makes a non-`GET` request
 (like `POST`, `PUT` or `DELETE`).
 
-The proxy can also used to speed up reaction times by preloading
-links when the user hovers over the click area (or puts the mouse/finger
-down before releasing). This way the
-response will already be cached when the user performs the click.
+The proxy can also used to speed up reaction times by [preloading
+links when the user hovers over the click area](/up-preload) (or puts the mouse/finger
+down before releasing). This way the response will already be cached when
+the user performs the click.
 
 Spinners
----------
+--------
 
 You can listen to [framework events](/up.bus) to implement a spinner
 (progress indicator) that appears during a long-running request,
@@ -31,12 +31,15 @@ Here is the Javascript to make it alive:
       show = function() { $element.show() };
       hide = function() { $element.hide() };
 
-      up.bus.on('proxy:busy', show);
-      up.bus.on('proxy:idle', hide);
+      showOff = up.on('proxy:busy', show);
+      hideOff = up.on('proxy:idle', hide);
 
+      hide();
+
+      // Clean up when the element is removed from the DOM
       return function() {
-        up.bus.off('proxy:busy', show);
-        up.bus.off('proxy:idle', hide);
+        showOff();
+        hideOff();
       };
 
     });

data/lib/assets/javascripts/up/{magic.js.coffee → syntax.js.coffee}

@@ -1,6 +1,6 @@
 ###*
-Registering behavior and custom elements
-========================================
+Custom elements
+===============
   
 Up.js keeps a persistent Javascript environment during page transitions.
 To prevent memory leaks it is important to cleanly set up and tear down
@@ -12,116 +12,15 @@ We need to work on this page:
 
 - Better class-level introduction for this module
 
-@class up.magic
+@class up.syntax
 ###
-up.magic = (($) ->
+up.syntax = (($) ->
   
   u = up.util
 
   DESTROYABLE_CLASS = 'up-destroyable'
   DESTROYER_KEY = 'up-destroyer'
 
-  liveDescriptions = []
-  defaultLiveDescriptions = null
-
-  ###*
-  # Convert an Up.js style listener (second argument is the event target
-  # as a jQuery collection) to a vanilla jQuery listener
-  ###
-  upListenerToJqueryListener = (upListener) ->
-    (event) ->
-      $me = event.$element || $(this)
-      upListener.apply($me.get(0), [event, $me, data($me)])
-
-  ###*
-  Listens to an event on `document`.
-
-  The given event listener which will be executed whenever the
-  given event is [triggered](/up.emit) on the given selector:
-
-      up.on('click', '.button', function(event, $element) {
-        console.log("Someone clicked the button %o", $element);
-      });
-
-  This is roughly equivalent to binding an event listener to `document`:
-
-      $(document).on('click', '.button', function(event) {
-        console.log("Someone clicked the button %o", $(this));
-      });
-
-  Other than jQuery, Up.js will silently discard event listeners
-  on [browsers that it doesn't support](/up.browser.isSupported).
-
-
-  \#\#\#\# Attaching structured data
-
-  In case you want to attach structured data to the event you're observing,
-  you can serialize the data to JSON and put it into an `[up-data]` attribute:
-
-      <span class="person" up-data="{ age: 18, name: 'Bob' }">Bob</span>
-      <span class="person" up-data="{ age: 22, name: 'Jim' }">Jim</span>
-
-  The JSON will parsed and handed to your event handler as a third argument:
-
-      up.on('click', '.person', function(event, $element, data) {
-        console.log("This is %o who is %o years old", data.name, data.age);
-      });
-
-
-  \#\#\#\# Migrating jQuery event handlers to `up.on`
-
-  Within the event handler, Up.js will bind `this` to the
-  native DOM element to help you migrate your existing jQuery code to
-  this new syntax.
-
-  So if you had this before:
-
-      $(document).on('click', '.button', function() {
-        $(this).something();
-      });
-
-  ... you can simply copy the event handler to `up.on`:
-
-      up.on('click', '.button', function() {
-        $(this).something();
-      });
-
-
-  @method up.on
-  @param {String} events
-    A space-separated list of event names to bind.
-  @param {String} [selector]
-    The selector of an element on which the event must be triggered.
-    Omit the selector to listen to all events with that name, regardless
-    of the event target.
-  @param {Function(event, $element, data)} behavior
-    The handler that should be called.
-    The function takes the affected element as the first argument (as a jQuery object).
-    If the element has an `up-data` attribute, its value is parsed as JSON
-    and passed as a second argument.
-  @return {Function}
-    A function that unbinds the event listeners when called.
-  ###
-  live = (args...) ->
-    # Silently discard any event handlers that are registered on unsupported
-    # browsers and return a no-op destructor
-    return (->) unless up.browser.isSupported()
-
-    description = u.copy(args)
-    lastIndex = description.length - 1
-    behavior = description[lastIndex]
-    description[lastIndex] = upListenerToJqueryListener(behavior)
-
-    # Remember the descriptions we registered, so we can
-    # clean up after ourselves during a reset
-    liveDescriptions.push(description)
-
-    $document = $(document)
-    $document.on(description...)
-
-    # Return destructor
-    -> $document.off(description...)
-
 
   ###*
   Registers a function to be called whenever an element with
@@ -321,16 +220,17 @@ up.magic = (($) ->
   we can support getting or setting individual keys.
 
   @protected
-  @method up.magic.data
+  @method up.syntax.data
   @param {String|Element|jQuery} elementOrSelector
   ###
 
   ###
-  Stores a JSON-string with the element.
+  Looks for an `up-data` attribute on the given element, then parses
+  its value as JSON and returns the JSON object.
 
   If an element annotated with [`up-data`] is inserted into the DOM,
   Up will parse the JSON and pass the resulting object to any matching
-  [`up.compiler`](/up.magic.compiler) handlers.
+  [`up.compiler`](/up.syntax.compiler) handlers.
 
   Similarly, when an event is triggered on an element annotated with
   [`up-data`], the parsed object will be passed to any matching
@@ -339,6 +239,10 @@ up.magic = (($) ->
   @ujs
   @method [up-data]
   @param {JSON} [up-data]
+  @return
+    The JSON-decoded value of the `up-data` attribute.
+
+    Returns an empty object (`{}`) if the element has no (or an empty) `up-data` attribute.
   ###
   data = (elementOrSelector) ->
     $element = $(elementOrSelector)
@@ -350,27 +254,20 @@ up.magic = (($) ->
 
   ###*
   Makes a snapshot of the currently registered event listeners,
-  to later be restored through [`up.bus.reset`](/up.bus.reset).
+  to later be restored through `reset`.
   
   @private
-  @method up.magic.snapshot
   ###
   snapshot = ->
-    defaultLiveDescriptions = u.copy(liveDescriptions) 
     defaultCompilers = u.copy(compilers)
 
   ###*
-  Resets the list of registered event listeners to the
+  Resets the list of registered compiler directives to the
   moment when the framework was booted.
   
   @private
-  @method up.magic.reset
   ###
   reset = ->
-    for description in liveDescriptions
-      unless u.contains(defaultLiveDescriptions, description)
-        $(document).off(description...)
-    liveDescriptions = u.copy(defaultLiveDescriptions)
     compilers = u.copy(defaultCompilers)
 
   ###*
@@ -395,29 +292,20 @@ up.magic = (($) ->
     up.emit('up:fragment:inserted', $element: $element)
     $element
 
-  onEscape = (handler) ->
-    live('keydown', 'body', (event) ->
-      if u.escapePressed(event)
-        handler(event)
-    )
-
-  live 'ready', (-> hello(document.body))
-  live 'up:fragment:inserted', (event) -> compile(event.$element)
-  live 'up:fragment:destroy', (event) -> destroy(event.$element)
-  live 'up:framework:boot', snapshot
-  live 'up:framework:reset', reset
+  up.on 'ready', (-> hello(document.body))
+  up.on 'up:fragment:inserted', (event) -> compile(event.$element)
+  up.on 'up:fragment:destroy', (event) -> destroy(event.$element)
+  up.on 'up:framework:boot', snapshot
+  up.on 'up:framework:reset', reset
 
   compiler: compiler
-  on: live
   hello: hello
-  onEscape: onEscape
   data: data
 
 )(jQuery)
 
-up.compiler = up.magic.compiler
-up.on = up.magic.on
-up.hello = up.magic.hello
+up.compiler = up.syntax.compiler
+up.hello = up.syntax.hello
 
 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/up/tooltip.js.coffee

@@ -1,18 +1,31 @@
 ###*
 Tooltips
 ========
-  
-Elements that have an `up-tooltip` attribute will show the attribute
-value in a tooltip when a user hovers over the element. 
-  
-\#\#\# Incomplete documentation!
-  
-We need to work on this page:
-  
-- Show the tooltip's HTML structure and how to style the elements
-- Explain how to position tooltips using `up-position`
-- We should have a position about tooltips that contain HTML.
-  
+
+Up.js comes with a basic tooltip implementation.
+
+You can an [`up-tooltip`](/up-tooltip) attribute to any HTML tag to show a tooltip whenever
+  the user hovers over the element:
+
+      <a href="/decks" up-tooltip="Show all decks">Decks</a>
+
+
+\#\#\#\# Styling
+
+The [default styles](https://github.com/makandra/upjs/blob/master/lib/assets/stylesheets/up/tooltip.css.sass)
+show a simple tooltip with white text on a gray background.
+A gray triangle points to the element.
+
+To change the styling, simply override CSS rules for the `.up-tooltip` selector and its `:after`
+selector that is used the triangle.
+
+The HTML of a tooltip element is simply this:
+
+    <div class="up-tooltip">
+      Show all decks
+    </div>
+
+The tooltip element is appended to the end of `<body>`.
 
 @class up.tooltip
 ###
@@ -20,6 +33,27 @@ up.tooltip = (($) ->
   
   u = up.util
 
+  ###*
+  Sets default options for future tooltips.
+
+  @method up.tooltip.config
+  @property
+  @param {String} [config.position]
+    The default position of tooltips relative to the element.
+    Can be either `"top"` or `"bottom"`.
+  @param {String} [config.openAnimation='fade-in']
+    The animation used to open a tooltip.
+  @param {String} [config.closeAnimation='fade-out']
+    The animation used to close a tooltip.
+  ###
+  config = u.config
+    position: 'top'
+    openAnimation: 'fade-in'
+    closeAnimation: 'fade-out'
+
+  reset = ->
+    config.reset()
+
   setPosition = ($link, $tooltip, position) ->
     linkBox = u.measure($link)
     tooltipBox = u.measure($tooltip)
@@ -47,7 +81,7 @@ up.tooltip = (($) ->
   ###*
   Opens a tooltip over the given element.
 
-      up.tooltip.open('.help', {
+      up.tooltip.attach('.help', {
         html: 'Enter multiple words or phrases'
       });
   
@@ -63,9 +97,9 @@ up.tooltip = (($) ->
   attach = (linkOrSelector, options = {}) ->
     $link = $(linkOrSelector)
     html = u.option(options.html, $link.attr('up-tooltip-html'))
-    text = u.option(options.text, $link.attr('up-tooltip'), $link.attr('title'))
-    position = u.option(options.position, $link.attr('up-position'), 'top')
-    animation = u.option(options.animation, u.castedAttr($link, 'up-animation'), 'fade-in')
+    text = u.option(options.text, $link.attr('up-tooltip'))
+    position = u.option(options.position, $link.attr('up-position'), config.position)
+    animation = u.option(options.animation, u.castedAttr($link, 'up-animation'), config.openAnimation)
     animateOptions = up.motion.animateOptions(options, $link)
     close()
     $tooltip = createElement(text: text, html: html)
@@ -83,7 +117,7 @@ up.tooltip = (($) ->
   close = (options) ->
     $tooltip = $('.up-tooltip')
     if $tooltip.length
-      options = u.options(options, animation: 'fade-out')
+      options = u.options(options, animation: config.closeAnimation)
       options = u.merge(options, up.motion.animateOptions(options))
       up.destroy($tooltip, options)
 
@@ -91,14 +125,23 @@ up.tooltip = (($) ->
   Displays a tooltip with text content 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>
+
+  To make the tooltip appear below the element instead of above the element,
+  add an `up-position` attribute:
+
+      <a href="/decks" up-tooltip="Show all decks" up-position="bottom">Decks</a>
 
   @method [up-tooltip]
+  @param {String} [up-animation]
+    The animation used to open the tooltip.
+    Defaults to [`up.tooltip.config.openAnimation`](/up.tooltip.config).
+  @param {String} [up-position]
+    The default position of tooltips relative to the element.
+    Can be either `"top"` or `"bottom"`.
+    Defaults to [`up.tooltip.config.position`](/up.tooltip.config).
   @ujs
   ###
+
   ###*
   Displays a tooltip with HTML content when hovering the mouse over this element:
 
@@ -124,7 +167,10 @@ up.tooltip = (($) ->
   up.on 'up:framework:reset', close
 
   # Close the tooltip when the user presses ESC.
-  up.magic.onEscape(-> close())
+  up.bus.onEscape(-> close())
+
+  # The framework is reset between tests
+  up.on 'up:framework:reset', reset
 
   attach: attach
   close: close

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

@@ -885,15 +885,14 @@ up.util = (($) ->
       right: ''
       bottom: ''
 
-  argNames = (fun) ->
-    code = fun.toString()
-    pattern = new RegExp('\\(([^\\)]*)\\)')
-    if match = code.match(pattern)
-      match[1].split(/\s*,\s*/)
-    else
-      error('Could not parse argument names of %o', fun)
+#  argNames = (fun) ->
+#    code = fun.toString()
+#    pattern = new RegExp('\\(([^\\)]*)\\)')
+#    if match = code.match(pattern)
+#      match[1].split(/\s*,\s*/)
+#    else
+#      error('Could not parse argument names of %o', fun)
 
-  argNames: argNames
   offsetParent: offsetParent
   fixedToAbsolute: fixedToAbsolute
   presentAttr: presentAttr

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

@@ -2,7 +2,7 @@
 #= require up/util
 #= require up/browser
 #= require up/bus
-#= require up/magic
+#= require up/syntax
 #= require up/history
 #= require up/layout
 #= require up/flow

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

@@ -10,8 +10,7 @@ $background: #666
   color: white
   padding: 6px 9px
   white-space: nowrap
-  //box-shadow: 0 0 4px rgba(0, 0, 0, 0.2)
-  
+
   &[up-position=top]
     margin-top: -$distance-from-trigger
     &:after

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.12.2'
+    VERSION = '0.12.3'
   end
 end

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

@@ -1,7 +1,52 @@
 describe 'up.bus', ->
   
   describe 'Javascript functions', ->
-    
+
+    describe 'up.on', ->
+
+      it 'registers a delagating event listener to the document body, which passes the $element as a second argument to the listener', ->
+
+        affix('.container .child')
+        observeClass = jasmine.createSpy()
+        up.on 'click', '.child', (event, $element) ->
+          observeClass($element.attr('class'))
+
+        $('.container').click()
+        $('.child').click()
+
+        expect(observeClass).not.toHaveBeenCalledWith('container')
+        expect(observeClass).toHaveBeenCalledWith('child')
+
+      it 'returns a method that unregisters the event listener when called', ->
+        $child = affix('.child')
+        clickSpy = jasmine.createSpy()
+        unsubscribe = up.on 'click', '.child', clickSpy
+        $('.child').click()
+        unsubscribe()
+        $('.child').click()
+        expect(clickSpy.calls.count()).toEqual(1)
+
+      it 'parses an up-data attribute as JSON and passes the parsed object as a third argument to the initializer', ->
+        $child = affix('.child')
+        observeArgs = jasmine.createSpy()
+        up.on 'click', '.child', (event, $element, data) ->
+          observeArgs($element.attr('class'), data)
+
+        data = { key1: 'value1', key2: 'value2' }
+        $tag = affix(".child").attr('up-data', JSON.stringify(data))
+
+        $('.child').click()
+        expect(observeArgs).toHaveBeenCalledWith('child', data)
+
+      it 'passes an empty object as a second argument to the listener if there is no up-data attribute', ->
+        $child = affix('.child')
+        observeArgs = jasmine.createSpy()
+        up.on 'click', '.child', (event, $element, data) ->
+          observeArgs($element.attr('class'), data)
+
+        $('.child').click()
+        expect(observeArgs).toHaveBeenCalledWith('child', {})
+
     describe 'up.emit', ->
 
       it 'triggers an event on the document', ->

data/spec_app/spec/javascripts/up/{magic_spec.js.coffee → syntax_spec.js.coffee}

@@ -1,22 +1,7 @@
-describe 'up.magic', ->
+describe 'up.syntax', ->
   
   describe 'Javascript functions', ->
   
-    describe 'up.on', ->
-      
-      it 'registers a delagating event listener to the document body', ->
-        
-        affix('.container .child')
-        observeClass = jasmine.createSpy()
-        up.on 'click', '.child', (event, $element) ->
-          observeClass($element.attr('class'))
-   
-        $('.container').click()
-        $('.child').click()
-   
-        expect(observeClass).not.toHaveBeenCalledWith('container')
-        expect(observeClass).toHaveBeenCalledWith('child')           
-      
     describe 'up.compiler', ->
       
       it 'applies an event initializer whenever a matching fragment is inserted', ->

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

@@ -2,11 +2,11 @@ describe 'up.util', ->
   
   describe 'Javascript functions', ->
 
-    describe 'up.util.argNames', ->
-
-      it 'returns an array of argument names for the given function', ->
-        fun = ($element, data) ->
-        expect(up.util.argNames(fun)).toEqual(['$element', 'data'])
+#    describe 'up.util.argNames', ->
+#
+#      it 'returns an array of argument names for the given function', ->
+#        fun = ($element, data) ->
+#        expect(up.util.argNames(fun)).toEqual(['$element', 'data'])
 
     describe 'up.util.castedAttr', ->
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,13 +100,13 @@ 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/magic.js.coffee
 - lib/assets/javascripts/up/modal.js.coffee
 - lib/assets/javascripts/up/module.js.coffee
 - lib/assets/javascripts/up/motion.js.coffee
 - lib/assets/javascripts/up/navigation.js.coffee
 - lib/assets/javascripts/up/popup.js.coffee
 - lib/assets/javascripts/up/proxy.js.coffee
+- lib/assets/javascripts/up/syntax.js.coffee
 - lib/assets/javascripts/up/tooltip.js.coffee
 - lib/assets/javascripts/up/util.js.coffee
 - lib/assets/stylesheets/up-bootstrap.css.sass
@@ -222,12 +222,12 @@ files:
 - spec_app/spec/javascripts/up/history_spec.js.coffee
 - spec_app/spec/javascripts/up/layout_spec.js.coffee
 - spec_app/spec/javascripts/up/link_spec.js.coffee
-- spec_app/spec/javascripts/up/magic_spec.js.coffee
 - spec_app/spec/javascripts/up/modal_spec.js.coffee
 - spec_app/spec/javascripts/up/motion_spec.js.coffee
 - spec_app/spec/javascripts/up/navigation_spec.js.coffee
 - spec_app/spec/javascripts/up/popup_spec.js.coffee
 - spec_app/spec/javascripts/up/proxy_spec.js.coffee
+- spec_app/spec/javascripts/up/syntax_spec.js.coffee
 - spec_app/spec/javascripts/up/tooltip_spec.js.coffee
 - spec_app/spec/javascripts/up/util_spec.js.coffee
 - spec_app/test/controllers/.keep