eyeballs 0.5.10.1 → 0.5.11

data/CHANGELOG

@@ -1,3 +1,10 @@
+Thu Oct 28
+- - - - - -
+- Much more robust support for o_O.params
+- Support for this.* within model declarations
+- Support for o_O('model_name') or o_O('controller_name') getter
+
+
 Thu Sep 30
 - - - - - -
 - Misc bugfixes

data/Gemfile

@@ -6,9 +6,10 @@ gem 'activesupport'
 
 group :development do
   gem 'jeweler'
+  gem 'rake'
 end
 
 group :test do
-  gem 'rspec'
-  gem 'ruby-debug'
+  gem 'rspec', '1.3.1'
+  gem 'ruby-debug19'
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.0)
+    archive-tar-minitar (0.5.2)
     columnize (0.3.1)
     gemcutter (0.6.1)
     git (1.2.5)
@@ -10,14 +11,21 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     rack (1.2.1)
-    rspec (1.3.0)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
+    rake (0.8.7)
+    rspec (1.3.1)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sinatra (1.0)
@@ -30,7 +38,8 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   jeweler
-  rspec
-  ruby-debug
+  rake
+  rspec (= 1.3.1)
+  ruby-debug19
   sinatra
   thor

data/README.md

@@ -45,31 +45,35 @@ At a very minimum, you should choose an adapter. There are a few to choose from:
   - **o\_O.couchdb** - persist records to a local CouchDB instance, for building MVC CouchApps, for example.
   - **o\_O.rest** - An adapter for persisting models to a backend powered by Rails, or using Rails-style RESTful routing.
 
-Finally, you need a controller. The first release of eyeballs.js includes a controller as part of the jQuery driver. This adapter also depends on jQuery.livequery.
+Finally, you need a controller. The first release of eyeballs.js includes a controller as part of the jQuery driver.
 
 You can also use a javascript templating language. Mustache.js fits this need quite nicely.
 
 Wrapping that all up, to use eyeballs.js with the Rails adapter and jQuery:
 
     <!-- jQuery and livequery -->
-    <script src="http://jquery.com/src/jquery-latest.js"></script>
-    <script src="jquery.livequery.js"></script>
+    <script src="vendor/javascripts/jquery.1.4.min.js"></script>
+    <script src="vendor/jquery/jquery.ba-bbq.min.js"></script>
     
     <!-- Mustache for templating -->
-    <script src="mustache.js"></script>
+    <script src="vendor/mustache/mustache.0.3.0.js"></script>
     
     <!-- eyeballs.js basic -->
-    <script src="o_O.js"></script>
-    <script src="modules/o_O.model.js"></script>
-    <script src="modules/o_O.validations.js"></script>
+    <script src="vendor/eyeballs/o_O.js"></script>
+    <script src="vendor/eyeballs/modules/o_O.model.js"></script>
+    <script src="vendor/eyeballs/modules/o_O.validations.js"></script>
     
     <!-- eyeballs.js jquery driver for controller logic -->
-    <script src="drivers/jquery/modules/o_O.controller.js"></script>
-    <script src="drivers/jquery/modules/o_O.support.js"></script>
-    <script src="drivers/jquery/modules/o_O.routes.js"></script>
+    <script src="vendor/eyeballs/drivers/jquery/modules/o_O.controller.js"></script>
+    <script src="vendor/eyeballs/drivers/jquery/modules/o_O.support.js"></script>
+    <script src="vendor/eyeballs/drivers/jquery/modules/o_O.routes.js"></script>
     
     <!-- REST adapter -->
-    <script src="drivers/jquery/adapters/o_O.rest.js"></script>
+    <script src="vendor/eyeballs/drivers/jquery/adapters/o_O.rest.js"></script>
+    
+    <!-- Configuration -->
+    <script src="config/initializer.js"></script>
+    <script src="config/routes.js"></script>
 
 Badabing, badaboom! You're now ready to start creating some models and controllers.
 
@@ -106,7 +110,7 @@ Models
 
 You define a model by passing a name and function to the eyeballs ( o_O ) function (pronounced 'eep eep'). As inspired by Rails, model definitions are capitalised. Note, however, that the new prefix is not used.
 
-    o_O('Post', function(post){ })
+    o_O('Post', function(){ })
 
 You can now initialize an individual post:
 
@@ -117,8 +121,8 @@ Not very exciting.
 
 However, if you're familiar with Rails, you'll be familiar with the wonderful syntax for adding validations to your models. eyeballs.js lets you add validations to your models as follows:
 
-    o_O('Post', function(post){
-      post.validates_presence_of('title')
+    o_O('Post', function(){
+      this.validates_presence_of('title')
     })
 
 Now, when you initialize a new Post, you can validate it, nice and easy:
@@ -133,8 +137,8 @@ and so on, so forth. This will be very familiar to those who use Rails.
 
 You can also add your own validations, again, similar to how Rails does things:
 
-    o_O('Post', function(post){
-      post.validates(function(post){
+    o_O('Post', function(){
+      this.validates(function(post){
         if(post.title != 'Awesome')
         {
           post.errors.push({message: 'Not Awesome Enough'})
@@ -161,8 +165,8 @@ When you want to find things:
 
 And if you want to add your own methods:
 
-    o_O('Post', function(post){
-      post.methods.title_downcased: function(){
+    o_O('Post', function(){
+      this.methods.title_downcased: function(){
         this.title.toLowerCase();
       }
     })
@@ -298,9 +302,9 @@ Imagine a simple app for posting reviews. It will comprise a "Review" model, "Re
 
 `models/review.js` looks like this:
 
-    o_O('Review', function(review){
-      review.validates_presence_of('title');
-      review.validates_presence_of('content');
+    o_O('Review', function(){
+      this.validates_presence_of('title');
+      this.validates_presence_of('content');
     });
 
 This defines the Review model, allowing us to initialize and save Review objects, while ensuring `title` and `content` are included.

data/Rakefile

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

data/dist/jquery/jquery.ba-bbq.min.js

@@ -0,0 +1,18 @@
+/*
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
+/*
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.10.1"
+  s.version = "0.5.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-10-28}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
      "bin/eyeballs",
      "config.ru",
      "dist/jquery/jquery-1.4.2.min.js",
-     "dist/jquery/jquery.ba-hashchange.js",
+     "dist/jquery/jquery.ba-bbq.min.js",
      "dist/mustache/mustache.0.3.0.js",
      "eyeballs.gemspec",
      "lib/eyeballs.rb",
@@ -64,10 +64,10 @@ Gem::Specification.new do |s|
      "test/unit/test_controller.html",
      "test/unit/test_dom.html",
      "test/unit/test_dom_with_callbacks.html",
-     "test/unit/test_form.html",
      "test/unit/test_localstorage.html",
      "test/unit/test_model.html",
      "test/unit/test_model_with_callbacks.html",
+     "test/unit/test_params.html",
      "test/unit/test_rest.html",
      "test/unit/test_routing.html"
   ]

data/lib/eyeballs/app_generator.rb

@@ -19,6 +19,7 @@ module Eyeballs
       directory "templates/app_root", new_app_path
       copy_file 'dist/jquery/jquery-1.4.2.min.js', "#{new_app_path}/vendor/jquery/jquery-1.4.2.min.js"
       copy_file 'dist/mustache/mustache.0.3.0.js', "#{new_app_path}/vendor/mustache/mustache.0.3.0.js"
+      copy_file 'dist/jquery/jquery.ba-bbq.min.js', "#{new_app_path}/vendor/jquery/jquery.ba-bbq.min.js"
       directory "src", "#{new_app_path}/vendor/eyeballs/"
       template "templates/initializer.js", "#{new_app_path}/config/initializer.js"
     end

data/spec/app_generator_spec.rb

@@ -3,11 +3,6 @@ require 'spec_helper'
 describe Eyeballs::AppGenerator do
   
   describe "generate a simple app" do
-    before(:all) do
-      create_test_root
-      FileUtils.cd(test_root)
-      Eyeballs::AppGenerator.start('test')
-    end
     let(:app_dir) { file('test', 'app') }
     let(:model_dir) { file('test', 'app', 'models') }
     let(:controller_dir) { file('test', 'app', 'controllers') }
@@ -19,12 +14,18 @@ describe Eyeballs::AppGenerator do
     let(:mustache_dir) { file('test', 'vendor', 'mustache') }
     
     let(:jquery_file) { file('test', 'vendor', 'jquery', 'jquery-1.4.2.min.js') }
-    let(:livequery_file) { file('test', 'vendor', 'jquery', 'jquery.livequery.js') }
+    let(:bbq_file) { file('test', 'vendor', 'jquery', 'jquery.ba-bbq.min.js') }
     let(:mustache_file) { file('test', 'vendor', 'mustache', 'mustache.0.3.0.js') }
     let(:index_file) { file('test', 'index.html') }
     let(:initializer_file) { file('test', 'config', 'initializer.js')}
     let(:routes_file) { file('test', 'config', 'routes.js')}
     
+    before(:all) do
+      create_test_root
+      FileUtils.cd(test_root)
+      Eyeballs::AppGenerator.start(['test'])
+    end
+    
     it "should create the test root" do
       File.exists?(test_root).should be_true
     end
@@ -43,7 +44,7 @@ describe Eyeballs::AppGenerator do
     
     it "should create the app files" do
       jquery_file.should exist
-      livequery_file.should_not exist
+      bbq_file.should exist
       mustache_file.should exist
       index_file.should exist
       initializer_file.should exist

data/spec/rack_app_detector_spec.rb

@@ -6,7 +6,7 @@ describe Eyeballs::AppGenerator do
       create_test_root
       FileUtils.mkdir(test_root + '/public')
       FileUtils.cd(test_root)
-      Eyeballs::AppGenerator.start('test')
+      Eyeballs::AppGenerator.start(['test'])
     end
     let(:app_dir) { file('public', 'javascripts', 'app') }
     

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

@@ -120,7 +120,6 @@ o_O.routes = {
         update_hash_parts();
         if(o_O.routes.urls.indexOf(hash) >= 0)
         {
-          console.log(compute_params()())
           o_O.routes.rules[hash].action(compute_params());
         }
         else

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

@@ -8,18 +8,33 @@ o_O.find_attributes = function(template, callback){
   return object;
 }
 
-o_O.params = function(form){
-    return o_O.find_attributes(form, function(field){
-      if(field.is('[type=radio]'))
-      {
-        return $('[data-attribute=' + field.attr('data-attribute') + ']:checked').val()
-      }
-      else
-      {
-        return field.val();
-      }
-    });
+o_O.params_from_form = function(form){
+  return $.deparam(form.serialize());
+}
+
+o_O.params = function(param, new_value){
+  if(new_value != void(0))
+  {
+    o_O.params.collection[param] = new_value;
+    return new_value;
+  }
+  if(typeof param === 'string')
+  {
+    return o_O.params.collection[param];
   }
+  return o_O.params.collection;
+}
+
+o_O.params.collection = {}
+
+$(function(){
+  $('body').delegate('form', 'submit', function(){
+    for(param in o_O.params_from_form($(this)))
+    {
+      o_O.params(param, o_O.params_from_form($(this))[param]);
+    }
+  })
+})
   
 o_O.render = function(template, data, options){
   o_O.get_template(template, data, function(data, template){ 
@@ -42,6 +57,14 @@ o_O.render = function(template, data, options){
       {
         $(options.html).html(rendered);
       }
+      if(options.before)
+      {
+        $(options.html).before(rendered);
+      }
+      if(options.after)
+      {
+        $(options.html).after(rendered);
+      }
     }
   });
 }

data/src/modules/o_O.model.js

@@ -54,7 +54,7 @@ o_O.model = {
       }
     }  
 
-    var config = callback(class_methods);
+    var config = callback.apply(class_methods, [class_methods]);
     instance_methods = {
       adapter: o_O.model.adapter,
       destroy: function(callback){

data/src/o_O.js

@@ -5,7 +5,11 @@ var o_O = function(){
   
   bind_to = (object_to_bind_to) ? object_to_bind_to : o_O.config.default_bind_to();
 
-  if(typeof arguments[1] === 'object')
+  if(arguments.length === 1)
+  {
+    return bind_to[arguments[0]]
+  }
+  else if(typeof arguments[1] === 'object')
   {
     var controller_name = arguments[0];
     bind_to[controller_name] = o_O.controller.initialize(controller_name, arguments[1]);

data/templates/scaffold_index.html

@@ -29,6 +29,7 @@
     </div>
   </body>
   <script src="<%= prefix %>vendor/jquery/jquery-1.4.2.min.js"></script>
+  <script src="<%= prefix %>vendor/jquery/jquery.ba-bbq.min.js"></script>
   <script src="<%= prefix %>vendor/mustache/mustache.0.3.0.js"></script>
   <script src="<%= prefix %>vendor/eyeballs/o_O.js"></script>
   <script src="<%= prefix %>vendor/eyeballs/modules/o_O.model.js"></script>

data/test/unit/test_dom.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>

data/test/unit/test_dom_with_callbacks.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>
@@ -120,6 +119,5 @@
   <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
-  </div>
 </body>
 </html>

data/test/unit/test_localstorage.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>

data/test/unit/test_model.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>
@@ -17,20 +16,20 @@
   
   o_O.model.adapter = o_O.dom;
   
-  o_O('Review', function(that){
-    that.validates_presence_of('title');
-    that.validates_presence_of('content');
-    that.validates_length_of('title', {min: 5, max: 15});
-    that.validates(function(review){
+  o_O('Review', function(){
+    this.validates_presence_of('title');
+    this.validates_presence_of('content');
+    this.validates_length_of('title', {min: 5, max: 15});
+    this.validates(function(review){
       if(review.score != 99 && review.test === true)
       {
         review.errors.push({message: 'Score should be 99'})
       }
     })
-    that.methods.title_numbered = function(){
+    this.methods.title_numbered = function(){
       return '1. ' + this.title;
     }
-    return that;
+    return this;
   });
   
   var MyApp = {};
@@ -44,6 +43,11 @@
       var test_model = MyApp.TestModel.initialize({title: 'Delicious'})
       equals(test_model.title, 'Delicious', 'should just work as normal')
     })
+    
+    test('functional syntax', 1, function(){
+      var test_model = o_O('Review').initialize({title: 'Delicious'})
+      equals(test_model.title, 'Delicious', 'should just work as normal')
+    })
 
     test('serialization',1, function(){
       var myReview = Review.initialize({title: 'Groovy'})

data/test/unit/test_model_with_callbacks.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>
@@ -146,7 +145,6 @@
   <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
-  </div>
   
   <div data-id="thing"></div>
 </body>

data/test/unit/test_params.html

@@ -0,0 +1,71 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+                    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
+  <script src="../../dist/jquery/jquery.ba-bbq.min.js"></script>
+  <script src="../../src/o_O.js"></script>
+  <script src="../../src/modules/o_O.model.js"></script>
+  <script src="../../src/modules/o_O.validations.js"></script>
+  <script src="../../src/drivers/jquery/adapters/o_O.dom.js"></script>
+  <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
+  <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
+  <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
+<script type="text/javascript" src="qunit.js"></script>
+
+  <script>
+
+  $(document).ready(function(){
+    
+    o_O('Review', function(that){
+      that.validates_presence_of('title');
+      that.validates_presence_of('content');
+      return that;
+    });
+    
+    o_O('TestController', {
+      create: function(){
+        
+      }
+    })
+    
+    module("Forms");
+    
+    test('getting form attributes', function(){
+      equals(o_O.params_from_form($('form#test-form')).title, 'Biscuit', 'form attributes should come in nicely')
+      equals(o_O.params_from_form($('form#test-form')).selection, "1", 'should work with checkboxes')
+      equals(o_O.params_from_form($('form#test-form')).thing['title'], "Thing's Title", 'should work with checkboxes')
+    });
+    
+    test('params should be empty', function(){
+      equals(typeof o_O.params(), 'object')
+    })
+    
+    test('setting a param', function(){
+      o_O.params('thing', 'new value')
+      equals(o_O.params('thing'), 'new value')
+    })
+    
+    test('submitting a form', function(){
+      $("form#test-form").trigger('submit')
+      equals(o_O.params('title'), 'Biscuit');
+      equals(o_O.params('thing')['title'], "Thing's Title");
+    })
+
+  });
+  </script>
+  
+</head>
+<body>
+  <h1 id="qunit-header">Form Tests</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ <form id="test-form" data-bind="test#create">
+  <input type="text" name="title" type="text" value="Biscuit">
+  <input type="radio" name="selection" value="1" checked>
+  <input type="radio" name="selection" value="-1">
+  <input type="text" name="thing[title]" value="Thing's Title"></input>
+ </form>
+</body>
+</html>

data/test/unit/test_rest.html

@@ -3,7 +3,6 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
 
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>

data/test/unit/test_routing.html

@@ -3,7 +3,7 @@
 <html>
 <head>
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.ba-hashchange.js"></script>
+  <script src="../../dist/jquery/jquery.ba-bbq.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
   <script src="../../src/modules/o_O.validations.js"></script>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 5
-  - 10
-  - 1
-  version: 0.5.10.1
+  - 11
+  version: 0.5.11
 platform: ruby
 authors: 
 - Paul Campbell
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +01:00
+date: 2010-10-28 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +65,7 @@ files:
 - bin/eyeballs
 - config.ru
 - dist/jquery/jquery-1.4.2.min.js
-- dist/jquery/jquery.ba-hashchange.js
+- dist/jquery/jquery.ba-bbq.min.js
 - dist/mustache/mustache.0.3.0.js
 - eyeballs.gemspec
 - lib/eyeballs.rb
@@ -103,10 +102,10 @@ files:
 - test/unit/test_controller.html
 - test/unit/test_dom.html
 - test/unit/test_dom_with_callbacks.html
-- test/unit/test_form.html
 - test/unit/test_localstorage.html
 - test/unit/test_model.html
 - test/unit/test_model_with_callbacks.html
+- test/unit/test_params.html
 - test/unit/test_rest.html
 - test/unit/test_routing.html
 - spec/app_generator_spec.rb

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

@@ -1,245 +0,0 @@
-
-/*!
- * jQuery hashchange event - v1.2 - 2/11/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-
-// Script: jQuery hashchange event
-//
-// *Version: 1.2, Last updated: 2/11/2010*
-// 
-// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
-// GitHub       - http://github.com/cowboy/jquery-hashchange/
-// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
-// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (1.1kb)
-// 
-// About: License
-// 
-// Copyright (c) 2010 "Cowboy" Ben Alman,
-// Dual licensed under the MIT and GPL licenses.
-// http://benalman.com/about/license/
-// 
-// About: Examples
-// 
-// This working example, complete with fully commented code, illustrate one way
-// in which this plugin can be used.
-// 
-// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
-// 
-// About: Support and Testing
-// 
-// Information about what version or versions of jQuery this plugin has been
-// tested with, what browsers it has been tested in, and where the unit tests
-// reside (so you can test it yourself).
-// 
-// jQuery Versions - 1.3.2, 1.4.1, 1.4.2pre
-// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.7, Safari 3-4, Chrome, Opera 9.6-10.1.
-// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
-// 
-// About: Known issues
-// 
-// While this jQuery hashchange event implementation is quite stable and robust,
-// there are a few unfortunate browser bugs surrounding expected hashchange
-// event-based behaviors, independent of any JavaScript window.onhashchange
-// abstraction. See the following examples for more information:
-// 
-// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
-// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
-// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
-// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
-// 
-// About: Release History
-// 
-// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
-//         from a page on another domain would cause an error in Safari 4. Also,
-//         IE6/7 Iframe is now inserted after the body (this actually works),
-//         which prevents the page from scrolling when the event is first bound.
-//         Event can also now be bound before DOM ready, but it won't be usable
-//         before then in IE6/7.
-// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
-//         where browser version is incorrectly reported as 8.0, despite
-//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
-// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
-//         window.onhashchange functionality into a separate plugin for users
-//         who want just the basic event & back button support, without all the
-//         extra awesomeness that BBQ provides. This plugin will be included as
-//         part of jQuery BBQ, but also be available separately.
-
-(function($,window,undefined){
-  '$:nomunge'; // Used by YUI compressor.
-  
-  // Method / object references.
-  var fake_onhashchange,
-    jq_event_special = $.event.special,
-    
-    // Reused strings.
-    str_location = 'location',
-    str_hashchange = 'hashchange',
-    str_href = 'href',
-    
-    // IE6/7 specifically need some special love when it comes to back-button
-    // support, so let's do a little browser sniffing..
-    browser = $.browser,
-    mode = document.documentMode,
-    is_old_ie = browser.msie && ( mode === undefined || mode < 8 ),
-    
-    // Does the browser support window.onhashchange? Test for IE version, since
-    // IE8 incorrectly reports this when in "IE7" or "IE8 Compatibility View"!
-    supports_onhashchange = 'on' + str_hashchange in window && !is_old_ie;
-  
-  // Get location.hash (or what you'd expect location.hash to be) sans any
-  // leading #. Thanks for making this necessary, Firefox!
-  function get_fragment( url ) {
-    url = url || window[ str_location ][ str_href ];
-    return url.replace( /^[^#]*#?(.*)$/, '$1' );
-  };
-  
-  // Property: jQuery.hashchangeDelay
-  // 
-  // The numeric interval (in milliseconds) at which the <hashchange event>
-  // polling loop executes. Defaults to 100.
-  
-  $[ str_hashchange + 'Delay' ] = 100;
-  
-  // Event: hashchange event
-  // 
-  // Fired when location.hash changes. In browsers that support it, the native
-  // window.onhashchange event is used (IE8, FF3.6), otherwise a polling loop is
-  // initialized, running every <jQuery.hashchangeDelay> milliseconds to see if
-  // the hash has changed. In IE 6 and 7, a hidden Iframe is created to allow
-  // the back button and hash-based history to work.
-  // 
-  // Usage:
-  // 
-  // > $(window).bind( 'hashchange', function(e) {
-  // >   var hash = location.hash;
-  // >   ...
-  // > });
-  // 
-  // Additional Notes:
-  // 
-  // * The polling loop and Iframe are not created until at least one callback
-  //   is actually bound to 'hashchange'.
-  // * If you need the bound callback(s) to execute immediately, in cases where
-  //   the page 'state' exists on page load (via bookmark or page refresh, for
-  //   example) use $(window).trigger( 'hashchange' );
-  // * The event can be bound before DOM ready, but since it won't be usable
-  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
-  //   to bind it inside a $(document).ready() callback.
-  
-  jq_event_special[ str_hashchange ] = $.extend( jq_event_special[ str_hashchange ], {
-    
-    // Called only when the first 'hashchange' event is bound to window.
-    setup: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to create our own. And we don't want to call this
-      // until the user binds to the event, just in case they never do, since it
-      // will create a polling loop and possibly even a hidden Iframe.
-      $( fake_onhashchange.start );
-    },
-    
-    // Called only when the last 'hashchange' event is unbound from window.
-    teardown: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to stop ours (if possible).
-      $( fake_onhashchange.stop );
-    }
-    
-  });
-  
-  // fake_onhashchange does all the work of triggering the window.onhashchange
-  // event for browsers that don't natively support it, including creating a
-  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
-  // Iframe to enable back and forward.
-  fake_onhashchange = (function(){
-    var self = {},
-      timeout_id,
-      iframe,
-      set_history,
-      get_history;
-    
-    // Initialize. In IE 6/7, creates a hidden Iframe for history handling.
-    function init(){
-      // Most browsers don't need special methods here..
-      set_history = get_history = function(val){ return val; };
-      
-      // But IE6/7 do!
-      if ( is_old_ie ) {
-        
-        // Create hidden Iframe after the end of the body to prevent initial
-        // page load from scrolling unnecessarily.
-        iframe = $('<iframe src="javascript:0"/>').hide().insertAfter( 'body' )[0].contentWindow;
-        
-        // Get history by looking at the hidden Iframe's location.hash.
-        get_history = function() {
-          return get_fragment( iframe.document[ str_location ][ str_href ] );
-        };
-        
-        // Set a new history item by opening and then closing the Iframe
-        // document, *then* setting its location.hash.
-        set_history = function( hash, history_hash ) {
-          if ( hash !== history_hash ) {
-            var doc = iframe.document;
-            doc.open().close();
-            doc[ str_location ].hash = '#' + hash;
-          }
-        };
-        
-        // Set initial history.
-        set_history( get_fragment() );
-      }
-    };
-    
-    // Start the polling loop.
-    self.start = function() {
-      // Polling loop is already running!
-      if ( timeout_id ) { return; }
-      
-      // Remember the initial hash so it doesn't get triggered immediately.
-      var last_hash = get_fragment();
-      
-      // Initialize if not yet initialized.
-      set_history || init();
-      
-      // This polling loop checks every $.hashchangeDelay milliseconds to see if
-      // location.hash has changed, and triggers the 'hashchange' event on
-      // window when necessary.
-      (function loopy(){
-        var hash = get_fragment(),
-          history_hash = get_history( last_hash );
-        
-        if ( hash !== last_hash ) {
-          set_history( last_hash = hash, history_hash );
-          
-          $(window).trigger( str_hashchange );
-          
-        } else if ( history_hash !== last_hash ) {
-          window[ str_location ][ str_href ] = window[ str_location ][ str_href ].replace( /#.*/, '' ) + '#' + history_hash;
-        }
-        
-        timeout_id = setTimeout( loopy, $[ str_hashchange + 'Delay' ] );
-      })();
-    };
-    
-    // Stop the polling loop, but only if an IE6/7 Iframe wasn't created. In
-    // that case, even if there are no longer any bound event handlers, the
-    // polling loop is still necessary for back/next to work at all!
-    self.stop = function() {
-      if ( !iframe ) {
-        timeout_id && clearTimeout( timeout_id );
-        timeout_id = 0;
-      }
-    };
-    
-    return self;
-  })();
-  
-})(jQuery,this);

data/test/unit/test_form.html

@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-                    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
-  <script src="../../dist/jquery/jquery.livequery.js"></script>
-  <script src="../../src/o_O.js"></script>
-  <script src="../../src/modules/o_O.model.js"></script>
-  <script src="../../src/modules/o_O.validations.js"></script>
-  <script src="../../src/drivers/jquery/adapters/o_O.dom.js"></script>
-  <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
-  <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
-  <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
-<script type="text/javascript" src="qunit.js"></script>
-
-  <script>
-  var Review = o_O(function(that){
-    that.validates_presence_of('title');
-    that.validates_presence_of('content');
-    return that;
-  });
-
-  $(document).ready(function(){
-    
-    module("Forms");
-    
-    test('getting form attributes', 2, function(){
-      equals(o_O.params($('form#test-form')).title, 'Biscuit', 'form attributes should come in nicely')
-      equals(o_O.params($('form#test-form')).selection, "1", 'should work with checkboxes')
-    });
-
-  });
-  </script>
-  
-</head>
-<body>
-  <h1 id="qunit-header">Form Tests</h1>
- <h2 id="qunit-banner"></h2>
- <h2 id="qunit-userAgent"></h2>
- <ol id="qunit-tests"></ol>
- <form id="test-form">
-  <input type="title" data-attribute="title" type="text" value="Biscuit">
-  <input type="radio" data-attribute="selection" value="1" checked>
-  <input type="radio" data-attribute="selection" value="-1">
- </form>
-</body>
-</html>