pusher_rails 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.1.4
+======
+- Upgraded backpusher.js to pusher/backpusher@9caa3ecce01916d8bcb8da1d5997912ec3c60bf9 which fixes a problem with success/error callbacks on create/fetch calls.
+
 v0.1.3
 ======
 - Upgraded to pusher.js 1.9.4

data/pusher_rails.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'pusher_rails'
-  s.version       = '0.1.3'
+  s.version       = '0.1.4'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["David Grandinetti"]
   s.email         = ["dave@wegoto12.com"]

data/vendor/assets/javascripts/backpusher.js

@@ -16,7 +16,7 @@
     // we can setup the socket_id param.
     if (channel.pusher.connection) {
       channel.pusher.connection.bind('connected', function() {
-        Backbone.pusher_socket_id = channel.pusher.socket_id;
+        Backbone.pusher_socket_id = channel.pusher.connection.socket_id;
       });
     } else {
       channel.pusher.bind('pusher:connection_established', function() {
@@ -100,40 +100,34 @@
     'read'  : 'GET'
   };
 
-  // Backpusher's Backbone.sync method:
-  // -------------
-  Backbone.sync = function(method, model, success, error) {
+  Backbone.sync = function(method, model, options) {
     var type = methodMap[method];
-    var modelJSON = null;
 
-    if (method === 'create' || method === 'update') {
-      modelJSON = JSON.stringify(model.toJSON());
-    }
+    // Default JSON-request options.
+    var params = _.extend({
+      type:         type,
+      dataType:     'json'
+    }, options);
 
     if (!(model && model.url)) {
       throw new Error("A 'url' property or function must be specified");
     }
 
-    var modelUrl = _.isFunction(model.url) ? model.url() : model.url;
-    modelUrl += '?socket_id=' + Backbone.pusher_socket_id;
+    if (!params.url) {
+      params.url = _.isFunction(model.url) ? model.url() : model.url;
+      params.url += '?socket_id=' + Backbone.pusher_socket_id;
+    }
 
-    // Default JSON-request options.
-    var params = {
-      url:          modelUrl,
-      type:         type,
-      contentType:  'application/json',
-      data:         modelJSON,
-      dataType:     'json',
-      processData:  false,
-      success:      success,
-      error:        error
-    };
+    // Ensure that we have the appropriate request data.
+    if (!params.data && model && (method == 'create' || method == 'update')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(model.toJSON());
+    }
 
     // For older servers, emulate JSON by encoding the request into an HTML-form.
     if (Backbone.emulateJSON) {
       params.contentType = 'application/x-www-form-urlencoded';
-      params.processData = true;
-      params.data        = modelJSON ? {model : modelJSON} : {};
+      params.data        = params.data ? {model : params.data} : {};
     }
 
     // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
@@ -143,15 +137,20 @@
         if (Backbone.emulateJSON) params.data._method = type;
         params.type = 'POST';
         params.beforeSend = function(xhr) {
-          xhr.setRequestHeader("X-HTTP-Method-Override", type);
+          xhr.setRequestHeader('X-HTTP-Method-Override', type);
         };
       }
     }
 
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !Backbone.emulateJSON) {
+      params.processData = false;
+    }
+
     // Make the request.
-    $.ajax(params);
+    return $.ajax(params);
   };
 
   // Export:
   exports.Backpusher = Backpusher;
-})((typeof exports !== 'undefined' ? exports : this));
+})((typeof exports !== 'undefined' ? exports : this));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &70338432315200 !ruby/object:Gem::Requirement
+  requirement: &70285432931700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70338432315200
+  version_requirements: *70285432931700
 description: Adds pusher.js/backpusher.js to the asset pipeline and pusher-gem to
   to your app.
 email: