unpoly-rails 0.34.2 → 0.35.0

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '0.34.2'
+    VERSION = '0.35.0'
   end
 end

data/spec_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    unpoly-rails (0.34.1)
+    unpoly-rails (0.34.2)
       rails (>= 3)
 
 GEM

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

@@ -1,7 +1,15 @@
+u = up.util
+
 beforeEach ->
   jasmine.addMatchers
     toHaveRequestMethod: (util, customEqualityTesters) ->
       compare: (request, expectedMethod) ->
         realMethodMatches = (request.method == expectedMethod)
-        wrappedMethodMatches = util.equals(request.data()['_method'], [expectedMethod], customEqualityTesters)
+        formData = request.data()
+        if u.isFormData(formData)
+          wrappedMethod = formData.get('_method')
+          wrappedMethodMatches = (wrappedMethod == expectedMethod)
+        else
+          wrappedMethod = formData['_method']
+          wrappedMethodMatches = util.equals(wrappedMethod, [expectedMethod], customEqualityTesters)
         pass: realMethodMatches || wrappedMethodMatches

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

@@ -99,14 +99,12 @@ describe 'up.dom', ->
             up.replace('.middle', '/bar')
             expect(jasmine.Ajax.requests.count()).toEqual(2)
 
-          describeCapability 'canFormData', ->
-
-            it "does not explode if the original request's { data } is a FormData object", ->
-              up.replace('.middle', '/foo', method: 'post', data: new FormData()) # POST requests are not cached
-              expect(jasmine.Ajax.requests.count()).toEqual(1)
-              @respond(responseHeaders: { 'X-Up-Location': '/bar', 'X-Up-Method': 'GET' })
-              secondReplace = -> up.replace('.middle', '/bar')
-              expect(secondReplace).not.toThrowError()
+          it "does not explode if the original request's { data } is a FormData object", ->
+            up.replace('.middle', '/foo', method: 'post', data: new FormData()) # POST requests are not cached
+            expect(jasmine.Ajax.requests.count()).toEqual(1)
+            @respond(responseHeaders: { 'X-Up-Location': '/bar', 'X-Up-Method': 'GET' })
+            secondReplace = -> up.replace('.middle', '/bar')
+            expect(secondReplace).not.toThrowError()
 
         describe 'with { data } option', ->
 
@@ -331,6 +329,26 @@ describe 'up.dom', ->
             expect($('.container')).toHaveText('new container text')
             expect(document.title).toBe('Title from HTML')
 
+          it 'does not update the document title if the response has a <title> tag inside an inline SVG image (bugfix)', ->
+            affix('.container').text('old container text')
+            document.title = 'old document title'
+            up.replace('.container', '/path', history: false, title: true)
+
+            @respondWith """
+              <svg width="500" height="300" xmlns="http://www.w3.org/2000/svg">
+                <g>
+                  <title>SVG Title Demo example</title>
+                  <rect x="10" y="10" width="200" height="50" style="fill:none; stroke:blue; stroke-width:1px"/>
+                </g>
+              </svg>
+
+              <div class='container'>
+                new container text
+              </div>
+            """
+            expect($('.container')).toHaveText('new container text')
+            expect(document.title).toBe('old document title')
+
           it "does not extract the title from the response or HTTP header if history isn't updated", ->
             affix('.container').text('old container text')
             document.title = 'old document title'
@@ -903,79 +921,80 @@ describe 'up.dom', ->
 
       describe 'with { transition } option', ->
 
-        describeCapability 'canCssTransition', ->
+        it 'morphs between the old and new element', (done) ->
+          affix('.element').text('version 1')
+          up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
 
-          it 'morphs between the old and new element', (done) ->
-            affix('.element').text('version 1')
-            up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(1)
+          expect(u.opacity($ghost1)).toBeAround(1.0, 0.1)
 
-            $ghost1 = $('.element.up-ghost:contains("version 1")')
-            expect($ghost1).toHaveLength(1)
-            expect(u.opacity($ghost1)).toBeAround(1.0, 0.1)
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect(u.opacity($ghost2)).toBeAround(0.0, 0.1)
 
-            $ghost2 = $('.element.up-ghost:contains("version 2")')
-            expect($ghost2).toHaveLength(1)
-            expect(u.opacity($ghost2)).toBeAround(0.0, 0.1)
+          u.setTimer 190, ->
+            expect(u.opacity($ghost1)).toBeAround(0.0, 0.3)
+            expect(u.opacity($ghost2)).toBeAround(1.0, 0.3)
+            done()
 
-            u.setTimer 190, ->
-              expect(u.opacity($ghost1)).toBeAround(0.0, 0.3)
-              expect(u.opacity($ghost2)).toBeAround(1.0, 0.3)
-              done()
+        it 'marks the old fragment and its ghost as .up-destroying during the transition', ->
+          affix('.element').text('version 1')
+          up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
 
-          it 'marks the old fragment and its ghost as .up-destroying during the transition', ->
-            affix('.element').text('version 1')
-            up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
+          $version1 = $('.element:not(.up-ghost):contains("version 1")')
+          $version1Ghost = $('.element.up-ghost:contains("version 1")')
+          expect($version1).toHaveLength(1)
+          expect($version1Ghost).toHaveLength(1)
+          expect($version1).toHaveClass('up-destroying')
+          expect($version1Ghost).toHaveClass('up-destroying')
 
-            $version1 = $('.element:not(.up-ghost):contains("version 1")')
-            $version1Ghost = $('.element.up-ghost:contains("version 1")')
-            expect($version1).toHaveLength(1)
-            expect($version1Ghost).toHaveLength(1)
-            expect($version1).toHaveClass('up-destroying')
-            expect($version1Ghost).toHaveClass('up-destroying')
-
-            $version2 = $('.element:not(.up-ghost):contains("version 2")')
-            $version2Ghost = $('.element.up-ghost:contains("version 2")')
-            expect($version2).toHaveLength(1)
-            expect($version2Ghost).toHaveLength(1)
-            expect($version2).not.toHaveClass('up-destroying')
-            expect($version2Ghost).not.toHaveClass('up-destroying')
-
-          it 'cancels an existing transition by instantly jumping to the last frame', ->
-            affix('.element').text('version 1')
-            up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
+          $version2 = $('.element:not(.up-ghost):contains("version 2")')
+          $version2Ghost = $('.element.up-ghost:contains("version 2")')
+          expect($version2).toHaveLength(1)
+          expect($version2Ghost).toHaveLength(1)
+          expect($version2).not.toHaveClass('up-destroying')
+          expect($version2Ghost).not.toHaveClass('up-destroying')
 
-            $ghost1 = $('.element.up-ghost:contains("version 1")')
-            expect($ghost1).toHaveLength(1)
-            expect($ghost1.css('opacity')).toBeAround(1.0, 0.1)
+        it 'cancels an existing transition by instantly jumping to the last frame', ->
+          affix('.element').text('version 1')
+          up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 200)
 
-            $ghost2 = $('.element.up-ghost:contains("version 2")')
-            expect($ghost2).toHaveLength(1)
-            expect($ghost2.css('opacity')).toBeAround(0.0, 0.1)
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(1)
+          expect($ghost1.css('opacity')).toBeAround(1.0, 0.1)
 
-            up.extract('.element', '<div class="element">version 3</div>', transition: 'cross-fade', duration: 200)
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect($ghost2.css('opacity')).toBeAround(0.0, 0.1)
 
-            $ghost1 = $('.element.up-ghost:contains("version 1")')
-            expect($ghost1).toHaveLength(0)
+          up.extract('.element', '<div class="element">version 3</div>', transition: 'cross-fade', duration: 200)
 
-            $ghost2 = $('.element.up-ghost:contains("version 2")')
-            expect($ghost2).toHaveLength(1)
-            expect($ghost2.css('opacity')).toBeAround(1.0, 0.1)
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(0)
 
-            $ghost3 = $('.element.up-ghost:contains("version 3")')
-            expect($ghost3).toHaveLength(1)
-            expect($ghost3.css('opacity')).toBeAround(0.0, 0.1)
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect($ghost2.css('opacity')).toBeAround(1.0, 0.1)
 
-          it 'delays the resolution of the returned promise until the transition is over', (done) ->
-            affix('.element').text('version 1')
-            resolution = jasmine.createSpy()
-            promise = up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 30)
-            promise.then(resolution)
-            expect(resolution).not.toHaveBeenCalled()
-            u.setTimer 80, ->
-              expect(resolution).toHaveBeenCalled()
-              done()
+          $ghost3 = $('.element.up-ghost:contains("version 3")')
+          expect($ghost3).toHaveLength(1)
+          expect($ghost3.css('opacity')).toBeAround(0.0, 0.1)
+
+        it 'delays the resolution of the returned promise until the transition is over', (done) ->
+          affix('.element').text('version 1')
+          resolution = jasmine.createSpy()
+          promise = up.extract('.element', '<div class="element">version 2</div>', transition: 'cross-fade', duration: 30)
+          promise.then(resolution)
+          expect(resolution).not.toHaveBeenCalled()
+          u.setTimer 80, ->
+            expect(resolution).toHaveBeenCalled()
+            done()
+
+        describe 'when animation is disabled', ->
 
-        describeFallback 'canCssTransition', ->
+          beforeEach ->
+            up.motion.config.enabled = false
 
           it 'immediately swaps the old and new elements', ->
             affix('.element').text('version 1')
@@ -1260,31 +1279,29 @@ describe 'up.dom', ->
           expect(keptListener).toHaveBeenCalledWith($keeper, { key: 'value1' })
           expect(keptListener).toHaveBeenCalledWith($keeper, { key: 'value2' })
 
-        describeCapability 'canCssTransition', ->
-
-          it "doesn't let the discarded element appear in a transition", (done) ->
-            oldTextDuringTransition = undefined
-            newTextDuringTransition = undefined
-            transition = ($old, $new) ->
-              oldTextDuringTransition = squish($old.text())
-              newTextDuringTransition = squish($new.text())
-              u.resolvedDeferred()
-            $container = affix('.container')
-            $container.html """
-              <div class='foo'>old-foo</div>
-              <div class='bar' up-keep>old-bar</div>
-              """
-            newHtml = """
-              <div class='container'>
-                <div class='foo'>new-foo</div>
-                <div class='bar' up-keep>new-bar</div>
-              </div>
-              """
-            promise = up.extract('.container', newHtml, transition: transition)
-            promise.then ->
-              expect(oldTextDuringTransition).toEqual('old-foo old-bar')
-              expect(newTextDuringTransition).toEqual('new-foo old-bar')
-              done()
+        it "doesn't let the discarded element appear in a transition", (done) ->
+          oldTextDuringTransition = undefined
+          newTextDuringTransition = undefined
+          transition = ($old, $new) ->
+            oldTextDuringTransition = squish($old.text())
+            newTextDuringTransition = squish($new.text())
+            u.resolvedDeferred()
+          $container = affix('.container')
+          $container.html """
+            <div class='foo'>old-foo</div>
+            <div class='bar' up-keep>old-bar</div>
+            """
+          newHtml = """
+            <div class='container'>
+              <div class='foo'>new-foo</div>
+              <div class='bar' up-keep>new-bar</div>
+            </div>
+            """
+          promise = up.extract('.container', newHtml, transition: transition)
+          promise.then ->
+            expect(oldTextDuringTransition).toEqual('old-foo old-bar')
+            expect(newTextDuringTransition).toEqual('new-foo old-bar')
+            done()
 
     describe 'up.destroy', ->
       

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

@@ -9,15 +9,9 @@ describe 'up.form', ->
       beforeEach ->
         up.form.config.observeDelay = 0
 
-      changeEvents = if up.browser.canInputEvent()
-        # Actually we only need `input`, but we want to notice
-        # if another script manually triggers `change` on the element.
-        ['input', 'change']
-      else
-        # Actually we won't ever get `input` from the user in this browser,
-        # but we want to notice if another script manually triggers `input`
-        # on the element.
-        ['input', 'change', 'keypress', 'paste', 'cut', 'click', 'propertychange']
+      # Actually we only need `input`, but we want to notice
+      # if another script manually triggers `change` on the element.
+      changeEvents = ['input', 'change']
 
       describe 'when the first argument is a form field', ->
 
@@ -342,20 +336,10 @@ describe 'up.form', ->
           beforeEach ->
             @$form.affix('input[name="file-field"][type="file"]')
 
-          describeCapability 'canFormData', ->
-
-            it 'transfers the form fields via FormData', ->
-              up.submit(@$form)
-              data = @lastRequest().data()
-              expect(u.isFormData(data)).toBe(true)
-
-          describeFallback 'canFormData', ->
-
-            it 'falls back to a vanilla form submission', ->
-              form = @$form.get(0)
-              spyOn(form, 'submit')
-              up.submit(@$form)
-              expect(form.submit).toHaveBeenCalled()
+          it 'transfers the form fields via FormData', ->
+            up.submit(@$form)
+            data = @lastRequest().data()
+            expect(u.isFormData(data)).toBe(true)
 
       describeFallback 'canPushState', ->
 

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

@@ -421,24 +421,22 @@ describe 'up.link', ->
 
         describe 'with [up-transition] modifier', ->
 
-          describeCapability 'canCssTransition', ->
-
-            it 'morphs between the old and new target element', (done) ->
-              affix('.target.old')
-              $link = affix('a[href="/path"][up-target=".target"][up-transition="cross-fade"][up-duration="500"][up-easing="linear"]')
-              Trigger.clickSequence($link)
-              @respondWith '<div class="target new">new text</div>'
-
-              $oldGhost = $('.target.old.up-ghost')
-              $newGhost = $('.target.new.up-ghost')
-              expect($oldGhost).toExist()
-              expect($newGhost).toExist()
-              expect(u.opacity($oldGhost)).toBeAround(1, 0.15)
-              expect(u.opacity($newGhost)).toBeAround(0, 0.15)
-              u.setTimer 250, ->
-                expect(u.opacity($oldGhost)).toBeAround(0.5, 0.15)
-                expect(u.opacity($newGhost)).toBeAround(0.5, 0.15)
-                done()
+          it 'morphs between the old and new target element', (done) ->
+            affix('.target.old')
+            $link = affix('a[href="/path"][up-target=".target"][up-transition="cross-fade"][up-duration="500"][up-easing="linear"]')
+            Trigger.clickSequence($link)
+            @respondWith '<div class="target new">new text</div>'
+
+            $oldGhost = $('.target.old.up-ghost')
+            $newGhost = $('.target.new.up-ghost')
+            expect($oldGhost).toExist()
+            expect($newGhost).toExist()
+            expect(u.opacity($oldGhost)).toBeAround(1, 0.15)
+            expect(u.opacity($newGhost)).toBeAround(0, 0.15)
+            u.setTimer 250, ->
+              expect(u.opacity($oldGhost)).toBeAround(0.5, 0.15)
+              expect(u.opacity($newGhost)).toBeAround(0.5, 0.15)
+              done()
 
         describe 'wih a CSS selector in the [up-fallback] attribute', ->
 

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

@@ -101,22 +101,20 @@ describe 'up.modal', ->
               expect(parseInt($body.css('padding-right'))).toBe(0)
               done()
 
-        describeCapability 'canCssTransition', ->
-
-          it "gives the scrollbar to .up-modal instead of .up-modal-viewport while animating, so we don't see scaled scrollbars in a zoom-in animation", (done) ->
-            openPromise = up.modal.extract('.container', '<div class="container">text</div>', animation: 'fade-in', duration: 100)
-            $modal = $('.up-modal')
-            $viewport = $modal.find('.up-modal-viewport')
-            expect($modal.css('overflow-y')).toEqual('scroll')
-            expect($viewport.css('overflow-y')).toEqual('hidden')
-            openPromise.then ->
-              expect($modal.css('overflow-y')).not.toEqual('scroll')
-              expect($viewport.css('overflow-y')).toEqual('scroll')
-              closePromise = up.modal.close(animation: 'fade-out', duration: 200)
-              u.nextFrame ->
-                expect($modal.css('overflow-y')).toEqual('scroll')
-                expect($viewport.css('overflow-y')).toEqual('hidden')
-                done()
+        it "gives the scrollbar to .up-modal instead of .up-modal-viewport while animating, so we don't see scaled scrollbars in a zoom-in animation", (done) ->
+          openPromise = up.modal.extract('.container', '<div class="container">text</div>', animation: 'fade-in', duration: 100)
+          $modal = $('.up-modal')
+          $viewport = $modal.find('.up-modal-viewport')
+          expect($modal.css('overflow-y')).toEqual('scroll')
+          expect($viewport.css('overflow-y')).toEqual('hidden')
+          openPromise.then ->
+            expect($modal.css('overflow-y')).not.toEqual('scroll')
+            expect($viewport.css('overflow-y')).toEqual('scroll')
+            closePromise = up.modal.close(animation: 'fade-out', duration: 200)
+            u.nextFrame ->
+              expect($modal.css('overflow-y')).toEqual('scroll')
+              expect($viewport.css('overflow-y')).toEqual('hidden')
+              done()
 
         it 'does not add right padding to the body if the body has overflow-y: hidden', (done) ->
           restoreBody = u.temporaryCss($('body'), 'overflow-y': 'hidden')
@@ -185,48 +183,46 @@ describe 'up.modal', ->
               expect(bodyPadding).not.toBeAround(2 * assumedScrollbarWidth, 2 * 5)
               done()
 
-        describeCapability 'canCssTransition', ->
+        it 'closes the current modal and wait for its close animation to finish before starting the open animation of a second modal', (done) ->
+          up.modal.config.openAnimation = 'fade-in'
+          up.modal.config.openDuration = 5
+          up.modal.config.closeAnimation = 'fade-out'
+          up.modal.config.closeDuration = 60
 
-          it 'closes the current modal and wait for its close animation to finish before starting the open animation of a second modal', (done) ->
-            up.modal.config.openAnimation = 'fade-in'
-            up.modal.config.openDuration = 5
-            up.modal.config.closeAnimation = 'fade-out'
-            up.modal.config.closeDuration = 60
+          events = []
+          u.each ['up:modal:open', 'up:modal:opened', 'up:modal:close', 'up:modal:closed'], (event) ->
+            up.on event, ->
+              events.push(event)
 
-            events = []
-            u.each ['up:modal:open', 'up:modal:opened', 'up:modal:close', 'up:modal:closed'], (event) ->
-              up.on event, ->
-                events.push(event)
+          up.modal.extract('.target', '<div class="target">response1</div>')
 
-            up.modal.extract('.target', '<div class="target">response1</div>')
+          # First modal is starting opening animation
+          expect(events).toEqual ['up:modal:open']
+          expect($('.target')).toHaveText('response1')
 
-            # First modal is starting opening animation
-            expect(events).toEqual ['up:modal:open']
+          u.setTimer 80, ->
+            # First modal has completed opening animation
+            expect(events).toEqual ['up:modal:open', 'up:modal:opened']
             expect($('.target')).toHaveText('response1')
 
-            u.setTimer 80, ->
-              # First modal has completed opening animation
-              expect(events).toEqual ['up:modal:open', 'up:modal:opened']
-              expect($('.target')).toHaveText('response1')
-
-              # We open another modal, which will cause the first modal to start closing
-              up.modal.extract('.target', '<div class="target">response2</div>')
+            # We open another modal, which will cause the first modal to start closing
+            up.modal.extract('.target', '<div class="target">response2</div>')
 
-              expect($('.target')).toHaveText('response1')
+            expect($('.target')).toHaveText('response1')
 
-              u.setTimer 20, ->
+            u.setTimer 20, ->
 
-                # Second modal is still waiting for first modal's closing animaton to finish.
-                expect(events).toEqual ['up:modal:open', 'up:modal:opened', 'up:modal:close']
-                expect($('.target')).toHaveText('response1')
+              # Second modal is still waiting for first modal's closing animaton to finish.
+              expect(events).toEqual ['up:modal:open', 'up:modal:opened', 'up:modal:close']
+              expect($('.target')).toHaveText('response1')
 
-                u.setTimer 200, ->
+              u.setTimer 200, ->
 
-                  # First modal has finished closing, second modal has finished opening.
-                  expect(events).toEqual ['up:modal:open', 'up:modal:opened', 'up:modal:close', 'up:modal:closed', 'up:modal:open', 'up:modal:opened']
-                  expect($('.target')).toHaveText('response2')
+                # First modal has finished closing, second modal has finished opening.
+                expect(events).toEqual ['up:modal:open', 'up:modal:opened', 'up:modal:close', 'up:modal:closed', 'up:modal:open', 'up:modal:opened']
+                expect($('.target')).toHaveText('response2')
 
-                  done()
+                done()
 
           it 'closes an opening modal if a second modal starts opening before the first modal has finished its open animation', (done) ->
             up.modal.config.openAnimation = 'fade-in'