wiselinks 0.3.0 → 0.3.2

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

@@ -1,25 +1,34 @@
 #= require _history
+#= require _history.html4
+#= require _history.adapter.jquery.js
 
 String.prototype.ends_with = (suffix) ->
   this.indexOf(suffix, this.length - suffix.length) != -1
 
 class Wiselinks
-  constructor: (@$target = $('body'), options = {}) ->
+  constructor: (@$target = $('body'), @options = {}) ->
     # Check that JQuery is available
     throw "Load JQuery to use Wiselinks" unless window.jQuery?
 
     self = this
 
+    @options = jQuery.extend(self._defaults(), @options);
+
+    if History.emulated.pushState && @options.html4 == true
+      if window.location.href.indexOf('#!') == -1 && window.location.pathname != '/'                 
+        window.location.href = "#{window.location.protocol}//#{window.location.host}/#!#{window.location.pathname}"
+      
+      if window.location.hash.indexOf('#!') != -1                 
+        self._call(window.location.hash.substring(2))    
+
     History.Adapter.bind(
       window,
       "statechange"
       (event, data) ->
-        return if (!History.ready)
+        return false if (!History.ready)
   
         state = History.getState()         
-        self._call(state.url, state.data.target, state.data.render)  
-
-        return false
+        self._call(state.url, state.data.target, state.data.render)        
     )
     
     $(document).on(
@@ -35,46 +44,51 @@ class Wiselinks
       "click", "a[data-push], a[data-replace]"
       (event) ->      
         if self._cross_origin_link(event.target) || self._non_standard_click(event)
-          return true;
-
+          return true;        
         self._process_link($(this))
 
         event.preventDefault()
         return false
-    )
+    )     
 
     @assets_digest = $("meta[name='assets-digest']").attr("content")
   
   load: (url, target, render = 'template') ->
     History.ready = true
-    History.pushState({ timestamp: (new Date().getTime()), render: render, target: target }, document.title, decodeURI(url) )
+    History.pushState({ timestamp: (new Date().getTime()), render: render, target: target }, document.title, url )
 
   reload: () ->
     History.ready = true
-    History.replaceState({ timestamp: (new Date().getTime()), render: 'template' }, document.title, decodeURI(History.getState().url) )
+    History.replaceState({ timestamp: (new Date().getTime()), render: 'template' }, document.title, History.getState().url )
+
+  _defaults: ->
+    html4: true
 
   _call: (url, target, render = 'template') ->
     self = this
 
     $target = if target? then $(target) else self.$target
 
-    $(document).trigger('page:loading', [url, $target.selector, render])
+    $document = $(document).trigger('page:loading', [url, $target.selector, render])
 
     $.ajax(
       url: url
       headers:
         'X-Render': render
+      complete: (event, xhr, settings) ->
+        $document.trigger('page:complete', [event, xhr, settings])
+
       success: (data, status, xhr) ->                
         if self._assets_changed(xhr.getResponseHeader('X-Assets-Digest'))
           window.location.reload(true)
         else
-          document.title = xhr.getResponseHeader('X-Title')
+          self._set_title(xhr)
           
           $target.html(data)
 
-          $(document).trigger('page:success', [data, status])
-      error: (xhr, status, error)->        
-        $(document).trigger('page:error', [status, error])
+          $document.trigger('page:success', [data, status])
+      error: (xhr, status, error)->
+        $document.trigger('page:error', [status, error])
       dataType: "html"
     )
   
@@ -127,6 +141,10 @@ class Wiselinks
     event.metaKey || event.ctrlKey || event.shiftKey || event.altKey  
 
   _assets_changed: (digest) ->
-    digest? && @assets_digest != digest
+    @assets_digest? && @assets_digest != digest
+
+  _set_title: (xhr) ->
+    value = xhr.getResponseHeader('X-Title')
+    document.title = value if value?
 
 window.Wiselinks = Wiselinks

data/lib/wiselinks/headers.rb

@@ -32,9 +32,10 @@ module Wiselinks
     end
 
     def wiselinks_title(value)
-      Wiselinks.log("title: #{value}")
-
-      self.headers['X-Title'] = value if self.request.wiselinks?
+      if self.request.wiselinks?
+        Wiselinks.log("title: #{value}")        
+        response.headers['X-Title'] = value 
+      end
     end    
 
     def wiselinks_request?

data/wiselinks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wiselinks"
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   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 = "2012-12-23"
+  s.date = "2012-12-26"
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/views/layouts/wiselinks.html.erb",
+    "lib/assets/javascripts/_history.adapter.jquery.js",
+    "lib/assets/javascripts/_history.html4.js",
     "lib/assets/javascripts/_history.js",
     "lib/assets/javascripts/wiselinks.js.coffee",
     "lib/wiselinks.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiselinks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -93,6 +93,8 @@ files:
 - Rakefile
 - VERSION
 - app/views/layouts/wiselinks.html.erb
+- lib/assets/javascripts/_history.adapter.jquery.js
+- lib/assets/javascripts/_history.html4.js
 - lib/assets/javascripts/_history.js
 - lib/assets/javascripts/wiselinks.js.coffee
 - lib/wiselinks.rb
@@ -166,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 699371933197126239
+      hash: 909818033412288113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: