eyeballs 0.5.10 → 0.5.10.1

data/Rakefile

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

data/eyeballs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.10"
+  s.version = "0.5.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]

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

@@ -59,19 +59,13 @@ o_O.routes = {
   draw: function(callback){    
     $(function(){
       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();
-        }
-        
-      }
       
-      var route_on_hash = function(){
-        var parts = location.hash.split('?')
-        var hash = parts[0].replace(/^(#)/, '').o_O_trim('/');
-        var query_string_parts;
+      var parts, hash, query_string_parts;
+      
+      var update_hash_parts = function(){
+        parts = location.hash.split('?')
+        hash = parts[0].replace(/^(#)/, '').o_O_trim('/');
+        query_string_parts;
         if(typeof parts[1] === 'string')
         {
           query_string_parts = parts[1].replace('&', '&').split('&');
@@ -80,9 +74,54 @@ o_O.routes = {
         {
           query_string_parts = '';
         }
+      }
+      
+      var compute_params = function(rule){
+        return function(attr){
+          var params = {}
+          if(rule)
+          {
+            for(j = 0; j < rule.matchers.length; j++)
+            {
+              params[rule.matchers[j].replace(/^:/, '')] = match[j+1];
+            }
+          }
+          
+          if(query_string_parts.length > 0)
+          {
+            for(k = 0; k < query_string_parts.length; k++)
+            {
+              var param_parts = query_string_parts[k].split('=')
+              params[param_parts[0]] = param_parts[1];
+            }
+          }
+          if(attr)
+          {
+            return params[attr];
+          }
+          else
+          {
+            return params;
+          }
+        }
+      }
+      
+      if(location.hash.o_O_trim() == '')
+      {
+        update_hash_parts()
+        if(typeof o_O.routes.rules['root'] === 'object')
+        {
+          o_O.routes.rules['root'].action(compute_params());
+        }
+        
+      }
+      
+      var route_on_hash = function(){
+        update_hash_parts();
         if(o_O.routes.urls.indexOf(hash) >= 0)
         {
-          o_O.routes.rules[hash].action(o_O.routes.rules[hash].with_args);
+          console.log(compute_params()())
+          o_O.routes.rules[hash].action(compute_params());
         }
         else
         {
@@ -91,30 +130,7 @@ o_O.routes = {
             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(query_string_parts.length > 0)
-                {
-                  for(k = 0; k < query_string_parts.length; k++)
-                  {
-                    var param_parts = query_string_parts[k].split('=')
-                    params[param_parts[0]] = param_parts[1];
-                  }
-                }
-                if(attr)
-                {
-                  return params[attr];
-                }
-                else
-                {
-                  return params;
-                }
-              });
+              rule.action(compute_params(rule));
               return;
             }
           }

data/test/unit/test_routing.html

@@ -21,33 +21,18 @@
       $('div#root').html('rooting for you')
     },
     index: function(bit){
-      var out;
-      if(bit == 'test')
-      {
-        out = 'clicked!'
-      }
-      else
-      {
-        out = 'indexed!'
-      }
-      $('div#index').html(out);
+      $('div#index').html('clicked!');
       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);
+      $('div#namespaced-index').html('namespaced and clicked!');
       return 'awesome!'
     },
     sending_params: function(params){
       $('div#with_params').html(params('test') + params('other_test'));
+    },
+    sending_params_normal: function(params){
+      $('div#with_params_normal').html(params('other_test'));
     }
   });
   
@@ -69,11 +54,12 @@
   
   o_O.routes.draw(function(map){
     map.root({to: "reviews#root"})
-    map.match('/reviews/index/', {to: "reviews#index", with_args: 'test'});
+    map.match('/reviews/index/', {to: "reviews#index"});
     map.namespace('my', function(my){
-      my.match('action', {to: "reviews#namespaced_index", with_args: 'test'})
+      my.match('action', {to: "reviews#namespaced_index"})
     })
     map.match('/reviews/:test', {to: 'reviews#sending_params'})
+    map.match('gobble', {to: 'reviews#sending_params_normal'})
     
     map.resources('songs')
   })
@@ -121,6 +107,14 @@
         start();
       },100)
     })
+
+    asyncTest('withparams normal route',function(){
+      $('a#with-params-normal').trigger('click');
+      setTimeout(function(){
+        equals($('div#with_params_normal').html(), 'else', "should pass the params");
+        start();
+      },100)
+    })
     
     asyncTest('resources new', function(){
       $('a#add-song').click()
@@ -168,7 +162,9 @@
   <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?other_test=else">Hello!</a>
+  <a id="with-params" data-ajax-history="true" href="/reviews/something?other_test=else">With Params</a>
+  
+  <a id="with-params-normal" data-ajax-history="true" href="/gobble?other_test=else">With Params Normal</a>
  
   <div id="index">
   </div>
@@ -176,6 +172,7 @@
   </div>
   <div id="root"></div>
   <div id="with_params"></div>
+  <div id="with_params_normal"></div>
   
   <a id="add-song" href="/songs/new" data-ajax-history="true">New Song</a>
   <div id="songs-add"></div>

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 77
   prerelease: false
   segments: 
   - 0
   - 5
   - 10
-  version: 0.5.10
+  - 1
+  version: 0.5.10.1
 platform: ruby
 authors: 
 - Paul Campbell