eyeballs 0.5.12.1 → 0.5.13

data/Rakefile

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

data/app.rb

@@ -3,6 +3,15 @@ require 'sinatra'
 set :static, true
 set :public, Proc.new { File.expand_path('.') }
 
+get '/tests.js' do
+  content_type 'application/javascript'
+  files = []
+  Dir["#{File.join(File.expand_path('.'), 'test', 'unit')}/*.html"].each do |file|
+    files << "'#{File.basename(file)}'"
+  end
+  "var test_files = [#{files.join(',')}];"
+end
+
 get '/reviews' do
   '[{"id": "1", "title":"Local, baby"}]'
 end
@@ -40,12 +49,21 @@ end
 
 post '/rails_reviews' do
   if params[:rails_review]
-    'ok'
+    '{"rails_review": {"id":"1"}}'
   else
     'fail'
   end
 end
 
+get '/rails_reviews/1' do
+  '{"rails_review": {"id":"1"}}'
+end
+
+get '/alternate_rails_reviews/1' do
+  '{"alternate_rails_review": {"id":"1"}}'
+end
+
+
 post '/alternate_rails_reviews' do
   if params[:alternate_object]
     'ok'

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.12.1"
+  s.version = "0.5.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-11-07}
+  s.date = %q{2010-12-01}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]
@@ -57,9 +57,10 @@ Gem::Specification.new do |s|
      "templates/scaffold_edit.html.mustache",
      "templates/scaffold_index.html",
      "templates/scaffold_partial.html.mustache",
-     "test/index.html",
+     "test/run_unit_tests.html",
      "test/unit/qunit.css",
      "test/unit/qunit.js",
+     "test/unit/run_all.js",
      "test/unit/test_binding.html",
      "test/unit/test_controller.html",
      "test/unit/test_dom.html",
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
      "test/unit/test_model_with_callbacks.html",
      "test/unit/test_params.html",
      "test/unit/test_rest.html",
+     "test/unit/test_rest_global_config.html",
      "test/unit/test_routing.html"
   ]
   s.homepage = %q{http://www.github.com/paulca/eyeballs.js}

data/spec/model_generator_spec.rb

@@ -14,7 +14,7 @@ describe Eyeballs::ModelGenerator do
   end
   
   it "should create my file" do
-    model_file.read.should include("o_O('Paul', function(paul){")
+    model_file.read.should include("o_O('Paul', function(){")
   end
   
   after(:all) do

data/spec/scaffold_generator_spec.rb

@@ -21,7 +21,7 @@ describe Eyeballs::ModelGenerator do
   end
   
   it "should fill out the model file" do
-    model_file.read.should include("o_O('Review', function(review){")
+    model_file.read.should include("o_O('Review', function(){")
   end
   
   it "should fill out the controller file" do

data/src/drivers/jquery/adapters/o_O.rest.js

@@ -1,5 +1,10 @@
 // REST & Rails, woop!
 o_O.rest = {
+  include_json_root: function(object){
+    return !!( o_O.config.include_json_root && 
+          window[object.model_name]['include_json_root'] == void(0)) ||
+        ( window[object.model_name]['include_json_root'] === true )
+  },
   figure_url: function(original_callback, object){
     if(typeof original_callback.url === 'string')
     {
@@ -47,13 +52,24 @@ o_O.rest = {
   {
     var object_to_save = {};
     var url;
+    var include_json_root = this.include_json_root(object)
     for(var i = 0; i < object.attributes.length; i++)
     {
       object_to_save[object.attributes[i]] = object[object.attributes[i]];
     }
     var respond = function(response){
       try{
-        var saved_object = JSON.parse(response);
+        if(typeof response === 'string') {
+          response = JSON.parse(response);
+        }
+
+        var saved_object = null;
+        if(include_json_root) {
+          saved_object = response[object.model_name.underscore()];
+        } else {
+          saved_object = response;
+        }
+
         for(var attribute in saved_object)
         {
           object_to_save[attribute] = saved_object[attribute];
@@ -70,8 +86,8 @@ o_O.rest = {
       }
     }
     url = this.figure_url(original_callback, object);
-    
-    if(window[object.model_name]['include_json_root'] === true)
+
+    if(this.include_json_root(object))
     {
       var object_name;
       new_object_to_save = {};
@@ -107,6 +123,7 @@ o_O.rest = {
   find: function(model, id, callback, options)
   {
     var url = this.figure_url(options, model) + '/' + id;
+    var include_json_root = this.include_json_root(model)
     $.get(url, function(response){
       if(typeof response === 'object')
       {
@@ -116,6 +133,10 @@ o_O.rest = {
       {
         try{
           var retrieved_object = JSON.parse(response);
+          if(include_json_root)
+          {
+            retrieved_object = retrieved_object[model.model_name.underscore()]
+          }
         }
         catch(e){
           var retrieved_object = model.initialize({id: id});

data/templates/initializer.js

@@ -4,6 +4,7 @@
 o_O.model.adapter = o_O.rest;
 o_O.config.authenticity_token = $('meta[name=csrf-token]').attr('content')
 o_O.config.template_path = '/javascripts/app/views';
+o_O.config.include_json_root = true;
 
 jQuery.ajaxSetup({ 
   'beforeSend': function(xhr) {xhr.setRequestHeader("Accept",

data/test/run_unit_tests.html

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <script src="/tests.js"></script>
+    <script>
+      console.log(test_files[0] + '#run_all')
+      document.location.href = 'unit/' + test_files[0] + '#run_all'
+    </script>
+  </head>
+</html>

data/test/unit/run_all.js

@@ -0,0 +1,17 @@
+var current_test = document.location.pathname.split('/')[document.location.pathname.split('/').length - 1];
+var index = test_files.indexOf(current_test)
+
+if(index > -1 && document.location.hash === '#run_all')
+{
+  setInterval(next_test_if_complete, 20)
+}
+
+function next_test_if_complete(){
+  if($('li.pass').length > 0 && $('li.fail').length === 0 && $('p#qunit-testresult'))
+  {
+    if(test_files[index+1])
+    {
+      document.location.href = test_files[index+1] + '#run_all'
+    }
+  }
+}

data/test/unit/test_binding.html

@@ -5,6 +5,8 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
 
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
@@ -15,7 +17,7 @@
   
   o_O.config.bind_to = MyApp;
   
-  o_O('Review');
+  o_O('Review', function(){});
 
   $(document).ready(function(){
     

data/test/unit/test_controller.html

@@ -5,6 +5,9 @@
   <script src="../../dist/jquery/jquery-1.4.2.min.js"></script>
   <script src="../../src/o_O.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_dom.html

@@ -9,6 +9,9 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_dom_with_callbacks.html

@@ -9,6 +9,9 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_localstorage.html

@@ -9,6 +9,9 @@
   <script src="../../src/adapters/o_O.localstorage.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_model.html

@@ -9,6 +9,9 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_model_with_callbacks.html

@@ -9,6 +9,9 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_params.html

@@ -10,6 +10,9 @@
   <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>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 

data/test/unit/test_rest.html

@@ -10,6 +10,9 @@
   <script src="../../src/drivers/jquery/adapters/o_O.rest.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
+
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
 
@@ -27,9 +30,10 @@
       fake_review.url = '/reviews'
     });
     
-    asyncTest('storing a basic basic thing', 3, function(){
+    asyncTest('Review.save() storing a basic basic thing', 3, function(){
       var review = Review.initialize({title: 'Magic!'})
       review.save(function(saved_review){
+        console.log(saved_review)
         equals(saved_review.title, review.title, 'title should match');
         equals(saved_review.id, '1', "Rails should give back the ID");
         equals(saved_review.model_name, 'Review', 'should save the model name');
@@ -37,7 +41,7 @@
       });
     });
     
-    asyncTest('storing a basic basic thing with custom URL set in the model', function(){
+    asyncTest('FakeReview.create() 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');
@@ -46,7 +50,7 @@
       });
     });
     
-    asyncTest('storing a basic basic thing with a custom URL set in the save', function(){
+    asyncTest('review.save() 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",
@@ -66,20 +70,27 @@
       review.json_root_name = 'alternate_object'
     });
     
-    asyncTest('storing a basic basic thing with include_root', function(){
+    asyncTest('RailsReview.create() 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');
+        equals(review.id, '1', 'should fetch a tasty RailsReview');
+        start();
+      });
+    });
+    
+    asyncTest('fetching with include_root', function(){
+      RailsReview.find(1,function(review, response){
+        equals(review.id, '1', 'should fetch a tasty RailsReview');
         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');
+    asyncTest('fetching while specifying a custom json_root_name', function(){
+      AlternateRailsReview.find(1,function(review, response){
+        equals(review.id, '1', 'should get an alternate_rails_review back');
         start();
       });
     });
-    
+
     o_O.config.authenticity_token = 'a12345';
     asyncTest('CSRF token', function(){
       RailsReview.create({title: "Unnecessary"}, {
@@ -142,7 +153,7 @@
       });
     });
     
-    asyncTest('pulling something in', 2, function(){
+    asyncTest('Review.initialize(...).save(...) pulling something in', 2, function(){
       var review = Review.initialize({title: 'More Magic!'});
       review.save(function(){
         found_review = Review.find(review.id, function(found_review){
@@ -153,7 +164,7 @@
       });
     })
     
-    asyncTest('pulling something in by itself', 1, function(){
+    asyncTest('Review.find(2) pulling something in by itself', 1, function(){
       Review.find(2, {success: function(found_review){
         equals(found_review.title, 'funtimes');
         start();

data/test/unit/test_rest_global_config.html

@@ -0,0 +1,61 @@
+<!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>
+  <script src="../../src/modules/o_O.validations.js"></script>
+  <script src="../../src/drivers/jquery/adapters/o_O.rest.js"></script>
+  <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
+  <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
+  <script src="/tests.js"></script>
+  <script src="run_all.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.model.adapter = o_O.rest;
+    
+    module("REST Interface Test (with jQuery) testing Global config");
+    
+    o_O.config.include_json_root = true
+    
+    o_O('RailsReview', function(){
+    });
+    o_O('AlternateRailsReview', function(){
+      this.json_root_name = 'alternate_object'
+    });
+    
+    asyncTest('RailsReview.create() storing a basic basic thing with include_root', function(){
+      RailsReview.create({title: "Awesome"},function(review, response){
+        equals(review.id, '1', '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();
+      });
+    });
+    
+
+  });
+  </script>
+  
+</head>
+<body>
+  <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>
+</body>
+</html>

data/test/unit/test_routing.html

@@ -11,6 +11,8 @@
   <script src="../../src/drivers/jquery/modules/o_O.controller.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.support.js"></script>
   <script src="../../src/drivers/jquery/modules/o_O.routes.js"></script>
+  <script src="/tests.js"></script>
+  <script src="run_all.js"></script>
 
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
 <script type="text/javascript" src="qunit.js"></script>
@@ -87,8 +89,12 @@
       equals(o_O.routes.rules['my/action'].action(), ReviewsController.namespaced_index())
     })
     
-    test('o_O.routes.root', function(){
-      equals($('div#root').html(), 'rooting for you');
+    asyncTest('o_O.routes.root', function(){
+      document.location.hash = ''
+      setTimeout(function(){
+        equals($('div#root').html(), 'rooting for you');
+        start()
+      }, 300)
     })
     
     asyncTest('map.match',function(){

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 5
-  - 12
-  - 1
-  version: 0.5.12.1
+  - 13
+  version: 0.5.13
 platform: ruby
 authors: 
 - Paul Campbell
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +00:00
+date: 2010-12-01 00:00:00 +00:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,9 +95,10 @@ files:
 - templates/scaffold_edit.html.mustache
 - templates/scaffold_index.html
 - templates/scaffold_partial.html.mustache
-- test/index.html
+- test/run_unit_tests.html
 - test/unit/qunit.css
 - test/unit/qunit.js
+- test/unit/run_all.js
 - test/unit/test_binding.html
 - test/unit/test_controller.html
 - test/unit/test_dom.html
@@ -108,6 +108,7 @@ files:
 - test/unit/test_model_with_callbacks.html
 - test/unit/test_params.html
 - test/unit/test_rest.html
+- test/unit/test_rest_global_config.html
 - test/unit/test_routing.html
 - spec/app_generator_spec.rb
 - spec/controller_generator_spec.rb