upjs-rails 0.11.1 → 0.12.0

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

@@ -1,18 +1,14 @@
 describe 'up.modal', ->
   
   describe 'Javascript functions', ->
-    
-    describe 'up.modal.defaults', ->
-      
-      it 'should have tests'
-        
-    describe 'up.modal.open', ->
 
-      assumedScrollbarWidth = 15
+    assumedScrollbarWidth = 15
+
+    describe 'up.modal.follow', ->
 
       it "loads the given link's destination in a dialog window", (done) ->
         $link = affix('a[href="/path/to"][up-modal=".middle"]').text('link')
-        promise = up.modal.open($link)
+        promise = up.modal.follow($link)
         request = @lastRequest()
         expect(request.url).toMatch /\/path\/to$/
         request.respondWith
@@ -33,8 +29,10 @@ describe 'up.modal', ->
           expect($('.up-modal-dialog .after')).not.toExist()
           done()
 
+    describe 'up.modal.visit', ->
+
       it "brings its own scrollbar, padding the body on the right in order to prevent jumping", (done) ->
-        promise = up.modal.open(url: '/foo', target: '.container')
+        promise = up.modal.visit('/foo', target: '.container')
 
         @lastRequest().respondWith
           status: 200
@@ -66,7 +64,7 @@ describe 'up.modal', ->
           top: '0'
           right: '30px'
 
-        promise = up.modal.open(url: '/foo', target: '.container')
+        promise = up.modal.visit('/foo', target: '.container')
 
         @lastRequest().respondWith
           status: 200

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

@@ -4,44 +4,44 @@ describe 'up.navigation', ->
 
     it 'marks a link as .up-current if it links to the current URL', ->
       spyOn(up.browser, 'url').and.returnValue('/foo')
-      $currentLink = up.ready(affix('a[href="/foo"]'))
-      $otherLink = up.ready(affix('a[href="/bar"]'))
+      $currentLink = up.hello(affix('a[href="/foo"]'))
+      $otherLink = up.hello(affix('a[href="/bar"]'))
       expect($currentLink).toHaveClass('up-current')
       expect($otherLink).not.toHaveClass('up-current')
       
     it 'marks any link as .up-current if its up-href attribute matches the current URL', ->
       spyOn(up.browser, 'url').and.returnValue('/foo')
-      $currentLink = up.ready(affix('span[up-href="/foo"]'))
-      $otherLink = up.ready(affix('span[up-href="/bar"]'))
+      $currentLink = up.hello(affix('span[up-href="/foo"]'))
+      $otherLink = up.hello(affix('span[up-href="/bar"]'))
       expect($currentLink).toHaveClass('up-current')
       expect($otherLink).not.toHaveClass('up-current')
 
     it 'marks any link as .up-current if any of its space-separated up-alias values matches the current URL', ->
       spyOn(up.browser, 'url').and.returnValue('/foo')
-      $currentLink = up.ready(affix('span[up-alias="/aaa /foo /bbb"]'))
-      $otherLink = up.ready(affix('span[up-alias="/bar"]'))
+      $currentLink = up.hello(affix('span[up-alias="/aaa /foo /bbb"]'))
+      $otherLink = up.hello(affix('span[up-alias="/bar"]'))
       expect($currentLink).toHaveClass('up-current')
       expect($otherLink).not.toHaveClass('up-current')
 
     it 'does not throw if the current location does not match an up-alias wildcard (bugfix)', ->
-      inserter = -> up.ready(affix('a[up-alias="/qqqq*"]'))
+      inserter = -> up.hello(affix('a[up-alias="/qqqq*"]'))
       expect(inserter).not.toThrow()
 
     it 'does not highlight a link to "#" (commonly used for JS-only buttons)', ->
-      $link = up.ready(affix('a[href="#"]'))
+      $link = up.hello(affix('a[href="#"]'))
       expect($link).not.toHaveClass('up-current')
 
     it 'marks URL prefixes as .up-current if an up-alias value ends in *', ->
       spyOn(up.browser, 'url').and.returnValue('/foo/123')
-      $currentLink = up.ready(affix('span[up-alias="/aaa /foo/* /bbb"]'))
-      $otherLink = up.ready(affix('span[up-alias="/bar"]'))
+      $currentLink = up.hello(affix('span[up-alias="/aaa /foo/* /bbb"]'))
+      $otherLink = up.hello(affix('span[up-alias="/bar"]'))
       expect($currentLink).toHaveClass('up-current')
       expect($otherLink).not.toHaveClass('up-current')
 
     it 'allows to configure a custom "current" class, but always also sets .up-current', ->
-      up.navigation.defaults(currentClasses: ['highlight'])
+      up.navigation.config.currentClasses = ['highlight']
       spyOn(up.browser, 'url').and.returnValue('/foo')
-      $currentLink = up.ready(affix('a[href="/foo"]'))
+      $currentLink = up.hello(affix('a[href="/foo"]'))
       expect($currentLink).toHaveClass('highlight up-current')
 
     if up.browser.canPushState()
@@ -101,7 +101,7 @@ describe 'up.navigation', ->
     
       it 'prefers to mark an enclosing [up-expand] click area', ->
         $area = affix('div[up-expand] a[href="/foo"][up-target=".main"]')
-        up.ready($area)
+        up.hello($area)
         $link = $area.find('a')
         affix('.main')
         $link.click()

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

@@ -2,11 +2,7 @@ describe 'up.popup', ->
 
   describe 'Javascript functions', ->
 
-    describe 'up.popup.defaults', ->
-
-      it 'should have tests'
-
-    describe 'up.popup.open', ->
+    describe 'up.popup.attach', ->
 
       it 'should have tests'
 

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

@@ -104,27 +104,27 @@ describe 'up.proxy', ->
       describe 'events', ->
         
         beforeEach ->
-          up.proxy.defaults(busyDelay: 0)
+          up.proxy.config.busyDelay = 0
           @events = []
-          u.each ['proxy:load', 'proxy:receive', 'proxy:busy', 'proxy:idle'], (eventName) =>
-            up.bus.on eventName, =>
+          u.each ['up:proxy:load', 'up:proxy:receive', 'up:proxy:busy', 'up:proxy:idle'], (eventName) =>
+            up.on eventName, =>
               @events.push eventName
 
-        it 'emits an proxy:busy event once the proxy started loading, and proxy:idle if it is done loading', ->
+        it 'emits an up:proxy:busy event once the proxy started loading, and up:proxy:idle if it is done loading', ->
   
           up.proxy.ajax(url: '/foo')
   
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy'
+            'up:proxy:load',
+            'up:proxy:busy'
           ])
   
           up.proxy.ajax(url: '/bar')
   
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:load'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:load'
           ])
   
           jasmine.Ajax.requests.at(0).respondWith
@@ -133,10 +133,10 @@ describe 'up.proxy', ->
             responseText: 'foo'
   
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:load',
-            'proxy:receive'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:load',
+            'up:proxy:receive'
           ])
   
           jasmine.Ajax.requests.at(1).respondWith
@@ -145,29 +145,29 @@ describe 'up.proxy', ->
             responseText: 'bar'
   
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:load',
-            'proxy:receive',
-            'proxy:receive',
-            'proxy:idle'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:load',
+            'up:proxy:receive',
+            'up:proxy:receive',
+            'up:proxy:idle'
           ])
   
-        it 'does not emit an proxy:busy event if preloading', ->
+        it 'does not emit an up:proxy:busy event if preloading', ->
 
           # A request for preloading preloading purposes
           # doesn't make us busy.
           up.proxy.ajax(url: '/foo', preload: true)
           expect(@events).toEqual([
-            'proxy:load'
+            'up:proxy:load'
           ])
           expect(up.proxy.busy()).toBe(false)
 
           # The same request with preloading does make us busy.
           up.proxy.ajax(url: '/foo')
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy'
+            'up:proxy:load',
+            'up:proxy:busy'
           ])
           expect(up.proxy.busy()).toBe(true)
 
@@ -178,31 +178,31 @@ describe 'up.proxy', ->
             contentType: 'text/html'
             responseText: 'foo'
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:receive',
-            'proxy:idle'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:receive',
+            'up:proxy:idle'
           ])
           expect(up.proxy.busy()).toBe(false)
 
-        it 'can delay the proxy:busy event to prevent flickering of spinners', ->
+        it 'can delay the up:proxy:busy event to prevent flickering of spinners', ->
           jasmine.clock().install()
-          up.proxy.defaults(busyDelay: 100)
+          up.proxy.config.busyDelay = 100
 
           up.proxy.ajax(url: '/foo')
           expect(@events).toEqual([
-            'proxy:load'
+            'up:proxy:load'
           ])
 
           jasmine.clock().tick(50)
           expect(@events).toEqual([
-            'proxy:load'
+            'up:proxy:load'
           ])
 
           jasmine.clock().tick(50)
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy'
+            'up:proxy:load',
+            'up:proxy:busy'
           ])
 
           jasmine.Ajax.requests.at(0).respondWith
