wiselinks 0.5.3 → 0.5.4

data/Gemfile.lock

@@ -39,7 +39,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.8)
+    childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -47,8 +47,8 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    diff-lcs (1.1.3)
+    coffee-script-source (1.5.0)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -59,7 +59,7 @@ GEM
     ffi (1.4.0)
     git (1.2.5)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -101,25 +101,25 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12.1)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.30.0)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -138,11 +138,11 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.36)
     websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)

data/README.md

@@ -1,9 +1,10 @@
 [![Gem Version](https://badge.fury.io/rb/wiselinks.png)](http://badge.fury.io/rb/wiselinks)
 [![Build Status](https://travis-ci.org/igor-alexandrov/wiselinks.png?branch=master)](https://travis-ci.org/igor-alexandrov/wiselinks)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/igor-alexandrov/wiselinks)
+[![Dependency Status](https://gemnasium.com/igor-alexandrov/wiselinks.png)](https://gemnasium.com/igor-alexandrov/wiselinks)
 
 
-[![Dependency Status](https://gemnasium.com/igor-alexandrov/wiselinks.png)](https://gemnasium.com/igor-alexandrov/wiselinks)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/igor-alexandrov/wiselinks)
+
 
 #Wiselinks
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/assets/javascripts/wiselinks.js.coffee

@@ -24,17 +24,18 @@ class Wiselinks
           window.location.href = "#{window.location.protocol}//#{window.location.host}#{@options.html4_root_path}#!#{window.location.pathname}"
         
         if window.location.hash.indexOf('#!') != -1                 
-          self._call(window.location.hash.substring(2))    
+          self._call(self._make_state(window.location.hash.substring(2)))    
 
       History.Adapter.bind(
         window,
         "statechange"
         (event, data) ->          
           state = History.getState()
+          
           if self._template_id_changed(state)
-            self._call(state.url, null, 'template')
+            self._call(self._reset_state(state))
           else            
-            self._call(state.url, state.data.target, state.data.render)        
+            self._call(state)
       )
       
       $(document).on(
@@ -62,26 +63,26 @@ class Wiselinks
 
   load: (url, target, render = 'template') ->    
     @template_id = new Date().getTime() if render != 'partial'
-    History.pushState({ template_id: @template_id, render: render, target: target }, document.title, url )
+    History.pushState({ template_id: @template_id, render: render, target: target, referer: window.location.href }, document.title, url )
 
   reload: () ->
-    History.replaceState({ template_id: @template_id, render: 'template' }, document.title, History.getState().url )
+    History.replaceState({ template_id: @template_id, render: 'template', referer: window.location.href }, document.title, History.getState().url )
 
   _defaults: ->
     html4: true
     html4_root_path: '/'
 
-  _call: (url, target, render = 'template') ->
+  _call: (state) ->
     self = this
 
-    $target = if target? then $(target) else self.$target
+    $target = if state.data.target? then $(state.data.target) else self.$target
+    $document = $(document).trigger('page:loading', [$target, state.data.render, state.url])
 
-    $document = $(document).trigger('page:loading', [$target, render, url])
-    
     $.ajax(
-      url: url
+      url: state.url
       headers:
-        'X-Wiselinks': render
+        'X-Wiselinks': state.data.render
+        'X-Wiselinks-Referer': state.data.referer
     
       dataType: "html"
     ).done(
@@ -91,7 +92,7 @@ class Wiselinks
         if self._assets_changed(xhr.getResponseHeader('X-Wiselinks-Assets-Digest'))
           window.location.reload(true)
         else if url? && url != window.location.href
-          $document.trigger('page:redirected', [$target, render, url])
+          $document.trigger('page:redirected', [$target, state.data.render, url])
           if ( xhr && xhr.readyState < 4)
             xhr.onreadystatechange = $.noop
             xhr.abort()          
@@ -101,13 +102,13 @@ class Wiselinks
           
           $target.html(data)
 
-          $document.trigger('page:done', [$target, status, url, data])
+          $document.trigger('page:done', [$target, status, state.ur, data])
     ).fail(
       (xhr, status, error) ->
-        $document.trigger('page:fail', [$target, status, url, error])
+        $document.trigger('page:fail', [$target, status, state.ur, error])
     ).always(
       (data_or_xhr, status, xhr_or_error)->
-        $document.trigger('page:always', [$target, status, url])
+        $document.trigger('page:always', [$target, status, state.ur])
     )
 
   _process_form: ($form) ->
@@ -169,4 +170,19 @@ class Wiselinks
     value = xhr.getResponseHeader('X-Wiselinks-Title')
     document.title = decodeURI(value) if value?
 
+  _make_state: (url, target, render = 'template', referer) ->
+    { 
+      url: url
+      data:
+        target: target
+        render: render
+        referer: referer
+    }
+  
+  _reset_state: (state) ->
+    state.data = {} unless state.data?    
+    state.data.target = null
+    state.data.render = 'template'
+    state
+    
 window.Wiselinks = Wiselinks

data/lib/wiselinks/request.rb

@@ -1,5 +1,18 @@
 module Wiselinks
   module Request
+    def self.included(base)            
+      base.alias_method_chain :referer, :wiselinks
+      base.alias_method_chain :referrer, :wiselinks
+    end
+
+    def referer_with_wiselinks
+      self.headers['X-Wiselinks-Referer'] || self.referer_without_wiselinks
+    end
+
+    def referrer_with_wiselinks
+      self.referer_with_wiselinks      
+    end
+
     def wiselinks?
       self.headers['X-Wiselinks'].present?
     end

data/wiselinks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wiselinks"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov", "Alexey Solilin", "Julia Egorova"]
-  s.date = "2013-02-24"
+  s.date = "2013-03-20"
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiselinks
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 933560943679734063
+      hash: -3940307628221105571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: