upjs-rails 0.11.0 → 0.11.1

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

@@ -22,12 +22,14 @@ up.util = (->
         cached = true
         cache = func(args...)
 
-  ajax = (options) ->
-    if options.selector
-      options.headers = {
-        "X-Up-Selector": options.selector
+  ajax = (request) ->
+    request = copy(request)
+    if request.selector
+      request.headers = {
+        "X-Up-Selector": request.selector
       }
-    $.ajax options
+    # Delegate to jQuery
+    $.ajax(request)
 
   ###*
   @method up.util.isStandardPort
@@ -36,7 +38,6 @@ up.util = (->
   isStandardPort = (protocol, port) ->
     ((port == "" || port == "80") && protocol == 'http:') || (port == "443" && protocol == 'https:')
 
-    
   ###*
   Normalizes URLs, relative paths and absolute paths to a full URL
   that can be checked for equality with other normalized URL.
@@ -112,32 +113,52 @@ up.util = (->
     element = document.createElement(tagName)
     element.innerHTML = html if isPresent(html)
     element
-    
+
+  ###*
+  @method up.debug
+  @protected
+  ###
   debug = (message, args...) ->
     message = "[UP] #{message}"
-    console.debug(message, args...)
+    up.browser.puts('debug', message, args...)
 
+  ###*
+  @method up.warn
+  @protected
+  ###
   warn = (message, args...) ->
     message = "[UP] #{message}"
-    console.warn(message, args...)
+    up.browser.puts('warn', message, args...)
+
+  ###*
+  Throws a fatal error with the given message.
+
+  - The error will be printed to the [error console](https://developer.mozilla.org/en-US/docs/Web/API/Console/error)
+  - An [`Error`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error) (exception) will be thrown, unwinding the current call stack
+  - The error message will be printed in a corner of the screen
+
+  \#\#\#\# Examples
 
+      up.error('Division by zero')
+      up.error('Unexpected result %o', result)
+
+  @method up.error
+  ###
   error = (args...) ->
     args[0] = "[UP] #{args[0]}"
-    console.error(args...)
-    asString = stringifyConsoleArgs(args)
+    up.browser.puts('error', args...)
+    asString = evalConsoleTemplate(args...)
     $error = presence($('.up-error')) || $('<div class="up-error"></div>').prependTo('body')
-    # $error = $('body')
     $error.addClass('up-error')
     $error.text(asString)
-    # alert "#{asString}\n\nOpen the developer console for details."
     throw new Error(asString)
 
   CONSOLE_PLACEHOLDERS = /\%[odisf]/g
     
-  stringifyConsoleArgs = (args) ->
+  evalConsoleTemplate = (args...) ->
     message = args[0]
     i = 0
-    maxLength = 50
+    maxLength = 80
     message.replace CONSOLE_PLACEHOLDERS, ->
       i += 1
       arg = args[i]
@@ -146,11 +167,19 @@ up.util = (->
         arg = arg.replace(/\s+/g, ' ')
         arg = "#{arg.substr(0, maxLength)}…" if arg.length > maxLength
         arg = "\"#{arg}\""
-      else if argType == 'number'
+      else if argType == 'undefined'
+        # JSON.stringify(undefined) is actually undefined
+        arg = 'undefined'
+      else if argType == 'number' || argType == 'function'
         arg = arg.toString()
       else
         arg = JSON.stringify(arg)
-        arg = "#{arg.substr(0, maxLength)}…" if arg.length > maxLength
+      if arg.length > maxLength
+        arg = "#{arg.substr(0, maxLength)} …"
+        # For truncated objects or functions, add a trailing brace so
+        # long log lines are easier to parse visually
+        if argType == 'object' || argType == 'function'
+          arg += " }"
       arg
 
   createSelectorFromElement = ($element) ->
@@ -212,13 +241,6 @@ up.util = (->
   
   trim = $.trim
   
-  keys = Object.keys || (object) ->
-    result = []
-    for key in object
-      if object.hasOwnProperty(key)
-        result.push(key)
-    result
-
   each = (collection, block) ->
     block(item, index) for item, index in collection
 
@@ -246,7 +268,7 @@ up.util = (->
     
   isBlank = (object) ->
     isMissing(object) ||                  # null or undefined
-    (isObject(object) && keys(object).length == 0) ||
+    (isObject(object) && Object.keys(object).length == 0) ||
     (object.length == 0)                  # String, Array, jQuery
   
   presence = (object, checker = isPresent) ->
@@ -429,7 +451,7 @@ up.util = (->
   # @private
   ###
   temporaryCss = ($element, css, block) ->
-    oldCss = $element.css(keys(css))
+    oldCss = $element.css(Object.keys(css))
     $element.css(css)
     memo = -> $element.css(oldCss)
     if block
@@ -488,7 +510,7 @@ up.util = (->
       # the public API `up.motion.animate` already does this.
       deferred = $.Deferred()
       transition =
-        'transition-property': keys(lastFrame).join(', ')
+        'transition-property': Object.keys(lastFrame).join(', ')
         'transition-duration': "#{opts.duration}ms"
         'transition-delay': "#{opts.delay}ms"
         'transition-timing-function': opts.easing
@@ -507,7 +529,7 @@ up.util = (->
       deferred
     else
       $element.css(lastFrame)
-      resolvedPromise()
+      resolvedDeferred()
       
   ANIMATION_PROMISE_KEY = 'up-animation-promise'
 
@@ -720,7 +742,7 @@ up.util = (->
   @param {String} [config.log]
     A prefix for log entries printed by this cache object.
   ###
-  cache = (config) ->
+  cache = (config = {}) ->
 
     store = undefined
 
@@ -734,6 +756,9 @@ up.util = (->
         args[0] = "[#{config.log}] #{args[0]}"
         debug(args...)
 
+    keys = ->
+      Object.keys(store)
+
     maxSize = ->
       if isMissing(config.size)
         undefined
@@ -761,7 +786,7 @@ up.util = (->
         key.toString()
 
     trim = ->
-      storeKeys = copy(keys(store))
+      storeKeys = copy(keys())
       size = maxSize()
       if size && storeKeys.length > size
         oldestKey = null
@@ -819,6 +844,7 @@ up.util = (->
     set: set
     remove: remove
     clear: clear
+    keys: keys
 
   config = (factoryOptions = {}) ->
     hash =
@@ -856,7 +882,6 @@ up.util = (->
     $match = undefined
     while ($element = $element.parent()) && $element.length
       position = $element.css('position')
-      console.log("Iteration element is %o with position %o", $element, position)
       if position == 'absolute' || position == 'relative' || $element.is('body')
         $match = $element
         break
@@ -948,7 +973,6 @@ up.util = (->
   clientSize: clientSize
   only: only
   trim: trim
-  keys: keys
   resolvedPromise: resolvedPromise
   resolvedDeferred: resolvedDeferred
   resolvableWhen: resolvableWhen
@@ -961,5 +985,10 @@ up.util = (->
   unwrapElement: unwrapElement
   multiSelector: multiSelector
   emptyJQuery: emptyJQuery
+  evalConsoleTemplate: evalConsoleTemplate
 
 )()
+
+up.error = up.util.error
+up.warn = up.util.warn
+up.debug = up.util.debug

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

@@ -15,13 +15,4 @@
 #= require up/tooltip
 #= require up/navigation
 #= require up/slot
-#= require_self
-
-up.browser.ensureRecentJquery()
-
-if up.browser.isSupported()
-  
-  up.browser.ensureConsoleExists()
-
-  up.bus.emit('framework:ready')
-  $(document).on 'ready', -> up.bus.emit('app:ready')
+#= require up/boot

data/lib/upjs/rails/version.rb

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

data/spec_app/config/environments/development.rb

@@ -25,7 +25,7 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug = false
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.

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

@@ -3,5 +3,6 @@ beforeEach ->
   @previousTitle = document.title
   
 afterEach ->
-  history.replaceState?({}, @previousTitle, @previousHref)
- 
+  if up.browser.canPushState()
+    history.replaceState?({}, @previousTitle, @previousHref)
+

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

@@ -122,7 +122,7 @@ describe 'up.flow', ->
             @revealedHTML = ''
             spyOn(up, 'reveal').and.callFake ($revealedElement) =>
               @revealedHTML = $revealedElement.get(0).outerHTML
-              u.resolvedPromise()
+              u.resolvedDeferred()
 
           it 'reveals a new element before it is being replaced', (done) ->
             @request = up.replace('.middle', '/path', reveal: true)

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

@@ -14,14 +14,16 @@ describe 'up.history', ->
 
     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')
-        up.history.push('/two')
-        $element = up.ready(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('')
-        expect($element.attr('up-follow')).toBe('')
+      if up.browser.canPushState()
+
+        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'))
+          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'
 
@@ -29,60 +31,64 @@ describe 'up.history', ->
 
     describe 'scroll restauration', ->
 
-      afterEach ->
-        $('.viewport').remove()
+      if up.browser.canPushState()
+
+        afterEach ->
+          $('.viewport').remove()
+
+        it 'restores the scroll position of viewports when the user hits the back button', (done) ->
 
-      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>
+          """
 
-        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
 
-        respond = (html) =>
-          @lastRequest().respondWith
-            status: 200
-            contentType: 'text/html'
-            responseText: longContentHtml
+          $viewport = $(longContentHtml).appendTo(document.body)
 
-        $viewport = $(longContentHtml).appendTo(document.body)
+          up.layout.defaults(viewports: ['.viewport'])
+          up.history.defaults(popTargets: ['.viewport'])
 
-        up.layout.defaults(viewports: ['.viewport'])
-        up.history.defaults(popTargets: ['.viewport'])
+          $viewport.append(longContentHtml)
 
-        $viewport.append(longContentHtml)
+          up.replace('.content', '/one')
+          respond()
 
-        up.replace('.content', '/one')
-        respond()
-        $viewport.scrollTop(50)
+          $viewport.scrollTop(50)
 
-        up.replace('.content', '/two')
-        respond()
-        $('.viewport').scrollTop(150)
+          up.replace('.content', '/two')
+          respond()
 
-        up.replace('.content', '/three')
-        respond()
-        $('.viewport').scrollTop(250)
+          $('.viewport').scrollTop(150)
 
-        history.back()
-        @setTimer 50, =>
-          respond() # we need to respond since we've never requested /two with the popTarget
-          expect($('.viewport').scrollTop()).toBe(150)
+          up.replace('.content', '/three')
+          respond()
+          $('.viewport').scrollTop(250)
 
           history.back()
           @setTimer 50, =>
-            respond() # we need to respond since we've never requested /one with the popTarget
-            expect($('.viewport').scrollTop()).toBe(50)
+            respond() # we need to respond since we've never requested /two with the popTarget
+            expect($('.viewport').scrollTop()).toBe(150)
 
-            history.forward()
+            history.back()
             @setTimer 50, =>
-              # No need to respond since we requested /two with the popTarget
-              # when we went backwards
-              expect($('.viewport').scrollTop()).toBe(150)
+              respond() # we need to respond since we've never requested /one with the popTarget
+              expect($('.viewport').scrollTop()).toBe(50)
 
               history.forward()
               @setTimer 50, =>
-                respond() # we need to respond since we've never requested /three with the popTarget
-                expect($('.viewport').scrollTop()).toBe(250)
-                done()
+                # 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

@@ -7,7 +7,7 @@ describe 'up.link', ->
     describe 'up.follow', ->
       
       if up.browser.canPushState()
-      
+
         it 'loads the given link via AJAX and replaces the response in the given target', (done) ->
           affix('.before').text('old-before')
           affix('.middle').text('old-middle')

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

@@ -9,13 +9,13 @@ describe 'up.motion', ->
         it 'animates the given element', (done) ->
           $element = affix('.element').text('content')
           opacity = -> Number($element.css('opacity'))
-          up.animate($element, 'fade-in', duration: 100, easing: 'linear')
+          up.animate($element, 'fade-in', duration: 200, easing: 'linear')
 
           @setTimer 0, ->
             expect(opacity()).toBeAround(0.0, 0.25)
-          @setTimer 50, ->
-            expect(opacity()).toBeAround(0.5, 0.25)
           @setTimer 100, ->
+            expect(opacity()).toBeAround(0.5, 0.25)
+          @setTimer 200, ->
             expect(opacity()).toBeAround(1.0, 0.25)
             done()
 
@@ -180,7 +180,7 @@ describe 'up.motion', ->
 
       else
 
-        it "doesn't animate and hides the first element instead", ->
+        it "doesn't animate and hides the old element instead", ->
           $old = affix('.old').text('old content')
           $new = affix('.new').text('new content')
           up.morph($old, $new, 'cross-fade', duration: 1000)

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

@@ -77,7 +77,7 @@ describe 'up.proxy', ->
           u.times 2, -> up.proxy.ajax(url: '/foo', method: method, cache: false)
           expect(jasmine.Ajax.requests.count()).toEqual(2)
 
-      u.each ['POST', 'PUT', 'DELETE', 'DESTROY'], (method) ->
+      u.each ['POST', 'PUT', 'DELETE'], (method) ->
 
         it "does not cache #{method} requests", ->
           u.times 2, -> up.proxy.ajax(url: '/foo', method: method)
@@ -264,15 +264,24 @@ describe 'up.proxy', ->
 
     describe 'up.proxy.preload', ->
 
-      it "loads and caches the given link's destination", ->
-        $link = affix('a[href="/path"]')
-        up.proxy.preload($link)
-        expect(u.isPromise(up.proxy.get(url: '/path'))).toBe(true)
+      if up.browser.canPushState()
 
-      it "does not load a link whose method has side-effects", ->
-        $link = affix('a[href="/path"][data-method="post"]')
-        up.proxy.preload($link)
-        expect(up.proxy.get(url: '/path')).toBeUndefined()
+        it "loads and caches the given link's destination", ->
+          $link = affix('a[href="/path"]')
+          up.proxy.preload($link)
+          expect(u.isPromise(up.proxy.get(url: '/path'))).toBe(true)
+
+        it "does not load a link whose method has side-effects", ->
+          $link = affix('a[href="/path"][data-method="post"]')
+          up.proxy.preload($link)
+          expect(up.proxy.get(url: '/path')).toBeUndefined()
+
+      else
+
+        it "does nothing", ->
+          $link = affix('a[href="/path"]')
+          up.proxy.preload($link)
+          expect(jasmine.Ajax.requests.count()).toBe(0)
 
     describe 'up.proxy.get', ->
 

data/spec_app/vendor/assets/bower_components/jasmine/.bower.json

@@ -1,14 +1,50 @@
 {
-  "name": "jasmine",
-  "homepage": "https://github.com/pivotal/jasmine",
-  "version": "2.0.4",
-  "_release": "2.0.4",
+  "name": "jasmine-core",
+  "version": "2.3.4",
+  "homepage": "http://jasmine.github.io",
+  "authors": [
+    "slackersoft <gregg@slackersoft.net>"
+  ],
+  "description": "Official packaging of Jasmine's core files",
+  "keywords": [
+    "test",
+    "jasmine",
+    "tdd",
+    "bdd"
+  ],
+  "license": "MIT",
+  "moduleType": "globals",
+  "main": "lib/jasmine-core/jasmine.js",
+  "ignore": [
+    "**/.*",
+    "dist",
+    "grunt",
+    "node_modules",
+    "pkg",
+    "release_notes",
+    "spec",
+    "src",
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "jasmine-core.gemspec",
+    "*.sh",
+    "*.py",
+    "Gruntfile.js",
+    "lib/jasmine-core.rb",
+    "lib/jasmine-core/boot/",
+    "lib/jasmine-core/spec",
+    "lib/jasmine-core/version.rb",
+    "lib/jasmine-core/*.py",
+    "sauce_connect.log"
+  ],
+  "_release": "2.3.4",
   "_resolution": {
     "type": "version",
-    "tag": "v2.0.4",
-    "commit": "d1b4a64a573d69f6cfd07c862a34402efdd0ea06"
+    "tag": "v2.3.4",
+    "commit": "651426b6583020e2f3fdae56d2873514963ba65e"
   },
   "_source": "git://github.com/pivotal/jasmine.git",
-  "_target": "~2.0",
+  "_target": "~2",
   "_originalSource": "jasmine"
 }

data/spec_app/vendor/assets/bower_components/jasmine/CONTRIBUTING.md

@@ -1,23 +1,28 @@
 # Developing for Jasmine Core
 
-We welcome your contributions - Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists (the main group - [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js) and the developer's list - [http://groups.google.com/group/jasmine-js-dev](http://groups.google.com/group/jasmine-js-dev)) before starting work - what you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
+We welcome your contributions! Thanks for helping make Jasmine a better project for everyone. Please review the backlog and discussion lists before starting work.  What you're looking for may already have been done. If it hasn't, the community can help make your contribution better.
+
+## Links
+
+- [Jasmine Google Group](http://groups.google.com/group/jasmine-js)
+- [Jasmine-dev Google Group](http://groups.google.com/group/jasmine-js-dev)
+- [Jasmine on PivotalTracker](https://www.pivotaltracker.com/n/projects/10606)
 
 ## General Workflow
 
 Please submit pull requests via feature branches using the semi-standard workflow of:
 
-1. Fork it
-1. Clone your fork: (`git clone git@github.com:yourUserName/jasmine.git`)                                                                                                                         
-1. Change directory: (`cd jasmine`)                                                                                                                                                               
-1. Asign original repository to a remote named 'upstream': (`git remote add                                                                                                                       
-upstream https://github.com/pivotal/jasmine.git`)                                                                                                                                                 
-1. Pull in changes not present in your local repository: (`git fetch upstream`)
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
+```bash
+git clone git@github.com:yourUserName/jasmine.git              # Clone your fork
+cd jasmine                                                     # Change directory
+git remote add upstream https://github.com/jasmine/jasmine.git # Assign original repository to a remote named 'upstream'
+git fetch upstream                                             # Pull in changes not present in your local repository
+git checkout -b my-new-feature                                 # Create your feature branch
+git commit -am 'Add some feature'                              # Commit your changes
+git push origin my-new-feature                                 # Push to the branch
+```
 
-We favor pull requests with very small, single commits with a single purpose.
+Once you've pushed a feature branch to your forked repo, you're ready to open a pull request. We favor pull requests with very small, single commits with a single purpose.
 
 ## Background
 
@@ -67,7 +72,11 @@ To install the Ruby dependencies, you will need Ruby, Rubygems, and Bundler avai
 
     $ bundle
 
-...will install all of the Ruby dependencies.
+...will install all of the Ruby dependencies. If the ffi gem fails to build its native extensions, you may need to manually install some system dependencies. On Ubuntu:
+
+    $ apt-get install gcc ruby ruby-dev libxml2 libxml2-dev libxslt1-dev
+
+...should get you to the point that `bundle` can install everything.
 
 To install the Node dependencies, you will need Node.js, Npm, and [Grunt](http://gruntjs.com/), the [grunt-cli](https://github.com/gruntjs/grunt-cli) and ensure that `grunt` is on your path.
 
@@ -94,13 +103,13 @@ Follow these tips and your pull request, patch, or suggestion is much more likel
 
 ### Running Specs
 
-Jasmine uses the [Jasmine Ruby gem](http://github.com/pivotal/jasmine-gem) to test itself in browser.
+Jasmine uses the [Jasmine Ruby gem](http://github.com/jasmine/jasmine-gem) to test itself in browser.
 
     $ rake jasmine
 
 ...and then visit `http://localhost:8888` to run specs.
 
-Jasmine uses Node.js with a custom runner to test outside of a browser.
+Jasmine uses the [Jasmine NPM package](http://github.com/jasmine/jasmine-npm) to test itself in a Node.js/npm environment.
 
     $ grunt execSpecsInNode
 
@@ -114,8 +123,8 @@ Jasmine uses Node.js with a custom runner to test outside of a browser.
 
 ## Submitting a Pull Request
 1. Revert your changes to `jasmine.js` and `jasmine-html.js`
-  * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches.
-1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master.
+  * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches
+1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master
 
 Note that we use Travis for Continuous Integration. We only accept green pull requests.