turbograft 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea7745bcaf28ab5e4a9a3d8b480c869d0bf1e4c5
-  data.tar.gz: c187593fb6046eb7cb3c2ac735ce83fba052ef6a
+  metadata.gz: 1aff9e76ad586eab0a400892c5f596ffeac608b0
+  data.tar.gz: 0e0c807cb3e2b1f6897de5977ae37850225b306c
 SHA512:
-  metadata.gz: 78e4a00167e1d282fd7677f60dd3e5d9179c08c40241a30d342d49faf64472fbbd03ce9577dfaf8cd8c4e615adca889d8ce977a8e27b9d48c1c96510a1403a11
-  data.tar.gz: c9311cb12e00474a41fd444f6f5446f85156620899446414e0af02aa5f78aa12f02d89b6fe23c01292024c54e57a4832f5c83a097ff2c7c4ccedcc4b445930ca
+  metadata.gz: 161fbc9a0d5312ce29364cabe5689aa8d25f9588b6504c1fde1f1a348c5daf9f47065a08e5533aa3e666d558469923ea9be4e9e26b677b1a80fcbaf5cc7aa238
+  data.tar.gz: 9b2346f149f5ead38e386d5a8fbff973c70075bf33018b94c3125518bc3b39b282d0a86cacc3c68c60c2595a80f78bf62c6ba427b4d07d98eb81597cf3e66b5d

data/README.md

@@ -74,12 +74,15 @@ It requires your `<form>`, `<a>`, or `<button>` to be marked up with:
 * `tg-remote`: (optionally valueless for `<form>`, but requires an HTTP method for links) the HTTP method you wish to call on your endpoint
 * `href`: (if node is `<a>` or `<button>`) the URL of the endpoint you wish to hit
 * `refresh-on-success`: (optional) The refresh keys to be refreshed, using the body of the response. This is space-delimited
+* `full-refresh-on-success-except`: (optional) Replaces body except for specififed refresh keys, using the body of the XHR which has succeeded
 * `refresh-on-error`: (optional) The refresh keys to be refreshed, but using body of XHR which has failed. Only works with error 422. If the XHR returns and error and you do not supply a refresh-on-error, nothing is changed
 * `full-refresh-on-error-except`: (optional) Replaces body except for specified refresh keys, using the body of the XHR which has failed.  Only works with error 422
 * `remote-once`: (optional) The action will only be performed once. Removes `remote-method` and `remote-once` from element after consumption
 * `full-refresh`: Rather than using the content of the XHR response for partial page replacement, a full page refresh is performed. If `refresh-on-success` is defined, the page will be reloaded on these keys. If `refresh-on-success` is not defined, a full page refresh is performed. Defaults to true if neither refresh-on-success nor refresh-on-error are provided
 * `tg-remote-norefresh`: Prevents `Page.refresh()` from being called, allowing methods to be executed without updating client state
 
+Note that as `refresh-on-*` pertains to partial refreshes and `full-refresh-on-*-except` pertains to full refreshes, they are incompatible with each other and should not be combined.
+
 ### Examples
 
 Call a remote method:

data/lib/assets/javascripts/turbograft/initializers.coffee

@@ -21,6 +21,7 @@ TurboGraft.handlers.remoteMethodHandler = (ev) ->
     httpUrl: httpUrl
     fullRefresh: target.getAttribute('full-refresh')?
     refreshOnSuccess: target.getAttribute('refresh-on-success')
+    refreshOnSuccessExcept: target.getAttribute('full-refresh-on-success-except')
     refreshOnError: target.getAttribute('refresh-on-error')
     refreshOnErrorExcept: target.getAttribute('full-refresh-on-error-except')
 
@@ -40,6 +41,7 @@ TurboGraft.handlers.remoteFormHandler = (ev) ->
     httpUrl: httpUrl
     fullRefresh: target.getAttribute('full-refresh')?
     refreshOnSuccess: target.getAttribute('refresh-on-success')
+    refreshOnSuccessExcept: target.getAttribute('full-refresh-on-success-except')
     refreshOnError: target.getAttribute('refresh-on-error')
     refreshOnErrorExcept: target.getAttribute('full-refresh-on-error-except')
 

data/lib/assets/javascripts/turbograft/remote.coffee

@@ -8,6 +8,7 @@ class TurboGraft.Remote
     @formData = @createPayload(form)
 
     @refreshOnSuccess       = @opts.refreshOnSuccess.split(" ")       if @opts.refreshOnSuccess
+    @refreshOnSuccessExcept = @opts.refreshOnSuccessExcept.split(" ") if @opts.refreshOnSuccessExcept
     @refreshOnError         = @opts.refreshOnError.split(" ")         if @opts.refreshOnError
     @refreshOnErrorExcept   = @opts.refreshOnErrorExcept.split(" ")   if @opts.refreshOnErrorExcept
 
@@ -51,8 +52,8 @@ class TurboGraft.Remote
 
   createPayload: (form) ->
     if form
-      if form.querySelectorAll("[type='file']").length > 0
-        formData = new FormData(form)
+      if form.querySelectorAll("[type='file'][name]").length > 0
+        formData = @nativeEncodeForm(form)
       else # for much smaller payloads
         formData = @uriEncodeForm(form)
     else
@@ -70,6 +71,25 @@ class TurboGraft.Remote
 
   uriEncodeForm: (form) ->
     formData = ""
+    @_iterateOverFormInputs form, (input) =>
+      formData = @formAppend(formData, input.name, input.value)
+    formData
+
+  formDataAppend: (formData, input) ->
+    if input.type == 'file'
+      for file in input.files
+        formData.append(input.name, file)
+    else
+      formData.append(input.name, input.value)
+    formData
+
+  nativeEncodeForm: (form) ->
+    formData = new FormData
+    @_iterateOverFormInputs form, (input) =>
+      formData = @formDataAppend(formData, input)
+    formData
+
+  _iterateOverFormInputs: (form, callback) ->
     inputs = form.querySelectorAll("input:not([type='reset']):not([type='button']):not([type='submit']):not([type='image']), select, textarea")
     for input in inputs
       inputEnabled = !input.disabled
@@ -77,9 +97,7 @@ class TurboGraft.Remote
 
       if inputEnabled && input.name
         if (radioOrCheck && input.checked) || !radioOrCheck
-          formData = @formAppend(formData, input.name, input.value)
-
-    formData
+          callback(input)
 
   onSuccess: (ev) ->
     @opts.success?()
@@ -102,6 +120,10 @@ class TurboGraft.Remote
         Page.refresh
           response: xhr
           onlyKeys: @refreshOnSuccess
+      else if @refreshOnSuccessExcept
+        Page.refresh
+          response: xhr
+          exceptKeys: @refreshOnSuccessExcept
       else
         Page.refresh
           response: xhr
@@ -114,10 +136,13 @@ class TurboGraft.Remote
       initiator: @initiator
       xhr: xhr
 
-    if @refreshOnError || @refreshOnErrorExcept
+    if @refreshOnError
       Page.refresh
         response: xhr
         onlyKeys: @refreshOnError
+    else if @refreshOnErrorExcept
+      Page.refresh
+        response: xhr
         exceptKeys: @refreshOnErrorExcept
     else
       triggerEventFor 'turbograft:remote:fail:unhandled', @initiator,

data/lib/turbograft/version.rb

@@ -1,3 +1,3 @@
 module TurboGraft
-  VERSION = '0.1.12'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails