eyeballs 0.5.8.2 → 0.5.9

data/Gemfile.lock

@@ -1,59 +1,36 @@
---- 
-dependencies: 
-  ruby-debug: 
-    group: 
-    - :test
-    version: ">= 0"
-  thor: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :test
-    version: ">= 0"
-  sinatra: 
-    group: 
-    - :default
-    version: ">= 0"
-  jeweler: 
-    group: 
-    - :development
-    version: ">= 0"
-  activesupport: 
-    group: 
-    - :default
-    version: ">= 0"
-specs: 
-- activesupport: 
-    version: 2.3.8
-- columnize: 
-    version: 0.3.1
-- json_pure: 
-    version: 1.4.3
-- gemcutter: 
-    version: 0.5.0
-- git: 
-    version: 1.2.5
-- rubyforge: 
-    version: 2.0.4
-- jeweler: 
-    version: 1.4.0
-- linecache: 
-    version: "0.43"
-- rack: 
-    version: 1.2.1
-- rspec: 
-    version: 1.3.0
-- ruby-debug-base: 
-    version: 0.10.3
-- ruby-debug: 
-    version: 0.10.3
-- sinatra: 
-    version: "1.0"
-- thor: 
-    version: 0.13.8
-hash: 18ee2e0d3e9a46cd1d8e8c39951ba9414860f401
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0)
+    columnize (0.3.1)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    linecache (0.43)
+    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)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sinatra (1.0)
+      rack (>= 1.0)
+    thor (0.14.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  jeweler
+  rspec
+  ruby-debug
+  sinatra
+  thor

data/README.md

@@ -43,7 +43,7 @@ At a very minimum, you should choose an adapter. There are a few to choose from:
   - **o\_O.dom** - a basic adapter without any persistence.
   - **o\_O.localstorage** - persist records to HTML5 local storage.
   - **o\_O.couchdb** - persist records to a local CouchDB instance, for building MVC CouchApps, for example.
-  - **o\_O.rails** - An adapter for persisting models to a backend powered by Rails, or using Rails-style RESTful routing.
+  - **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.
 

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "eyeballs"
-    s.version = "0.5.8.2"
+    s.version = "0.5.9"
     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.8.2"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-09-25}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
      "test/index.html",
      "test/unit/qunit.css",
      "test/unit/qunit.js",
+     "test/unit/test_binding.html",
      "test/unit/test_controller.html",
      "test/unit/test_dom.html",
      "test/unit/test_dom_with_callbacks.html",

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

@@ -21,6 +21,12 @@ o_O.routes = {
       namespace: function(prefix, callback){
         callback(o_O.routes.router(prefix));
       },
+      resources: function(name){
+        this.match(name, {to:name + '#index'});
+        this.match(name + '/new', {to:name + '#add'});
+        this.match(name + '/:id/edit', {to:name + '#edit'});
+        this.match(name + '/:id', {to:name + '#show'});
+      },
       match: function(route, options){
         var parsed_route = route.o_O_trim('/')
 
@@ -91,6 +97,7 @@ o_O.routes = {
                   return params;
                 }
               });
+              return;
             }
           }
         }

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

@@ -38,6 +38,10 @@ o_O.render = function(template, data, options){
       {
         $(options.replace).replaceWith(rendered);
       }
+      if(options.html)
+      {
+        $(options.html).replaceWith(rendered);
+      }
     }
   });
 }
@@ -63,33 +67,4 @@ o_O.get_template = function(template, data, callback){
       callback(data, response);
     });
   }
-}
-
-if(typeof String.prototype.capitalize === 'undefined')
-{
-  String.prototype.capitalize = function(){
-    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);
-  }
-}
-
-String.prototype.o_O_trim = function(chars) {
-  return this.replace(new RegExp("(^[" + chars + "]+|[" + chars + "]+$)", "g"), '')
 }

data/src/modules/o_O.model.js

@@ -6,26 +6,29 @@ o_O.model = {
     var validates_presence_of, validates_length_of;
     var table_name = model_name.underscore() + 's';
     var initial_class_methods = [];
-  
-    class_methods = {
-      validations: {presence: [], lengthliness: [], custom: []},
-      methods: {},
-      validates_presence_of: function(field){
-        this.validations.presence.push({field: field});
-      },
-      validates_length_of: function(field, options){
-        options.field = field;
-        this.validations.lengthliness.push(options);
-      },
-      validates: function(validation){
-        this.validations.custom.push(validation)
-      }
-    }
-    for(var method in class_methods)
+
+    var class_methods = {}
+    if(typeof o_O.validations === 'object')
     {
-      initial_class_methods.push(method);
+      class_methods = {
+        validations: {presence: [], lengthliness: [], custom: []},
+        methods: {},
+        validates_presence_of: function(field){
+          this.validations.presence.push({field: field});
+        },
+        validates_length_of: function(field, options){
+          options.field = field;
+          this.validations.lengthliness.push(options);
+        },
+        validates: function(validation){
+          this.validations.custom.push(validation)
+        }
+      }
+      for(var method in o_O.validations.class_methods)
+      {
+        initial_class_methods.push(method);
+      }
     }
-    
   
     var run_callback = function(callback, method, object, response){
       try{
@@ -114,8 +117,11 @@ o_O.model = {
       },
       valid: function(){
         this.errors.length = 0;
-        
-        o_O.validations.run(this);
+
+        if(typeof o_O.validations === 'object')
+        {
+          o_O.validations.run(this);
+        }
 
         if(this.errors.length == 0)
         {

data/src/modules/o_O.validations.js

@@ -41,5 +41,19 @@ o_O.validations = {
         object.errors.push({field: field, type: 'presence', message: message})
       }
     }
+  },
+  class_methods: {
+    validations: {presence: [], lengthliness: [], custom: []},
+    methods: {},
+    validates_presence_of: function(field){
+      this.validations.presence.push({field: field});
+    },
+    validates_length_of: function(field, options){
+      options.field = field;
+      this.validations.lengthliness.push(options);
+    },
+    validates: function(validation){
+      this.validations.custom.push(validation)
+    }
   }
 }

data/src/o_O.js

@@ -2,7 +2,8 @@ var o_O = function(){
 
   var bind_to;
   var object_to_bind_to = arguments[2];
-  bind_to = (object_to_bind_to) ? object_to_bind_to : window;
+  
+  bind_to = (object_to_bind_to) ? object_to_bind_to : o_O.config.default_bind_to();
 
   if(typeof arguments[1] === 'object')
   {
@@ -10,12 +11,16 @@ var o_O = function(){
     bind_to[controller_name] = o_O.controller.initialize(controller_name, arguments[1]);
     return bind_to[controller_name];
   }
-
-  if(typeof arguments[1] === 'function')
+  else
   {
-    
     var model_name = arguments[0];
     var model_initializer = arguments[1];
+    
+    if(typeof model_initializer != 'function')
+    {
+      model_initializer = function(){}
+    }
+    
     bind_to[model_name] = o_O.model.initialize(model_name, model_initializer);
     
     if(typeof o_O.models !== 'object')
@@ -28,7 +33,11 @@ var o_O = function(){
   }
 }
 
-o_O.config = {}
+o_O.config = {
+  default_bind_to: function(){
+    return (o_O.config.bind_to) ? o_O.config.bind_to : window
+  }
+}
 o_O.templates = {}
 
 o_O._uuid_default_prefix = '';
@@ -53,4 +62,33 @@ o_O.alert_errors = function(object){
     error_message = error_message + object.errors[i].message + "\n";
   }
   alert(error_message);
+}
+
+if(typeof String.prototype.capitalize === 'undefined')
+{
+  String.prototype.capitalize = function(){
+    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);
+  }
+}
+
+String.prototype.o_O_trim = function(chars) {
+  return this.replace(new RegExp("(^[" + chars + "]+|[" + chars + "]+$)", "g"), '')
 }

data/templates/app_root/index.html

@@ -13,16 +13,5 @@
     
     <p>As you add models and controllers, don't forget to include them!</p>
     
-    <script src="<%= prefix %>vendor/jquery/jquery-1.4.2.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>
-    <script src="<%= prefix %>vendor/eyeballs/modules/o_O.validations.js"></script>
-    <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.controller.js"></script>
-    <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.routes.js"></script>
-    <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.support.js"></script>
-    <script src="<%= prefix %>vendor/eyeballs/adapters/o_O.localstorage.js"></script>
-    <script src="<%= prefix %>config/initializer.js"></script>
-    <script src="<%= prefix %>config/routes.js"></script>
-    <script src="<%= prefix %>app/models/<%= name.downcase %>.js"></script>  </body>
+  </body>
 </html>

data/test/unit/test_binding.html

@@ -0,0 +1,44 @@
+<!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="../../src/o_O.js"></script>
+  <script src="../../src/modules/o_O.model.js"></script>
+
+  <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
+<script type="text/javascript" src="qunit.js"></script>
+
+  <script>
+  
+  var MyApp = {};
+  
+  o_O.config.bind_to = MyApp;
+  
+  o_O('Review');
+
+  $(document).ready(function(){
+    
+    module("Models");
+    
+    test('binding to a non-global object', 1, function(){
+      var test_model = MyApp.Review.initialize({title: 'Delicious'})
+      equals(test_model.title, 'Delicious', 'should just work as normal')
+    })
+
+  });
+  </script>
+  
+</head>
+<body>
+  <h1 id="qunit-header">Binding Tests</h1>
+ <h2 id="qunit-banner"></h2>
+ <h2 id="qunit-userAgent"></h2>
+ <ol id="qunit-tests"></ol>
+ 
+ <div data-model="Review" data-id="paul">
+  <h1 data-attribute="title">Yeah!</h1>
+  <p data-attribute="content">Paris</p>
+ </div>
+</body>
+</html>

data/test/unit/test_routing.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="../../dist/jquery/jquery.ba-hashchange.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/modules/o_O.model.js"></script>
@@ -52,6 +51,22 @@
     }
   });
   
+  var clicked_routes = []
+  o_O('SongsController', {
+    add: function(){
+      $('div#songs-add').html('ok')
+    },
+    index: function(){
+      $('div#songs-index').html('ok')
+    },
+    show: function(params){
+      $('div#songs-show').html('ok ' + params('id'))
+    },
+    edit: function(params){
+      $('div#songs-edit').html('ok ' + params('id'))
+    }
+  })
+  
   o_O.routes.draw(function(map){
     map.root({to: "reviews#root"})
     map.match('/reviews/index/', {to: "reviews#index", with_args: 'test'});
@@ -59,6 +74,8 @@
       my.match('action', {to: "reviews#namespaced_index", with_args: 'test'})
     })
     map.match('/reviews/:test', {to: 'reviews#sending_params'})
+    
+    map.resources('songs')
   })
 
   $(document).ready(function(){
@@ -105,13 +122,45 @@
       },100)
     })
     
+    asyncTest('resources new', function(){
+      $('a#add-song').click()
+      setTimeout(function(){
+        equals($('div#songs-add').text(), 'ok') 
+        start();
+      }, 100)
+    })
+
+    asyncTest('resources index', function(){
+      $('a#index-song').click()
+      setTimeout(function(){
+        equals($('div#songs-index').text(), 'ok') 
+        start();
+      }, 100)
+    })
+
+    asyncTest('resources edit', function(){
+      $('a#edit-song').click()
+      setTimeout(function(){
+        equals($('div#songs-edit').text(), 'ok 1') 
+        start();
+      }, 100)
+    })
+
+    asyncTest('resources show', function(){
+      $('a#show-song').click()
+      setTimeout(function(){
+        equals($('div#songs-show').text(), 'ok 1') 
+        start();
+      }, 100)
+    })
+    
 
   });
   </script>
   
 </head>
 <body>
-  <h1 id="qunit-header">Controller Tests</h1>
+  <h1 id="qunit-header">Routing Tests</h1>
   <h2 id="qunit-banner"></h2>
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
@@ -127,5 +176,18 @@
   </div>
   <div id="root"></div>
   <div id="with_params"></div>
+  
+  <a id="add-song" href="/songs/new" data-ajax-history="true">New Song</a>
+  <div id="songs-add"></div>
+
+  <a id="edit-song" href="/songs/1/edit" data-ajax-history="true">Edit Song</a>
+  <div id="songs-edit"></div>
+
+  <a id="show-song" href="/songs/1" data-ajax-history="true">Show Song</a>
+  <div id="songs-show"></div>
+
+  <a id="index-song" href="/songs/" data-ajax-history="true">Songs Index</a>
+  <div id="songs-index"></div>
+  
 </body>
 </html>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 5
-  - 8
-  - 2
-  version: 0.5.8.2
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Paul Campbell
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +01:00
+date: 2010-09-25 00:00:00 +02:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +98,7 @@ files:
 - test/index.html
 - test/unit/qunit.css
 - test/unit/qunit.js
+- test/unit/test_binding.html
 - test/unit/test_controller.html
 - test/unit/test_dom.html
 - test/unit/test_dom_with_callbacks.html