unpoly-rails 0.20.0 → 0.21.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.20.0'
+    VERSION = '0.21.0'
   end
 end

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

@@ -32,12 +32,21 @@ describe 'up.flow', ->
             expect($('.after')).toHaveText('old-after')
             done()
 
-        it 'sends an X-Up-Target HTTP headers along with the request', ->
+        it 'sends an X-Up-Target HTTP header along with the request', ->
           up.replace('.middle', '/path')
           request = @lastRequest()
-          console.log(request.requestHeaders)
           expect(request.requestHeaders['X-Up-Target']).toEqual('.middle')
 
+        it 'returns a promise that will be resolved once the server response was received and the fragments were swapped', ->
+          resolution = jasmine.createSpy()
+          promise = up.replace('.middle', '/path')
+          promise.then(resolution)
+          expect(resolution).not.toHaveBeenCalled()
+          expect($('.middle')).toHaveText('old-middle')
+          @respond()
+          expect(resolution).toHaveBeenCalled()
+          expect($('.middle')).toHaveText('new-middle')
+
         describe 'with { data } option', ->
 
           it "uses the given params as a non-GET request's payload", ->
@@ -457,6 +466,78 @@ describe 'up.flow', ->
         expect($(elements.get(0)).text()).toEqual('text')
         expect($(elements.get(1)).text()).toEqual('')
 
+      describe 'with { transition } option', ->
+
+        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: 50)
+
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(1)
+          expect($ghost1.css('opacity')).toBeAround(1.0, 0.1)
+
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect($ghost2.css('opacity')).toBeAround(0.0, 0.1)
+
+          @setTimer 40, ->
+            expect($ghost1.css('opacity')).toBeAround(0.0, 0.2)
+            expect($ghost2.css('opacity')).toBeAround(1.0, 0.2)
+            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)
+
+          $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)
+
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(1)
+          expect($ghost1.css('opacity')).toBeAround(1.0, 0.1)
+
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect($ghost2.css('opacity')).toBeAround(0.0, 0.1)
+
+          up.extract('.element', '<div class="element">version 3</div>', transition: 'cross-fade', duration: 200)
+
+          $ghost1 = $('.element.up-ghost:contains("version 1")')
+          expect($ghost1).toHaveLength(0)
+
+          $ghost2 = $('.element.up-ghost:contains("version 2")')
+          expect($ghost2).toHaveLength(1)
+          expect($ghost2.css('opacity')).toBeAround(1.0, 0.1)
+
+          $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()
+          @setTimer 50, ->
+            expect(resolution).toHaveBeenCalled()
+            done()
+
       describe 'handling of [up-keep] elements', ->
 
         squish = (string) ->
@@ -509,8 +590,6 @@ describe 'up.flow', ->
             up.extract '.keeper', "<div class='keeper' up-keep>new-inside</div>"
             expect($('.keeper')).toHaveText('old-inside')
 
-          it "does not compile the kept element a second time"
-
           it "only emits an event up:fragment:kept, but not an event up:fragment:inserted", ->
             insertedListener = jasmine.createSpy('subscriber to up:fragment:inserted')
             up.on('up:fragment:inserted', insertedListener)

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

@@ -282,12 +282,12 @@ describe 'up.form', ->
           expect($labels[0]).not.toHaveText('Validation message')
           expect($labels[1]).toHaveText('Validation message')
 
-    describe '[up-toggle]', ->
+    describe '[up-switch]', ->
 
       describe 'on a select', ->
 
         beforeEach ->
-          @$select = affix('select[up-toggle=".target"]')
+          @$select = affix('select[up-switch=".target"]')
           @$blankOption = @$select.affix('option').text('<Please select something>').val('')
           @$fooOption = @$select.affix('option[value="foo"]').text('Foo')
           @$barOption = @$select.affix('option[value="bar"]').text('Bar')
@@ -331,7 +331,7 @@ describe 'up.form', ->
       describe 'on a checkbox', ->
 
         beforeEach ->
-          @$checkbox = affix('input[type="checkbox"][value="1"][up-toggle=".target"]')
+          @$checkbox = affix('input[type="checkbox"][value="1"][up-switch=".target"]')
 
         it "shows the target element iff its up-show-for attribute is :checked and the checkbox is checked", ->
           $target = affix('.target[up-show-for=":checked"]')
@@ -372,10 +372,10 @@ describe 'up.form', ->
 
         beforeEach ->
           @$buttons     = affix('.radio-buttons')
-          @$blankButton = @$buttons.affix('input[type="radio"][name="group"][up-toggle=".target"]').val('')
-          @$fooButton   = @$buttons.affix('input[type="radio"][name="group"][up-toggle=".target"]').val('foo')
-          @$barButton   = @$buttons.affix('input[type="radio"][name="group"][up-toggle=".target"]').val('bar')
-          @$bazkButton  = @$buttons.affix('input[type="radio"][name="group"][up-toggle=".target"]').val('baz')
+          @$blankButton = @$buttons.affix('input[type="radio"][name="group"][up-switch=".target"]').val('')
+          @$fooButton   = @$buttons.affix('input[type="radio"][name="group"][up-switch=".target"]').val('foo')
+          @$barButton   = @$buttons.affix('input[type="radio"][name="group"][up-switch=".target"]').val('bar')
+          @$bazkButton  = @$buttons.affix('input[type="radio"][name="group"][up-switch=".target"]').val('baz')
 
         it "shows the target element iff its up-show-for attribute contains the selected button value", ->
           $target = affix('.target[up-show-for="something bar other"]')
@@ -433,7 +433,7 @@ describe 'up.form', ->
       describe 'on a text input', ->
 
         beforeEach ->
-          @$textInput = affix('input[type="text"][up-toggle=".target"]')
+          @$textInput = affix('input[type="text"][up-switch=".target"]')
 
         it "shows the target element iff its up-show-for attribute contains the input value", ->
           $target = affix('.target[up-show-for="something bar other"]')

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

@@ -92,6 +92,53 @@ describe 'up.syntax', ->
           expect($baz.attr('up-keep')).toBeMissing()
           expect($bam.attr('up-keep')).toEqual('.partner')
 
+      describe 'with { priority } option', ->
+
+        it 'runs compilers with higher priority first', ->
+          traces = []
+          up.compiler '.element', { priority: 1 }, -> traces.push('foo')
+          up.compiler '.element', { priority: 2 }, -> traces.push('bar')
+          up.compiler '.element', { priority: 0 }, -> traces.push('baz')
+          up.compiler '.element', { priority: 3 }, -> traces.push('bam')
+          up.compiler '.element', { priority: -1 }, -> traces.push('qux')
+          up.hello(affix('.element'))
+          expect(traces).toEqual ['qux', 'baz', 'foo', 'bar', 'bam']
+
+        it 'considers priority-less compilers to be priority zero', ->
+          traces = []
+          up.compiler '.element', { priority: 1 }, -> traces.push('foo')
+          up.compiler '.element', -> traces.push('bar')
+          up.compiler '.element', { priority: -1 }, -> traces.push('baz')
+          up.hello(affix('.element'))
+          expect(traces).toEqual ['baz', 'bar', 'foo']
+
+        it 'runs two compilers with the same priority in the order in which they were registered', ->
+          traces = []
+          up.compiler '.element', { priority: 1 }, -> traces.push('foo')
+          up.compiler '.element', { priority: 1 }, -> traces.push('bar')
+          up.hello(affix('.element'))
+          expect(traces).toEqual ['foo', 'bar']
+
+    describe 'up.macro', ->
+
+      it 'registers compilers that are run before other compilers', ->
+        traces = []
+        up.compiler '.element', { priority: 10 }, -> traces.push('foo')
+        up.compiler '.element', { priority: -1000 }, -> traces.push('bar')
+        up.macro '.element', -> traces.push('baz')
+        up.hello(affix('.element'))
+        expect(traces).toEqual ['baz', 'bar' , 'foo']
+
+      it 'allows to macros to have priorities of their own', ->
+        traces = []
+        up.macro '.element', { priority: 1 }, -> traces.push('foo')
+        up.macro '.element', { priority: 2 }, -> traces.push('bar')
+        up.macro '.element', { priority: 0 }, -> traces.push('baz')
+        up.macro '.element', { priority: 3 }, -> traces.push('bam')
+        up.macro '.element', { priority: -1 }, -> traces.push('qux')
+        up.hello(affix('.element'))
+        expect(traces).toEqual ['qux', 'baz', 'foo', 'bar', 'bam']
+
     describe 'up.hello', ->
 
       it 'should have tests'

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

@@ -245,6 +245,82 @@ describe 'up.util', ->
         string = up.util.requestDataAsQuery({ 'my+key': 'my+value' })
         expect(string).toEqual('my%2Bkey=my%2Bvalue')
 
+    describe 'up.util.resolvableWhen', ->
+
+      it 'returns a promise that is resolved when all the given deferreds are resolved', ->
+        one = jasmine.createSpy()
+        two = jasmine.createSpy()
+        both = jasmine.createSpy()
+        oneDeferred = $.Deferred()
+        oneDeferred.then(one)
+        twoDeferred = $.Deferred()
+        twoDeferred.then(two)
+
+        bothDeferred = up.util.resolvableWhen(oneDeferred, twoDeferred)
+        bothDeferred.then(both)
+
+        expect(one).not.toHaveBeenCalled()
+        expect(two).not.toHaveBeenCalled()
+        expect(both).not.toHaveBeenCalled()
+
+        oneDeferred.resolve()
+        expect(one).toHaveBeenCalled()
+        expect(two).not.toHaveBeenCalled()
+        expect(both).not.toHaveBeenCalled()
+
+        twoDeferred.resolve()
+        expect(one).toHaveBeenCalled()
+        expect(two).toHaveBeenCalled()
+        expect(both).toHaveBeenCalled()
+
+      it 'returns a promise with a .resolve method that resolves the given deferreds', ->
+        one = jasmine.createSpy()
+        two = jasmine.createSpy()
+        both = jasmine.createSpy()
+        oneDeferred = $.Deferred()
+        oneDeferred.then(one)
+        twoDeferred = $.Deferred()
+        twoDeferred.then(two)
+
+        bothDeferred = up.util.resolvableWhen(oneDeferred, twoDeferred)
+        bothDeferred.then(both)
+
+        expect(one).not.toHaveBeenCalled()
+        expect(two).not.toHaveBeenCalled()
+        expect(both).not.toHaveBeenCalled()
+
+        bothDeferred.resolve()
+        expect(one).toHaveBeenCalled()
+        expect(two).toHaveBeenCalled()
+        expect(both).toHaveBeenCalled()
+
+      it 'does not resolve the given deferreds more than once', ->
+        oneDeferred = $.Deferred()
+        spyOn(oneDeferred, 'resolve')
+        bothDeferred = up.util.resolvableWhen(oneDeferred)
+
+        bothDeferred.resolve()
+        bothDeferred.resolve()
+
+        expect(oneDeferred.resolve.calls.count()).toEqual(1)
+
+      describe 'bugfix against troublesome jQuery optimization if only one deferred is given', ->
+
+        it 'does not simply return the given deferred', ->
+          oneDeferred = $.Deferred()
+          whenDeferred = up.util.resolvableWhen(oneDeferred)
+          # This is what $.when returns if only passed a single argument
+          expect(whenDeferred).not.toBe(oneDeferred.promise())
+          # Cover eventual implementations
+          expect(whenDeferred).not.toBe(oneDeferred)
+          expect(whenDeferred.promise()).not.toBe(oneDeferred.promise())
+          expect(whenDeferred.promise()).not.toBe(oneDeferred)
+
+        it 'does not create an infinite loop if the given deferred is nested twice and the first nesting is resolved', ->
+          oneDeferred = $.Deferred()
+          firstNesting = up.util.resolvableWhen(oneDeferred)
+          secondNesting = up.util.resolvableWhen(firstNesting)
+          expect(-> firstNesting.resolve()).not.toThrowError()
 
     describe 'up.util.requestDataAsArray', ->
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails