backbone_sync-rails 0.0.5 → 0.0.6

data/README.md

@@ -59,18 +59,22 @@ This assumes you already have a Backbone.js + Rails app.
     end
     ```
 
-6.  Instantiate a new `BackboneSync.RailsFayeSynchronizer` for *each instance*
+7.  Instantiate a new `BackboneSync.RailsFayeSynchronizer` for *each instance*
     of a Backbone collection you instantiate.  You could do this in the
     collection's constructor, or do it by hand:
 
     ```javascript
     // For simplicitly, here it is in a router, or app bootstrap
     this.users = new MyApp.Collections.UsersCollection();
-    new BackboneSync.RailsFayeSubscriber(this.users, channel: 'users');
+    var fayeClient = new Faye.Client('<%= BackboneSync::Rails::Faye.root_address %>/faye');
+    new BackboneSync.RailsFayeSubscriber(this.users, {
+      channel: 'users', // Set to Rails model.class.table_name, or override Model#faye_channel
+      client: fayeClient
+    });
     this.wizards.reset(options.users);
     ```
 
-7.  Check it out!  Open two browsers, do some stuff in one, and see your changes
+8.  Check it out!  Open two browsers, do some stuff in one, and see your changes
     cascade to the other.  Your Backbone views will need to observe events on
     the collection like `change`, `add`, and `remove`.
 

data/lib/backbone_sync-rails/faye/event.rb

@@ -1,4 +1,4 @@
-require 'backbone_sync-rails/faye/message'
+require 'net/http'
 
 module BackboneSync
   module Rails
@@ -10,13 +10,22 @@ module BackboneSync
         end
 
         def broadcast
-          Message.new(channel, data).send
+          Net::HTTP.post_form(uri, :message => message)
         end
 
         private
 
+        def uri
+          URI.parse("#{BackboneSync::Rails::Faye.root_address}/faye")
+        end
+
+        def message
+          { :channel => channel, :data => data }.to_json
+        end
+
         def channel
-          "/sync/#{@model.class.table_name}"
+          subchannel = @model.try(:faye_channel) || @model.class.table_name
+          "/sync/#{subchannel}"
         end
 
         def data

data/lib/backbone_sync-rails/faye.rb

@@ -4,6 +4,7 @@ module BackboneSync
   module Rails
     module Faye
       mattr_accessor :root_address
+      self.root_address = 'http://localhost:9292'
     end
   end
 end

data/lib/backbone_sync-rails/version.rb

@@ -1,3 +1,3 @@
 module BackboneSyncRails
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/vendor/assets/javascripts/backbone_sync-rails/rails_faye_subscriber.js.erb

@@ -1,80 +1,47 @@
-// Original CoffeeScript:
-//
-// window.BackboneSync = {}
-// 
-// class BackboneSync.RailsFayeSubscriber
-//   constructor: (collection, options) ->
-//     @collection = collection
-//     @client  = new Faye.Client('<%= BackboneSync::Rails::Faye.root_address %>/faye')
-//     @channel = options.channel
-// 
-//     @subscribe()
-// 
-//   subscribe: =>
-//     @client.subscribe "/sync/#{@channel}", @receive
-// 
-//   receive: (message) =>
-//     $.each message, (event, eventArguments) =>
-//       @[event](eventArguments)
-// 
-//   update: (params) =>
-//     $.each params, (id, attributes) =>
-//       model = @collection.get(id)
-//       model.set(attributes)
-// 
-//   create: (params) =>
-//     $.each params, (id, attributes) =>
-//       model = new @collection.model(attributes)
-//       @collection.add(model)
-// 
-//   destroy: (params) =>
-//     $.each params, (id, attributes) =>
-//       model = @collection.get(id)
-//       @collection.remove(model)
+this.BackboneSync = this.BackboneSync || {};
 
-(function() {
-  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-  window.BackboneSync = {};
-  BackboneSync.RailsFayeSubscriber = (function() {
-    function RailsFayeSubscriber(collection, options) {
-      this.destroy = __bind(this.destroy, this);
-      this.create = __bind(this.create, this);
-      this.update = __bind(this.update, this);
-      this.receive = __bind(this.receive, this);
-      this.subscribe = __bind(this.subscribe, this);      this.collection = collection;
-      this.client = new Faye.Client('<%= BackboneSync::Rails::Faye.root_address %>/faye');
-      this.channel = options.channel;
-      this.subscribe();
-    }
-    RailsFayeSubscriber.prototype.subscribe = function() {
-      return this.client.subscribe("/sync/" + this.channel, this.receive);
-    };
-    RailsFayeSubscriber.prototype.receive = function(message) {
-      return $.each(message, __bind(function(event, eventArguments) {
-        return this[event](eventArguments);
-      }, this));
-    };
-    RailsFayeSubscriber.prototype.update = function(params) {
-      return $.each(params, __bind(function(id, attributes) {
-        var model;
-        model = this.collection.get(id);
-        return model.set(attributes);
-      }, this));
-    };
-    RailsFayeSubscriber.prototype.create = function(params) {
-      return $.each(params, __bind(function(id, attributes) {
-        var model;
-        model = new this.collection.model(attributes);
-        return this.collection.add(model);
-      }, this));
-    };
-    RailsFayeSubscriber.prototype.destroy = function(params) {
-      return $.each(params, __bind(function(id, attributes) {
-        var model;
-        model = this.collection.get(id);
-        return this.collection.remove(model);
-      }, this));
-    };
-    return RailsFayeSubscriber;
-  })();
-}).call(this);
+BackboneSync.RailsFayeSubscriber = (function() {
+  function RailsFayeSubscriber(collection, options) {
+    this.collection = collection;
+    this.client = options.client;
+    this.channel = options.channel;
+    this.subscribe();
+  }
+
+  RailsFayeSubscriber.prototype.subscribe = function() {
+    return this.client.subscribe("/sync/" + this.channel, _.bind(this.receive, this));
+  };
+
+  RailsFayeSubscriber.prototype.receive = function(message) {
+    var self = this;
+    return $.each(message, function(event, eventArguments) {
+      return self[event](eventArguments);
+    });
+  };
+
+  RailsFayeSubscriber.prototype.update = function(params) {
+    var self = this;
+    return $.each(params, function(id, attributes) {
+      var model = self.collection.get(id);
+      return model.set(attributes);
+    });
+  };
+
+  RailsFayeSubscriber.prototype.create = function(params) {
+    var self = this;
+    return $.each(params, function(id, attributes) {
+      var model = new self.collection.model(attributes);
+      return self.collection.add(model);
+    });
+  };
+
+  RailsFayeSubscriber.prototype.destroy = function(params) {
+    var self = this;
+    return $.each(params, function(id, attributes) {
+      var model = self.collection.get(id);
+      return self.collection.remove(model);
+    });
+  };
+
+  return RailsFayeSubscriber;
+})();

data/vendor/assets/javascripts/extensions/backbone.collection.idempotent.js

@@ -2,7 +2,7 @@ Backbone.Collection.prototype._addWithIdCheck = function(model, options) {
   var idAttribute = model.idAttribute || this.model.prototype.idAttribute;
   var modelId = model[idAttribute];
 
-  if (this.get(modelId) === undefined) {
+  if (modelId === undefined || this.get(modelId) === undefined) {
     this._addWithoutIdCheck(model, options);
   }
 };

metadata

@@ -2,7 +2,7 @@
 name: backbone_sync-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jason Morrison
@@ -10,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 -04:00
+date: 2011-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,6 +33,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id002
 description: Broadcast changes from Rails models to client-side Backbone.js collections with WebSockets.
 email: 
@@ -46,7 +46,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/backbone_sync-rails/faye/event.rb
-- lib/backbone_sync-rails/faye/message.rb
 - lib/backbone_sync-rails/faye/observer.rb
 - lib/backbone_sync-rails/faye.rb
 - lib/backbone_sync-rails/version.rb
@@ -100,12 +99,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2403046260054443418
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2403046260054443418
+      segments: 
+      - 0
       version: "0"
 requirements: []
 

data/lib/backbone_sync-rails/faye/message.rb

@@ -1,31 +0,0 @@
-require 'net/http'
-require 'json'
-
-module BackboneSync
-  module Rails
-    module Faye
-      # To publish from outside of an `EM.run {}` loop:
-      # http://groups.google.com/group/faye-users/browse_thread/thread/ae6e2a1cc37b3b07
-      class Message
-        def initialize(channel, data)
-          @channel = channel
-          @data = data
-        end
-
-        def send
-          Net::HTTP.post_form(uri, :message => payload) 
-        end
-
-        private
-
-        def uri
-          URI.parse("#{BackboneSync::Rails::Faye.root_address}/faye")
-        end
-
-        def payload
-          {:channel => @channel, :data => @data}.to_json
-        end
-      end
-    end
-  end
-end