crossroadsjs-rails 1.0.0 → 1.1.0

data/.gitignore

@@ -1 +1,2 @@
-/Gemfile.lock
+/Gemfile.lock
+*.gem

data/README.md

@@ -1,6 +1,6 @@
 # Crossroads.js for Rails ![Build Status][travis_ci_build_status]
 
-Provides Crossroads.js (0.7.1) for use with Rails 3
+Provides Crossroads.js (0.8.0) for use with Rails 3
 
 [RubyGems][ruby_gems] | [Ruby Toolbox][ruby_toolbox] | [GitHub][github] | [Travis CI][travis_ci] | [RubyDoc][ruby_doc]
 

data/lib/crossroadsjs/rails/version.rb

@@ -1,6 +1,6 @@
 module Crossroadsjs
   module Rails
-    VERSION = "1.0.0"
-    CROSSROADSJS_VERSION = "0.7.1";
+    VERSION = "1.1.0"
+    CROSSROADSJS_VERSION = "0.8.0";
   end
 end

data/spec/crossroadsjs/rails/version_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
 describe Crossroadsjs::Rails do
-  it { Crossroadsjs::Rails::VERSION.should == "1.0.0" }
-  it { Crossroadsjs::Rails::CROSSROADSJS_VERSION.should == "0.7.1" }
+  it { Crossroadsjs::Rails::VERSION.should == "1.1.0" }
+  it { Crossroadsjs::Rails::CROSSROADSJS_VERSION.should == "0.8.0" }
 end

data/vendor/assets/javascripts/crossroads.js

@@ -1,15 +1,14 @@
 /** @license
- * Crossroads.js <http://millermedeiros.github.com/crossroads.js>
- * Released under the MIT license
+ * crossroads <http://millermedeiros.github.com/crossroads.js/>
+ * License: MIT
  * Author: Miller Medeiros
- * Version: 0.7.1 - Build: 93 (2012/02/02 09:29 AM)
+ * Version: 0.8.0 (2012/3/5 14:26)
  */
 
 (function (define) {
 define(['signals'], function (signals) {
 
     var crossroads,
-        patternLexer,
         UNDEF;
 
     // Helpers -----------
@@ -85,6 +84,7 @@ define(['signals'], function (signals) {
      */
     function Crossroads() {
         this._routes = [];
+        this._prevRoutes = [];
         this.bypassed = new signals.Signal();
         this.routed = new signals.Signal();
     }
@@ -121,8 +121,9 @@ define(['signals'], function (signals) {
             this._routes.length = 0;
         },
 
-        parse : function (request) {
+        parse : function (request, defaultArgs) {
             request = request || '';
+            defaultArgs = defaultArgs || [];
 
             var routes = this._getMatchedRoutes(request),
                 i = 0,
@@ -130,16 +131,26 @@ define(['signals'], function (signals) {
                 cur;
 
             if (n) {
+                this._notifyPrevRoutes(request);
+                this._prevRoutes = routes;
                 //shold be incremental loop, execute routes in order
                 while (i < n) {
                     cur = routes[i];
-                    cur.route.matched.dispatch.apply(cur.route.matched, cur.params);
+                    cur.route.matched.dispatch.apply(cur.route.matched, defaultArgs.concat(cur.params));
                     cur.isFirst = !i;
-                    this.routed.dispatch(request, cur);
+                    this.routed.dispatch.apply(this.routed, defaultArgs.concat([request, cur]));
                     i += 1;
                 }
             } else {
-                this.bypassed.dispatch(request);
+                this.bypassed.dispatch.apply(this.bypassed, defaultArgs.concat([request]));
+            }
+        },
+
+        _notifyPrevRoutes : function(request) {
+            var i = 0, cur;
+            while (cur = this._prevRoutes[i++]) {
+                //check if switched exist since route may be disposed
+                if(cur.route.switched) cur.route.switched.dispatch(request);
             }
         },
 
@@ -179,8 +190,15 @@ define(['signals'], function (signals) {
 
     //"static" instance
     crossroads = new Crossroads();
-    crossroads.VERSION = '0.7.1';
+    crossroads.VERSION = '0.8.0';
 
+    crossroads.NORM_AS_ARRAY = function (req, vals) {
+        return [vals.vals_];
+    };
+
+    crossroads.NORM_AS_OBJECT = function (req, vals) {
+        return [vals];
+    };
 
 
     // Route --------------
@@ -190,13 +208,15 @@ define(['signals'], function (signals) {
      * @constructor
      */
     function Route(pattern, callback, priority, router) {
-        var isRegexPattern = isRegExp(pattern);
+        var isRegexPattern = isRegExp(pattern),
+            patternLexer = crossroads.patternLexer;
         this._router = router;
         this._pattern = pattern;
         this._paramsIds = isRegexPattern? null : patternLexer.getParamIds(this._pattern);
         this._optionalParamsIds = isRegexPattern? null : patternLexer.getOptionalParamsIds(this._pattern);
         this._matchRegexp = isRegexPattern? pattern : patternLexer.compilePattern(pattern);
         this.matched = new signals.Signal();
+        this.switched = new signals.Signal();
         if (callback) {
             this.matched.add(callback);
         }
@@ -249,7 +269,7 @@ define(['signals'], function (signals) {
 
         _getParamsObject : function (request) {
             var shouldTypecast = this._router.shouldTypecast,
-                values = patternLexer.getParamValues(request, this._matchRegexp, shouldTypecast),
+                values = crossroads.patternLexer.getParamValues(request, this._matchRegexp, shouldTypecast),
                 o = {},
                 n = values.length;
             while (n--) {
@@ -270,7 +290,7 @@ define(['signals'], function (signals) {
             if (norm && isFunction(norm)) {
                 params = norm(request, this._getParamsObject(request));
             } else {
-                params = patternLexer.getParamValues(request, this._matchRegexp, this._router.shouldTypecast);
+                params = crossroads.patternLexer.getParamValues(request, this._matchRegexp, this._router.shouldTypecast);
             }
             return params;
         },
@@ -281,7 +301,8 @@ define(['signals'], function (signals) {
 
         _destroy : function () {
             this.matched.dispose();
-            this.matched = this._pattern = this._matchRegexp = null;
+            this.switched.dispose();
+            this.matched = this.switched = this._pattern = this._matchRegexp = null;
         },
 
         toString : function () {
@@ -295,7 +316,7 @@ define(['signals'], function (signals) {
     // Pattern Lexer ------
     //=====================
 
-    patternLexer = crossroads.patternLexer = (function () {
+    crossroads.patternLexer = (function () {
 
 
         var ESCAPE_CHARS_REGEXP = /[\\.+*?\^$\[\](){}\/'#]/g, //match chars that should be escaped on string regexp
@@ -306,15 +327,21 @@ define(['signals'], function (signals) {
             REQUIRED_PARAMS_REGEXP = /\{([^}]+)\}/g, //match everything between `{ }`
             OPTIONAL_PARAMS_REGEXP = /:([^:]+):/g, //match everything between `: :`
             PARAMS_REGEXP = /(?:\{|:)([^}:]+)(?:\}|:)/g, //capture everything between `{ }` or `: :`
+            REQUIRED_REST = /\{([^}]+)\*\}/g,
+            OPTIONAL_REST = /:([^:]+)\*:/g,
 
             //used to save params during compile (avoid escaping things that
             //shouldn't be escaped).
             SAVE_REQUIRED_PARAMS = '__CR_RP__',
             SAVE_OPTIONAL_PARAMS = '__CR_OP__',
+            SAVE_REQUIRED_REST = '__CR_RR__',
+            SAVE_OPTIONAL_REST = '__CR_OR__',
             SAVE_REQUIRED_SLASHES = '__CR_RS__',
             SAVE_OPTIONAL_SLASHES = '__CR_OS__',
             SAVED_REQUIRED_REGEXP = new RegExp(SAVE_REQUIRED_PARAMS, 'g'),
             SAVED_OPTIONAL_REGEXP = new RegExp(SAVE_OPTIONAL_PARAMS, 'g'),
+            SAVED_REQUIRED_REST_REGEXP = new RegExp(SAVE_REQUIRED_REST, 'g'),
+            SAVED_OPTIONAL_REST_REGEXP = new RegExp(SAVE_OPTIONAL_REST, 'g'),
             SAVED_OPTIONAL_SLASHES_REGEXP = new RegExp(SAVE_OPTIONAL_SLASHES, 'g'),
             SAVED_REQUIRED_SLASHES_REGEXP = new RegExp(SAVE_REQUIRED_SLASHES, 'g');
 
@@ -350,6 +377,8 @@ define(['signals'], function (signals) {
             //save chars that shouldn't be escaped
             pattern = pattern.replace(OPTIONAL_SLASHES_REGEXP, '$1'+ SAVE_OPTIONAL_SLASHES +'$2');
             pattern = pattern.replace(REQUIRED_SLASHES_REGEXP, '$1'+ SAVE_REQUIRED_SLASHES +'$2');
+            pattern = pattern.replace(OPTIONAL_REST, SAVE_OPTIONAL_REST);
+            pattern = pattern.replace(REQUIRED_REST, SAVE_REQUIRED_REST);
             pattern = pattern.replace(OPTIONAL_PARAMS_REGEXP, SAVE_OPTIONAL_PARAMS);
             return pattern.replace(REQUIRED_PARAMS_REGEXP, SAVE_REQUIRED_PARAMS);
         }
@@ -357,6 +386,8 @@ define(['signals'], function (signals) {
         function untokenize(pattern) {
             pattern = pattern.replace(SAVED_OPTIONAL_SLASHES_REGEXP, '\\/?');
             pattern = pattern.replace(SAVED_REQUIRED_SLASHES_REGEXP, '\\/');
+            pattern = pattern.replace(SAVED_OPTIONAL_REST_REGEXP, '(.*)?'); // optional group to avoid passing empty string as captured
+            pattern = pattern.replace(SAVED_REQUIRED_REST_REGEXP, '(.+)');
             pattern = pattern.replace(SAVED_OPTIONAL_REGEXP, '([^\\/]+)?\/?');
             return pattern.replace(SAVED_REQUIRED_REGEXP, '([^\\/]+)');
         }

data/vendor/assets/javascripts/crossroads.min.js

@@ -1,15 +1,7 @@
-/*
-
- Crossroads.js <http://millermedeiros.github.com/crossroads.js>
- Released under the MIT license
- Author: Miller Medeiros
- Version: 0.7.1 - Build: 93 (2012/02/02 09:29 AM)
-*/
-(function(f){f(["signals"],function(g){function f(a,b){if(a.indexOf)return a.indexOf(b);else{for(var c=a.length;c--;)if(a[c]===b)return c;return-1}}function i(a,b){return"[object "+b+"]"===Object.prototype.toString.call(a)}function n(a){return a===null||a==="null"?null:a==="true"?!0:a==="false"?!1:a===m||a==="undefined"?m:a===""||isNaN(a)?a:parseFloat(a)}function k(){this._routes=[];this.bypassed=new g.Signal;this.routed=new g.Signal}function o(a,b,c,e){var d=i(a,"RegExp");this._router=e;this._pattern=
-a;this._paramsIds=d?null:h.getParamIds(this._pattern);this._optionalParamsIds=d?null:h.getOptionalParamsIds(this._pattern);this._matchRegexp=d?a:h.compilePattern(a);this.matched=new g.Signal;b&&this.matched.add(b);this._priority=c||0}var j,h,m;k.prototype={normalizeFn:null,create:function(){return new k},shouldTypecast:!1,addRoute:function(a,b,c){a=new o(a,b,c,this);this._sortedInsert(a);return a},removeRoute:function(a){var b=f(this._routes,a);b!==-1&&this._routes.splice(b,1);a._destroy()},removeAllRoutes:function(){for(var a=
-this.getNumRoutes();a--;)this._routes[a]._destroy();this._routes.length=0},parse:function(a){var a=a||"",b=this._getMatchedRoutes(a),c=0,e=b.length,d;if(e)for(;c<e;)d=b[c],d.route.matched.dispatch.apply(d.route.matched,d.params),d.isFirst=!c,this.routed.dispatch(a,d),c+=1;else this.bypassed.dispatch(a)},getNumRoutes:function(){return this._routes.length},_sortedInsert:function(a){var b=this._routes,c=b.length;do--c;while(b[c]&&a._priority<=b[c]._priority);b.splice(c+1,0,a)},_getMatchedRoutes:function(a){for(var b=
-[],c=this._routes,e=c.length,d;d=c[--e];)(!b.length||d.greedy)&&d.match(a)&&b.push({route:d,params:d._getParamsArray(a)});return b},toString:function(){return"[crossroads numRoutes:"+this.getNumRoutes()+"]"}};j=new k;j.VERSION="0.7.1";o.prototype={greedy:!1,rules:void 0,match:function(a){return this._matchRegexp.test(a)&&this._validateParams(a)},_validateParams:function(a){var b=this.rules,c=this._getParamsObject(a),e;for(e in b)if(e!=="normalize_"&&b.hasOwnProperty(e)&&!this._isValidParam(a,e,c))return!1;
-return!0},_isValidParam:function(a,b,c){var e=this.rules[b],d=c[b],l=!1;d==null&&this._optionalParamsIds&&f(this._optionalParamsIds,b)!==-1?l=!0:i(e,"RegExp")?l=e.test(d):i(e,"Array")?l=f(e,d)!==-1:i(e,"Function")&&(l=e(d,a,c));return l},_getParamsObject:function(a){for(var b=this._router.shouldTypecast,c=h.getParamValues(a,this._matchRegexp,b),e={},d=c.length;d--;)e[d]=c[d],this._paramsIds&&(e[this._paramsIds[d]]=c[d]);e.request_=b?n(a):a;e.vals_=c;return e},_getParamsArray:function(a){var b=this.rules?
-this.rules.normalize_:null;return(b=b||this._router.normalizeFn)&&i(b,"Function")?b(a,this._getParamsObject(a)):h.getParamValues(a,this._matchRegexp,this._router.shouldTypecast)},dispose:function(){this._router.removeRoute(this)},_destroy:function(){this.matched.dispose();this.matched=this._pattern=this._matchRegexp=null},toString:function(){return'[Route pattern:"'+this._pattern+'", numListeners:'+this.matched.getNumListeners()+"]"}};h=j.patternLexer=function(){function a(a,b){for(var c=[],d;d=a.exec(b);)c.push(d[1]);
-return c}var b=/[\\.+*?\^$\[\](){}\/'#]/g,c=/\/$/g,e=/([:}]|\w(?=\/))\/?(:)/g,d=/([:}])\/?(\{)/g,f=/\{([^}]+)\}/g,g=/:([^:]+):/g,h=/(?:\{|:)([^}:]+)(?:\}|:)/g,i=RegExp("__CR_RP__","g"),j=RegExp("__CR_OP__","g"),k=RegExp("__CR_OS__","g"),m=RegExp("__CR_RS__","g");return{getParamIds:function(b){return a(h,b)},getOptionalParamsIds:function(b){return a(g,b)},getParamValues:function(a,b,c){if(a=b.exec(a))if(a.shift(),c){c=a;a=c.length;for(b=[];a--;)b[a]=n(c[a]);a=b}return a},compilePattern:function(a){if(a=
-a||"")a=a.replace(c,""),a=a.replace(e,"$1__CR_OS__$2"),a=a.replace(d,"$1__CR_RS__$2"),a=a.replace(g,"__CR_OP__"),a=a.replace(f,"__CR_RP__"),a=a.replace(b,"\\$&"),a=a.replace(k,"\\/?"),a=a.replace(m,"\\/"),a=a.replace(j,"([^\\/]+)?/?"),a=a.replace(i,"([^\\/]+)");return RegExp("^"+a+"/?$")}}}();return j})})(typeof define==="function"&&define.amd?define:function(f,g){typeof module!=="undefined"&&module.exports?module.exports=g(require(f[0])):window.crossroads=g(window[f[0]])});
+/** @license
+ * crossroads <http://millermedeiros.github.com/crossroads.js/>
+ * License: MIT
+ * Author: Miller Medeiros
+ * Version: 0.8.0 (2012/3/5 14:26)
+ */
+(function(a){a(["signals"],function(a){function d(a,b){if(a.indexOf)return a.indexOf(b);var c=a.length;while(c--)if(a[c]===b)return c;return-1}function e(a,b){return"[object "+b+"]"===Object.prototype.toString.call(a)}function f(a){return e(a,"RegExp")}function g(a){return e(a,"Array")}function h(a){return e(a,"Function")}function i(a){var b;return a===null||a==="null"?b=null:a==="true"?b=!0:a==="false"?b=!1:a===c||a==="undefined"?b=c:a===""||isNaN(a)?b=a:b=parseFloat(a),b}function j(a){var b=a.length,c=[];while(b--)c[b]=i(a[b]);return c}function k(){this._routes=[],this._prevRoutes=[],this.bypassed=new a.Signal,this.routed=new a.Signal}function l(c,d,e,g){var h=f(c),i=b.patternLexer;this._router=g,this._pattern=c,this._paramsIds=h?null:i.getParamIds(this._pattern),this._optionalParamsIds=h?null:i.getOptionalParamsIds(this._pattern),this._matchRegexp=h?c:i.compilePattern(c),this.matched=new a.Signal,this.switched=new a.Signal,d&&this.matched.add(d),this._priority=e||0}var b,c;return k.prototype={normalizeFn:null,create:function(){return new k},shouldTypecast:!1,addRoute:function(a,b,c){var d=new l(a,b,c,this);return this._sortedInsert(d),d},removeRoute:function(a){var b=d(this._routes,a);b!==-1&&this._routes.splice(b,1),a._destroy()},removeAllRoutes:function(){var a=this.getNumRoutes();while(a--)this._routes[a]._destroy();this._routes.length=0},parse:function(a,b){a=a||"",b=b||[];var c=this._getMatchedRoutes(a),d=0,e=c.length,f;if(e){this._notifyPrevRoutes(a),this._prevRoutes=c;while(d<e)f=c[d],f.route.matched.dispatch.apply(f.route.matched,b.concat(f.params)),f.isFirst=!d,this.routed.dispatch.apply(this.routed,b.concat([a,f])),d+=1}else this.bypassed.dispatch.apply(this.bypassed,b.concat([a]))},_notifyPrevRoutes:function(a){var b=0,c;while(c=this._prevRoutes[b++])c.route.switched&&c.route.switched.dispatch(a)},getNumRoutes:function(){return this._routes.length},_sortedInsert:function(a){var b=this._routes,c=b.length;do--c;while(b[c]&&a._priority<=b[c]._priority);b.splice(c+1,0,a)},_getMatchedRoutes:function(a){var b=[],c=this._routes,d=c.length,e;while(e=c[--d])(!b.length||e.greedy)&&e.match(a)&&b.push({route:e,params:e._getParamsArray(a)});return b},toString:function(){return"[crossroads numRoutes:"+this.getNumRoutes()+"]"}},b=new k,b.VERSION="0.8.0",b.NORM_AS_ARRAY=function(a,b){return[b.vals_]},b.NORM_AS_OBJECT=function(a,b){return[b]},l.prototype={greedy:!1,rules:void 0,match:function(a){return this._matchRegexp.test(a)&&this._validateParams(a)},_validateParams:function(a){var b=this.rules,c=this._getParamsObject(a),d;for(d in b)if(d!=="normalize_"&&b.hasOwnProperty(d)&&!this._isValidParam(a,d,c))return!1;return!0},_isValidParam:function(a,b,c){var e=this.rules[b],i=c[b],j=!1;return i==null&&this._optionalParamsIds&&d(this._optionalParamsIds,b)!==-1?j=!0:f(e)?j=e.test(i):g(e)?j=d(e,i)!==-1:h(e)&&(j=e(i,a,c)),j},_getParamsObject:function(a){var c=this._router.shouldTypecast,d=b.patternLexer.getParamValues(a,this._matchRegexp,c),e={},f=d.length;while(f--)e[f]=d[f],this._paramsIds&&(e[this._paramsIds[f]]=d[f]);return e.request_=c?i(a):a,e.vals_=d,e},_getParamsArray:function(a){var c=this.rules?this.rules.normalize_:null,d;return c=c||this._router.normalizeFn,c&&h(c)?d=c(a,this._getParamsObject(a)):d=b.patternLexer.getParamValues(a,this._matchRegexp,this._router.shouldTypecast),d},dispose:function(){this._router.removeRoute(this)},_destroy:function(){this.matched.dispose(),this.switched.dispose(),this.matched=this.switched=this._pattern=this._matchRegexp=null},toString:function(){return'[Route pattern:"'+this._pattern+'", numListeners:'+this.matched.getNumListeners()+"]"}},b.patternLexer=function(){function w(a,b){var c=[],d;while(d=a.exec(b))c.push(d[1]);return c}function x(a){return w(g,a)}function y(a){return w(f,a)}function z(c){return c=c||"",c&&(c=c.replace(b,""),c=A(c),c=c.replace(a,"\\$&"),c=B(c)),new RegExp("^"+c+"/?$")}function A(a){return a=a.replace(c,"$1"+p+"$2"),a=a.replace(d,"$1"+o+"$2"),a=a.replace(i,n),a=a.replace(h,m),a=a.replace(f,l),a.replace(e,k)}function B(a){return a=a.replace(u,"\\/?"),a=a.replace(v,"\\/"),a=a.replace(t,"(.*)?"),a=a.replace(s,"(.+)"),a=a.replace(r,"([^\\/]+)?/?"),a.replace(q,"([^\\/]+)")}function C(a,b,c){var d=b.exec(a);return d&&(d.shift(),c&&(d=j(d))),d}var a=/[\\.+*?\^$\[\](){}\/'#]/g,b=/\/$/g,c=/([:}]|\w(?=\/))\/?(:)/g,d=/([:}])\/?(\{)/g,e=/\{([^}]+)\}/g,f=/:([^:]+):/g,g=/(?:\{|:)([^}:]+)(?:\}|:)/g,h=/\{([^}]+)\*\}/g,i=/:([^:]+)\*:/g,k="__CR_RP__",l="__CR_OP__",m="__CR_RR__",n="__CR_OR__",o="__CR_RS__",p="__CR_OS__",q=new RegExp(k,"g"),r=new RegExp(l,"g"),s=new RegExp(m,"g"),t=new RegExp(n,"g"),u=new RegExp(p,"g"),v=new RegExp(o,"g");return{getParamIds:x,getOptionalParamsIds:y,getParamValues:C,compilePattern:z}}(),b})})(typeof define=="function"&&define.amd?define:function(a,b){typeof module!="undefined"&&module.exports?module.exports=b(require(a[0])):window.crossroads=b(window[a[0]])})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroadsjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &22510320 !ruby/object:Gem::Requirement
+  requirement: &21993624 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22510320
+  version_requirements: *21993624
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22509852 !ruby/object:Gem::Requirement
+  requirement: &21993312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *22509852
+  version_requirements: *21993312
 description: Provides Crossroads.js for use with Rails 3
 email: philostler@gmail.com
 executables: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Crossroads.js for Rails