eyeballs 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+Fri Aug 6
+- - - - - 
+- Add support for passing params from the URL to the controller
+
 Sun Aug 1
 - - - - -
 - Bring the scaffold generator up to date

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "eyeballs"
-    s.version = "0.5.5"
+    s.version = "0.5.6"
     s.author = "Paul Campbell"
     s.email = "paul@rslw.com"
     s.homepage = "http://www.github.com/paulca/eyeballs.js"

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-08-01}
+  s.date = %q{2010-08-06}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]

data/src/drivers/jquery/modules/o_O.routes.js

@@ -2,6 +2,7 @@ o_O.routes = {
   
   rules: {},
   urls: [],
+  regex_urls: [],
   
   figure_action: function(options){
     var parts = options.to.split('#');
@@ -22,15 +23,29 @@ o_O.routes = {
       },
       match: function(route, options){
         var parsed_route = route.o_O_trim('/')
+
         if(typeof prefix != 'undefined')
         {
           parsed_route = prefix + '/' + parsed_route
         }
-        o_O.routes.rules[parsed_route] = {
-          action: o_O.routes.figure_action(options),
-          with_args: options.with_args
-          };
-        o_O.routes.urls.push(parsed_route);
+
+        if(parsed_route.indexOf(':') >= 0)
+        { 
+          var regex_to_match = parsed_route.replace(/:[^\/]*/g, '([^\/]*)');
+          o_O.routes.rules[parsed_route] = {
+            action: o_O.routes.figure_action(options),
+            matchers: parsed_route.match(/:[^\/]*/g)
+            };
+          o_O.routes.regex_urls.push({regex: regex_to_match, matcher:parsed_route});
+        }
+        else
+        {
+          o_O.routes.rules[parsed_route] = {
+            action: o_O.routes.figure_action(options),
+            with_args: options.with_args
+            };
+          o_O.routes.urls.push(parsed_route);
+        }
       }
     }
   },
@@ -53,6 +68,31 @@ o_O.routes = {
         {
           o_O.routes.rules[hash].action(o_O.routes.rules[hash].with_args);
         }
+        else
+        {
+          for(i = 0; i < o_O.routes.regex_urls.length; i++)
+          {
+            if(match = hash.match(o_O.routes.regex_urls[i].regex))
+            {
+              var rule = o_O.routes.rules[o_O.routes.regex_urls[i].matcher];
+              rule.action(function(attr){
+                var params = {}
+                for(j = 0; j < rule.matchers.length; j++)
+                {
+                  params[rule.matchers[j].replace(/^:/, '')] = match[j+1];
+                }
+                if(attr)
+                {
+                  return params[attr];
+                }
+                else
+                {
+                  return params;
+                }
+              });
+            }
+          }
+        }
       });
       
       $('a').live('click', function(){

data/test/unit/test_routing.html

@@ -12,7 +12,6 @@
   <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.routes.js"></script>
-  <script src="../../src/drivers/jquery/modules/o_O.routes.js"></script>
 
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
@@ -47,6 +46,9 @@
       }
       $('div#namespaced-index').html(out);
       return 'awesome!'
+    },
+    sending_params: function(params){
+      $('div#with_params').html(params('test'));
     }
   });
   
@@ -56,6 +58,7 @@
     map.namespace('my', function(my){
       my.match('action', {to: "reviews#namespaced_index", with_args: 'test'})
     })
+    map.match('/reviews/:test', {to: 'reviews#sending_params'})
   })
 
   $(document).ready(function(){
@@ -93,6 +96,15 @@
         start();
       },100)
     })
+    
+    asyncTest('withparams',function(){
+      $('a#with-params').trigger('click');
+      setTimeout(function(){
+        equals($('div#with_params').html(), 'something', "should pass the params");
+        start();
+      },100)
+    })
+    
 
   });
   </script>
@@ -106,11 +118,14 @@
  
   <a id="index-link" data-ajax-history="true" href="/reviews/index">Hello!</a>
   <a id="namespaced-index-link" data-ajax-history="true" href="/my/action">Hello!</a>
+  
+  <a id="with-params" data-ajax-history="true" href="/reviews/something">Hello!</a>
  
   <div id="index">
   </div>
   <div id="namespaced-index">
   </div>
   <div id="root"></div>
+  <div id="with_params"></div>
 </body>
 </html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 +01:00
+date: 2010-08-06 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency