eyeballs 0.4.2 → 0.5.0

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

@@ -26,7 +26,10 @@ o_O.routes = {
         {
           parsed_route = prefix + '/' + parsed_route
         }
-        o_O.routes.rules[parsed_route] = {"action": o_O.routes.figure_action(options), "with": options.with};
+        o_O.routes.rules[parsed_route] = {
+          action: o_O.routes.figure_action(options),
+          with_args: options.with_args
+          };
         o_O.routes.urls.push(parsed_route);
       }
     }
@@ -48,7 +51,7 @@ o_O.routes = {
         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);
+          o_O.routes.rules[hash].action(o_O.routes.rules[hash].with_args);
         }
       });
       

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

@@ -61,10 +61,28 @@ o_O.get_template = function(template, data, callback){
   }
 }
 
-if(typeof String.prototype.capitalize == 'undefined')
+if(typeof String.prototype.capitalize === 'undefined')
 {
   String.prototype.capitalize = function(){
-    return this.charAt(0).toUpperCase() + this.slice(1);
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  }
+}
+
+if(typeof String.prototype.underscore === 'undefined')
+{
+  String.prototype.underscore = function(){
+    return this.replace(/::/g, '/')
+               .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+               .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+               .replace(/-/g, '_')
+               .toLowerCase();
+  }
+}
+
+if(typeof String.prototype.blank === 'undefined')
+{
+  String.prototype.blank = function(){
+    return /^\s*$/.test(this);
   }
 }
 

data/src/modules/o_O.model.js

@@ -4,7 +4,8 @@ o_O.model = {
     var callback = callback;
     var class_methods, instance_methods, initializer_methods;
     var validates_presence_of, validates_length_of;
-    var table_name = model_name.toLowerCase() + 's';
+    var table_name = model_name.underscore() + 's';
+    var initial_class_methods = [];
   
     class_methods = {
       validations: {presence: [], lengthliness: [], custom: []},
@@ -20,16 +21,21 @@ o_O.model = {
         this.validations.custom.push(validation)
       }
     }
+    for(var method in class_methods)
+    {
+      initial_class_methods.push(method);
+    }
+    
   
-    var run_callback = function(callback, method, args){
+    var run_callback = function(callback, method, object, response){
       try{
         if(typeof callback === 'function' && method === 'success')
         {
-          callback(args);
+          callback(object, response);
         }
         if(typeof callback === 'object' && typeof callback[method] === 'function')
         {
-          callback[method](args);
+          callback[method](object, response);
         }
       }
       catch(e)
@@ -52,9 +58,9 @@ o_O.model = {
         run_callback(callback, 'loading', this)
         if(this.adapter)
         {
-          this.adapter.destroy(this, function(returned_object){
-            run_callback(callback, 'success', returned_object);
-          });
+          this.adapter.destroy(this, function(returned_object, response){
+            run_callback(callback, 'success', returned_object, response);
+          }, callback);
         }
         else
         {
@@ -70,11 +76,11 @@ o_O.model = {
           if(this.adapter)
           {
             var model = this;
-            this.adapter.save(this, function(returned_object){
+            this.adapter.save(this, function(returned_object, response){
               var initialized_object = o_O.models[model.model_name].initialize(returned_object);
               initialized_object.new_record = false;
-              run_callback(callback, 'success', initialized_object);
-            });
+              run_callback(callback, 'success', initialized_object, response);
+            }, callback);
           }
           else
           {
@@ -107,7 +113,7 @@ o_O.model = {
         this.save(callback);
       },
       valid: function(){
-        this.errors = [];
+        this.errors.length = 0;
         
         o_O.validations.run(this);
 
@@ -123,6 +129,16 @@ o_O.model = {
       errors: [],
       validations: class_methods.validations
     }
+    instance_methods.errors.on = function(field){
+      for(var i=0; i<instance_methods.errors.length; i++)
+      {
+        if(field === instance_methods.errors[i].field)
+        {
+          return instance_methods.errors[i];
+        }
+      }
+    }
+    
     for(method in class_methods.methods)
     {
       instance_methods[method] = class_methods.methods[method]
@@ -157,6 +173,9 @@ o_O.model = {
         }
         return attributes;
       },
+      create: function(attributes, callbacks){
+        this.initialize(attributes).save(callbacks);
+      },
       find: function(id, callback){
         if(this.adapter)
         {
@@ -182,6 +201,14 @@ o_O.model = {
       model_name: model_name,
       table_name: table_name
     }
+    
+    for(var method in class_methods)
+    {
+      if(initial_class_methods.indexOf(method) === -1)
+      {
+        initializer_methods[method] = class_methods[method];
+      }
+    }
   
     return initializer_methods;
   }

data/src/modules/o_O.validations.js

@@ -20,12 +20,12 @@ o_O.validations = {
       {
         if(max && object[field].length > max)
         {
-          var message = field + ' should be less than ' + max + ' characters';
+          var message = field.capitalize() + ' should be less than ' + max + ' characters';
           object.errors.push({field: field, type: 'length', message: message});
         }
         if(min && object[field].length < min)
         {
-          var message = field + ' should be greater than ' + min + ' characters';
+          var message = field.capitalize() + ' should be greater than ' + min + ' characters';
           object.errors.push({field: field, type: 'length', message: message});
         }
       }
@@ -35,9 +35,9 @@ o_O.validations = {
     for(var i = 0; i < object.validations.presence.length; i++)
     {
       var field = object.validations.presence[i].field;
-      if(object[field] == '' || object[field] == null)
+      if(object[field] == null || (typeof object[field] === 'string' && object[field].blank()) )
       {
-        var message = field + ' should be present';
+        var message = field.capitalize() + ' should be present';
         object.errors.push({field: field, type: 'presence', message: message})
       }
     }

data/templates/app_root/config/initializer.js

@@ -1,3 +1,4 @@
 // This is a very handy place to put any initial logic
 // For example, choosing your adapter
-// o_O.model.adapter = o_O.rest;
+o_O.model.adapter = o_O.rest;
+o_O.config.authenticity_token = $('meta[name=csrf-token]').attr('content')

data/test/unit/test_controller.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/drivers/jquery/modules/o_O.controller.js"></script>
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
@@ -46,50 +45,39 @@
       $('form#myForm').trigger('submit');
       equals($('form#myForm').html(), 'created!', 'html should have been updated');
     });
-    
-    test('submitting an auto-bound form with data-bind shortcut', 1, function(){
-      $('form#myShortcutForm').trigger('submit');
-      equals($('form#myShortcutForm').html(), 'created!', 'html should have been updated');
-    });
-    
+
     test('clicking an auto-bound link', 1, function(){
       $('a#myLink').trigger('click');
       equals($('a#myLink').html(), 'shown!', 'html should have been updated');
     });
-    
-    test('clicking an auto-bound link with data-bind shortcut', 1, function(){
-      $('a#myShortcutLink').trigger('click');
-      equals($('a#myShortcutLink').html(), 'shown!', 'html should have been updated');
-    });
-    
+
+
     test('hovering a custom bound element', 1, function(){
       $('div#myDiv').trigger('mouseover');
       equals($('div#myDiv').html(), 'other!', 'html should have been updated');
     });
     
-    new_element = $('<a id="anotherLink" data-controller="reviews" data-action="another">another link</a>')
+    new_element = $('<a id="anotherLink" data-bind="reviews#another">another link</a>')
     $('div#anotherDiv').append(new_element);
     
     
-    setTimeout(function(){
-      test("a new link", 1, function(){
+    asyncTest('new link', function(){
+      setTimeout(function(){
         $('a#anotherLink').trigger('click');
         equals($('a#anotherLink').html(), 'another!', 'it should have some dynamic behavior');
-      })
-    }, 100);
-
-    test('should allow default behavior', 1, function(){
-      $('input#myCheckbox').trigger('click');
-      equals($('input#myCheckbox:checked').length, 1, "check box should be checked")
+        start();
+      }, 100);
     })
-    
-    test('should allow default behavior with data-bind', 2, function(){
-      $('input#myOtherCheckbox').trigger('click');
-      equals($('input#myOtherCheckbox:checked').val(), 'bacon', "check box value should change")
-      equals($('input#myOtherCheckbox:checked').length, 1, "check box should be checked")
+
+    asyncTest('should allow default behavior', 1, function(){
+      setTimeout(function(){
+        $('input#myCheckbox').trigger('click');
+        equals($('input#myCheckbox:checked').length, 1, "check box should be checked")
+        start();
+      }, 100)
     })
     
-    test('should bind on shortcuts',2, function(){
+    test('should bind multiple events',2, function(){
       $('div#shortcut').trigger('click');
       equals($("div#shortcut").html(), 'shortcut!', 'it should be bound with the data-bind keyword')
       $('div#shortcut').trigger('mouseover');
@@ -107,15 +95,11 @@
   <ol id="qunit-tests"></ol>
  
  <div data-id="paul">
-  <form id="myForm" data-controller="reviews" data-action="create">
-    test form
-  </form>
-  
-  <form id="myShortcutForm" data-bind="reviews#create">
+  <form id="myForm" data-bind="reviews#create">
     test form
   </form>
-  
-  <a id="myLink" data-controller="reviews" data-action="show">
+    
+  <a id="myLink" data-bind="reviews#show">
     test link
   </a>
   
@@ -123,15 +107,14 @@
     test link
   </a>
 
-  <div id="myDiv" data-controller="reviews" data-action="other" data-event="mouseenter">stuff</div>
-  <div id="shortcut" data-bind="click:reviews#shortcut; mouseenter:reviews#multi">
+  <div id="myDiv" data-bind="mouseover:reviews#other">stuff</div>
+  <div id="shortcut" data-bind="click:reviews#shortcut; mouseover:reviews#multi">
     I'm a shortcut
   </div>
   <div id="anotherDiv">
     
   </div>
-  <input id="myCheckbox" data-controller="reviews" data-action="check" data-default="true" type="checkbox">
-  <input id="myOtherCheckbox" data-bind="+click:reviews#check" type="checkbox" value="toast">
+  <input id="myCheckbox" data-bind="+click:reviews#check" data-default="true" type="checkbox">
  </div>
 </body>
 </html>

data/test/unit/test_model.html

@@ -88,10 +88,12 @@
       equals(myReview.content, 'Dublin', 'should update the content');
     })
     
-    test('updating a review invalid', 1, function(){
+    test('updating a review invalid', function(){
       myReview = Review.find('paul');
       myReview.update_attributes({title: '', content: ''});
       equals(myReview.errors.length, 2, "should have 2 errors");
+      equals(myReview.errors.on('title').field, 'title')
+      equals(myReview.errors.on('title').type, 'presence')
     })
 
     test('defining methods should work',1, function(){
@@ -105,11 +107,11 @@
       equals(myReview.errors.length, 1, "should have an error");
       equals(myReview.errors[0].field, 'title', 'should be on title');
       equals(myReview.errors[0].type, 'length', 'should be length')
-      equals(myReview.errors[0].message, 'title should be less than 15 characters', 'should have an error message')
+      equals(myReview.errors[0].message, 'Title should be less than 15 characters', 'should have an error message')
       myReview.title = 'the'
       myReview.save();
       equals(myReview.errors.length, 1, "should still only have one error");
-      equals(myReview.errors[0].message, 'title should be greater than 5 characters', 'should have an error message')
+      equals(myReview.errors[0].message, 'Title should be greater than 5 characters', 'should have an error message')
     });
     
     test('custom validation', 3, function(){

data/test/unit/test_model_with_callbacks.html

@@ -65,6 +65,18 @@
       });
     });
     
+    asyncTest('create', 2, function(){
+      Review.create({title: "Biscuit", content: "Some Content"},{
+        loading: function(){
+          ok('should call the loading callback before success')
+        },
+        success: function(){
+          ok('should call the success callback')
+          start();
+        }
+      });
+    });
+    
     asyncTest('an invalid review',1, function(){
       var myReview = Review.initialize();
       myReview.save({

data/test/unit/test_rest.html

@@ -21,9 +21,12 @@
     
     o_O.model.adapter = o_O.rest;
     
-    module("Rails Test (with jQuery)");
+    module("REST Interface Test (with jQuery)");
     
-    o_O('Review', function(){})
+    o_O('Review', function(){});
+    o_O('FakeReview', function(fake_review){
+      fake_review.url = '/reviews'
+    });
     
     asyncTest('storing a basic basic thing', 3, function(){
       var review = Review.initialize({title: 'Magic!'})
@@ -35,6 +38,96 @@
       });
     });
     
+    asyncTest('storing a basic basic thing with custom URL set in the model', function(){
+      FakeReview.create({title: 'Magic!'}, function(saved_review){
+        equals(FakeReview.url, '/reviews', 'Should be set');
+        equals(saved_review.title, 'Magic!', 'title should match');
+        equals(saved_review.id, '1', "Rails should give back the ID");
+        start();
+      });
+    });
+    
+    asyncTest('storing a basic basic thing with a custom URL set in the save', function(){
+      var review = Review.initialize({title: 'Magic!'})
+      review.save({
+        url: "/alternate_reviews",
+        success: function(saved_review){
+          equals(saved_review.title, review.title, 'title should match');
+          equals(saved_review.id, '2', "Rails should give back the ID");
+          start();
+        }
+      });
+    });
+    
+    o_O('RailsReview', function(review){
+      review.include_json_root = true;
+    });
+    o_O('AlternateRailsReview', function(review){
+      review.include_json_root = true;
+      review.json_root_name = 'alternate_object'
+    });
+    
+    asyncTest('storing a basic basic thing with include_root', function(){
+      RailsReview.create({title: "Awesome"},function(review, response){
+        equals(response, 'ok', 'should send things with a root');
+        start();
+      });
+    });
+
+    asyncTest('specifying a custom json_root_name', function(){
+      AlternateRailsReview.create({title: "Awesome"},function(review, response){
+        equals(response, 'ok', 'should send things to /alternate_rails_reviews');
+        start();
+      });
+    });
+    
+    o_O.config.authenticity_token = 'a12345';
+    asyncTest('CSRF token', function(){
+      RailsReview.create({title: "Unnecessary"}, {
+        url: '/auth_token',
+        success: function(review, response){
+          equals(response, 'a12345', 'authenticity token should match')
+          start();
+        }
+      })
+    })
+    
+    asyncTest('accepting a string back', function(){
+      var review = Review.initialize({title: 'Magic!'})
+      review.save({
+        url: "/string_back",
+        success: function(saved_review, response){
+          equals(response, 'some string', 'we should be able to accept a string back');
+          start();
+        }
+      });
+    });
+    
+    asyncTest("ID shouldn't be sent", function(){
+      var string_back_id;
+      AlternateRailsReview.create({},{
+        url: "/test_id",
+        success: function(saved_review, response){
+          equals('ok', response, 'it should not sent an ID');
+          start();
+      }
+      });
+    });
+    
+    asyncTest('consistent ID on string back', function(){
+      var string_back_id;
+      Review.create({},{
+        url: "/string_back",
+        loading: function(saved_review){
+          string_back_id = saved_review.id;
+        },
+        success: function(saved_review, response){
+          equals(saved_review.id, string_back_id, 'ids should be the same');
+          start();
+      }
+      });
+    });
+    
     asyncTest('pulling something in', 2, function(){
       var review = Review.initialize({title: 'More Magic!'});
       review.save(function(){
@@ -77,28 +170,51 @@
       var review = Review.initialize({title: 'Doomed!'});
       review.save(function(saved_review){
         saved_review.update_attributes({title: 'Tennessee'}, function(saved_review){
-          equals(saved_review.title, 'Tennessee', 'Title should have been updated');
+          equals(saved_review.title, 'Updated', 'Title should have been updated');
+          start();
+        });
+      });
+    });
+    
+    asyncTest('updating with custom URL', 1, function(){
+      var review = FakeReview.initialize({title: 'Doomed!'});
+      review.save(function(saved_review){
+        saved_review.update_attributes({title: 'Tennessee'}, function(saved_review){
+          equals(saved_review.title, 'Updated', 'Title should have been updated');
           start();
         });
       });
     });
     
-    asyncTest('deleting', 1, function(){
+    asyncTest('deleting', 2, function(){
       var review = Review.initialize({title: 'Doomed!'});
       review.save(function(saved_review){        
-        saved_review.destroy(function(destroyed_review){
+        saved_review.destroy(function(destroyed_review, response){
           equals(destroyed_review.destroyed, true, 'It should have deleted the doc')
+          equals(response, 'Deleted OK', 'It should have deleted the doc')
           start()
         });
       });
     })
+    
+    asyncTest('deleting with custom URL', 2, function(){
+      var review = FakeReview.initialize({title: 'Doomed!'});
+      review.save(function(saved_review){        
+        saved_review.destroy(function(destroyed_review, response){
+          equals(destroyed_review.destroyed, true, 'It should have deleted the doc')
+          equals(response, 'Deleted OK', 'It should have deleted the doc')
+          start()
+        });
+      });
+    })
+    
 
   });
   </script>
   
 </head>
 <body>
-  <h1 id="qunit-header">Rails Tests (with jQuery)</h1>
+  <h1 id="qunit-header">REST Interface Tests (with jQuery)</h1>
   <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>