eyeballs 0.5.12 → 0.5.12.1

data/Rakefile

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

data/app.rb

@@ -7,6 +7,11 @@ get '/reviews' do
   '[{"id": "1", "title":"Local, baby"}]'
 end
 
+get '/reviews_with_content_type' do
+  content_type 'application/json'
+  '[{"id": "1", "title":"Local, baby"}]'
+end
+
 post '/reviews' do
   '{"id": "1"}'
 end

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.12"
+  s.version = "0.5.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-07}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]

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

@@ -14,12 +14,19 @@ o_O.rest = {
       return '/' + object.table_name;
     }
   },
-  all: function(model, callback){
-    $.get('/' + model.table_name, function(response){
-      var documents = JSON.parse(response);
+  all: function(model, callback, original_callback){
+    $.get(this.figure_url(original_callback, model), function(response){
+      var documents;
+      try {
+        documents = JSON.parse(response);
+      }
+      catch(e){
+        documents = response
+      }
+      
       if(typeof callback === 'function')
       {
-        callback(documents);
+        callback(documents, response);
       }
     })
   },

data/src/modules/o_O.model.js

@@ -155,7 +155,10 @@ o_O.model = {
       all: function(callback){
         if(this.adapter)
         {
-          return this.adapter.all(this, callback);
+          run_callback(callback, 'loading');
+          return this.adapter.all(this, function(returned_object, response){
+            run_callback(callback, 'success', returned_object, response);
+          }, callback);
         }
       },
       initialize: function(attributes){

data/templates/model.js

@@ -1,3 +1,3 @@
-o_O('<%= name.capitalize %>', function(<%= name.downcase %>){
+o_O('<%= name.capitalize %>', function(){
   
 })

data/test/unit/test_model_with_callbacks.html

@@ -36,6 +36,21 @@
     
     module("Models");
     
+    asyncTest('all() with callbacks',2, function(){
+      Review.all({
+        loading: function(){
+          ok('this should be called')
+        },
+        success: function(){
+          ok('this should be called');
+          start();
+        },
+        failure: function(){
+          ok(false, 'this should not be called');
+        }
+      })
+    });
+    
     asyncTest('find() an existent object',2, function(){
       Review.find('thing', {
         loading: function(){

data/test/unit/test_rest.html

@@ -178,6 +178,20 @@
       });
     })
     
+    asyncTest('getting all with content type', 2, function(){
+      var review = Review.initialize({title: 'Local, baby'});
+      review.save(function(saved_review){
+        Review.all({
+          url: '/reviews_with_content_type',
+          success: function(documents){
+            equals(documents[0].title, 'Local, baby', 'It should pull in everything')
+            equals(documents[0].id, '1', 'It should persist the id')
+            start();
+          }
+        })
+      });
+    })
+    
     asyncTest('setting new_record attribute', 2, function(){
       var review = Review.initialize()
       equals(review.new_record, true, 'should be a new record review');

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 5
   - 12
-  version: 0.5.12
+  - 1
+  version: 0.5.12.1
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +00:00
+date: 2010-11-07 00:00:00 +00:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency