eyeballs 0.5.11 → 0.5.12

data/CHANGELOG

@@ -1,3 +1,7 @@
+Wed Nov 3
+- - - - - 
+- Support passing in params via the routes
+
 Thu Oct 28
 - - - - - -
 - Much more robust support for o_O.params

data/README.md

@@ -248,12 +248,20 @@ You can also set params in the URL, eg:
     })
 
     <a href="/posts/1">Click Me for Post 1!</a>
+
+or in the route:
+    
+    o_O.routes.draw(function(map){
+      map.match('/posts/:id/', {to: 'posts#show', 'custom':'posts'})
+    })
+    
+    o_O.params('custom') #=> 'post'
     
 and your controller:
     
     o_O('PostsController', {
-      show: function(params){
-        alert(params('id')) #=> '1'
+      show: function(){
+        alert(o_O.params('id')) #=> '1'
       }
     })
 
@@ -309,11 +317,11 @@ Imagine a simple app for posting reviews. It will comprise a "Review" model, "Re
 
 This defines the Review model, allowing us to initialize and save Review objects, while ensuring `title` and `content` are included.
 
-The `create` action in `controllers/reviews_venue.js` looks like this (using jQuery):
+The `create` action in `controllers/reviews_controller.js` looks like this (using jQuery):
 
     ...
     create: function(){
-      var review = Review.initialize(o_O.params($(this)));
+      var review = Review.initialize(o_O.params('review'));
       var form = $(this);
       review.save({o
         invalid: function(review){

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "eyeballs"
-    s.version = "0.5.11"
+    s.version = "0.5.12"
     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.11"
+  s.version = "0.5.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-10-28}
+  s.date = %q{2010-11-03}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]

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

@@ -28,19 +28,26 @@ o_O.routes = {
         this.match(name + '/:id', {to:name + '#show'});
       },
       match: function(route, options){
-        var parsed_route = route.o_O_trim('/')
-
+        var parsed_route = route.o_O_trim('/');
+        var params = options;
+        
+        for(var param in options)
+        {
+          if(param != 'to')
+            params[param] = options[param];
+        }
+        
         if(typeof prefix != 'undefined')
         {
           parsed_route = prefix + '/' + 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)
+            matchers: parsed_route.match(/:[^\/]*/g),
+            params: params
             };
           o_O.routes.regex_urls.push({regex: regex_to_match, matcher:parsed_route});
         }
@@ -77,33 +84,33 @@ o_O.routes = {
       }
       
       var compute_params = function(rule){
-        return function(attr){
-          var params = {}
-          if(rule)
+
+        if(rule)
+        {
+          for(j = 0; j < rule.matchers.length; j++)
           {
-            for(j = 0; j < rule.matchers.length; j++)
-            {
-              params[rule.matchers[j].replace(/^:/, '')] = match[j+1];
-            }
+            o_O.params.collection[rule.matchers[j].replace(/^:/, '')] = match[j+1];
           }
           
-          if(query_string_parts.length > 0)
+          if(rule.params)
           {
-            for(k = 0; k < query_string_parts.length; k++)
+            for(param in rule.params)
             {
-              var param_parts = query_string_parts[k].split('=')
-              params[param_parts[0]] = param_parts[1];
+              o_O.params.collection[param] = rule.params[param];
             }
           }
-          if(attr)
-          {
-            return params[attr];
-          }
-          else
+        }
+        
+        if(query_string_parts.length > 0)
+        {
+          for(k = 0; k < query_string_parts.length; k++)
           {
-            return params;
+            var param_parts = query_string_parts[k].split('=')
+            o_O.params.collection[param_parts[0]] = param_parts[1];
           }
         }
+
+        return o_O.params
       }
       
       if(location.hash.o_O_trim() == '')

data/test/unit/test_model.html

@@ -29,6 +29,9 @@
     this.methods.title_numbered = function(){
       return '1. ' + this.title;
     }
+    this.do_something = function(){
+      return 'did something'
+    }
     return this;
   });
   
@@ -48,6 +51,10 @@
       var test_model = o_O('Review').initialize({title: 'Delicious'})
       equals(test_model.title, 'Delicious', 'should just work as normal')
     })
+    
+    test('class-ish method', function(){
+      equals(o_O('Review').do_something(), 'did something')
+    })
 
     test('serialization',1, function(){
       var myReview = Review.initialize({title: 'Groovy'})

data/test/unit/test_routing.html

@@ -52,6 +52,12 @@
     }
   })
   
+  o_O('GalleryController', {
+    gallery: function(){
+      $('div#gallery').html(o_O.params('thing'))
+    }
+  })
+  
   o_O.routes.draw(function(map){
     map.root({to: "reviews#root"})
     map.match('/reviews/index/', {to: "reviews#index"});
@@ -60,6 +66,7 @@
     })
     map.match('/reviews/:test', {to: 'reviews#sending_params'})
     map.match('gobble', {to: 'reviews#sending_params_normal'})
+    map.match('/gallery/:image', {to: 'gallery#gallery', thing: 'gallery'})
     
     map.resources('songs')
   })
@@ -148,6 +155,14 @@
       }, 100)
     })
     
+    asyncTest('pass params via routes', function(){
+      $('a#gallery-link').click()
+      setTimeout(function(){
+        equals($('div#gallery').text(), 'gallery') 
+        start();
+      }, 100)
+    })
+    
 
   });
   </script>
@@ -186,5 +201,8 @@
   <a id="index-song" href="/songs/" data-ajax-history="true">Songs Index</a>
   <div id="songs-index"></div>
   
+  <a id="gallery-link" href="/gallery/stuff" data-ajax-history="true">Songs Index</a>
+  <div id="gallery"></div>
+  
 </body>
 </html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 5
-  - 11
-  version: 0.5.11
+  - 12
+  version: 0.5.12
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +01:00
+date: 2010-11-03 00:00:00 +00:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency