Merge pull request #52 from oskbor/master

Fix for issue #51

backbone.subroute.js

@@ -43,7 +43,7 @@
             // grab the full URL
             var hash;
             if (Backbone.history.fragment) {
-                hash = Backbone.history.getFragment();
+                hash = Backbone.history.getFragment(Backbone.history.fragment);
             } else {
                 hash = Backbone.history.getHash();
             }

package.json

@@ -42,7 +42,7 @@
     "grunt-template-jasmine-requirejs": "^0.2.0",
     "grunt-version": "^0.3.0",
     "jasmine-sinon": "^0.4.0",
-    "sinon": "^1.10.3",
+    "sinon": "~1.10.3",
     "underscore": "^1.6.0"
   },
   "keywords": [

spec/js/load-url-on-init-specs.js

@@ -15,7 +15,31 @@ describe("When an initial URL hash is provided at subroute initialization time",
             routes: {
                 "": "handleRootRoute",
                 "foo": "handleRootFooRoute",
-                "user/:user": "handleRootUserRoute"
+                "user/:user": "handleRootUserRoute",
+                "subroute*args": "initSubRoute"
+            },
+            initSubRoute: function(args) {
+
+
+                var testRouter = Backbone.SubRoute.extend({
+                    routes: {
+                        "": "handleDefaultRoute",
+                        "foo": "handleFooRoute",
+                        "profile": "handleProfileRoute"
+                    },
+                    handleDefaultRoute: function() {
+                        that.defaultRouteSpy();
+                    },
+                    handleFooRoute: function() {
+                        that.fooRouteSpy();
+                    },
+                    handleProfileRoute: function() {
+                        that.profileRouteSpy();
+                    }
+                });
+
+                this.baseRouter = new testRouter("subroute");
+
             }
         });
 
@@ -136,5 +160,19 @@ describe("When an initial URL hash is provided at subroute initialization time",
         expect(this.loadUrlSpy).toHaveBeenCalledOnce();
     });
 
+    it('triggers the "foo" route if the loadURL matches the route', function() {
+
+
+        Backbone.history.loadUrl("subroute/foo");
+
+        expect(this.fooRouteSpy).toHaveBeenCalledOnce();
+        expect(this.fooRouteSpy).toHaveBeenCalledWith();
+
+        //Once in this test and once in the implementation
+        expect(this.loadUrlSpy).toHaveBeenCalledTwice();
+
+    });
+
+
 
 });