eyeballs 0.5.6.1 → 0.5.7

data/CHANGELOG

@@ -1,6 +1,7 @@
 Fri Aug 6
 - - - - - 
 - Add support for passing params from the URL to the controller
+- Add proper callbacks and reading a response to .find
 
 Sun Aug 1
 - - - - -

data/Rakefile

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

data/app.rb

@@ -15,6 +15,10 @@ post '/alternate_reviews' do
   '{"id": "2"}'
 end
 
+get '/string_back' do
+  'found a string'
+end
+
 post '/string_back' do
   'some string'
 end

data/eyeballs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.6.1"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]

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

@@ -100,16 +100,27 @@ o_O.rest = {
   find: function(model, id, callback, options)
   {
     var url = '/' + model.table_name + '/' + id;
-    if(typeof options === 'object' && options.prefix)
+    if(typeof options === 'object')
     {
-      url = options.prefix + url;
+      if(options['url']){
+        url = options['url'];
+      }
+      else if(options['prefix'])
+      {
+        url = options.prefix + url;
+      }
     }
     $.get(url, function(response){
-      var retrieved_object = JSON.parse(response);
+      try{
+        var retrieved_object = JSON.parse(response);
+      }
+      catch(e){
+        var retrieved_object = model.initialize({id: id});
+      }
       if(typeof callback === 'function')
       {
         retrieved_object.new_record = false;
-        callback(retrieved_object);
+        callback(retrieved_object, response);
       }
     })
   }

data/src/modules/o_O.model.js

@@ -179,9 +179,9 @@ o_O.model = {
       find: function(id, callback){
         if(this.adapter)
         {
-          run_callback(callback, 'loading', this)
+          run_callback(callback, 'loading', this.initialize({id: id}))
           var model = this;
-          return this.adapter.find(this, id, function(returned_object){
+          return this.adapter.find(this, id, function(returned_object, response){
             found_object = model.initialize(returned_object);
             if(!found_object['new_record'])
             {
@@ -189,11 +189,11 @@ o_O.model = {
             }
             if(found_object.id)
             {
-              run_callback(callback, 'success', found_object);
+              run_callback(callback, 'success', found_object, response);
             }
             else
             {
-              run_callback(callback, 'failure', found_object);
+              run_callback(callback, 'failure', found_object, response);
             }
           }, callback);
         }

data/test/unit/test_rest.html

@@ -114,7 +114,7 @@
       });
     });
     
-    asyncTest('consistent ID on string back', function(){
+    asyncTest('consistent ID save with string back', function(){
       var string_back_id;
       Review.create({},{
         url: "/string_back",
@@ -128,6 +128,21 @@
       });
     });
     
+    asyncTest('consistent ID find with string back', function(){
+      var string_back_id;
+      Review.find({},{
+        url: "/string_back",
+        loading: function(found_review){
+          string_back_id = found_review.id;
+        },
+        success: function(found_review, response){
+          equals(response, 'found a string', 'should give me a string back!');
+          equals(found_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(){

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 6
-  - 1
-  version: 0.5.6.1
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Paul Campbell