unpoly-rails 0.53.4 → 0.54.0

data/lib/assets/javascripts/unpoly/link.coffee

@@ -350,12 +350,16 @@ up.link = (($) ->
   @selector a[up-target]
   @param {string} up-target
     The CSS selector to replace
+
+    Inside the CSS selector you may refer to this link as `&` ([like in Sass](https://sass-lang.com/documentation/file.SASS_REFERENCE.html#parent-selector)).
   @param {string} [up-method='get']
     The HTTP method to use for the request.
   @param {string} [up-transition='none']
     The [transition](/up.motion) to use for morphing between the old and new elements.
   @param [up-fail-target='body']
-    The selector to replace if the server responds with an error.
+    The CSS selector to replace if the server responds with an error.
+
+    Inside the CSS selector you may refer to this link as `&` ([like in Sass](https://sass-lang.com/documentation/file.SASS_REFERENCE.html#parent-selector)).
   @param {string} [up-fail-transition='none']
     The [transition](/up.motion) to use for morphing between the old and new elements
     when the server responds with an error.
@@ -371,10 +375,12 @@ up.link = (($) ->
     Whether to reveal the target element after it was replaced.
 
     You can also pass a CSS selector for the element to reveal.
+    Inside the CSS selector you may refer to this link as `&` ([like in Sass](https://sass-lang.com/documentation/file.SASS_REFERENCE.html#parent-selector)).
   @param {string} [up-fail-reveal='true']
     Whether to reveal the target element when the server responds with an error.
 
     You can also pass a CSS selector for the element to reveal.
+    Inside the CSS selector you may refer to this link as `&` ([like in Sass](https://sass-lang.com/documentation/file.SASS_REFERENCE.html#parent-selector)).
   @param {string} [up-restore-scroll='false']
     Whether to restore previously known scroll position of all viewports
     within the target selector.

data/lib/assets/javascripts/unpoly/protocol.coffee

@@ -231,7 +231,7 @@ up.protocol = (($) ->
     The name of the optional cookie the server can send to
     [signal the initial request method](/up.protocol#signaling-the-initial-request-method).
   @param {String} [config.methodParam='_method']
-    The name of the POST parameter when [wrapping HTTP methods](/up.form.config#config.wrapMethods)
+    The name of the POST parameter when [wrapping HTTP methods](/up.proxy.config#config.wrapMethods)
     in a `POST` request.
   @param {String} [config.csrfHeader='X-CSRF-Token']
     The name of the HTTP header that will include the

data/lib/assets/javascripts/unpoly/util.coffee

@@ -1589,7 +1589,6 @@ up.util = (($) ->
     poke: =>
       unless @currentTask # don't start a new task while we're still running one
         if @currentTask = @queue.shift()
-          # console.debug('[DivertibleChain.poke] currentTask is now %o', @currentTask)
           promise = @currentTask()
           always promise, =>
             @currentTask = undefined

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.53.4'
+    VERSION = '0.54.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.53.4",
+  "version": "0.54.0",
   "description": "Unobtrusive JavaScript framework",
   "main": "dist/unpoly.js",
   "files": [

data/spec_app/Gemfile.lock

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

data/spec_app/spec/javascripts/helpers/show_lib_versions.coffee

@@ -1,7 +1,6 @@
 showVersions = ->
   $('.jasmine-version').text """
   jQuery #{$.fn.jquery}
-  Unpoly #{up.version}
   Jasmine #{jasmine.version}
   """
 

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

@@ -886,8 +886,7 @@ describe 'up.dom', ->
             # No need to respond because /foo has been cached before
             next => expect($viewport.scrollTop()).toEqual(65)
 
-
-        describe 'with { reveal: true } option', ->
+        describe 'with { reveal } option', ->
 
           beforeEach ->
             @revealedHTML = []
@@ -910,6 +909,73 @@ describe 'up.dom', ->
               expect(@revealMock).not.toHaveBeenCalledWith(@oldMiddle)
               expect(@revealedText).toEqual ['new-middle']
 
+          it 'allows to pass another selector to reveal', asyncSpec (next)->
+            $other = affix('.other').text('other text')
+
+            up.replace('.middle', '/path', reveal: '.other')
+
+            next =>
+              @respond()
+
+            next =>
+              expect(@revealedText).toEqual ['other text']
+
+          it 'allows to refer to the replacement { origin } as "&" in the { reveal } selector', asyncSpec (next) ->
+            $origin = affix('.origin').text('origin text')
+
+            up.replace('.middle', '/path', reveal: '&', origin: '.origin')
+
+            next =>
+              @respond()
+
+            next =>
+              expect(@revealedText).toEqual ['origin text']
+
+          describe 'when the server responds with an error code', ->
+
+            it 'ignores the { reveal } option', asyncSpec (next) ->
+              $failTarget = affix('.fail-target')
+              up.replace('.middle', '/path', failTarget: '.fail-target', reveal: true)
+
+              next =>
+                @respond(status: 500)
+
+              next =>
+                expect(@revealMock).not.toHaveBeenCalled()
+
+            it 'accepts a { failReveal } option for error responses', asyncSpec (next) ->
+              $failTarget = affix('.fail-target').text('old fail target text')
+              up.replace('.middle', '/path', failTarget: '.fail-target', reveal: false, failReveal: true)
+
+              next =>
+              @respondWith
+                status: 500
+                responseText: """
+                  <div class="fail-target">
+                    new fail target text
+                  </div>
+                  """
+
+              next =>
+                expect(@revealedText).toEqual ['new fail target text']
+
+            it 'allows to refer to the replacement { origin } as "&" in the { failTarget } selector', asyncSpec (next) ->
+              $origin = affix('.origin').text('origin text')
+              $failTarget = affix('.fail-target').text('old fail target text')
+              up.replace('.middle', '/path', failTarget: '.fail-target', reveal: false, failReveal: '&', origin: $origin)
+
+              next =>
+              @respondWith
+                status: 500
+                responseText: """
+                  <div class="fail-target">
+                    new fail target text
+                  </div>
+                  """
+
+              next =>
+                expect(@revealedText).toEqual ['origin text']
+
           describe 'when more than one fragment is replaced', ->
 
             it 'only reveals the first fragment', asyncSpec (next) ->
@@ -1187,7 +1253,7 @@ describe 'up.dom', ->
           string
 
         beforeEach ->
-# Need to refactor this spec file so examples don't all share one example
+          # Need to refactor this spec file so examples don't all share one example
           $('.before, .middle, .after').remove()
 
         it 'keeps an [up-keep] element, but does replace other elements around it', asyncSpec (next) ->
@@ -1228,6 +1294,26 @@ describe 'up.dom', ->
           next =>
             expect(squish($('.container').text())).toEqual('new-before old-inside new-after')
 
+        it 'updates an [up-keep] element with { keep: false } option', asyncSpec (next) ->
+          $container = affix('.container')
+          $container.html """
+            old-before
+            <div class='element' up-keep>old-inside</div>
+            old-after
+            """
+
+          up.extract '.container', """
+            <div class='container'>
+              new-before
+              <div class='element' up-keep>new-inside</div>
+              new-after
+            </div>
+            """,
+            keep: false
+
+          next =>
+            expect(squish($('.container').text())).toEqual('new-before new-inside new-after')
+
         describe 'if an [up-keep] element is itself a direct replacement target', ->
 
           it "keeps that element", asyncSpec (next) ->
@@ -1559,6 +1645,8 @@ describe 'up.dom', ->
             expect(newTextDuringTransition).toEqual('new-foo old-bar')
             done()
 
+
+
     describe 'up.destroy', ->
 
       it 'removes the element with the given selector', (done) ->

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

@@ -480,6 +480,28 @@ describe 'up.form', ->
                 expect(revealStub).toHaveBeenCalled()
                 expect(revealStub.calls.mostRecent().args[0]).toBeMatchedBy('#foo-form')
 
+            it 'allows to refer to this form as "&" in the selector', asyncSpec (next) ->
+              $form = affix('form#foo-form[action="/action"][up-target="#foo-form"]')
+
+              revealStub = up.layout.knife.mock('reveal')
+
+              up.submit($form, reveal: '& .form-child')
+
+              next =>
+                @respondWith """
+                  <div class="target">
+                    new text
+                  </div>
+
+                  <form id="foo-form">
+                    <div class="form-child">other</div>
+                  </form>
+                """
+
+              next =>
+                expect(revealStub).toHaveBeenCalled()
+                expect(revealStub.calls.mostRecent().args[0]).toEqual($('#foo-form .form-child'))
+
           describe 'with { failReveal } option', ->
 
             it 'reveals the given selector for a failed submission', asyncSpec (next) ->
@@ -504,6 +526,31 @@ describe 'up.form', ->
                 expect(revealStub).toHaveBeenCalled()
                 expect(revealStub.calls.mostRecent().args[0]).toBeMatchedBy('.error')
 
+            it 'allows to refer to this form as "&" in the selector', asyncSpec (next) ->
+              $form = affix('form#foo-form[action="/action"][up-target=".target"][up-fail-reveal="#foo-form .form-child"]')
+              $target = affix('.target')
+
+              revealStub = up.layout.knife.mock('reveal')
+
+              up.submit($form, reveal: '& .form-child')
+
+              next =>
+                @respondWith
+                  status: 500
+                  responseText: """
+                    <div class="target">
+                      new text
+                    </div>
+
+                    <form id="foo-form">
+                      <div class="form-child">other</div>
+                    </form>
+                    """
+
+              next =>
+                expect(revealStub).toHaveBeenCalled()
+                expect(revealStub.calls.mostRecent().args[0]).toEqual($('#foo-form .form-child'))
+
         describe 'in a form with file inputs', ->
 
           beforeEach ->
@@ -559,6 +606,23 @@ describe 'up.form', ->
         next =>
           expect('.response').toHaveText('new text')
 
+      it 'allows to refer to this form as "&" in the target selector', asyncSpec (next) ->
+        $form = affix('form.my-form[action="/form-target"][up-target="&"]').text('old form text')
+        $submitButton = $form.affix('input[type="submit"]')
+        up.hello($form)
+
+        Trigger.clickSequence($submitButton)
+
+        next =>
+          @respondWith """
+            <form class="my-form">
+              new form text
+            </form>
+          """
+
+        next =>
+          expect('.my-form').toHaveText('new form text')
+
       describe 'when the server responds with an error code', ->
 
         it 'replaces the form instead of the [up-target] selector', asyncSpec (next) ->
@@ -596,6 +660,56 @@ describe 'up.form', ->
             # the event handler, our handler mutes the rejection.
             expect(window).not.toHaveUnhandledRejections()
 
+        it 'updates a given selector when an [up-fail-target] is given', asyncSpec (next) ->
+          $form = affix('form.my-form[action="/path"][up-target=".target"][up-fail-target=".errors"]').text('old form text')
+          $errors = affix('.target').text('old target text')
+          $errors = affix('.errors').text('old errors text')
+
+          $submitButton = $form.affix('input[type="submit"]')
+          up.hello($form)
+
+          Trigger.clickSequence($submitButton)
+
+          next =>
+            @respondWith
+              status: 500
+              responseText: """
+                <form class="my-form">
+                  new form text
+                </form>
+
+                <div class="errors">
+                  new errors text
+                </div>
+                """
+
+          next =>
+            expect('.my-form').toHaveText('old form text')
+            expect('.target').toHaveText('old target text')
+            expect('.errors').toHaveText('new errors text')
+
+        it 'allows to refer to this form as "&" in the [up-fail-target] selector', asyncSpec (next) ->
+          $form = affix('form.my-form[action="/form-target"][up-target=".target"][up-fail-target="&"]').text('old form text')
+          $target = affix('.target').text('old target text')
+
+          $submitButton = $form.affix('input[type="submit"]')
+          up.hello($form)
+
+          Trigger.clickSequence($submitButton)
+
+          next =>
+            @respondWith
+              status: 500,
+              responseText: """
+                <form class="my-form">
+                  new form text
+                </form>
+                """
+
+          next =>
+            expect('.target').toHaveText('old target text')
+            expect('.my-form').toHaveText('new form text')
+
       describe 'submit buttons', ->
 
         it 'includes the clicked submit button in the params', asyncSpec (next) ->

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

@@ -51,11 +51,23 @@ describe 'up.radio', ->
           promiseState(promise).then (result) ->
             expect(result.state).toEqual('fulfilled')
 
-      it 'does not replace the element when the server responds with an error', asyncSpec (next) ->
+      it 'does not change the X-Up-Target header for the request', asyncSpec (next) ->
         affix('.hungry[up-hungry]').text('old hungry')
         affix('.target').text('old target')
+        affix('.fail-target').text('old fail target')
 
-        up.replace('.target', '/path', failTarget: '.target')
+        up.replace('.target', '/path', failTarget: '.fail-target')
+
+        next =>
+          expect(@lastRequest().requestHeaders['X-Up-Target']).toEqual('.target')
+          expect(@lastRequest().requestHeaders['X-Up-Fail-Target']).toEqual('.fail-target')
+
+      it 'does replace the element when the server responds with an error (e.g. for error flashes)', asyncSpec (next) ->
+        affix('.hungry[up-hungry]').text('old hungry')
+        affix('.target').text('old target')
+        affix('.fail-target').text('old fail target')
+
+        up.replace('.target', '/path', failTarget: '.fail-target')
 
         next =>
           @respondWith
@@ -64,6 +76,9 @@ describe 'up.radio', ->
               <div class="target">
                 new target
               </div>
+              <div class="fail-target">
+                new fail target
+              </div>
               <div class="between">
                 new between
               </div>
@@ -72,6 +87,23 @@ describe 'up.radio', ->
               </div>
               """
 
+      it 'does not update [up-hungry] elements with { hungry: false } option', asyncSpec (next) ->
+        affix('.hungry[up-hungry]').text('old hungry')
+        affix('.target').text('old target')
+
+        up.replace('.target', '/path', hungry: false)
+
+        next =>
+          @respondWith
+            responseText: """
+              <div class="target">
+                new target
+              </div>
+              <div class="hungry">
+                new hungry
+              </div>
+              """
+
         next =>
           expect('.target').toHaveText('new target')
           expect('.hungry').toHaveText('old hungry')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.53.4
+  version: 0.54.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails