wiselinks 0.6.4 → 0.7.0

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    wiselinks (0.6.4)
+    wiselinks (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -19,42 +19,37 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.4)
     arel (3.0.2)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
     builder (3.0.4)
-    capybara (2.0.2)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    closure-compiler (1.1.8)
+      xpath (~> 2.0)
+    closure-compiler (1.1.10)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.5.0)
+    coffee-script-source (1.6.2)
     coffeelint (0.0.6)
       coffee-script
     colorize (0.5.8)
@@ -64,8 +59,9 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    crack (0.3.2)
-    diff-lcs (1.2.1)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -73,21 +69,18 @@ GEM
       activesupport (>= 3.0.0)
     faker (1.1.2)
       i18n (~> 0.5)
-    ffi (1.4.0)
-    hike (1.2.1)
-    i18n (0.6.4)
+    hike (1.2.3)
+    i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    multi_json (1.6.1)
-    nokogiri (1.5.6)
+    mime-types (1.23)
+    mini_portile (0.5.0)
+    multi_json (1.7.7)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -96,22 +89,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -120,30 +113,24 @@ GEM
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
+    rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.31.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.4.2)
+    safe_yaml (0.9.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.4)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -154,17 +141,16 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    thor (0.17.0)
-    tilt (1.3.4)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.0.7)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -179,7 +165,7 @@ DEPENDENCIES
   coveralls
   factory_girl
   faker
-  rails (>= 3.2.0)
+  rails (~> 3.2.13)
   rake
   rspec
   rspec-rails

data/README.md

@@ -60,7 +60,13 @@ Wiselinks works in all major browsers including browsers that do not support HTM
 			<td>Yes (experimental feature)</td>
 		</tr>
 		<tr>
-			<td>Form parameters optimization</td>			
+			<td>Form blank values exclusion</td>			
+			<td><strong>Yes</strong> (optional)</td>
+			<td>No</td>
+			<td>No</td>
+		</tr>
+		<tr>
+			<td>Form values optimization</td>			
 			<td><strong>Yes</strong></td>
 			<td>No</td>
 			<td>No</td>
@@ -235,7 +241,7 @@ Data from the request will be pasted into `<div id="catalog">`. This configurati
 
 Wiselinks can process forms. After submit button is clicked, Wiselinks will perform a request to form url with form attributes serialized to a string. Wiselinks always performs a HTTP GET request.
 
-```html	
+```html
 <div class="filter">
     <form action="/" method="get" data-push="true" data-target="@catalog">
 		<input type="text" size="30" name="title" id="title">
@@ -248,15 +254,41 @@ Wiselinks can process forms. After submit button is clicked, Wiselinks will perf
           	<option value="trashed">Trash</option>
     	</select>
     	
-		<input type="submit" value="Find" name="commit">		
+		<input type="submit" value="Find" name="commit">
     </form>
-</div>    
+</div>
 
 <div role="catalog">
 	<!-- the list of your items -->
-	...
+	...	
 </div>
-```     	
+```
+**data-include-blank-url-params**
+
+During form submit Wiselinks excludes blank parameters to make your URLs cleaner. You can disable this behaviour with ```data-include-blank-url-params``` attribute.
+
+```html
+<div class="filter">
+    <form action="/" method="get" data-push="true" data-target="@catalog" data-include-blank-url-params="true">
+		<input type="text" size="30" name="title" id="title">
+		<input type="submit" value="Find" name="commit">
+    </form>
+</div>
+```
+
+**data-optimize-url-params**
+
+Array parameters ```category_ids[]=1&category_ids[]=2&category_ids[]=3``` are optimized to more human readable ```category_ids=1,2,3```. To changed this behaviour use ```data-optimize-url-params``` attribute.
+
+```html
+<div class="filter">
+    <form action="/" method="get" data-push="true" data-target="@catalog" data-optimize-url-params="false">
+		<input type="text" size="30" name="title" id="title">
+		<input type="submit" value="Find" name="commit">
+    </form>
+</div>
+```
+
 
 ### Server processing
 

data/build/{wiselinks-0.6.4.js → wiselinks-0.7.0.js}

@@ -1,8 +1,8 @@
 /**
- * Wiselinks-0.6.4
+ * Wiselinks-0.7.0
  * @copyright 2012-2013 Igor Alexandrov, Alexey Solilin, Julia Egorova, Alexandr Borisov
  * @preserve https://github.com/igor-alexandrov/wiselinks
- */  
+ */
 
 // Generated by CoffeeScript 1.6.3
 (function() {
@@ -15,15 +15,26 @@
     }
 
     Form.prototype.process = function() {
-      var $disable, selector, url;
+      var self;
+      self = this;
+      if (self._include_blank_url_params()) {
+        return self.page.load(self._url(), self._target(), self._type());
+      } else {
+        return self._without_blank_url_params(function() {
+          return self.page.load(self._url(), self._target(), self._type());
+        });
+      }
+    };
+
+    Form.prototype._without_blank_url_params = function(callback) {
+      var $disable, selector;
       selector = 'select:not(:disabled),input:not(:disabled)';
       $disable = this.$form.find(selector).filter(function() {
         return !$(this).val();
       });
       $disable.attr('disabled', true);
-      url = this._url();
-      $disable.attr('disabled', false);
-      return this.page.load(url, this.$form.attr("data-target"), this._type());
+      callback();
+      return $disable.attr('disabled', false);
     };
 
     Form.prototype._params = function() {
@@ -44,23 +55,43 @@
       return hash;
     };
 
+    Form.prototype._include_blank_url_params = function() {
+      return this.$form.data('include-blank-url-params') === true;
+    };
+
+    Form.prototype._optimize_url_params = function() {
+      return this.$form.data('optimize-url-params') !== false;
+    };
+
     Form.prototype._type = function() {
-      if (this.$form.attr("data-push") === 'partial') {
+      if (this.$form.data('push') === 'partial') {
         return 'partial';
       } else {
         return 'template';
       }
     };
 
+    Form.prototype._target = function() {
+      return this.$form.data('target');
+    };
+
     Form.prototype._url = function() {
-      var key, serialized, url, value, _ref;
-      serialized = [];
-      _ref = this._params();
-      for (key in _ref) {
-        value = _ref[key];
-        serialized.push("" + key + "=" + (encodeURIComponent(value)));
-      }
-      serialized = serialized.join('&');
+      var key, params, self, serialized, url, value;
+      self = this;
+      serialized = (function() {
+        var _ref;
+        if (self._optimize_url_params()) {
+          params = [];
+          _ref = this._params();
+          for (key in _ref) {
+            value = _ref[key];
+            params.push("" + key + "=" + (encodeURIComponent(value)));
+          }
+          return params.join('&');
+        } else {
+          return this.$form.serialize();
+        }
+      }).call(this);
       url = this.$form.attr("action");
       if (serialized.length > 0) {
         url += "?" + serialized;
@@ -72,7 +103,7 @@
 
   })();
 
-  if (window._Wiselinks === void 0) {
+  if (window._Wiselinks == null) {
     window._Wiselinks = {};
   }
 
@@ -90,8 +121,8 @@
 
     Link.prototype.process = function() {
       var type;
-      type = this.$link.attr("data-push") === 'partial' ? 'partial' : 'template';
-      return this.page.load(this.$link.attr("href"), this.$link.attr("data-target"), type);
+      type = this.$link.data('push') === 'partial' ? 'partial' : 'template';
+      return this.page.load(this.$link.attr("href"), this.$link.data('target'), type);
     };
 
     Link.prototype._cross_origin_link = function(link) {
@@ -261,7 +292,7 @@
           return window.location.reload(true);
         } else {
           state = History.getState();
-          if ((url != null) && url !== state.url) {
+          if ((url != null) && url !== encodeURI(state.url)) {
             self._redirect_to(url, $target, state, xhr);
           }
           $target.html(data);
@@ -293,16 +324,16 @@
       return $(document).trigger('page:loading', [$target, state.data.render, state.url]);
     };
 
-    RequestManager.prototype._done = function($target, status, state, data) {
-      return $(document).trigger('page:done', [$target, status, state.url, data]);
+    RequestManager.prototype._done = function($target, status, url, data) {
+      return $(document).trigger('page:done', [$target, status, url, data]);
     };
 
-    RequestManager.prototype._fail = function($target, status, state, error) {
-      return $(document).trigger('page:fail', [$target, status, state.url, error]);
+    RequestManager.prototype._fail = function($target, status, url, error) {
+      return $(document).trigger('page:fail', [$target, status, url, error]);
     };
 
-    RequestManager.prototype._always = function($target, status, state) {
-      return $(document).trigger('page:always', [$target, status, state.url]);
+    RequestManager.prototype._always = function($target, status, url) {
+      return $(document).trigger('page:always', [$target, status, url]);
     };
 
     RequestManager.prototype._title = function(value) {

data/build/{wiselinks-0.6.4.min.js → wiselinks-0.7.0.min.js}

@@ -13,18 +13,19 @@
  2010-2011 Benjamin Arthur Lupton <contact@balupton.com>
  @license New BSD License <http://creativecommons.org/licenses/BSD/>
 */
-(function(){var c;c=function(){function c(d,e){this.page=d;this.$form=e}c.prototype.process=function(){var d,e;d=this.$form.find("select:not(:disabled),input:not(:disabled)").filter(function(){return!$(this).val()});d.attr("disabled",!0);e=this._url();d.attr("disabled",!1);return this.page.load(e,this.$form.attr("data-target"),this._type())};c.prototype._params=function(){var d,e,b,f,c,q;d={};q=this.$form.serializeArray();f=0;for(c=q.length;f<c;f++)e=q[f],"utf8"!==e.name&&(b=-1!==e.name.indexOf("[]",
-e.name.length-2)?e.name.substr(0,e.name.length-2):e.name,d[b]=null!=d[b]?d[b]+(","+e.value):e.value);return d};c.prototype._type=function(){return"partial"===this.$form.attr("data-push")?"partial":"template"};c.prototype._url=function(){var d,e,b,f;e=[];f=this._params();for(d in f)b=f[d],e.push(""+d+"="+encodeURIComponent(b));e=e.join("&");d=this.$form.attr("action");0<e.length&&(d+="?"+e);return d};return c}();void 0===window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.Form=c;c=function(){function c(d,
-e){this.page=d;this.$link=e}c.prototype.allows_process=function(d){return!(this._cross_origin_link(d.currentTarget)||this._non_standard_click(d))};c.prototype.process=function(){var d;d="partial"===this.$link.attr("data-push")?"partial":"template";return this.page.load(this.$link.attr("href"),this.$link.attr("data-target"),d)};c.prototype._cross_origin_link=function(d){return location.protocol!==d.protocol||location.host.split(":")[0]!==d.host.split(":")[0]};c.prototype._non_standard_click=function(d){return d.metaKey||
-d.ctrlKey||d.shiftKey||d.altKey};return c}();void 0===window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.Link=c;c=function(){function c(d,e){var b;this.$target=d;this.options=e;b=this;this.template_id=(new Date).getTime();this.request_manager=new _Wiselinks.RequestManager(this.options);b._try_target(this.$target);History.emulated.pushState&&!0===this.options.html4&&(-1===window.location.href.indexOf("#!")&&(!0===this.options.html4_normalize_path&&window.location.pathname!==this.options.html4_root_path)&&
-(window.location.href=""+window.location.protocol+"//          "+window.location.host+"          "+this.options.html4_root_path+"#!          "+window.location.pathname),-1!==window.location.hash.indexOf("#!")&&b._call(b._make_state(window.location.hash.substring(2))));History.Adapter.bind(window,"statechange",function(d,e){var c;c=History.getState();return b._template_id_changed(c)?b._call(b._reset_state(c)):b._call(c)});$(document).on("click","a[data-push], a[data-replace]",function(d){var e;if((e=
-new _Wiselinks.Link(b,$(this))).allows_process(d))return d.preventDefault(),e.process(),!1});$(document).on("submit","form[data-push], form[data-replace]",function(d){var e;if(e=new _Wiselinks.Form(b,$(this)))return d.preventDefault(),e.process(),!1})}c.prototype.load=function(d,e,b){null==b&&(b="template");"partial"!==b&&(this.template_id=(new Date).getTime());null!=e&&this._try_target($(e));return History.pushState({timestamp:(new Date).getTime(),template_id:this.template_id,render:b,target:e,referer:window.location.href},
+(function(){var c;c=function(){function c(d,e){this.page=d;this.$form=e}c.prototype.process=function(){var d;d=this;return d._include_blank_url_params()?d.page.load(d._url(),d._target(),d._type()):d._without_blank_url_params(function(){return d.page.load(d._url(),d._target(),d._type())})};c.prototype._without_blank_url_params=function(d){var e;e=this.$form.find("select:not(:disabled),input:not(:disabled)").filter(function(){return!$(this).val()});e.attr("disabled",!0);d();return e.attr("disabled",
+!1)};c.prototype._params=function(){var d,e,b,f,c,q;d={};q=this.$form.serializeArray();f=0;for(c=q.length;f<c;f++)e=q[f],"utf8"!==e.name&&(b=-1!==e.name.indexOf("[]",e.name.length-2)?e.name.substr(0,e.name.length-2):e.name,d[b]=null!=d[b]?d[b]+(","+e.value):e.value);return d};c.prototype._include_blank_url_params=function(){return!0===this.$form.data("include-blank-url-params")};c.prototype._optimize_url_params=function(){return!1!==this.$form.data("optimize-url-params")};c.prototype._type=function(){return"partial"===
+this.$form.data("push")?"partial":"template"};c.prototype._target=function(){return this.$form.data("target")};c.prototype._url=function(){var d,e,b;var f;if(this._optimize_url_params()){e=[];f=this._params();for(d in f)b=f[d],e.push(""+d+"="+encodeURIComponent(b));d=e.join("&")}else d=this.$form.serialize();e=this.$form.attr("action");0<d.length&&(e+="?"+d);return e};return c}();null==window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.Form=c;c=function(){function c(d,e){this.page=d;this.$link=
+e}c.prototype.allows_process=function(d){return!(this._cross_origin_link(d.currentTarget)||this._non_standard_click(d))};c.prototype.process=function(){var d;d="partial"===this.$link.data("push")?"partial":"template";return this.page.load(this.$link.attr("href"),this.$link.data("target"),d)};c.prototype._cross_origin_link=function(d){return location.protocol!==d.protocol||location.host.split(":")[0]!==d.host.split(":")[0]};c.prototype._non_standard_click=function(d){return d.metaKey||d.ctrlKey||d.shiftKey||
+d.altKey};return c}();void 0===window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.Link=c;c=function(){function c(d,e){var b;this.$target=d;this.options=e;b=this;this.template_id=(new Date).getTime();this.request_manager=new _Wiselinks.RequestManager(this.options);b._try_target(this.$target);History.emulated.pushState&&!0===this.options.html4&&(-1===window.location.href.indexOf("#!")&&(!0===this.options.html4_normalize_path&&window.location.pathname!==this.options.html4_root_path)&&(window.location.href=
+""+window.location.protocol+"//          "+window.location.host+"          "+this.options.html4_root_path+"#!          "+window.location.pathname),-1!==window.location.hash.indexOf("#!")&&b._call(b._make_state(window.location.hash.substring(2))));History.Adapter.bind(window,"statechange",function(d,e){var c;c=History.getState();return b._template_id_changed(c)?b._call(b._reset_state(c)):b._call(c)});$(document).on("click","a[data-push], a[data-replace]",function(d){var e;if((e=new _Wiselinks.Link(b,
+$(this))).allows_process(d))return d.preventDefault(),e.process(),!1});$(document).on("submit","form[data-push], form[data-replace]",function(d){var e;if(e=new _Wiselinks.Form(b,$(this)))return d.preventDefault(),e.process(),!1})}c.prototype.load=function(d,e,b){null==b&&(b="template");"partial"!==b&&(this.template_id=(new Date).getTime());null!=e&&this._try_target($(e));return History.pushState({timestamp:(new Date).getTime(),template_id:this.template_id,render:b,target:e,referer:window.location.href},
 document.title,d)};c.prototype.reload=function(){return History.replaceState({timestamp:(new Date).getTime(),template_id:this.template_id,render:"template",referer:window.location.href},document.title,History.getState().url)};c.prototype._call=function(d){var e;e=null!=d.data.target?$(d.data.target):this.$target;return this.request_manager.call(e,d)};c.prototype._template_id_changed=function(d){return null==d.data.template_id||d.data.template_id!==this.template_id};c.prototype._make_state=function(d,
 e,b,f){null==b&&(b="template");return{url:d,data:{target:e,render:b,referer:f}}};c.prototype._reset_state=function(d){null==d.data&&(d.data={});d.data.target=null;d.data.render="template";return d};c.prototype._try_target=function(d){if(0===d.length&&"exception"===this.options.target_missing)throw Error("[Wiselinks] Target missing: `"+d.selector+"`");};return c}();void 0===window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.Page=c;c=function(){function c(d){this.options=null!=d?d:{}}c.prototype.call=
-function(d,c){var b;b=this;if(null!=this.redirected)this.redirected=null;else return b._loading(d,c),$.ajax({url:c.url,headers:{"X-Wiselinks":c.data.render,"X-Wiselinks-Referer":c.data.referer},dataType:"html"}).done(function(f,g,k){var l,h;h=k.getResponseHeader("X-Wiselinks-Url");l=k.getResponseHeader("X-Wiselinks-Assets-Digest");if(b._assets_changed(l))return window.location.reload(!0);c=History.getState();null!=h&&h!==c.url&&b._redirect_to(h,d,c,k);d.html(f);b._title(k.getResponseHeader("X-Wiselinks-Title"));
+function(d,c){var b;b=this;if(null!=this.redirected)this.redirected=null;else return b._loading(d,c),$.ajax({url:c.url,headers:{"X-Wiselinks":c.data.render,"X-Wiselinks-Referer":c.data.referer},dataType:"html"}).done(function(f,g,k){var l,h;h=k.getResponseHeader("X-Wiselinks-Url");l=k.getResponseHeader("X-Wiselinks-Assets-Digest");if(b._assets_changed(l))return window.location.reload(!0);c=History.getState();null!=h&&h!==encodeURI(c.url)&&b._redirect_to(h,d,c,k);d.html(f);b._title(k.getResponseHeader("X-Wiselinks-Title"));
 return b._done(d,g,c.url,f)}).fail(function(f,g,k){return b._fail(d,g,c.url,k)}).always(function(f,g,k){return b._always(d,g,c.url)})};c.prototype._assets_changed=function(d){return null!=this.options.assets_digest&&this.options.assets_digest!==d};c.prototype._redirect_to=function(d,c,b,f){f&&4>f.readyState&&(f.onreadystatechange=$.noop,f.abort());this.redirected=!0;$(document).trigger("page:redirected",[c,b.data.render,d]);return History.replaceState(b.data,document.title,d)};c.prototype._loading=
-function(d,c){return $(document).trigger("page:loading",[d,c.data.render,c.url])};c.prototype._done=function(d,c,b,f){return $(document).trigger("page:done",[d,c,b.url,f])};c.prototype._fail=function(c,e,b,f){return $(document).trigger("page:fail",[c,e,b.url,f])};c.prototype._always=function(c,e,b){return $(document).trigger("page:always",[c,e,b.url])};c.prototype._title=function(c){if(null!=c)return $(document).trigger("page:title",decodeURI(c)),document.title=decodeURI(c)};return c}();void 0===
-window._Wiselinks&&(window._Wiselinks={});window._Wiselinks.RequestManager=c;c=function(){function c(d,e){null==d&&(d=$("body"));this.options=null!=e?e:{};this._try_jquery();this.options=$.extend(this._defaults(),this.options);this.enabled()&&(this.page=new _Wiselinks.Page(d,this.options))}c.prototype.enabled=function(){return!History.emulated.pushState||!0===this.options.html4};c.prototype.load=function(c,e,b){null==b&&(b="template");return this.page.load(c,e,b)};c.prototype.reload=function(){return this.page.reload()};
+function(d,c){return $(document).trigger("page:loading",[d,c.data.render,c.url])};c.prototype._done=function(d,c,b,f){return $(document).trigger("page:done",[d,c,b,f])};c.prototype._fail=function(d,c,b,f){return $(document).trigger("page:fail",[d,c,b,f])};c.prototype._always=function(d,c,b){return $(document).trigger("page:always",[d,c,b])};c.prototype._title=function(d){if(null!=d)return $(document).trigger("page:title",decodeURI(d)),document.title=decodeURI(d)};return c}();void 0===window._Wiselinks&&
+(window._Wiselinks={});window._Wiselinks.RequestManager=c;c=function(){function c(d,e){null==d&&(d=$("body"));this.options=null!=e?e:{};this._try_jquery();this.options=$.extend(this._defaults(),this.options);this.enabled()&&(this.page=new _Wiselinks.Page(d,this.options))}c.prototype.enabled=function(){return!History.emulated.pushState||!0===this.options.html4};c.prototype.load=function(c,e,b){null==b&&(b="template");return this.page.load(c,e,b)};c.prototype.reload=function(){return this.page.reload()};
 c.prototype._defaults=function(){return{html4:!0,html4_root_path:"/",html4_normalize_path:!0,target_missing:null,assets_digest:$("meta[name='assets-digest']").attr("content")}};c.prototype._try_jquery=function(){if(null==window.jQuery)throw Error("[Wiselinks] jQuery is not loaded");};return c}();window.Wiselinks=c}).call(this);
 (function(c,q){var d=c.History=c.History||{},e=c.jQuery;if("undefined"!==typeof d.Adapter)throw Error("History.js Adapter has already been loaded...");d.Adapter={bind:function(b,c,d){e(b).bind(c,d)},trigger:function(b,c,d){e(b).trigger(c,d)},extractEventData:function(b,c,d){return c&&c.originalEvent&&c.originalEvent[b]||d&&d[b]||q},onDomLoad:function(b){e(b)}};"undefined"!==typeof d.init&&d.init()})(window);
 (function(c,q){var d=c.document,e=c.setInterval||e,b=c.History=c.History||{};if("undefined"!==typeof b.initHtml4)throw Error("History.js HTML4 Support has already been loaded...");b.initHtml4=function(){if("undefined"!==typeof b.initHtml4.initialized)return!1;b.initHtml4.initialized=!0;b.enabled=!0;b.savedHashes=[];b.isLastHash=function(c){var d=b.getHashByIndex();return c===d};b.saveHash=function(c){if(b.isLastHash(c))return!1;b.savedHashes.push(c);return!0};b.getHashByIndex=function(c){var d=null;

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

@@ -2,15 +2,24 @@ class Form
   constructor: (@page, @$form) ->
 
   process: ->
+    self = this
+
+    if self._include_blank_url_params()
+      self.page.load(self._url(), self._target(), self._type())
+    else
+      self._without_blank_url_params(
+        ->
+          self.page.load(self._url(), self._target(), self._type())
+      )
+
+  _without_blank_url_params: (callback) ->
     selector = 'select:not(:disabled),input:not(:disabled)'
     $disable = @$form.find(selector).filter(-> !$(this).val())
 
     $disable.attr('disabled', true)
-    url = this._url()
+    callback()
     $disable.attr('disabled', false)
 
-    @page.load(url, @$form.attr("data-target"), this._type())
-
   _params: ->
     hash = {}
 
@@ -29,23 +38,37 @@ class Form
 
     hash
 
+  _include_blank_url_params: ->
+    @$form.data('include-blank-url-params') == true
+
+  _optimize_url_params: ->
+    @$form.data('optimize-url-params') != false
+
   _type: ->
-    if (@$form.attr("data-push") == 'partial') then 'partial' else 'template'
+    if (@$form.data('push') == 'partial') then 'partial' else 'template'
+
+  _target: ->
+    @$form.data('target')
 
   _url: ->
-    serialized = []
+    self = this
+
+    serialized = if self._optimize_url_params()
+      params = []
+
+      # To find out why encodeURIComponent should be used, follow the link:
+      # http://stackoverflow.com/questions/75980/best-practice-escape-or-encodeuri-encodeuricomponent
+      #
+      for key, value of this._params()
+        params.push("#{key}=#{encodeURIComponent(value)}")
 
-    # To find out why encodeURIComponent should be used, follow the link:
-    # http://stackoverflow.com/questions/75980/best-practice-escape-or-encodeuri-encodeuricomponent
-    #
-    for key, value of this._params()
-      serialized.push("#{key}=#{encodeURIComponent(value)}")
+      params.join('&')
+    else
+      @$form.serialize()
 
-    serialized = serialized.join('&')
-    
     url = @$form.attr("action")
     url += "?#{serialized}" if serialized.length > 0
     url
 
-window._Wiselinks = {} if window._Wiselinks == undefined
+window._Wiselinks ?= {}
 window._Wiselinks.Form = Form

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

@@ -1,17 +1,17 @@
 class Link
   constructor: (@page, @$link) ->
-  
+
   allows_process: (event) ->
     !(this._cross_origin_link(event.currentTarget) ||
       this._non_standard_click(event))
 
   process: ->
-    type = if (@$link.attr("data-push") == 'partial')
+    type = if (@$link.data('push') == 'partial')
       'partial'
     else
       'template'
 
-    @page.load(@$link.attr("href"), @$link.attr("data-target"), type)
+    @page.load(@$link.attr("href"), @$link.data('target'), type)
 
   # We split host because IE returns host with port and other browsers not
   #

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

@@ -18,7 +18,7 @@ class Page
           #{window.location.host}
           #{@options.html4_root_path}#!
           #{window.location.pathname}"
-      
+
       if window.location.hash.indexOf('#!') != -1
         self._call(self._make_state(window.location.hash.substring(2)))
 
@@ -27,7 +27,7 @@ class Page
       "statechange"
       (event, data) ->
         state = History.getState()
-        
+
         if self._template_id_changed(state)
           self._call(self._reset_state(state))
         else
@@ -74,7 +74,7 @@ class Page
       render: 'template',
       referer: window.location.href
     }, document.title, History.getState().url )
-  
+
   _call: (state) ->
     $target = if state.data.target? then $(state.data.target) else @$target
     this.request_manager.call($target, state)
@@ -90,13 +90,13 @@ class Page
         render: render
         referer: referer
     }
-  
+
   _reset_state: (state) ->
     state.data = {} unless state.data?
     state.data.target = null
     state.data.render = 'template'
     state
-  
+
   _try_target: ($target) ->
     if $target.length == 0  && @options.target_missing == 'exception'
       throw new Error("[Wiselinks] Target missing: `#{$target.selector}`")

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

@@ -21,7 +21,7 @@ class RequestManager
       headers:
         'X-Wiselinks': state.data.render
         'X-Wiselinks-Referer': state.data.referer
-    
+
       dataType: "html"
     ).done(
       (data, status, xhr) ->
@@ -32,9 +32,9 @@ class RequestManager
           window.location.reload(true)
         else
           state = History.getState()
-          if url? && url != state.url
+          if url? && url != encodeURI(state.url)
             self._redirect_to(url, $target, state, xhr)
-                  
+
           $target.html(data)
 
           self._title(xhr.getResponseHeader('X-Wiselinks-Title'))
@@ -54,7 +54,7 @@ class RequestManager
     if ( xhr && xhr.readyState < 4)
       xhr.onreadystatechange = $.noop
       xhr.abort()
-    
+
     @redirected = true
     $(document).trigger('page:redirected', [$target, state.data.render, url])
     History.replaceState(state.data, document.title, url)
@@ -62,20 +62,20 @@ class RequestManager
   _loading: ($target, state) ->
     $(document).trigger('page:loading', [$target, state.data.render, state.url])
 
-  _done: ($target, status, state, data) ->
-    $(document).trigger('page:done', [$target, status, state.url, data])
+  _done: ($target, status, url, data) ->
+    $(document).trigger('page:done', [$target, status, url, data])
 
-  _fail: ($target, status, state, error) ->
-    $(document).trigger('page:fail', [$target, status, state.url, error])
+  _fail: ($target, status, url, error) ->
+    $(document).trigger('page:fail', [$target, status, url, error])
 
-  _always: ($target, status, state) ->
-    $(document).trigger('page:always', [$target, status, state.url])
+  _always: ($target, status, url) ->
+    $(document).trigger('page:always', [$target, status, url])
 
   _title: (value) ->
     if value?
       $(document).trigger('page:title', decodeURI(value))
       document.title = decodeURI(value)
-  
+
 
 window._Wiselinks = {} if window._Wiselinks == undefined
 window._Wiselinks.RequestManager = RequestManager

data/lib/wiselinks.rb

@@ -12,7 +12,7 @@ require 'wiselinks/rails' if defined?(::Rails)
 module Wiselinks
   extend Logger
 
-  DEFAULTS = {    
+  DEFAULTS = {
     :assets_digest => nil,
     :logger => nil
   }

data/lib/wiselinks/builder.rb

@@ -5,16 +5,16 @@ require 'coffeelint'
 
 require 'wiselinks/version'
 
-module Wiselinks  
+module Wiselinks
   class Builder
     include Rake::DSL if defined? Rake::DSL
 
-    class << self      
+    class << self
       attr_accessor :instance
 
       def install
         self.new.install
-      end      
+      end
     end
 
 
@@ -38,7 +38,7 @@ module Wiselinks
           system("rm ./build/*")
 
           system("echo '#{self.declaration}' > ./build/#{self.name_with_version}.js")
-          system("coffee -o ./build -j temp.js -c #{self.coffee_sources.join(' ')}")    
+          system("coffee -o ./build -j temp.js -c #{self.coffee_sources.join(' ')}")
           system("cat ./build/temp.js >> ./build/#{self.name_with_version}.js")
 
           self.js_sources.each do |file|
@@ -83,7 +83,7 @@ module Wiselinks
  * #{self.name.capitalize}-#{self.version}
  * @copyright 2012-#{Date.today.year} #{self.specification.authors.join(', ')}
  * @preserve https://github.com/igor-alexandrov/wiselinks
- */  
+ */
 EOS
     end
 

data/lib/wiselinks/controller_methods.rb

@@ -1,9 +1,8 @@
 module Wiselinks
-  module ControllerMethods    
-    
-    def self.included(base)      
-      base.helper_method :wiselinks_title      
+  module ControllerMethods
 
+    def self.included(base)
+      base.helper_method :wiselinks_title
       base.before_filter :set_wiselinks_url
     end
 
@@ -15,13 +14,13 @@ module Wiselinks
 
     def wiselinks_title(value)
       if self.request.wiselinks? && value.present?
-        Wiselinks.log("title: #{value}")        
+        Wiselinks.log("title: #{value}")
         self.response.headers['X-Wiselinks-Title'] = URI.encode(value)
       end
     end
 
-    def set_wiselinks_url      
-      self.response.headers['X-Wiselinks-Url'] = request.url if self.request.wiselinks?
+    def set_wiselinks_url
+      self.response.headers['X-Wiselinks-Url'] = request.env['REQUEST_URI'] if self.request.wiselinks?
     end
   end
-end
+end

data/lib/wiselinks/helpers.rb

@@ -1,9 +1,9 @@
 module Wiselinks
-  module Helpers    
+  module Helpers
     def wiselinks_meta_tag
-      if Wiselinks.options[:assets_digest].present?       
+      if Wiselinks.options[:assets_digest].present?
         tag('meta', :name => 'assets-digest', :content => Wiselinks.options[:assets_digest])
       end
-    end 
+    end
   end
 end

data/lib/wiselinks/logger.rb

@@ -1,5 +1,5 @@
 module Wiselinks
-  module Logger    
+  module Logger
     def logger
       @logger ||= Wiselinks.options[:logger] || ::Logger.new(STDOUT)
     end

data/lib/wiselinks/rails.rb

@@ -1,7 +1,7 @@
 module Wiselinks
   module Rails
     class Engine < ::Rails::Engine
-      initializer 'wiselinks.register_logger' do        
+      initializer 'wiselinks.register_logger' do
         Wiselinks.options[:logger] = ::Rails.logger
       end
 
@@ -9,8 +9,8 @@ module Wiselinks
         ActionDispatch::Request.send :include, Request
         ActionController::Base.send :include, ControllerMethods
         ActionController::Base.send :include, Rendering
-        ActionView::Base.send :include, Helpers        
-      end    
+        ActionView::Base.send :include, Helpers
+      end
 
       initializer "wiselinks.register_assets_digest"  do
         if ::Rails.application.config.assets.digest && ::Rails.application.config.assets.digests.present?

data/lib/wiselinks/rendering.rb

@@ -1,7 +1,7 @@
 module Wiselinks
-  module Rendering    
-    
-    def self.included(base)            
+  module Rendering
+
+    def self.included(base)
       base.alias_method_chain :render, :wiselinks
     end
 
@@ -10,7 +10,7 @@ module Wiselinks
     def render_with_wiselinks(*args, &block)
       options = _normalize_args(*args)
 
-      if self.request.wiselinks?              
+      if self.request.wiselinks?
         self.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
         self.headers['Pragma'] = 'no-cache'
 
@@ -20,15 +20,15 @@ module Wiselinks
         else
           Wiselinks.log("Processing template request")
           if Wiselinks.options[:layout] != false
-            options[:layout] = self.wiselinks_layout 
+            options[:layout] = self.wiselinks_layout
           end
         end
 
         if Wiselinks.options[:assets_digest].present?
           Wiselinks.log("Assets digest #{Wiselinks.options[:assets_digest]}")
 
-          self.headers['X-Wiselinks-Assets-Digest'] = Wiselinks.options[:assets_digest]          
-        end        
+          self.headers['X-Wiselinks-Assets-Digest'] = Wiselinks.options[:assets_digest]
+        end
       end
 
       self.render_without_wiselinks(options, &block)

data/lib/wiselinks/request.rb

@@ -1,6 +1,6 @@
 module Wiselinks
   module Request
-    def self.included(base)            
+    def self.included(base)
       base.alias_method_chain :referer, :wiselinks
       base.alias_method_chain :referrer, :wiselinks
     end
@@ -10,7 +10,7 @@ module Wiselinks
     end
 
     def referrer_with_wiselinks
-      self.referer_with_wiselinks      
+      self.referer_with_wiselinks
     end
 
     def wiselinks?

data/lib/wiselinks/version.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-module Wiselinks  
+module Wiselinks
   module Version
     MAJOR = 0
-    MINOR = 6
-    PATCH = 4
+    MINOR = 7
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,8 +1,9 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery  
-  
+  protect_from_forgery
+
   layout 'application'
 
-  def index    
-  end  
+  def index; end
+  def no_slash; end
+  def trailing_slash; end
 end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,7 @@
 Dummy::Application.routes.draw do
   root :to => 'application#index'
+
+  get 'no-slash' => 'application#no_slash'
+  get 'trailing-slash' => 'application#trailing_slash',
+    :trailing_slash => true
 end

data/spec/helper.rb

@@ -1,20 +1,19 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-require 'rails'
-require 'wiselinks'
-require 'rspec'
+ENV['RAILS_ENV'] = 'test'
+require "dummy/config/environment"
+
+require 'rspec/rails'
 require 'webmock/rspec'
+require 'wiselinks'
 
 require 'coveralls'
 Coveralls.wear!
 
-ENV['RAILS_ENV'] = 'test'
-require "dummy/config/environment"
-
 require 'capybara/rspec'
 require 'capybara/rails'
 Capybara.app = Dummy::Application
 
 require 'factory_girl'
-FactoryGirl.find_definitions
+FactoryGirl.find_definitions

data/spec/requests/trailing_slash_spec.rb

@@ -0,0 +1,17 @@
+require "helper"
+
+describe 'Requests' do
+  context 'w/ trailing slash' do
+    it 'sets X-Wiselinks header field correctly' do
+      get('trailing-slash/', {}, {"X-Wiselinks" => 'template'})
+      response.headers['X-Wiselinks-Url'].last.should == '/'
+    end
+  end
+
+  context 'w/out slash' do
+    it 'sets X-Wiselinks header field correctly' do
+      get('no-slash', {}, {"X-Wiselinks" => 'template'})
+      response.headers['X-Wiselinks-Url'].last.should_not == '/'
+    end
+  end
+end

data/wiselinks.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'faker'
   gem.add_development_dependency 'capybara'
 
-  gem.add_development_dependency 'rails', '>= 3.2.0'
+  gem.add_development_dependency 'rails', '~> 3.2.13'
   gem.add_development_dependency 'coffee-rails'
 
   gem.add_development_dependency 'closure-compiler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiselinks
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -227,17 +227,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -302,9 +302,9 @@ files:
 - README.md
 - Rakefile
 - app/views/layouts/wiselinks.html.erb
-- build/wiselinks-0.6.4.js
-- build/wiselinks-0.6.4.min.js
-- build/wiselinks-0.6.4.min.js.gz
+- build/wiselinks-0.7.0.js
+- build/wiselinks-0.7.0.min.js
+- build/wiselinks-0.7.0.min.js.gz
 - compiler.jar
 - lib/assets/javascripts/_form.js.coffee
 - lib/assets/javascripts/_link.js.coffee
@@ -335,6 +335,8 @@ files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/application/index.html.erb
+- spec/dummy/app/views/application/no_slash.html.erb
+- spec/dummy/app/views/application/trailing_slash.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -355,7 +357,6 @@ files:
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -388,6 +389,7 @@ files:
 - spec/dummy/tmp/cache/assets/E11/4E0/sprockets%2F86e145a39f85cceeaffdff91ebb61449
 - spec/factories/requests.rb
 - spec/helper.rb
+- spec/requests/trailing_slash_spec.rb
 - wiselinks.gemspec
 homepage: http://github.com/igor-alexandrov/wiselinks
 licenses:
@@ -404,7 +406,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 584745828112753545
+      hash: 2776055283966944450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -413,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 584745828112753545
+      hash: 2776055283966944450
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -433,6 +435,8 @@ test_files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/application/index.html.erb
+- spec/dummy/app/views/application/no_slash.html.erb
+- spec/dummy/app/views/application/trailing_slash.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -453,7 +457,6 @@ test_files:
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -486,3 +489,4 @@ test_files:
 - spec/dummy/tmp/cache/assets/E11/4E0/sprockets%2F86e145a39f85cceeaffdff91ebb61449
 - spec/factories/requests.rb
 - spec/helper.rb
+- spec/requests/trailing_slash_spec.rb