entangled 0.0.20 → 0.0.21

data/spec/dummy/public/app/controllers/message.js

@@ -10,7 +10,6 @@ angular.module('entangledTest')
   Message.find($routeParams.id, function(message) {
     $scope.$apply(function() {
       $scope.message = message;
-      console.log('Show callback called!');
     });
   });
 });

data/spec/dummy/public/app/entangled/entangled.js

@@ -9,7 +9,7 @@ angular.module('entangled', [])
   // methods $save() and $destroy. A Resource also
   // stores the socket's URL it was retrieved from so it
   // can be reused for other requests.
-  var Resource = function(params, webSocketUrl) {
+  var Resource = function(params, webSocketUrl, hasMany) {
     // Assign proerties
     for (var key in params) {
       // Skip inherent object properties
@@ -18,7 +18,15 @@ angular.module('entangled', [])
       }
     }
 
+    // Assign socket URL
     this.webSocketUrl = webSocketUrl;
+
+    // Assign has many relationship
+    if (hasMany) {
+      this[hasMany] = function() {
+        return new Entangled(this.webSocketUrl + '/' + this.id + '/' + hasMany);
+      };
+    }
   };
 
   // $save() will send a request to the server
@@ -26,14 +34,12 @@ angular.module('entangled', [])
   // an existing, depending on whether or not
   // an id is present.
   Resource.prototype.$save = function(callback) {
-    var that = this;
-
     if (this.id) {
       // Update
-      var socket = new WebSocket(that.webSocketUrl + '/' + that.id + '/update');
+      var socket = new WebSocket(this.webSocketUrl + '/' + this.id + '/update');
       socket.onopen = function() {
-        socket.send(JSON.stringify(that));
-      };
+        socket.send(JSON.stringify(this));
+      }.bind(this);
 
       // Receive updated resource from server
       socket.onmessage = function(event) {
@@ -43,25 +49,29 @@ angular.module('entangled', [])
           // Assign/override new data (such as updated_at, etc)
           if (data.resource) {
             for (key in data.resource) {
-              that[key] = data.resource[key];
+              this[key] = data.resource[key];
             }
           }
         }
 
-        // Pass 'that' to callback for create
-        // function so that the create function
+        // Assign has many association. The association
+        // can only be available to a persisted record
+        this[this.hasMany] = new Entangled(this.webSocketUrl + '/' + this.id + '/' + this.hasMany);
+
+        // Pass 'this' to callback for create
+        // function so this the create function
         // can pass the created resource to its
         // own callback; not needed for $save per se
-        if (callback) callback(that);
-      };
+        if (callback) callback(this);
+      }.bind(this);
     } else {
       // Create
-      var socket = new WebSocket(that.webSocketUrl + '/create');
+      var socket = new WebSocket(this.webSocketUrl + '/create');
 
       // Send attributes to server
       socket.onopen = function() {
-        socket.send(JSON.stringify(that));
-      };
+        socket.send(JSON.stringify(this));
+      }.bind(this);
 
       // Receive saved resource from server
       socket.onmessage = function(event) {
@@ -72,17 +82,17 @@ angular.module('entangled', [])
           // updated_at, etc)
           if (data.resource) {
             for (key in data.resource) {
-              that[key] = data.resource[key];
+              this[key] = data.resource[key];
             }
           }
         }
 
-        // Pass 'that' to callback for create
-        // function so that the create function
+        // Pass 'this' to callback for create
+        // function so this the create function
         // can pass the created resource to its
         // own callback; not needed for $save per se
-        if (callback) callback(that);
-      };
+        if (callback) callback(this);
+      }.bind(this);
     }
   };
 
@@ -136,11 +146,11 @@ angular.module('entangled', [])
 
   // Resources wraps all individual Resource objects
   // in a collection.
-  var Resources = function(resources, webSocketUrl) {
+  var Resources = function(resources, webSocketUrl, hasMany) {
     this.all = [];
 
     for (var i = 0; i < resources.length; i++) {
-      var resource = new Resource(resources[i], webSocketUrl);
+      var resource = new Resource(resources[i], webSocketUrl, hasMany);
       this.all.push(resource);
     }
   };
@@ -160,10 +170,17 @@ angular.module('entangled', [])
     this.webSocketUrl = webSocketUrl;
   };
 
+  // hasMany() adds the appropriate association and
+  // sets up websockets accordingly
+  Entangled.prototype.hasMany = function(resources) {
+    this.hasMany = resources;
+    // this[resources] = new Entangled(this.webSocketUrl + '/' + this.id + '/' + resources);
+  };
+
   // Function to instantiate a new Resource, optionally
   // with given parameters
   Entangled.prototype.new = function(params) {
-    return new Resource(params, this.webSocketUrl);
+    return new Resource(params, this.webSocketUrl, this.hasMany);
   };
 
   // Retrieve all Resources from the root of the socket's
@@ -180,12 +197,12 @@ angular.module('entangled', [])
         // If the collection of Resources was sent
         if (data.resources) {
           // Store retrieved Resources in property
-          this.resources = new Resources(data.resources, socket.url);
+          this.resources = new Resources(data.resources, socket.url, this.hasMany);
         } else if (data.action) {
           if (data.action === 'create') {
             // If new Resource was created, add it to the
             // collection
-            this.resources.all.push(new Resource(data.resource, socket.url));
+            this.resources.all.push(new Resource(data.resource, socket.url, this.hasMany));
           } else if (data.action === 'update') {
             // If an existing Resource was updated,
             // update it in the collection as well
@@ -197,7 +214,7 @@ angular.module('entangled', [])
               }
             }
 
-            this.resources.all[index] = new Resource(data.resource, socket.url);
+            this.resources.all[index] = new Resource(data.resource, socket.url, this.hasMany);
           } else if (data.action === 'destroy') {
             // If a Resource was destroyed, remove it
             // from Resources as well
@@ -220,7 +237,7 @@ angular.module('entangled', [])
       // Run the callback and pass in the
       // resulting collection
       callback(this.resources.all);
-    };
+    }.bind(this);
   };
 
   // Instantiate and persist a record in one go
@@ -243,12 +260,12 @@ angular.module('entangled', [])
         if (data.resource && !data.action) {
           // If the Resource was sent from the server,
           // store it
-          this.resource = new Resource(data.resource, webSocketUrl);
+          this.resource = new Resource(data.resource, webSocketUrl, this.hasMany);
         } else if (data.action) {
           if (data.action === 'update') {
             // If the stored Resource was updated,
             // update it here as well
-            this.resource = new Resource(data.resource, webSocketUrl);
+            this.resource = new Resource(data.resource, webSocketUrl, this.hasMany);
           } else if (data.action === 'destroy') {
             // If the stored Resource was destroyed,
             // remove it from here as well
@@ -262,7 +279,7 @@ angular.module('entangled', [])
 
       // Run callback with retrieved Resource
       callback(this.resource);
-    };
+    }.bind(this);
   };
 
   return Entangled;

data/spec/dummy/public/app/services/list.js

@@ -0,0 +1,9 @@
+'use strict';
+
+angular.module('entangledTest')
+
+.factory('List', function(Entangled) {
+  var entangled = new Entangled('ws://localhost:3000/lists');
+  entangled.hasMany('items');
+  return entangled;
+});

data/spec/dummy/public/index.html

@@ -11,6 +11,9 @@
   <script src="app/app.js"></script>
   <script src="app/controllers/messages.js"></script>
   <script src="app/controllers/message.js"></script>
+  <script src="app/controllers/lists.js"></script>
+  <script src="app/controllers/list.js"></script>
   <script src="app/services/message.js"></script>
+  <script src="app/services/list.js"></script>
 </body>
 </html>

data/spec/dummy/public/test/controllers/lists_test.js

@@ -0,0 +1,87 @@
+'use strict';
+
+describe('ListsCtrl', function() {
+  beforeEach(module('entangledTest'));
+
+  var ListsCtrl,
+    scope,
+    List;
+
+  beforeEach(inject(function ($controller, $rootScope, $injector) {
+    scope = $rootScope.$new();
+    ListsCtrl = $controller('ListsCtrl', {
+      $scope: scope
+    }),
+    List = $injector.get('List');
+  }));
+
+  it('fetches all lists', function(done) {
+    List.all(function(lists) {
+      expect(lists).toEqual(jasmine.any(Array));
+      done();
+    });
+  });
+
+  it("fetches a list's items after creating it", function(done) {
+    List.create({ name: 'foo' }, function(list) {
+      // Assert that list has been persisted
+      expect(list.$persisted()).toBeTruthy();
+
+      // Fetch list's items
+      list.items().all(function(items) {
+        expect(items).toEqual(jasmine.any(Array));
+        done();
+      });
+    });
+  });
+
+  it("fetches a list's items after fetching it", function(done) {
+    List.create({ name: 'foo' }, function(list) {
+      // Fetch list
+      List.find(list.id, function(list) {
+        // Assert that list is persisted
+        expect(list.$persisted).toBeTruthy();
+
+        // Fetch list's items
+        list.items().all(function(items) {
+          expect(items).toEqual(jasmine.any(Array));
+          done();
+        });
+      });
+    });
+  });
+
+  it("fetches a list's items when fetching all lists", function(done) {
+    List.all(function(lists) {
+      var list = lists[0];
+
+      // Assert that list is persisted
+      expect(list.$persisted()).toBeTruthy();
+
+      // Fetch list's items
+      list.items().all(function(items) {
+        expect(items).toEqual(jasmine.any(Array));
+        done();
+      });
+    });
+  });
+
+  it("creates and finds a list's item", function(done) {
+    List.create({ name: 'foo' }, function(list) {
+      // Create item
+      list.items().create({ name: 'foo' }, function(item) {
+        // Assert that item has been persisted
+        expect(item.$persisted()).toBeTruthy();
+
+        // Assert that item's list_id is equal to the list's id
+        expect(item.list_id).toBe(list.id);
+
+        // Assert that it can find the item
+        list.items().find(item.id, function(item) {
+          expect(item.$persisted()).toBeTruthy();
+          done();
+        });
+      });
+    });
+  });
+});

data/spec/dummy/public/views/lists/index.html

@@ -0,0 +1,14 @@
+<h1>Lists</h1>
+
+<table>
+  <tr ng-repeat="list in lists">
+    <td><a ng-href="#/lists/{{ list.id }}">{{ list.name }}</a></td>
+    <td><button ng-click="destroy(list)">Delete</button></td>
+  </li>
+</table>
+
+<form ng-submit="create()">
+  <input type="text" ng-model="list.name">
+  <input type="submit">
+</form>
+

data/spec/dummy/public/views/lists/show.html

@@ -0,0 +1,9 @@
+<h1>List</h1>
+
+<h2>{{ list.name }}</h2>
+
+<ul>
+  <li ng-repeat="item in items">
+    {{ item.name }}, {{ item.complete }}
+  </li>
+</ul>

data/spec/models/inclusion_exclusion_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to collection channel
       expect(redis).to have_received(:publish).with(
-        'foos', {
+        foo.collection_channel, {
           action: :create,
           resource: foo
         }.to_json
@@ -24,7 +24,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to member channel
       expect(redis).to have_received(:publish).with(
-        "foos/#{foo.to_param}", {
+        foo.member_channel, {
           action: :create,
           resource: foo
         }.to_json
@@ -44,7 +44,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       ).never
 
       expect(redis).to have_received(:publish).with(
-        "foos/#{foo.to_param}", {
+        foo.member_channel, {
           action: :update,
           resource: foo
         }.to_json
@@ -64,7 +64,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       ).never
 
       expect(redis).to have_received(:publish).with(
-        "foos/#{foo.to_param}", {
+        foo.member_channel, {
           action: :destroy,
           resource: foo
         }.to_json
@@ -80,7 +80,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to collection channel
       expect(redis).to have_received(:publish).with(
-        'bars', {
+        bar.collection_channel, {
           action: :create,
           resource: bar
         }.to_json
@@ -88,7 +88,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to member channel
       expect(redis).to have_received(:publish).with(
-        "bars/#{bar.to_param}", {
+        bar.member_channel, {
           action: :create,
           resource: bar
         }.to_json
@@ -101,14 +101,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       bar.update(body: 'bar')
 
       expect(redis).to have_received(:publish).with(
-        'bars', {
+        bar.collection_channel, {
           action: :update,
           resource: bar
         }.to_json
       )
 
       expect(redis).to have_received(:publish).with(
-        "bars/#{bar.to_param}", {
+        bar.member_channel, {
           action: :update,
           resource: bar
         }.to_json
@@ -121,14 +121,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       bar.destroy
 
       expect(redis).to have_received(:publish).with(
-        'bars', {
+        bar.collection_channel, {
           action: :destroy,
           resource: bar
         }.to_json
       ).never
 
       expect(redis).to have_received(:publish).with(
-        "bars/#{bar.to_param}", {
+        bar.member_channel, {
           action: :destroy,
           resource: bar
         }.to_json
@@ -144,7 +144,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to collection channel
       expect(redis).to have_received(:publish).with(
-        'foobars', {
+        foobar.collection_channel, {
           action: :create,
           resource: foobar
         }.to_json
@@ -152,7 +152,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to member channel
       expect(redis).to have_received(:publish).with(
-        "foobars/#{foobar.to_param}", {
+        foobar.member_channel, {
           action: :create,
           resource: foobar
         }.to_json
@@ -165,14 +165,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       foobar.update(body: 'foobar')
 
       expect(redis).to have_received(:publish).with(
-        'foobars', {
+        foobar.collection_channel, {
           action: :update,
           resource: foobar
         }.to_json
       )
 
       expect(redis).to have_received(:publish).with(
-        "foobars/#{foobar.to_param}", {
+        foobar.member_channel, {
           action: :update,
           resource: foobar
         }.to_json
@@ -185,14 +185,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       foobar.destroy
 
       expect(redis).to have_received(:publish).with(
-        'foobars', {
+        foobar.collection_channel, {
           action: :destroy,
           resource: foobar
         }.to_json
       )
 
       expect(redis).to have_received(:publish).with(
-        "foobars/#{foobar.to_param}", {
+        foobar.member_channel, {
           action: :destroy,
           resource: foobar
         }.to_json
@@ -208,7 +208,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to collection channel
       expect(redis).to have_received(:publish).with(
-        'barfoos', {
+        barfoo.collection_channel, {
           action: :create,
           resource: barfoo
         }.to_json
@@ -216,7 +216,7 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
 
       # Publishing to member channel
       expect(redis).to have_received(:publish).with(
-        "barfoos/#{barfoo.to_param}", {
+        barfoo.member_channel, {
           action: :create,
           resource: barfoo
         }.to_json
@@ -229,14 +229,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       barfoo.update(body: 'barfoo')
 
       expect(redis).to have_received(:publish).with(
-        'barfoos', {
+        barfoo.collection_channel, {
           action: :update,
           resource: barfoo
         }.to_json
       ).never
 
       expect(redis).to have_received(:publish).with(
-        "barfoos/#{barfoo.to_param}", {
+        barfoo.member_channel, {
           action: :update,
           resource: barfoo
         }.to_json
@@ -249,14 +249,14 @@ RSpec.describe 'Inclusion/exclusion', type: :model do
       barfoo.destroy
 
       expect(redis).to have_received(:publish).with(
-        'barfoos', {
+        barfoo.collection_channel, {
           action: :destroy,
           resource: barfoo
         }.to_json
       ).never
 
       expect(redis).to have_received(:publish).with(
-        "barfoos/#{barfoo.to_param}", {
+        barfoo.member_channel, {
           action: :destroy,
           resource: barfoo
         }.to_json