eyeballs 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+Wed Jul 7 2010
+- - - - - - - -
+- Add namespace and root support in routing
+
 Tue Jul 6 2010
 - - - - - - - -
 - Housekeeping, add adapters, modules and drivers directories and relevant sub-directories

data/README.md

@@ -237,6 +237,22 @@ You can now bind this to particular links, by adding the `data-ajax-history` att
     
 This link will now call `PostsController.new()` when it is clicked.
 
+If you want a default action to fire, that is when the `document.hash` is empty, just hook up a `map.root`:
+
+    o_O.routes.draw(function(map){
+      map.root({to: 'posts#index'})
+    })
+    
+If you have several routes that share the same prefix, you can use a namespace:
+
+    o_O.routes.draw(function(map){
+      map.namespace('my', function(){
+        map.match('posts/new', {to: "myposts#new"}) # hooks up to MypostsController.new()
+      })
+    })
+    
+Tasty!
+
 #### Binding actions to events ####
 
 To bind events to these controller actions, use the data-controller and data-action attributes:

data/Rakefile

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

data/dist/jquery/jquery.ba-hashchange.js

@@ -1,3 +1,4 @@
+
 /*!
  * jQuery hashchange event - v1.2 - 2/11/2010
  * http://benalman.com/projects/jquery-hashchange-plugin/

data/eyeballs.gemspec

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

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

@@ -3,30 +3,49 @@ o_O.routes = {
   rules: {},
   urls: [],
   
-  router: {
-    match: function(route, options){
-      
-      var figure_action = function(options){
-        var parts = options.to.split('#');
-        var controller = parts[0];
-        var action = parts[1];
-        
-        controller = controller.capitalize() + "Controller";
-        return window[controller][action];
+  figure_action: function(options){
+    var parts = options.to.split('#');
+    var controller = parts[0];
+    var action = parts[1];
+
+    controller = controller.capitalize() + "Controller";
+    return window[controller][action];
+  },
+  
+  router: function(prefix){
+    return {
+      root: function(options){
+        o_O.routes.rules['root'] = {"action": o_O.routes.figure_action(options)}
+      },
+      namespace: function(prefix, callback){
+        callback(o_O.routes.router(prefix));
+      },
+      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": options.with};
+        o_O.routes.urls.push(parsed_route);
       }
-      
-      o_O.routes.rules[route] = {"action": figure_action(options), "with": options.with};
-      o_O.routes.urls.push(route);
     }
   },
   
   draw: function(callback){    
     $(function(){
       
-      callback(o_O.routes.router);
+      callback(o_O.routes.router());
+      if(location.hash.o_O_trim() == '')
+      {
+        if(typeof o_O.routes.rules['root'] === 'object')
+        {
+          o_O.routes.rules['root'].action();
+        }
+      }
       
       $(window).bind( 'hashchange', function(){
-        var hash = location.hash.replace(/^(#)/, '');
+        var hash = location.hash.replace(/^(#)/, '').o_O_trim('/');
         if(o_O.routes.urls.indexOf(hash) >= 0)
         {
           o_O.routes.rules[hash].action(o_O.routes.rules[hash].with);

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

@@ -66,4 +66,8 @@ if(typeof String.prototype.capitalize == 'undefined')
   String.prototype.capitalize = function(){
     return this.charAt(0).toUpperCase() + this.slice(1);
   }
+}
+
+String.prototype.o_O_trim = function(chars) {
+  return this.replace(new RegExp("(^[" + chars + "]+|[" + chars + "]+$)", "g"), '')
 }

data/test/unit/test_routing.html

@@ -19,6 +19,9 @@
 
   <script>
   o_O('ReviewsController', {
+    root: function(){
+      $('div#root').html('rooting for you')
+    },
     index: function(bit){
       var out;
       if(bit == 'test')
@@ -31,23 +34,48 @@
       }
       $('div#index').html(out);
       return 'whoop!'
+    },
+    namespaced_index: function(bit){
+      var out;
+      if(bit == 'test')
+      {
+        out = 'namespaced and clicked!'
+      }
+      else
+      {
+        out = 'namespaced and indexed!'
+      }
+      $('div#namespaced-index').html(out);
+      return 'awesome!'
     }
   });
   
   o_O.routes.draw(function(map){
-    map.match('/', {to: "reviews#index", with: 'test'});
+    map.root({to: "reviews#root"})
+    map.match('/reviews/index/', {to: "reviews#index", with: 'test'});
+    map.namespace('my', function(my){
+      my.match('action', {to: "reviews#namespaced_index", with: 'test'})
+    })
   })
 
   $(document).ready(function(){
     
-    module("Simple Route");
+    module("Routing", {teardown: function(){
+      document.location.hash = ''
+    }});
     
     test('o_O.routes.urls', function(){
-      equals(o_O.routes.urls[0], '/', 'should store the necessary URLs')
+      equals(o_O.routes.urls[0], 'reviews/index', 'should store the necessary URLs')
+      equals(o_O.routes.urls[1], 'my/action', 'should store the necessary URLs')
     })
     
     test('o_O.routes.rules', function(){
-      equals(o_O.routes.rules['/'].action(), ReviewsController.index())
+      equals(o_O.routes.rules['reviews/index'].action(), ReviewsController.index())
+      equals(o_O.routes.rules['my/action'].action(), ReviewsController.namespaced_index())
+    })
+    
+    test('o_O.routes.root', function(){
+      equals($('div#root').html(), 'rooting for you');
     })
     
     asyncTest('map.match',function(){
@@ -57,6 +85,14 @@
         start();
       },100)
     })
+    
+    asyncTest('map.namespace',function(){
+      $('a#namespaced-index-link').trigger('click');
+      setTimeout(function(){
+        equals($('div#namespaced-index').html(), 'namespaced and clicked!', "should call the action");
+        start();
+      },100)
+    })
 
   });
   </script>
@@ -68,9 +104,13 @@
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
  
-  <a id="index-link" data-ajax-history="true" href="/">Hello!</a>
+  <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>
  
   <div id="index">
   </div>
+  <div id="namespaced-index">
+  </div>
+  <div id="root"></div>
 </body>
 </html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +01:00
+date: 2010-07-07 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency