changed access to named route_sets, renamed spec function

dantebronto · Jun 27, 2010 · 46a6f23 · 46a6f23
1 parent 8c38176
commit 46a6f23
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/picard/lib/picard/routing_engine.js b/picard/lib/picard/routing_engine.js
@@ -107,10 +107,7 @@ GLOBAL.route_set = function(name, handler){
     route_set_cache[name] = route_set_scope
     handler.apply(route_set_scope)
   }
-}
-
-GLOBAL.route_sets = function(){
-  return route_set_cache
+  return route_set_cache[name]
 }
 
 Picard.routes = routes
diff --git a/sample_app/app.js b/sample_app/app.js
@@ -34,7 +34,7 @@ helpers({
   message: function(){
     return "Welcome to Picard!"
   },
-  odd: function(num){
+  parity: function(num){
     return num + (num % 2 == 0 ? " is even" : " is odd")
   }
 })

diff --git a/sample_app/controllers/test_controller.js b/sample_app/controllers/test_controller.js
@@ -4,7 +4,7 @@ route_set(function(){ // no name given
     message: function(name){
       return 'Hello ' + (name ? name : '')
     },
-    version: route_sets().operations.helpers().version
+    version: route_set('operations').helpers().version
   })
 
   this.get('/anonymous_route_set', function(){

diff --git a/sample_app/views/advanced.haml b/sample_app/views/advanced.haml
@@ -15,6 +15,6 @@
     = message()
 
   #odd
-    = odd(3)
+    = parity(3)
     %br
-    = odd(4)
+    = parity(4)