Merge f838c0d into 19b88b1

.gitignore

@@ -49,3 +49,7 @@ spec/dummy/log/test.log
 
 # For rubinius:
 #*.rbc
+
+# For Eclipse
+.project
+

README.md

@@ -311,7 +311,7 @@ Event is triggered before the `XMLHttpRequest` is initialised and performed.
 
 * *render* – what should be rendered; can be 'template' or 'partial';
 
-**page:redirected ($target, render, url)**
+**page:redirected ($target, render, url, xhr)**
 
 Event is triggered when you were redirected during `XMLHttpRequest` (with HTTP 30x status).
 * *$target* – jQuery object in which result of the request will be inserted;
@@ -320,7 +320,9 @@ Event is triggered when you were redirected during `XMLHttpRequest` (with HTTP 3
 
 * *render* – what should be rendered; can be 'template' or 'partial';
 
-**page:done ($target, status, url, data)**
+* *xhr* – the jqXHR object, which is a superset of the XMLHTTPRequest object;
+
+**page:done ($target, status, url, data, xhr)**
 
 Event is triggered if the request succeeds.
 * *$target* – jQuery object that was updated with the request;
@@ -331,7 +333,9 @@ Event is triggered if the request succeeds.
 
 * *data* – content of the request;
 
-**page:fail ($target, status, url, error, code)**
+* *xhr* – the jqXHR object, which is a superset of the XMLHTTPRequest object;
+
+**page:fail ($target, status, url, error, code, xhr)**
 
 Event is triggered if the request fails.
 
@@ -345,6 +349,8 @@ Event is triggered if the request fails.
 
 * *code* – HTTP response status code
 
+* *xhr* – the jqXHR object, which is a superset of the XMLHTTPRequest object;
+
 **page:always ($target, status, url)**
 
 Event is triggered after each request.

lib/assets/javascripts/_form.js.coffee

@@ -5,11 +5,11 @@ class Form
     self = this
 
     if self._include_blank_url_params()
-      self.page.load(self._url(), self._target(), self._type())
+      self.page.load(self._url(), self._target(), self._type(), self._scope())
     else
       self._without_blank_url_params(
         ->
-          self.page.load(self._url(), self._target(), self._type())
+          self.page.load(self._url(), self._target(), self._type(), self._scope())
       )
 
   _without_blank_url_params: (callback) ->
@@ -50,6 +50,9 @@ class Form
   _target: ->
     @$form.data('target')
 
+  _scope: ->
+    @$form.data('scope')
+
   _url: ->
     self = this
 

lib/assets/javascripts/_link.js.coffee

@@ -11,7 +11,7 @@ class Link
     else
       'template'
 
-    @page.load(@$link.attr("href"), @$link.data('target'), type)
+    @page.load(@$link.attr("href"), @$link.data('target'), type, @$link.data('scope'))
 
   _cross_origin_link: (link) ->
     this._different_protocol(link) ||
@@ -41,4 +41,4 @@ class Link
     event.metaKey || event.ctrlKey || event.shiftKey || event.altKey
 
 window._Wiselinks = {} if window._Wiselinks == undefined
-window._Wiselinks.Link = Link
+window._Wiselinks.Link = Link

lib/assets/javascripts/_page.js.coffee

@@ -50,7 +50,7 @@ class Page
           return false
     )
 
-  load: (url, target, render = 'template') ->
+  load: (url, target, render = 'template', scope) ->
     @template_id = new Date().getTime() if render != 'partial'
 
     selector = if target?
@@ -63,6 +63,7 @@ class Page
       template_id: @template_id,
       render: render,
       target: selector,
+      scope: scope,
       referer: window.location.href
     }, document.title, url )
 
@@ -81,19 +82,21 @@ class Page
   _template_id_changed: (state) ->
     !state.data.template_id? || state.data.template_id != @template_id
 
-  _make_state: (url, target, render = 'template', referer) ->
+  _make_state: (url, target, render = 'template', referer, scope) ->
     {
       url: url
       data:
         target: target
         render: render
         referer: referer
+        scope: scope
     }
 
   _reset_state: (state) ->
     state.data = {} unless state.data?
     state.data.target = null
     state.data.render = 'template'
+    state.data.scope = null
     state
 
   _try_target: ($target) ->
@@ -105,4 +108,4 @@ class Page
 
 
 window._Wiselinks = {} if window._Wiselinks == undefined
-window._Wiselinks.Page = Page
+window._Wiselinks.Page = Page

lib/assets/javascripts/_request_manager.js.coffee

@@ -23,14 +23,16 @@ class RequestManager
       headers:
         'X-Wiselinks': state.data.render
         'X-Wiselinks-Referer': state.data.referer
+        'X-Wiselinks-Target': state.data.target
+        'X-Wiselinks-Scope': state.data.scope
 
       dataType: "html"
     ).done(
       (data, status, xhr) ->
         self._html_loaded($target, data, status, xhr)
     ).fail(
       (xhr, status, error) ->
-        self._fail($target, status, state, error, xhr.status, xhr.responseText)
+        self._fail($target, status, state, error, xhr.status, xhr.responseText, xhr)
     ).always(
       (data_or_xhr, status, xhr_or_error)->
         self._always($target, status, state)
@@ -51,17 +53,17 @@ class RequestManager
       xhr.abort()
 
     @redirected = true
-    $(document).trigger('page:redirected', [$target, state.data.render, url])
+    $(document).trigger('page:redirected', [$target, state.data.render, url, xhr])
     History.replaceState(state.data, document.title, url)
 
   _loading: ($target, state) ->
     $(document).trigger('page:loading'
       [$target, state.data.render, decodeURI(state.url)]
     )
 
-  _done: ($target, status, state, data) ->
+  _done: ($target, status, state, data, xhr) ->
     $(document).trigger('page:done'
-      [$target, status, decodeURI(state.url), data]
+      [$target, status, decodeURI(state.url), data, xhr]
     )
 
   _html_loaded: ($target, data, status, xhr) ->
@@ -85,12 +87,12 @@ class RequestManager
           @_robots(response.robots())
           @_link_rel_prev(response.link_rel_prev())
           @_link_rel_next(response.link_rel_next())
-          @_done($target, status, state, response.content())
+          @_done($target, status, state, response.content(), xhr)
       )
 
-  _fail: ($target, status, state, error, code, data) ->
+  _fail: ($target, status, state, error, code, data, xhr) ->
     $(document).trigger('page:fail'
-      [$target, status, decodeURI(state.url), error, code, data]
+      [$target, status, decodeURI(state.url), error, code, data, xhr]
     )
 
   _always: ($target, status, state) ->

lib/assets/javascripts/wiselinks.js.coffee

@@ -17,8 +17,8 @@ class Wiselinks
   enabled: ->
     !History.emulated.pushState || @options.html4 == true
 
-  load: (url, target, render = 'template') ->
-    @page.load(url, target, render)
+  load: (url, target, render = 'template', scope) ->
+    @page.load(url, target, render, scope)
 
   reload: () ->
     @page.reload()
@@ -34,4 +34,4 @@ class Wiselinks
   _try_jquery: ->
     throw new Error("[Wiselinks] jQuery is not loaded") unless window.jQuery?
 
-window.Wiselinks = Wiselinks
+window.Wiselinks = Wiselinks

lib/wiselinks/request.rb

@@ -24,6 +24,14 @@ def wiselinks_template?
     def wiselinks_partial?
       self.wiselinks? && self.headers['X-Wiselinks'] == 'partial'
     end
+
+    def wiselinks_target
+      self.headers['X-Wiselinks-Target']
+    end
+
+    def wiselinks_scope
+      self.headers['X-Wiselinks-Scope']
+    end
   end
 end
 

wiselinks.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
 
-  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'webmock', '~> 1.9.0'
   gem.add_development_dependency 'shoulda'
   gem.add_development_dependency 'simplecov'
@@ -38,4 +37,4 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'closure-compiler'
   gem.add_development_dependency 'coffeelint'
-end
+end