upjs-rails 0.9.1 → 0.10.0

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

@@ -265,7 +265,10 @@ up.util = (->
 
   isString = (object) ->
     typeof(object) == 'string'
-    
+
+  isNumber = (object) ->
+    typeof(object) == 'number'
+
   isHash = (object) ->
     typeof(object) == 'object' && !!object
 
@@ -559,11 +562,19 @@ up.util = (->
   contains = (stringOrArray, element) ->
     stringOrArray.indexOf(element) >= 0
 
-  castsToTrue = (object) ->
-    String(object) == "true"
-    
-  castsToFalse = (object) ->
-    String(object) == "false"
+  castedAttr = ($element, attrName) ->
+    value = $element.attr(attrName)
+    switch value
+      when 'false'  then false
+      when 'true'   then true
+      when ''       then true
+      else value # other strings, undefined, null, ...
+
+#  castsToTrue = (object) ->
+#    String(object) == "true"
+#
+#  castsToFalse = (object) ->
+#    String(object) == "false"
     
   locationFromXhr = (xhr) ->
     xhr.getResponseHeader('X-Up-Location')
@@ -618,20 +629,138 @@ up.util = (->
       array.splice(index, 1)
       element
 
+  ###*
+  @method up.util.cache
+  @param {Number|Function} [config.size]
+    Maximum number of cache entries.
+    Set to `undefined` to not limit the cache size.
+  @param {Number|Function} [config.expiry]
+    The number of milliseconds after which a cache entry
+    will be discarded.
+  @param {String} [config.log]
+    A prefix for log entries printed by this cache object.
+  ###
+  cache = (config) ->
+
+    store = undefined
+
+    clear = ->
+      store = {}
+
+    clear()
+
+    log = (args...) ->
+      if config.log
+        args[0] = "[#{config.log}] #{args[0]}"
+        debug(args...)
+
+    maxSize = ->
+      if isMissing(config.size)
+        undefined
+      else if isFunction(config.size)
+        config.size()
+      else if isNumber(config.size)
+        config.size
+      else
+        error("Invalid size config: %o", config.size)
+
+    expiryMilis = ->
+      if isMissing(config.expiry)
+        undefined
+      else if isFunction(config.expiry)
+        config.expiry()
+      else if isNumber(config.expiry)
+        config.expiry
+      else
+        error("Invalid expiry config: %o", config.expiry)
+
+    normalizeStoreKey = (key) ->
+      if config.key
+        config.key(key)
+      else
+        key.toString()
+
+    trim = ->
+      storeKeys = copy(keys(store))
+      size = maxSize()
+      if size && storeKeys.length > size
+        oldestKey = null
+        oldestTimestamp = null
+        each storeKeys, (key) ->
+          promise = store[key] # we don't need to call cacheKey here
+          timestamp = promise.timestamp
+          if !oldestTimestamp || oldestTimestamp > timestamp
+            oldestKey = key
+            oldestTimestamp = timestamp
+        delete store[oldestKey] if oldestKey
+
+    alias = (oldKey, newKey) ->
+      value = get(oldKey)
+      if isDefined(value)
+        set(newKey, value)
+
+    timestamp = ->
+      (new Date()).valueOf()
+
+    set = (key, value) ->
+      storeKey = normalizeStoreKey(key)
+      store[storeKey] =
+        timestamp: timestamp()
+        value: value
+
+    remove = (key) ->
+      storeKey = normalizeStoreKey(key)
+      delete store[storeKey]
+
+    isFresh = (entry) ->
+      expiry = expiryMilis()
+      if expiry
+        timeSinceTouch = timestamp() - entry.timestamp
+        timeSinceTouch < expiryMilis()
+      else
+        true
+
+    get = (key, fallback = undefined) ->
+      storeKey = normalizeStoreKey(key)
+      if entry = store[storeKey]
+        if !isFresh(entry)
+          log("Discarding stale cache entry for %o", key)
+          remove(key)
+          fallback
+        else
+          log("Cache hit for %o", key)
+          entry.value
+      else
+        log("Cache miss for %o", key)
+        fallback
+
+    alias: alias
+    get: get
+    set: set
+    remove: remove
+    clear: clear
+
+
   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 = {}) ->
-        for key, value of options
-          if factoryOptions.hasOwnProperty(key)
-            hash[key] = value
+      update: (options) ->
+        if options
+          if isString(options)
+            hash.ensureKeyExists(options)
+            hash[options]
           else
-            error("Unknown setting %o", key)
-        hash
+            for key, value of options
+              hash.ensureKeyExists(key)
+              hash[key] = value
+        else
+          hash
     apiKeys = Object.getOwnPropertyNames(hash)
     hash.reset()
     hash
@@ -705,8 +834,9 @@ up.util = (->
   endsWith: endsWith
   isArray: isArray
   toArray: toArray
-  castsToTrue: castsToTrue
-  castsToFalse: castsToFalse
+#  castsToTrue: castsToTrue
+#  castsToFalse: castsToFalse
+  castedAttr: castedAttr
   locationFromXhr: locationFromXhr
   methodFromXhr: methodFromXhr
   clientSize: clientSize
@@ -721,6 +851,7 @@ up.util = (->
   memoize: memoize
   scrollbarWidth: scrollbarWidth
   config: config
+  cache: cache
   unwrapElement: unwrapElement
 
 )()

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

@@ -1,5 +1,5 @@
 defaults = up.layout.defaults()
 
 up.layout.defaults
-  fixedTop: "#{defaults.fixedTop}, .navbar-fixed-top"
-  fixedBottom: "#{defaults.fixedBottom}, .navbar-fixed-bottom"
+  fixedTop: defaults.fixedTop.concat(['.navbar-fixed-top'])
+  fixedBottom: defaults.fixedBottom.concat(['.navbar-fixed-bottom'])

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

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

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

@@ -2,10 +2,10 @@
 #= require up/util
 #= require up/browser
 #= require up/bus
-#= require up/layout
-#= require up/flow
 #= require up/magic
 #= require up/history
+#= require up/layout
+#= require up/flow
 #= require up/motion
 #= require up/proxy
 #= require up/link

data/lib/upjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Upjs
   module Rails
-    VERSION = '0.9.1'
+    VERSION = '0.10.0'
   end
 end

data/spec_app/Gemfile.lock

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

data/spec_app/config/routes.rb

@@ -1,7 +1,6 @@
 Rails.application.routes.draw do
 
   mount JasmineRails::Engine => '/specs' if defined?(JasmineRails)
-  resources :cards
-  root to: 'pages#home'
+  root to: redirect('/specs')
 
 end

data/spec_app/spec/javascripts/helpers/knife.js.coffee

@@ -59,7 +59,7 @@
   me.reset = reset
   me.cleaners = []
 
-  if jasmine
+  if jasmine?
     me.point = "(#{contextBleeder.toString()})()"
     # Jasmine defines afterEach on window
     afterEach reset

data/spec_app/spec/javascripts/helpers/last_request.js.coffee

@@ -0,0 +1,4 @@
+beforeEach ->
+  @lastRequest = ->
+    jasmine.Ajax.requests.mostRecent() or up.util.error('There is no last request')
+

data/spec_app/spec/javascripts/helpers/set_timer.js.coffee

@@ -1,3 +1,3 @@
-@setTimer = (millis, fun) ->
-  setTimeout(fun, millis)
-
+beforeEach ->
+  @setTimer = (millis, fun) ->
+    setTimeout(fun, millis)

data/spec_app/spec/javascripts/helpers/to_end_with.js.coffee

@@ -0,0 +1,5 @@
+beforeEach ->
+  jasmine.addMatchers
+    toEndWith: (util, customEqualityTesters) ->
+      compare: (actual, expected) ->
+        pass: up.util.endsWith(actual, expected)

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

@@ -22,7 +22,7 @@ describe 'up.flow', ->
             """
 
           @respond = ->
-            jasmine.Ajax.requests.mostRecent().respondWith
+            @lastRequest().respondWith
               status: 200
               contentType: 'text/html'
               responseText: @responseText
@@ -114,7 +114,9 @@ describe 'up.flow', ->
             expect(window.scriptTagExecuted).toHaveBeenCalledWith('middle')
             done()
 
-        describe 'automatic scrolling', ->
+        it 'restores the scroll positions of all viewports within the target with options.restoreScroll'
+
+        describe 'revealing of elements', ->
 
           beforeEach ->
             @revealedHTML = ''
@@ -126,14 +128,14 @@ describe 'up.flow', ->
             @request = up.replace('.middle', '/path')
             @respond()
             @request.then =>
-              expect(up.reveal).toHaveBeenCalledWith(@oldMiddle, jasmine.any(Object))
+              expect(up.reveal).toHaveBeenCalledWith(@oldMiddle)
               done()
 
           it 'reveals a new element that is being appended', (done) ->
             @request = up.replace('.middle:after', '/path')
             @respond()
             @request.then =>
-              expect(up.reveal).not.toHaveBeenCalledWith(@oldMiddle, jasmine.any(Object))
+              expect(up.reveal).not.toHaveBeenCalledWith(@oldMiddle)
               # Text nodes are wrapped in a .up-insertion container so we can
               # animate them and measure their position/size for scrolling.
               # This is not possible for container-less text nodes.
@@ -146,7 +148,7 @@ describe 'up.flow', ->
             @request = up.replace('.middle:before', '/path')
             @respond()
             @request.then =>
-              expect(up.reveal).not.toHaveBeenCalledWith(@oldMiddle, jasmine.any(Object))
+              expect(up.reveal).not.toHaveBeenCalledWith(@oldMiddle)
               # Text nodes are wrapped in a .up-insertion container so we can
               # animate them and measure their position/size for scrolling.
               # This is not possible for container-less text nodes.
@@ -253,7 +255,7 @@ describe 'up.flow', ->
             expect($('.element')).toHaveText('new text')
             done()
             
-          request = jasmine.Ajax.requests.mostRecent()
+          request = @lastRequest()
           expect(request.url).toMatch(/\/source$/)
     
           request.respondWith

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

@@ -19,7 +19,7 @@ describe 'up.form', ->
     
           @promise = up.submit($form)
     
-          @request = jasmine.Ajax.requests.mostRecent()
+          @request = @lastRequest()
           expect(@request.url).toMatch /\/path\/to$/
           expect(@request.method).toBe 'PUT'
           expect(@request.data()).toEqual

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

@@ -9,4 +9,83 @@ describe 'up.history', ->
     describe 'up.history.push', ->
 
       it 'should have tests'
-      
+
+  describe 'unobtrusive behavior', ->
+
+    describe '[up-back]', ->
+
+      it 'sets an [up-href] attribute to the previous URL and sets the up-restore-scroll attribute to "true"', ->
+        up.history.push('/one')
+        console.log("url is now %o, previous was %o", up.history.url(), up.history.previousUrl())
+        up.history.push('/two')
+        console.log("url is now %o, previous was %o", up.history.url(), up.history.previousUrl())
+        $element = up.ready(affix('a[href="/three"][up-back]').text('text'))
+        console.log("url is now %o, previous was %o", up.history.url(), up.history.previousUrl())
+        expect($element.attr('href')).toEndWith('/three')
+        expect($element.attr('up-href')).toEndWith('/one')
+        expect($element.attr('up-restore-scroll')).toBe('')
+        expect($element.attr('up-follow')).toBe('')
+
+      it 'does not overwrite an existing up-href or up-restore-scroll attribute'
+
+      it 'does not set an up-href attribute if there is no previous URL'
+
+    describe 'scroll restauration', ->
+
+      afterEach ->
+        $('.viewport').remove()
+
+      it 'restores the scroll position of viewports when the user hits the back button', (done) ->
+
+        longContentHtml = """
+          <div class="viewport" style="width: 100px; height: 100px; overflow-y: scroll">
+            <div class="content" style="height: 1000px"></div>
+          </div>
+        """
+
+        respond = (html) =>
+          @lastRequest().respondWith
+            status: 200
+            contentType: 'text/html'
+            responseText: longContentHtml
+
+        $viewport = $(longContentHtml).appendTo(document.body)
+
+        up.layout.defaults(viewports: ['.viewport'])
+        up.history.defaults(popTargets: ['.viewport'])
+
+        $viewport.append(longContentHtml)
+
+        up.replace('.content', '/one')
+        respond()
+        $viewport.scrollTop(50)
+
+        up.replace('.content', '/two')
+        respond()
+        $('.viewport').scrollTop(150)
+
+        up.replace('.content', '/three')
+        respond()
+        $('.viewport').scrollTop(250)
+
+        history.back()
+        @setTimer 50, =>
+          respond() # we need to respond since we've never requested /two with the popTarget
+          expect($('.viewport').scrollTop()).toBe(150)
+
+          history.back()
+          @setTimer 50, =>
+            respond() # we need to respond since we've never requested /one with the popTarget
+            expect($('.viewport').scrollTop()).toBe(50)
+
+            history.forward()
+            @setTimer 50, =>
+              # No need to respond since we requested /two with the popTarget
+              # when we went backwards
+              expect($('.viewport').scrollTop()).toBe(150)
+
+              history.forward()
+              @setTimer 50, =>
+                respond() # we need to respond since we've never requested /three with the popTarget
+                expect($('.viewport').scrollTop()).toBe(250)
+                done()

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

@@ -1,5 +1,7 @@
 describe 'up.link', ->
-  
+
+  u = up.util
+
   describe 'Javascript functions', ->
   
     describe 'up.follow', ->
@@ -14,7 +16,7 @@ describe 'up.link', ->
     
           promise = up.follow($link)
     
-          jasmine.Ajax.requests.mostRecent().respondWith
+          @lastRequest().respondWith
             status: 200
             contentType: 'text/html'
             responseText:
@@ -33,9 +35,67 @@ describe 'up.link', ->
         it 'uses the method from a data-method attribute', ->
           $link = affix('a[href="/path"][data-method="PUT"]')
           up.follow($link)
-          request = jasmine.Ajax.requests.mostRecent()
+          request = @lastRequest()
           expect(request.method).toBe('PUT')
 
+        it 'adds history entries and allows the user to use the back- and forward-buttons', (done) ->
+
+          # 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']
+
+
+          respondWith = (html) =>
+            @lastRequest().respondWith
+              status: 200
+              contentType: 'text/html'
+              responseText: "<div class='container'><div class='target'>#{html}</div></div>"
+
+          followAndRespond = ($link, html) ->
+            promise = up.follow($link)
+            respondWith(html)
+            promise
+
+          $link1 = affix('a[href="/one"][up-target=".target"]')
+          $link2 = affix('a[href="/two"][up-target=".target"]')
+          $link3 = affix('a[href="/three"][up-target=".target"]')
+          $container = affix('.container')
+          $target = affix('.target').appendTo($container).text('original text')
+
+          followAndRespond($link1, 'text from one').then =>
+            expect($('.target')).toHaveText('text from one')
+            expect(location.pathname).toEqual('/one')
+
+            followAndRespond($link2, 'text from two').then =>
+              expect($('.target')).toHaveText('text from two')
+              expect(location.pathname).toEqual('/two')
+
+              followAndRespond($link3, 'text from three').then =>
+                expect($('.target')).toHaveText('text from three')
+                expect(location.pathname).toEqual('/three')
+
+                history.back()
+                @setTimer 50, =>
+                  respondWith('restored text from two')
+                  expect($('.target')).toHaveText('restored text from two')
+                  expect(location.pathname).toEqual('/two')
+
+                  history.back()
+                  @setTimer 50, =>
+                    respondWith('restored text from one')
+                    expect($('.target')).toHaveText('restored text from one')
+                    expect(location.pathname).toEqual('/one')
+
+                    history.forward()
+                    @setTimer 50, =>
+                      # Since the response is cached, we don't have to respond
+                      expect($('.target')).toHaveText('restored text from two')
+                      expect(location.pathname).toEqual('/two')
+
+                      done()
+
       else
         
         it 'follows the given link', ->
@@ -54,7 +114,7 @@ describe 'up.link', ->
     describe 'up.visit', ->
       
       it 'should have tests'
-          
+
   describe 'unobtrusive behavior', ->
 
     describe 'a[up-target]', ->

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

@@ -11,7 +11,7 @@ describe 'up.modal', ->
       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)
-        request = jasmine.Ajax.requests.mostRecent()
+        request = @lastRequest()
         expect(request.url).toMatch /\/path\/to$/
         request.respondWith
           status: 200
@@ -34,7 +34,7 @@ describe 'up.modal', ->
       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')
 
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText:

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

@@ -11,11 +11,11 @@ describe 'up.motion', ->
           opacity = -> Number($element.css('opacity'))
           up.animate($element, 'fade-in', duration: 100, easing: 'linear')
 
-          setTimer 0, ->
+          @setTimer 0, ->
             expect(opacity()).toBeAround(0.0, 0.25)
-          setTimer 50, ->
+          @setTimer 50, ->
             expect(opacity()).toBeAround(0.5, 0.25)
-          setTimer 100, ->
+          @setTimer 100, ->
             expect(opacity()).toBeAround(1.0, 0.25)
             done()
 
@@ -104,19 +104,19 @@ describe 'up.motion', ->
 
           opacity = ($element) -> Number($element.css('opacity'))
 
-          setTimer 0, ->
+          @setTimer 0, ->
             expect(opacity($newGhost)).toBeAround(0.0, 0.25)
             expect(opacity($oldGhost)).toBeAround(1.0, 0.25)
 
-          setTimer 40, ->
+          @setTimer 40, ->
             expect(opacity($newGhost)).toBeAround(0.4, 0.25)
             expect(opacity($oldGhost)).toBeAround(0.6, 0.25)
 
-          setTimer 70, ->
+          @setTimer 70, ->
             expect(opacity($newGhost)).toBeAround(0.7, 0.25)
             expect(opacity($oldGhost)).toBeAround(0.3, 0.25)
 
-          setTimer 125, ->
+          @setTimer 125, ->
             # Once our two ghosts have rendered their visual effect,
             # we remove them from the DOM.
             expect($newGhost).not.toBeInDOM()

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

@@ -39,7 +39,7 @@ describe 'up.navigation', ->
       expect($otherLink).not.toHaveClass('up-current')
 
     it 'allows to configure a custom "current" class, but always also sets .up-current', ->
-      up.navigation.defaults(currentClass: 'highlight')
+      up.navigation.defaults(currentClasses: ['highlight'])
       spyOn(up.browser, 'url').and.returnValue('/foo')
       $currentLink = up.ready(affix('a[href="/foo"]'))
       expect($currentLink).toHaveClass('highlight up-current')
@@ -50,7 +50,7 @@ describe 'up.navigation', ->
         $link = affix('a[href="/foo"][up-target=".main"]')
         affix('.main')
         $link.click()
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseHeaders: { 'X-Up-Location': '/foo/' }
@@ -61,7 +61,7 @@ describe 'up.navigation', ->
         $link = affix('a[href="/foo/"][up-target=".main"]')
         affix('.main')
         $link.click()
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseHeaders: { 'X-Up-Location': '/foo' }
@@ -80,7 +80,7 @@ describe 'up.navigation', ->
         $link.click()
 #        console.log($link)
         expect($link).toHaveClass('up-active')
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText: '<div class="main">new-text</div>'
@@ -92,7 +92,7 @@ describe 'up.navigation', ->
         affix('.main')
         Trigger.mousedown($link)
         expect($link).toHaveClass('up-active')
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText: '<div class="main">new-text</div>'
@@ -106,7 +106,7 @@ describe 'up.navigation', ->
         affix('.main')
         $link.click()
         expect($area).toHaveClass('up-active')
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText: '<div class="main">new-text</div>'

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

@@ -22,7 +22,7 @@ describe 'up.proxy', ->
         expect(jasmine.Ajax.requests.count()).toEqual(1)
         expect(responses).toEqual([])
 
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText: 'foo'
@@ -39,7 +39,7 @@ describe 'up.proxy', ->
         # See that we have triggered a second request
         expect(jasmine.Ajax.requests.count()).toEqual(2)
 
-        jasmine.Ajax.requests.mostRecent().respondWith
+        @lastRequest().respondWith
           status: 200
           contentType: 'text/html'
           responseText: 'bar'