turbograft 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfceb6ad8b2e34e8d9ce6d0a69349ba600b1345
-  data.tar.gz: 42e22d98b1307ebbd2e48ae1ce872e3bdc06a388
+  metadata.gz: d0cf7f7c936415c6a11516f9a43f533f5b67b178
+  data.tar.gz: ad506629d8ad4c6c27b778b3b2bfabbb40ca70ad
 SHA512:
-  metadata.gz: 2871b128d1379d4944ede546d25a2e563eafcfe4faab8090742b75679a88dd27710a224b092976845d3e0716e0d5a9e93a43379eb0f316ee05176dbdb3c1002c
-  data.tar.gz: 179aaf1e7a524cb56af76b06e002f7ae8556541589b1b9ebc32a68058931f1f46e4b2e595f112cf99e7b9a2207f88d44e9729ba13daef7ce6aaee290ea8a4d91
+  metadata.gz: 4d98dd4f884babcf6538344e42ae3e728877711d37bc38cca97ca837eb7b2e606e32e455d4f33fca7b57fa21a3f53e7c57e5aabd51f0cbaaa6a0a82ff37e68af
+  data.tar.gz: 54c66bd97efdbb41bdafb7a0edf710bb5f9b8a85a358fe3b9480052ce34159c5556f4494a9109b9c2922bcd9f3be01ca8d07a9166c75139def907e29eb59f59d

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

@@ -36,6 +36,7 @@ TurboGraft.handlers.remoteFormHandler = (ev) ->
   throw new Error("Turbograft developer error: You did not provide a URL ('action' attribute) for tg-remote") unless httpUrl
 
   options =
+    httpRequestType: target.getAttribute('method')
     httpUrl: httpUrl
     fullRefresh: target.getAttribute('full-refresh')?
     refreshOnSuccess: target.getAttribute('refresh-on-success')

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

@@ -3,16 +3,20 @@ class TurboGraft.Remote
 
     @initiator = form || target
 
-    @formData = @createPayload(form)
+    @actualRequestType = if @opts.httpRequestType?.toLowerCase() == 'get' then 'GET' else 'POST'
 
-    actualRequestType = if @opts.httpRequestType?.toLowerCase() == 'get' then 'GET' else 'POST'
+    @formData = @createPayload(form)
 
     @refreshOnSuccess       = @opts.refreshOnSuccess.split(" ")       if @opts.refreshOnSuccess
     @refreshOnError         = @opts.refreshOnError.split(" ")         if @opts.refreshOnError
     @refreshOnErrorExcept   = @opts.refreshOnErrorExcept.split(" ")   if @opts.refreshOnErrorExcept
 
     xhr = new XMLHttpRequest
-    xhr.open(actualRequestType, @opts.httpUrl, true)
+    if @actualRequestType == 'GET'
+      url = if @formData then @opts.httpUrl + "?#{@formData}" else @opts.httpUrl
+      xhr.open(@actualRequestType, url, true)
+    else
+      xhr.open(@actualRequestType, @opts.httpUrl, true)
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
     xhr.setRequestHeader('Accept', 'text/html, application/xhtml+xml, application/xml')
     xhr.setRequestHeader("Content-Type", @contentType) if @contentType
@@ -51,15 +55,20 @@ class TurboGraft.Remote
       else # for much smaller payloads
         formData = @uriEncodeForm(form)
     else
-      formData = new FormData()
+      formData = ''
 
     if formData instanceof FormData
       formData.append("_method", @opts.httpRequestType) if @opts.httpRequestType
     else
       @contentType = "application/x-www-form-urlencoded; charset=UTF-8"
+      formData = @formAppend(formData, "_method", @opts.httpRequestType) if formData.indexOf("_method") == -1 && @opts.httpRequestType && @actualRequestType != 'GET'
 
     formData
 
+  formAppend: (uriEncoded, key, value) ->
+    uriEncoded += "&" if uriEncoded.length
+    uriEncoded += "#{encodeURIComponent(key)}=#{encodeURIComponent(value)}"
+
   uriEncodeForm: (form) ->
     formData = ""
     inputs = form.querySelectorAll("input:not([type='reset']):not([type='button']):not([type='submit']):not([type='image']), select, textarea")
@@ -69,9 +78,8 @@ class TurboGraft.Remote
 
       if inputEnabled && input.name
         if (radioOrCheck && input.checked) || !radioOrCheck
-          formData += "#{encodeURIComponent(input.name)}=#{encodeURIComponent(input.value)}&"
+          formData = @formAppend(formData, input.name, input.value)
 
-    formData = formData.slice(0,-1) if formData.charAt(formData.length - 1) == "&"
     formData
 
   onSuccess: (ev) ->
@@ -86,17 +94,18 @@ class TurboGraft.Remote
       Page.visit(redirect, reload: true)
       return
 
-    if @opts.fullRefresh && @refreshOnSuccess
-      Page.refresh(onlyKeys: @refreshOnSuccess)
-    else if @opts.fullRefresh
-      Page.refresh()
-    else if @refreshOnSuccess
-      Page.refresh
-        response: xhr
-        onlyKeys: @refreshOnSuccess
-    else
-      Page.refresh
-        response: xhr
+    unless @initiator.hasAttribute('tg-remote-norefresh')
+      if @opts.fullRefresh && @refreshOnSuccess
+        Page.refresh(onlyKeys: @refreshOnSuccess)
+      else if @opts.fullRefresh
+        Page.refresh()
+      else if @refreshOnSuccess
+        Page.refresh
+          response: xhr
+          onlyKeys: @refreshOnSuccess
+      else
+        Page.refresh
+          response: xhr
 
   onError: (ev) ->
     @opts.fail?()

data/lib/turbograft/version.rb

@@ -1,3 +1,3 @@
 module TurboGraft
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -183,6 +183,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It's like turbolinks, but with partial page replacement and tests
 email:
 - tylermercier@gmail.com