eyeballs 0.5.9 → 0.5.10

data/CHANGELOG

@@ -1,6 +1,11 @@
+Thu Sep 30
+- - - - - -
+- Misc bugfixes
+- Add support for query string style params
+
 Sun Aug 8
 - - - - -
-- Remove 'previx', 'url' is better ...
+- Remove 'prefix', 'url' is better ...
 
 Fri Aug 6
 - - - - - 

data/Rakefile

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

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

@@ -58,7 +58,6 @@ o_O.routes = {
   
   draw: function(callback){    
     $(function(){
-      
       callback(o_O.routes.router());
       if(location.hash.o_O_trim() == '')
       {
@@ -70,7 +69,17 @@ o_O.routes = {
       }
       
       var route_on_hash = function(){
-        var hash = location.hash.replace(/^(#)/, '').o_O_trim('/');
+        var parts = location.hash.split('?')
+        var hash = parts[0].replace(/^(#)/, '').o_O_trim('/');
+        var query_string_parts;
+        if(typeof parts[1] === 'string')
+        {
+          query_string_parts = parts[1].replace('&', '&').split('&');
+        }
+        else
+        {
+          query_string_parts = '';
+        }
         if(o_O.routes.urls.indexOf(hash) >= 0)
         {
           o_O.routes.rules[hash].action(o_O.routes.rules[hash].with_args);
@@ -88,6 +97,15 @@ o_O.routes = {
                 {
                   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];

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

@@ -40,7 +40,7 @@ o_O.render = function(template, data, options){
       }
       if(options.html)
       {
-        $(options.html).replaceWith(rendered);
+        $(options.html).html(rendered);
       }
     }
   });

data/test/unit/test_routing.html

@@ -47,7 +47,7 @@
       return 'awesome!'
     },
     sending_params: function(params){
-      $('div#with_params').html(params('test'));
+      $('div#with_params').html(params('test') + params('other_test'));
     }
   });
   
@@ -117,7 +117,7 @@
     asyncTest('withparams',function(){
       $('a#with-params').trigger('click');
       setTimeout(function(){
-        equals($('div#with_params').html(), 'something', "should pass the params");
+        equals($('div#with_params').html(), 'somethingelse', "should pass the params");
         start();
       },100)
     })
@@ -168,7 +168,7 @@
   <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>
+  <a id="with-params" data-ajax-history="true" href="/reviews/something?other_test=else">Hello!</a>
  
   <div id="index">
   </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 5
-  - 9
-  version: 0.5.9
+  - 10
+  version: 0.5.10
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 +02:00
+date: 2010-09-30 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency