unpoly-rails 0.33.0 → 0.34.0

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

@@ -79,8 +79,6 @@ up.proxy = (($) ->
     An array of uppercase HTTP method names. AJAX requests with one of these methods
     will be converted into a `POST` request and carry their original method as a `_method`
     parameter. This is to [prevent unexpected redirect behavior](https://makandracards.com/makandra/38347).
-  @param {String} [config.wrapMethodParam]
-    The name of the POST parameter when wrapping HTTP methods in a `POST` request.
   @param {Array<String>} [config.safeMethods]
     An array of uppercase HTTP method names that are considered idempotent.
     The proxy cache will only cache idempotent requests and will clear the entire
@@ -94,7 +92,6 @@ up.proxy = (($) ->
     cacheExpiry: 1000 * 60 * 5
     maxRequests: 4
     wrapMethods: ['PATCH', 'PUT', 'DELETE']
-    wrapMethodParam: '_method'
     safeMethods: ['GET', 'OPTIONS', 'HEAD']
 
   cacheKey = (request) ->
@@ -206,7 +203,7 @@ up.proxy = (($) ->
   @param {String} [request.timeout]
     A timeout in milliseconds for the request.
 
-    If [`up.proxy.config.maxRequests`](/up.proxy.config#maxRequests) is set, the timeout
+    If [`up.proxy.config.maxRequests`](/up.proxy.config#config.maxRequests) is set, the timeout
     will not include the time spent waiting in the queue.
   @return
     A promise for the response that is API-compatible with the
@@ -410,10 +407,10 @@ up.proxy = (($) ->
     request = u.copy(request)
 
     request.headers ||= {}
-    request.headers['X-Up-Target'] = request.target
+    request.headers[up.protocol.config.targetHeader] = request.target
 
     if u.contains(config.wrapMethods, request.method)
-      request.data = u.appendRequestData(request.data, config.wrapMethodParam, request.method)
+      request.data = u.appendRequestData(request.data, up.protocol.config.methodParam, request.method)
       request.method = 'POST'
 
     if u.isFormData(request.data)

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

@@ -375,8 +375,8 @@ up.syntax = (($) ->
   ###
 
   ###*
-  If an element annotated with [`up-data`] is inserted into the DOM,
-  Up will parse the JSON and pass the resulting object to any matching
+  If an element with an `up-data` attribute enters the DOM,
+  Unpoly will parse the JSON and pass the resulting object to any matching
   [`up.compiler()`](/up.compiler) handlers.
 
   For instance, a container for a [Google Map](https://developers.google.com/maps/documentation/javascript/tutorial)

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

@@ -1172,27 +1172,6 @@ up.util = (($) ->
 #  castsToFalse = (object) ->
 #    String(object) == "false"
 
-  ###*
-  @function up.util.locationFromXhr
-  @internal
-  ###
-  locationFromXhr = (xhr) ->
-    xhr.getResponseHeader('X-Up-Location')
-
-  ###*
-  @function up.util.titleFromXhr
-  @internal
-  ###
-  titleFromXhr = (xhr) ->
-    xhr.getResponseHeader('X-Up-Title')
-
-  ###*
-  @function up.util.methodFromXhr
-  @internal
-  ###
-  methodFromXhr = (xhr) ->
-    xhr.getResponseHeader('X-Up-Method')
-
   ###*
   Returns a copy of the given object that only contains
   the given properties.
@@ -2078,9 +2057,6 @@ up.util = (($) ->
   contains: contains
   toArray: toArray
   castedAttr: castedAttr
-  locationFromXhr: locationFromXhr
-  titleFromXhr: titleFromXhr
-  methodFromXhr: methodFromXhr
   clientSize: clientSize
   only: only
   except: except

data/lib/unpoly/rails/request_method_cookie.rb

@@ -13,7 +13,7 @@ module Unpoly
   module Rails
     module RequestMethod
 
-      COOKIE_NAME = '_up_request_method'
+      COOKIE_NAME = '_up_method'
 
       def self.included(base)
         base.before_filter :set_up_request_method_cookie
@@ -22,10 +22,10 @@ module Unpoly
       private
 
       def set_up_request_method_cookie
-        if request.get?
-          cookies.delete(COOKIE_NAME)
-        else
+        if !request.get? && !up?
           cookies[COOKIE_NAME] = request.request_method
+        else
+          cookies.delete(COOKIE_NAME)
         end
       end
 

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.33.0'
+    VERSION = '0.34.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unpoly",
-  "version": "0.33.0",
+  "version": "0.34.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.32.0)
+    unpoly-rails (0.33.0)
       rails (>= 3)
 
 GEM

data/spec_app/spec/controllers/binding_test_controller_spec.rb

@@ -144,4 +144,50 @@ describe BindingTestController do
 
   end
 
+  describe 'request method cookie' do
+
+    describe 'if the request is both non-GET and not a fragment update' do
+
+      it 'echoes the request method in an _up_method cookie ' do
+        put :text
+        expect(response.cookies['_up_method']).to eq('PUT')
+      end
+
+    end
+
+    describe 'if the request is not a fragment update, but GET' do
+
+      it 'does not set the cookie' do
+        get :text
+        expect(response.cookies['_up_method']).to be_nil
+      end
+
+      it 'deletes an existing cookie' do
+        request.cookies['_up_method'] = 'PUT'
+        get :text
+        expect(response.cookies['_up_method']).to be_nil
+      end
+
+    end
+
+    describe 'if the request is non-GET but a fragment update' do
+
+      it 'does not set the cookie' do
+        request.headers['X-Up-Target'] = '.target'
+        put :text
+        expect(response.cookies['_up_method']).to be_nil
+      end
+
+      it 'deletes an existing cookie' do
+        request.cookies['_up_method'] = 'PUT'
+        request.headers['X-Up-Target'] = '.target'
+        put :text
+        expect(response.cookies['_up_method']).to be_nil
+      end
+
+    end
+
+
+  end
+
 end

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

@@ -318,6 +318,36 @@ describe 'up.layout', ->
         # Viewing 100 to 199
         expect($viewport.scrollTop()).toBe(100)
 
+    describe 'revealHash', ->
+
+      it 'reveals an element with an ID matching the hash in the location', ->
+        revealSpy = up.layout.knife.mock('reveal')
+        $match = affix('div#hash')
+        location.hash = '#hash'
+        up.layout.revealHash()
+        expect(revealSpy).toHaveBeenCalledWith($match)
+
+      it 'reveals a named anchor matching the hash in the location', ->
+        revealSpy = up.layout.knife.mock('reveal')
+        $match = affix('a[name="hash"]')
+        location.hash = '#hash'
+        up.layout.revealHash()
+        expect(revealSpy).toHaveBeenCalledWith($match)
+
+      it 'does nothing and returns a rejected promise if no element or anchor matches the hash in the location', ->
+        revealSpy = up.layout.knife.mock('reveal')
+        location.hash = '#hash'
+        promise = up.layout.revealHash()
+        expect(revealSpy).not.toHaveBeenCalled()
+        expect(promise.state()).toEqual('rejected')
+
+      it 'does nothing and returns a resolved promise if the location has no hash', ->
+        revealSpy = up.layout.knife.mock('reveal')
+        location.hash = ''
+        promise = up.layout.revealHash()
+        expect(revealSpy).not.toHaveBeenCalled()
+        expect(promise.state()).toEqual('resolved')
+
     describe 'up.layout.viewportsWithin', ->
 
       it 'should have tests'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - lib/assets/javascripts/unpoly/motion.coffee
 - lib/assets/javascripts/unpoly/namespace.coffee.erb
 - lib/assets/javascripts/unpoly/popup.coffee
+- lib/assets/javascripts/unpoly/protocol.coffee
 - lib/assets/javascripts/unpoly/proxy.coffee
 - lib/assets/javascripts/unpoly/rails.coffee
 - lib/assets/javascripts/unpoly/syntax.coffee
@@ -119,7 +120,7 @@ files:
 - lib/assets/stylesheets/unpoly-bootstrap3/modal-ext.sass
 - lib/assets/stylesheets/unpoly.sass
 - lib/assets/stylesheets/unpoly/close.sass
-- lib/assets/stylesheets/unpoly/flow.sass
+- lib/assets/stylesheets/unpoly/dom.sass
 - lib/assets/stylesheets/unpoly/link.sass
 - lib/assets/stylesheets/unpoly/modal.sass
 - lib/assets/stylesheets/unpoly/popup.sass