@@ -211,19 +211,19 @@ describe 'up.proxy', ->
             responseText: 'foo'
 
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:receive',
-            'proxy:idle'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:receive',
+            'up:proxy:idle'
           ])
 
-        it 'does not emit proxy:idle if a delayed proxy:busy was never emitted due to a fast response', ->
+        it 'does not emit up:proxy:idle if a delayed up:proxy:busy was never emitted due to a fast response', ->
           jasmine.clock().install()
-          up.proxy.defaults(busyDelay: 100)
+          up.proxy.config.busyDelay = 100
 
           up.proxy.ajax(url: '/foo')
           expect(@events).toEqual([
-            'proxy:load'
+            'up:proxy:load'
           ])
 
           jasmine.clock().tick(50)
@@ -236,17 +236,17 @@ describe 'up.proxy', ->
           jasmine.clock().tick(100)
 
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:receive'
+            'up:proxy:load',
+            'up:proxy:receive'
           ])
 
-        it 'emits proxy:idle if a request returned but failed', ->
+        it 'emits up:proxy:idle if a request returned but failed', ->
 
           up.proxy.ajax(url: '/foo')
 
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy'
+            'up:proxy:load',
+            'up:proxy:busy'
           ])
 
           jasmine.Ajax.requests.at(0).respondWith
@@ -255,10 +255,10 @@ describe 'up.proxy', ->
             responseText: 'something went wrong'
 
           expect(@events).toEqual([
-            'proxy:load',
-            'proxy:busy',
-            'proxy:receive',
-            'proxy:idle'
+            'up:proxy:load',
+            'up:proxy:busy',
+            'up:proxy:receive',
+            'up:proxy:idle'
           ])
 
 
@@ -306,9 +306,8 @@ describe 'up.proxy', ->
       it 'preloads the link destination on mouseover, after a delay'
 
       it 'triggers a separate AJAX request with a short cache expiry when hovered multiple times', (done) ->
-        up.proxy.defaults
-          cacheExpiry: 10
-          preloadDelay: 0
+        up.proxy.config.cacheExpiry = 10
+        up.proxy.config.preloadDelay = 0
         spyOn(up, 'follow')
         $element = affix('a[href="/foo"][up-preload]')
         Trigger.mouseover($element)

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

@@ -2,7 +2,7 @@ describe 'up.tooltip', ->
   
   describe 'Javascript functions', ->
     
-    describe 'up.tooltip.open', ->
+    describe 'up.tooltip.attach', ->
       
       it 'opens a tooltop above the center of the given element', ->
         $link = affix('span').text('button label')
@@ -13,7 +13,7 @@ describe 'up.tooltip', ->
           width: '50px'
           height: '50px'
         )
-        up.tooltip.open($link, html: 'tooltip text')
+        up.tooltip.attach($link, html: 'tooltip text')
         $tooltip = $('.up-tooltip')
         expect($tooltip).toBeInDOM()
         expect($tooltip).toHaveText('tooltip text')
@@ -22,8 +22,18 @@ describe 'up.tooltip', ->
         expect(tooltipBox.top).toBeAround(linkBox.top - tooltipBox.height, 15)
         expect(tooltipBox.left).toBeAround(linkBox.left + 0.5 * (linkBox.width - tooltipBox.width), 15)
         
-      it 'allows HTML for the tooltip text'
-        
+      it 'allows HTML for the tooltip text when contents are given as .html option', ->
+        $link = affix('span')
+        up.tooltip.attach($link, html: '<b>text</b>')
+        $tooltip = $('.up-tooltip')
+        expect($tooltip.html()).toEqual('<b>text</b>')
+
+      it 'escapes HTML for the tooltip text when contents given as .html option', ->
+        $link = affix('span')
+        up.tooltip.attach($link, text: '<b>text</b>')
+        $tooltip = $('.up-tooltip')
+        expect($tooltip.html()).toEqual('&lt;b&gt;text&lt;/b&gt;')
+
       it 'closes an existing tooltip'
       
       describe 'with position option', ->
@@ -39,7 +49,11 @@ describe 'up.tooltip', ->
     describe '[up-tooltip]', ->
 
       it 'should have tests'
-      
+
+    describe '[up-tooltip-html]', ->
+
+      it 'should have tests'
+
     describe 'body', ->
       
       it 'closes a tooltip when clicked'

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

@@ -2,6 +2,12 @@ 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.castedAttr', ->
 
       it 'returns true if the attribute value is the string "true"', ->
@@ -82,38 +88,23 @@ describe 'up.util', ->
         expect(object.a).toBe(1)
         expect(object.b).toBe(2)
 
-      describe '#update', ->
-
-        it 'merges the given options into the object', ->
-          object = up.util.config(a: 1, b: undefined, c: undefined)
-          object.update(b: 2, c: 3)
-          expect(object.b).toBe(2)
-          expect(object.c).toBe(3)
-
-        it 'returns the current hash when called without arguments', ->
-          object = up.util.config(a: 1, b: 2)
-          result = object.update()
-          expect(result.a).toBe(1)
-          expect(result.b).toBe(2)
-
-        it 'throws an error when setting a key that was not included in the factory settings', ->
-          object = up.util.config(a: 1)
-          update = -> object.update(b: 2)
-          expect(update).toThrowError(/unknown setting/i)
+      it 'does not allow to set a key that was not included in the factory settings', ->
+        object = up.util.config(a: 1)
+        object.b = 2
+        expect(object.b).toBeUndefined()
 
       describe '#reset', ->
 
         it 'resets the object to its original state', ->
           object = up.util.config(a: 1)
           expect(object.b).toBeUndefined()
-          object.b = 2
-          expect(object.b).toBe(2)
+          object.a = 2
+          expect(object.a).toBe(2)
           object.reset()
-          expect(object.b).toBeUndefined()
+          expect(object.a).toBe(1)
 
-        it 'does not remove #reset or #update methods from the object', ->
+        it 'does not remove the #reset or #update method from the object', ->
           object = up.util.config(a: 1)
           object.b = 2
           object.reset()
           expect(object.reset).toBeDefined()
-          expect(object.update).toBeDefined()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Henning Koch
@@ -107,7 +107,6 @@ files:
 - 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/slot.js.coffee
 - lib/assets/javascripts/up/tooltip.js.coffee
 - lib/assets/javascripts/up/util.js.coffee
 - lib/assets/stylesheets/up-bootstrap.css.sass
@@ -229,7 +228,6 @@ files:
 - 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/slot_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

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

@@ -1,63 +0,0 @@
-###*
-Content slots
-=============
-
-It can be useful to mark "slots" in your page layout where you expect
-content to appear in the future.
-
-For example, you might have
-
-    <div up-slot class="alerts"></div>
-
-    <script>
-      up.compiler('.alerts', function ($element) {
-        setInterval(3000, function() { up.reload('.alerts') });
-      });
-    </script>
-
-Seeing that the `.alerts` container is empty, Up.js will hide it:
-
-    <div class="alerts" up-slot style="display: none"></div>
-
-As soon as you
-
-    <div class="alerts" up-slot>
-      Meeting at 11:30 AM
-    </div>
-
-
-TODO: Write some documentation
-  
-@class up.slot
-###
-up.slot = (->
-  
-  u = up.util
-  
-  hasContent = ($slot) ->
-    u.trim($slot.html()) != ''
-
-  check = ($element) ->
-    u.findWithSelf($element, '[up-slot]').each ->
-      $slot = $(this)
-      unless hasContent($slot)
-        $slot.hide()
-
-  ###*
-  Use this attribute to mark up empty element containers that
-  you plan to update with content in the future.
-
-  An element with this attribute is automatically hidden
-  if it has no content, and is re-shown if it is updated with
-  content.
-
-  This is useful to prevent the element from applying unwanted
-  margins to the surrounding page flow.
-
-  @method [up-slot]
-  @ujs
-  ###
-  up.bus.on 'fragment:ready', check
-  
-)()
-

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

@@ -1,16 +0,0 @@
-describe 'up.marker', ->
-  
-  describe 'unobtrusive behavior', ->
-  
-    describe '[up-slot]', ->
-      
-      it 'hides empty containers', ->
-        $element = affix('.element[up-slot]')
-        up.ready($element)
-        expect($element).not.toBeVisible()
-      
-      it 'does not hide empty containers', ->
-        $element = affix('.element[up-slot]').text('content')
-        up.ready($element)
-        expect($element).toBeVisible()
-