upjs-rails 0.11.1 → 0.12.0

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

@@ -21,16 +21,17 @@ We need to work on this page:
   
 @class up.popup
 ###
-up.popup = (->
+up.popup = (($) ->
 
   u = up.util
 
   currentSource = undefined
 
   ###*
-  @method up.popup.defaults
-  @param {String} options.animation
-  @param {String} options.position
+  @method up.popup.config
+  @param {String} config.openAnimation
+  @param {String} config.closeAnimation
+  @param {String} config.position
   ###
   config = u.config
     openAnimation: 'fade-in'
@@ -114,9 +115,9 @@ up.popup = (->
     up.animate($popup, animation, animateOptions)
     
   ###*
-  Opens a popup overlay.
+  Attaches a popup overlay to the given element or selector.
   
-  @method up.popup.open
+  @method up.popup.attach
   @param {Element|jQuery|String} elementOrSelector
   @param {String} [options.url]
   @param {String} [options.position='bottom-right']
@@ -133,7 +134,7 @@ up.popup = (->
     open even if the page changes in the background.
   @param {Object} [options.history=false]
   ###
-  open = (linkOrSelector, options) ->
+  attach = (linkOrSelector, options) ->
     $link = $(linkOrSelector)
     
     options = u.options(options)
@@ -204,9 +205,9 @@ up.popup = (->
     $element.closest('.up-popup').length > 0
 
   ###*
-  Opens the target of this link in a popup overlay:
+  Opens this link's destination of in a popup overlay:
 
-      <a href="/decks" up-modal=".deck_list">Switch deck</a>
+      <a href="/decks" up-popup=".deck_list">Switch deck</a>
 
   If the `up-sticky` attribute is set, the dialog does not auto-close
   if a page fragment below the popup overlay updates:
@@ -224,7 +225,7 @@ up.popup = (->
     if $link.is('.up-current')
       close()
     else
-      open($link)
+      attach($link)
   )
 
   # Close the popup when someone clicks outside the popup
@@ -235,7 +236,7 @@ up.popup = (->
       close()
   )
   
-  up.bus.on('fragment:ready', ($fragment) ->
+  up.on('up:fragment:inserted', (event, $fragment) ->
     if contains($fragment)
       if newSource = $fragment.attr('up-source')
         currentSource = newSource
@@ -263,12 +264,14 @@ up.popup = (->
   )
 
   # The framework is reset between tests
-  up.bus.on 'framework:reset', reset
+  up.on 'up:framework:reset', reset
 
-  open: open
+  attach: attach
   close: close
   source: source
-  defaults: config.update
+  config: config
+  defaults: -> u.error('up.popup.defaults(...) no longer exists. Set values on he up.popup.config property instead.')
   contains: contains
-  
-)()
+  open: -> up.warn('up.popup.open no longer exists. Please use up.popup.attach instead.')
+
+)(jQuery)

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

@@ -3,8 +3,8 @@ Caching and preloading
 ======================
 
 All HTTP requests go through the Up.js proxy.
-It caches a [limited](/up.proxy#up.proxy.defaults) number of server responses
-for a [limited](/up.proxy#up.proxy.defaults) amount of time,
+It caches a [limited](/up.proxy#up.proxy.config) number of server responses
+for a [limited](/up.proxy#up.proxy.config) amount of time,
 making requests to these URLs return insantly.
   
 The cache is cleared whenever the user makes a non-`GET` request
@@ -45,11 +45,11 @@ The `proxy:busy` event will be emitted after a delay of 300 ms
 to prevent the spinner from flickering on and off.
 You can change (or remove) this delay like this:
 
-    up.proxy.defaults({ busyDelay: 150 });
+    up.proxy.config.busyDelay = 150;
 
 @class up.proxy  
 ###
-up.proxy = (->
+up.proxy = (($) ->
 
   u = up.util
 
@@ -60,17 +60,17 @@ up.proxy = (->
   busyEventEmitted = undefined
 
   ###*
-  @method up.proxy.defaults
-  @param {Number} [options.preloadDelay=75]
+  @method up.proxy.config
+  @param {Number} [config.preloadDelay=75]
     The number of milliseconds to wait before [`[up-preload]`](#up-preload)
     starts preloading.
-  @param {Number} [options.cacheSize=70]
+  @param {Number} [config.cacheSize=70]
     The maximum number of responses to cache.
     If the size is exceeded, the oldest items will be dropped from the cache.
-  @param {Number} [options.cacheExpiry=300000]
+  @param {Number} [config.cacheExpiry=300000]
     The number of milliseconds until a cache entry expires.
     Defaults to 5 minutes.
-  @param {Number} [options.busyDelay=300]
+  @param {Number} [config.busyDelay=300]
     How long the proxy waits until emitting the `proxy:busy` [event](/up.bus).
     Use this to prevent flickering of spinners.
   ###
@@ -243,7 +243,7 @@ up.proxy = (->
     if wasIdle
       emission = ->
         if busy() # a fast response might have beaten the delay
-          up.bus.emit('proxy:busy')
+          up.bus.emit('up:proxy:busy')
           busyEventEmitted = true
       if config.busyDelay > 0
         busyDelayTimer = setTimeout(emission, config.busyDelay)
@@ -253,14 +253,14 @@ up.proxy = (->
   loadEnded = ->
     pendingCount -= 1
     if idle() && busyEventEmitted
-      up.bus.emit('proxy:idle')
+      up.bus.emit('up:proxy:idle')
       busyEventEmitted = false
 
   load = (request) ->
     u.debug('Loading URL %o', request.url)
-    up.bus.emit('proxy:load', request)
+    up.bus.emit('up:proxy:load', request)
     promise = u.ajax(request)
-    promise.always -> up.bus.emit('proxy:receive', request)
+    promise.always -> up.bus.emit('up:proxy:receive', request)
     promise
 
   isIdempotent = (request) ->
@@ -320,7 +320,7 @@ up.proxy = (->
     unless up.link.childClicked(event, $element)
       checkPreload($element)
 
-  up.bus.on 'framework:reset', reset
+  up.on 'up:framework:reset', reset
 
   preload: preload
   ajax: ajax
@@ -330,6 +330,7 @@ up.proxy = (->
   remove: remove
   idle: idle
   busy: busy
-  defaults: config.update
+  config: config
+  defaults: -> u.error('up.proxy.defaults(...) no longer exists. Set values on he up.proxy.config property instead.')
   
-)()
+)(jQuery)

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

@@ -16,7 +16,7 @@ We need to work on this page:
 
 @class up.tooltip
 ###
-up.tooltip = (->
+up.tooltip = (($) ->
   
   u = up.util
 
@@ -35,10 +35,14 @@ up.tooltip = (->
     $tooltip.attr('up-position', position)
     $tooltip.css(css)
 
-  createElement = (html) ->
-    u.$createElementFromSelector('.up-tooltip')
-      .html(html)
-      .appendTo(document.body)
+  createElement = (options) ->
+    $element = u.$createElementFromSelector('.up-tooltip')
+    if u.isGiven(options.text)
+      $element.text(options.text)
+    else
+      $element.html(options.html)
+    $element.appendTo(document.body)
+    $element
 
   ###*
   Opens a tooltip over the given element.
@@ -47,7 +51,7 @@ up.tooltip = (->
         html: 'Enter multiple words or phrases'
       });
   
-  @method up.tooltip.open
+  @method up.tooltip.attach
   @param {Element|jQuery|String} elementOrSelector
   @param {String} [options.html]
     The HTML to display in the tooltip.
@@ -56,14 +60,15 @@ up.tooltip = (->
   @param {String} [options.animation]
     The animation to use when opening the tooltip.
   ###
-  open = (linkOrSelector, options = {}) ->
+  attach = (linkOrSelector, options = {}) ->
     $link = $(linkOrSelector)
-    html = u.option(options.html, $link.attr('up-tooltip'), $link.attr('title'))
+    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')
     animateOptions = up.motion.animateOptions(options, $link)
     close()
-    $tooltip = createElement(html)
+    $tooltip = createElement(text: text, html: html)
     setPosition($link, $tooltip, position)
     up.animate($tooltip, animation, animateOptions)
 
@@ -83,7 +88,7 @@ up.tooltip = (->
       up.destroy($tooltip, options)
 
   ###*
-  Displays a tooltip when hovering the mouse over this element:
+  Displays a tooltip with text content when hovering the mouse over this element:
 
       <a href="/decks" up-tooltip="Show all decks">Decks</a>
   
@@ -94,7 +99,15 @@ up.tooltip = (->
   @method [up-tooltip]
   @ujs
   ###
-  up.compiler('[up-tooltip]', ($link) ->
+  ###*
+  Displays a tooltip with HTML content when hovering the mouse over this element:
+
+      <a href="/decks" up-tooltip="Show &lt;b&gt;all&lt;/b&gt; decks">Decks</a>
+
+  @method [up-tooltip-html]
+  @ujs
+  ###
+  up.compiler('[up-tooltip], [up-tooltip-html]', ($link) ->
     # Don't register these events on document since *every*
     # mouse move interaction  bubbles up to the document. 
     $link.on('mouseover', -> open($link))
@@ -108,12 +121,13 @@ up.tooltip = (->
 
   # The framework is reset between tests, so also close
   # a currently open tooltip.
-  up.bus.on 'framework:reset', close
+  up.on 'up:framework:reset', close
 
   # Close the tooltip when the user presses ESC.
   up.magic.onEscape(-> close())
 
-  open: open
+  attach: attach
   close: close
+  open: -> u.error('up.tooltip.open no longer exists. Use up.tooltip.attach instead.')
 
-)()
+)(jQuery)

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

@@ -10,7 +10,7 @@ If you use them in your own code, you will get hurt.
 @protected
 @class up.util
 ###
-up.util = (->
+up.util = (($) ->
 
   memoize = (func) ->
     cache = undefined
@@ -847,27 +847,10 @@ up.util = (->
     keys: keys
 
   config = (factoryOptions = {}) ->
-    hash =
-      ensureKeyExists: (key) ->
-        factoryOptions.hasOwnProperty(key) or error("Unknown setting %o", key)
-      reset: ->
-        ownKeys = copy(Object.getOwnPropertyNames(hash))
-        for key in ownKeys
-          delete hash[key] unless contains(apiKeys, key)
-        hash.update copy(factoryOptions)
-      update: (options) ->
-        if options
-          if isString(options)
-            hash.ensureKeyExists(options)
-            hash[options]
-          else
-            for key, value of options
-              hash.ensureKeyExists(key)
-              hash[key] = value
-        else
-          hash
-    apiKeys = Object.getOwnPropertyNames(hash)
+    hash = {}
+    hash.reset = -> extend(hash, factoryOptions)
     hash.reset()
+    Object.preventExtensions(hash)
     hash
 
   unwrapElement = (wrapper) ->
@@ -902,6 +885,15 @@ 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: argNames
   offsetParent: offsetParent
   fixedToAbsolute: fixedToAbsolute
   presentAttr: presentAttr
@@ -987,7 +979,7 @@ up.util = (->
   emptyJQuery: emptyJQuery
   evalConsoleTemplate: evalConsoleTemplate
 
-)()
+)($)
 
 up.error = up.util.error
 up.warn = up.util.warn

data/lib/assets/javascripts/up-bootstrap/layout-ext.js.coffee

@@ -1,6 +1,5 @@
-defaults = up.layout.defaults()
-
-up.layout.defaults
-  fixedTop: defaults.fixedTop.concat(['.navbar-fixed-top'])
-  fixedBottom: defaults.fixedBottom.concat(['.navbar-fixed-bottom'])
-  anchoredRight: defaults.anchoredRight.concat(['.navbar-fixed-top', '.navbar-fixed-bottom', '.footer'])
+up.layout.config.fixedTop.push('.navbar-fixed-top')
+up.layout.config.fixedBottom.push('.navbar-fixed-bottom')
+up.layout.config.anchoredRight.push('.navbar-fixed-top')
+up.layout.config.anchoredRight.push('.navbar-fixed-bottom')
+up.layout.config.anchoredRight.push('.footer')

data/lib/assets/javascripts/up-bootstrap/modal-ext.js.coffee

@@ -1,11 +1,11 @@
 # Use BS `modal-dialog` and `modal-content` classes.
 # Also don't show a close button by default, since BS
 # expects user to add this manually within the content block.
-up.modal.defaults
-  template: """
-            <div class="up-modal">
-              <div class="up-modal-dialog modal-dialog">
-                <div class="up-modal-content modal-content"></div>
-              </div>
-            </div>
-            """
+up.modal.config.template =
+  """
+  <div class="up-modal">
+    <div class="up-modal-dialog modal-dialog">
+      <div class="up-modal-content modal-content"></div>
+    </div>
+  </div>
+  """

data/lib/assets/javascripts/up-bootstrap/navigation-ext.js.coffee

@@ -1,6 +1,3 @@
-defaults = up.navigation.defaults()
-
-# BS use the class `active` to highlight the current section
+# Bootstrap uses the class `active` to highlight the current section
 # of a navigation bar.
-up.navigation.defaults
-  currentClasses: defaults.currentClasses.concat(['active'])
+up.navigation.config.currentClasses.push('active')

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

@@ -14,5 +14,4 @@
 #= require up/modal
 #= require up/tooltip
 #= require up/navigation
-#= require up/slot
 #= require up/boot

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.11.1'
+    VERSION = '0.12.0'
   end
 end

data/spec_app/Gemfile.lock

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

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

@@ -2,11 +2,48 @@ describe 'up.bus', ->
   
   describe 'Javascript functions', ->
     
-    describe 'up.bus.on', ->
-
-      it 'should have tests'
-    
     describe 'up.bus.emit', ->
 
-      it 'should have tests'
-      
+      it 'triggers an event on the document', ->
+        emittedEvent = undefined
+        emitted$Target = undefined
+
+        up.on 'foo', (event, $target) ->
+          emittedEvent = event
+          emitted$Target = $target
+
+        expect(emittedEvent).toBeUndefined()
+        expect(emitted$Target).toBeUndefined()
+
+        up.bus.emit('foo')
+
+        expect(emittedEvent).toBeDefined()
+        expect(emittedEvent.preventDefault).toBeDefined()
+        expect(emitted$Target).toEqual($(document))
+
+      it 'accepts custom event properties', ->
+        emittedEvent = undefined
+
+        up.on 'foo', (event) ->
+          emittedEvent = event
+
+        up.bus.emit('foo', { customField: 'custom-value' })
+
+        expect(emittedEvent.customField).toEqual('custom-value')
+
+      it 'triggers an event on an element given as .$element event property', ->
+        emittedEvent = undefined
+        emitted$Target = undefined
+
+        $element = affix('.element').text('foo')
+
+        up.on 'foo', (event, $target) ->
+          emittedEvent = event
+          emitted$Target = $target
+
+        up.bus.emit('foo', $element: $element)
+
+        expect(emittedEvent).toBeDefined()
+        expect(emitted$Target).toEqual($element)
+
+        expect(emittedEvent.$element).toEqual($element)

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

@@ -241,7 +241,7 @@ describe 'up.flow', ->
       it 'calls destructors for custom elements', ->
         up.compiler('.element', ($element) -> destructor)
         destructor = jasmine.createSpy('destructor')
-        up.ready(affix('.element'))
+        up.hello(affix('.element'))
         up.destroy('.element')
         expect(destructor).toHaveBeenCalled()
         

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

@@ -19,7 +19,7 @@ describe 'up.history', ->
         it 'sets an [up-href] attribute to the previous URL and sets the up-restore-scroll attribute to "true"', ->
           up.history.push('/one')
           up.history.push('/two')
-          $element = up.ready(affix('a[href="/three"][up-back]').text('text'))
+          $element = up.hello(affix('a[href="/three"][up-back]').text('text'))
           expect($element.attr('href')).toEndWith('/three')
           expect($element.attr('up-href')).toEndWith('/one')
           expect($element.attr('up-restore-scroll')).toBe('')
@@ -52,8 +52,8 @@ describe 'up.history', ->
 
           $viewport = $(longContentHtml).appendTo(document.body)
 
-          up.layout.defaults(viewports: ['.viewport'])
-          up.history.defaults(popTargets: ['.viewport'])
+          up.layout.config.viewports = ['.viewport']
+          up.history.config.popTargets = ['.viewport']
 
           $viewport.append(longContentHtml)
 

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

@@ -7,10 +7,9 @@ describe 'up.layout', ->
     describe 'up.reveal', ->
 
       beforeEach ->
-        up.layout.defaults
-          snap: 0
-          substance: 99999
-          viewports: [document]
+        up.layout.config.snap = 0
+        up.layout.config.substance = 99999
+        up.layout.config.viewports = [document]
 
       describe 'when the viewport is the document', ->
 
@@ -57,7 +56,7 @@ describe 'up.layout', ->
 
         it 'snaps to the top if the space above the future-visible area is smaller than the value of config.snap', ->
 
-          up.layout.defaults(snap: 30)
+          up.layout.config.snap = 30
 
           @$elements[0].css(height: '20px')
 
@@ -235,8 +234,7 @@ describe 'up.layout', ->
 
       it 'only reveals the top number of pixels defined in config.substance', ->
 
-        up.layout.defaults
-          substance: 20
+        up.layout.config.substance = 20
 
         $viewport = affix('div').css
           'position': 'absolute'
@@ -291,26 +289,26 @@ describe 'up.layout', ->
     describe 'up.layout.viewportsOf', ->
 
       it 'seeks upwards from the given element', ->
-        up.layout.defaults(viewports: ['.viewport1', '.viewport2'])
+        up.layout.config.viewports = ['.viewport1', '.viewport2']
         $viewport1 = affix('.viewport1')
         $viewport2 = affix('.viewport2')
         $element = affix('div').appendTo($viewport2)
         expect(up.layout.viewportOf($element)).toEqual($viewport2)
 
       it 'returns the given element if it is a configured viewport itself', ->
-        up.layout.defaults(viewports: ['.viewport'])
+        up.layout.config.viewports = ['.viewport']
         $viewport = affix('.viewport')
         expect(up.layout.viewportOf($viewport)).toEqual($viewport)
 
       it 'finds the document if the viewport is the document', ->
         # This actually tests that the hierarchy returned by `$.parent`
         # is $element => ... => $('body') => $('html') => $(document)
-        up.layout.defaults(viewports: [document])
+        up.layout.config.viewports = [document]
         $element = affix('div')
         expect(up.layout.viewportOf($element)).toEqual($(document))
 
       it 'throws an error if no viewport could be found', ->
-        up.layout.defaults(viewports: ['.does-not-exist'])
+        up.layout.config.viewports = ['.does-not-exist']
         $element = affix('div')
         lookup = -> up.layout.viewportOf($element)
         expect(lookup).toThrowError(/Could not find viewport/i)

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

@@ -43,9 +43,7 @@ describe 'up.link', ->
           # By default, up.history will replace the <body> tag when
           # the user presses the back-button. We reconfigure this
           # so we don't lose the Jasmine runner interface.
-          up.history.defaults
-            popTargets: ['.container']
-
+          up.history.config.popTargets = ['.container']
 
           respondWith = (html) =>
             @lastRequest().respondWith
@@ -121,7 +119,7 @@ describe 'up.link', ->
 
       it 'does not follow a form with up-target attribute (bugfix)', ->
         $form = affix('form[up-target]')
-        up.ready($form)
+        up.hello($form)
         followSpy = up.link.knife.mock('follow')
         $form.click()
         expect(followSpy).not.toHaveBeenCalled()
@@ -131,7 +129,7 @@ describe 'up.link', ->
       it "calls up.follow with the clicked link", ->
         followSpy = up.link.knife.mock('follow')
         $link = affix('a[href="/path"][up-follow]')
-        up.ready($link)
+        up.hello($link)
         $link.click()
         expect(followSpy).toHaveBeenCalledWith($link)
 
@@ -139,24 +137,24 @@ describe 'up.link', ->
 
       it 'copies up-related attributes of a contained link', ->
         $area = affix('div[up-expand] a[href="/path"][up-target="selector"][up-instant][up-preload]')
-        up.ready($area)
+        up.hello($area)
         expect($area.attr('up-target')).toEqual('selector')
         expect($area.attr('up-instant')).toEqual('')
         expect($area.attr('up-preload')).toEqual('')
 
       it "renames a contained link's href attribute to up-href so the container is considered a link", ->
         $area = affix('div[up-expand] a[up-follow][href="/path"]')
-        up.ready($area)
+        up.hello($area)
         expect($area.attr('up-href')).toEqual('/path')
 
       it "copies an contained non-link element with up-href attribute", ->
         $area = affix('div[up-expand] span[up-follow][up-href="/path"]')
-        up.ready($area)
+        up.hello($area)
         expect($area.attr('up-href')).toEqual('/path')
 
       it 'adds an up-follow attribute if the contained link has neither up-follow nor up-target attributes', ->
         $area = affix('div[up-expand] a[href="/path"]')
-        up.ready($area)
+        up.hello($area)
         expect($area.attr('up-follow')).toEqual('')
 
     describe '[up-instant]', ->

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

@@ -25,7 +25,7 @@ describe 'up.magic', ->
         up.compiler '.child', ($element) ->
           observeClass($element.attr('class'))
   
-        up.ready(affix('.container .child'))
+        up.hello(affix('.container .child'))
    
         expect(observeClass).not.toHaveBeenCalledWith('container')
         expect(observeClass).toHaveBeenCalledWith('child')           
@@ -36,7 +36,7 @@ describe 'up.magic', ->
         up.compiler '.child', ($element) ->
           destructor
   
-        up.ready(affix('.container .child'))
+        up.hello(affix('.container .child'))
         expect(destructor).not.toHaveBeenCalled()
         
         up.destroy('.container')
@@ -51,7 +51,7 @@ describe 'up.magic', ->
         data = { key1: 'value1', key2: 'value2' }
 
         $tag = affix(".child").attr('up-data', JSON.stringify(data))
-        up.ready($tag)
+        up.hello($tag)
 
         expect(observeArgs).toHaveBeenCalledWith('child', data)
 
@@ -61,12 +61,12 @@ describe 'up.magic', ->
         up.compiler '.child', ($element, data) ->
           observeArgs($element.attr('class'), data)
 
-        up.ready(affix(".child"))
+        up.hello(affix(".child"))
 
         expect(observeArgs).toHaveBeenCalledWith('child', {})
 
 
-    describe 'up.ready', ->
+    describe 'up.hello', ->
 
       it 'should have tests'