entangled 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2db62264a96d90447e75a73bed98ef29fd1a86
-  data.tar.gz: 5e2a82bd5418bb9911b54febe96721e285cee439
+  metadata.gz: d7c388678aa588a1f547b713feb70dbd9f5aaa44
+  data.tar.gz: 5c4baa78c2e13abb9fdce0aabbd132698a474af4
 SHA512:
-  metadata.gz: a4ce644d5222adcf7a7631da195c64ea1f35c9e70419451ece36a3a46325adca6c7386d015b70e10610f3d0d484c95fca19648f624f7baf9f4d02283ade87147
-  data.tar.gz: 31dfde1c1a38423af73029c115b38580030d2c268104b4ce5b90ea305c059458d1622e024267a81476f74880d9c7a07af2e0420e2ced2b4b33a55064b8aafe35
+  metadata.gz: a740b57b3679899c1c3bde3d2b969f00a5457f826af461626119fdb4083a08eba5c5115b433fc8c243736a00a6c7c074fa9b8c8673c561fd2cf6c18cef72c134
+  data.tar.gz: 17eb36090addf15cc12ea4a9c346dcb70411ac7273ce613ebfcf08143f9d47c15d0ee02ee8c1185a5b3200febabc2bb8fb13ac17538d205bb4a0b06daa0645e3

data/README.md

@@ -207,6 +207,8 @@ The Entangled service comes with these functions:
 - `$update(params, callback)`
 - `$destroy(callback)`
 
+They're just like class and instance methods in Active Record.
+
 In your controller, you could then inject that `Message` service and use it like so:
 
 ```javascript
@@ -411,14 +413,14 @@ The gem relies heavily on convention over configuration and currently only works
 ## Development Priorities
 The following features are to be implemented next:
 
-- Support more than one belongs_to association in back end
-- Support belongs_to in front end
-- Support deeply nested belongs_to, e.g. Parent > Child > Grandchild
-- Support has_one association in back end and front end
+- Support more than one `belongs_to` association in back end
+- Support `belongsTo` in front end
+- Support deeply nested `belongs_to`, e.g. `Parent > Child > Grandchild`
+- Support `has_one` association in back end and front end
 - Add offline capabilities
 - Add authentication - with JWT?
 - On Heroku, tasks are always in different order depending on which ones are checked off and not
-- Add $onChange function to objects - or could a simple $watch and $watchCollection suffice?
+- Add `$onChange` function to objects - or could a simple $watch and $watchCollection suffice?
 - Add diagram on how it works to Readme
 - Check if Rails 4.0.0 supported too
 - GNU instead of MIT? Or something else? How to switch?
@@ -426,7 +428,8 @@ The following features are to be implemented next:
 - Handle errors gracefully (e.g. finding a non-existent id, etc, authorization error in the back end, timeouts, etc)
 - Test controllers (see https://github.com/ngauthier/tubesock/issues/41)
 - Freeze destroyed object
-- Set $persisted() to false on a destroyed object
+- Set `$persisted()` to false on a destroyed object
+- Add `.destroyAll()` function to `Resources`
 
 ## Contributing
 1. [Fork it](https://github.com/dchacke/entangled/fork) - you will notice that the repo comes with a back end and a front end part to test both parts of the gem

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "entangled",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "authors": [
     "Dennis Charles Hackethal <dennis.hackethal@gmail.com>"
   ],

data/entangled.js

@@ -1 +1 @@
-angular.module("entangled",[]).factory("Entangled",function(){var e=function(e,t,r){for(var i in e)e.hasOwnProperty(i)&&(this[i]=e[i]);this.webSocketUrl=t,r&&(this[r]=function(){return new s(this.webSocketUrl+"/"+this.id+"/"+r)})};e.prototype.$save=function(e){if(this.id){var t=new WebSocket(this.webSocketUrl+"/"+this.id+"/update");t.onopen=function(){t.send(JSON.stringify(this))}.bind(this),t.onmessage=function(t){if(t.data){var r=JSON.parse(t.data);if(r.resource)for(key in r.resource)this[key]=r.resource[key]}this[this.hasMany]=new s(this.webSocketUrl+"/"+this.id+"/"+this.hasMany),e&&e(this)}.bind(this)}else{var t=new WebSocket(this.webSocketUrl+"/create");t.onopen=function(){t.send(JSON.stringify(this))}.bind(this),t.onmessage=function(t){if(t.data){var s=JSON.parse(t.data);if(s.resource)for(key in s.resource)this[key]=s.resource[key]}e&&e(this)}.bind(this)}},e.prototype.$update=function(e,t){for(var s in e)e.hasOwnProperty(s)&&(this[s]=e[s]);this.$save(t)},e.prototype.$destroy=function(e){var t=new WebSocket(this.webSocketUrl+"/"+this.id+"/destroy");t.onopen=function(){t.send(null)},t.onmessage=function(t){if(t.data){var s=JSON.parse(t.data);if(s.resource)for(key in s.resource)this[key]=s.resource[key]}e&&e(this)}.bind(this)},e.prototype.$valid=function(){return!(this.errors&&Object.keys(this.errors).length)},e.prototype.$invalid=function(){return!this.$valid()},e.prototype.$persisted=function(){return!!this.id};var t=function(t,s,r){this.all=[];for(var i=0;i<t.length;i++){var o=new e(t[i],s,r);this.all.push(o)}},s=function(e){this.webSocketUrl=e};return s.prototype.hasMany=function(e){this.hasMany=e},s.prototype["new"]=function(t){return new e(t,this.webSocketUrl,this.hasMany)},s.prototype.all=function(s){var r=new WebSocket(this.webSocketUrl);r.onmessage=function(i){if(i.data.length){var o=JSON.parse(i.data);if(o.resources)this.resources=new t(o.resources,r.url,this.hasMany);else if(o.action)if("create"===o.action)this.resources.all.push(new e(o.resource,r.url,this.hasMany));else if("update"===o.action){for(var n,a=0;a<this.resources.all.length;a++)this.resources.all[a].id===o.resource.id&&(n=a);this.resources.all[n]=new e(o.resource,r.url,this.hasMany)}else if("destroy"===o.action){for(var n,a=0;a<this.resources.all.length;a++)this.resources.all[a].id===o.resource.id&&(n=a);this.resources.all.splice(n,1)}else console.log("Something else other than CRUD happened..."),console.log(o)}s(this.resources.all)}.bind(this)},s.prototype.create=function(e,t){var s=this["new"](e);s.$save(t)},s.prototype.find=function(t,s){var r=this.webSocketUrl,i=new WebSocket(r+"/"+t);i.onmessage=function(t){if(t.data.length){var i=JSON.parse(t.data);i.resource&&!i.action?this.resource=new e(i.resource,r,this.hasMany):i.action?"update"===i.action?this.resource=new e(i.resource,r,this.hasMany):"destroy"===i.action&&(this.resource=void 0):(console.log("Something else other than CRUD happened..."),console.log(i))}s(this.resource)}.bind(this)},s});
+angular.module("entangled",[]).factory("Entangled",function(){var e=function(e,t,r){for(var i in e)e.hasOwnProperty(i)&&(this[i]=e[i]);this.webSocketUrl=t,r&&(this[r]=function(){return new s(this.webSocketUrl+"/"+this.id+"/"+r)})};e.prototype.$save=function(e){if(this.id){var t=new WebSocket(this.webSocketUrl+"/"+this.id+"/update");t.onopen=function(){t.send(JSON.stringify(this))}.bind(this),t.onmessage=function(t){if(t.data){var r=JSON.parse(t.data);if(r.resource)for(key in r.resource)this[key]=r.resource[key]}this[this.hasMany]=new s(this.webSocketUrl+"/"+this.id+"/"+this.hasMany),e&&e(this)}.bind(this)}else{var t=new WebSocket(this.webSocketUrl+"/create");t.onopen=function(){t.send(JSON.stringify(this))}.bind(this),t.onmessage=function(t){if(t.data){var s=JSON.parse(t.data);if(s.resource)for(key in s.resource)this[key]=s.resource[key]}e&&e(this)}.bind(this)}},e.prototype.$update=function(e,t){for(var s in e)e.hasOwnProperty(s)&&(this[s]=e[s]);this.$save(t)},e.prototype.$destroy=function(e){var t=new WebSocket(this.webSocketUrl+"/"+this.id+"/destroy");t.onopen=function(){t.send(null)},t.onmessage=function(t){if(t.data){var s=JSON.parse(t.data);if(s.resource)for(key in s.resource)this[key]=s.resource[key]}e&&e(this)}.bind(this)},e.prototype.$valid=function(){return!(this.errors&&Object.keys(this.errors).length)},e.prototype.$invalid=function(){return!this.$valid()},e.prototype.$persisted=function(){return!!this.id};var t=function(t,s,r){this.all=[];for(var i=0;i<t.length;i++){var o=new e(t[i],s,r);this.all.push(o)}},s=function(e){this.className="Entangled",this.webSocketUrl=e};return s.prototype.hasMany=function(e){this.hasMany=e},s.prototype["new"]=function(t){return new e(t,this.webSocketUrl,this.hasMany)},s.prototype.all=function(s){var r=new WebSocket(this.webSocketUrl);r.onmessage=function(i){if(i.data.length){var o=JSON.parse(i.data);if(o.resources)this.resources=new t(o.resources,r.url,this.hasMany);else if(o.action)if("create"===o.action)this.resources.all.push(new e(o.resource,r.url,this.hasMany));else if("update"===o.action){for(var n,a=0;a<this.resources.all.length;a++)this.resources.all[a].id===o.resource.id&&(n=a);this.resources.all[n]=new e(o.resource,r.url,this.hasMany)}else if("destroy"===o.action){for(var n,a=0;a<this.resources.all.length;a++)this.resources.all[a].id===o.resource.id&&(n=a);this.resources.all.splice(n,1)}else console.log("Something else other than CRUD happened..."),console.log(o)}s(this.resources.all)}.bind(this)},s.prototype.create=function(e,t){var s=this["new"](e);s.$save(t)},s.prototype.find=function(t,s){var r=this.webSocketUrl,i=new WebSocket(r+"/"+t);i.onmessage=function(t){if(t.data.length){var i=JSON.parse(t.data);i.resource&&!i.action?this.resource=new e(i.resource,r,this.hasMany):i.action?"update"===i.action?this.resource=new e(i.resource,r,this.hasMany):"destroy"===i.action&&(this.resource=void 0):(console.log("Something else other than CRUD happened..."),console.log(i))}s(this.resource)}.bind(this)},s});

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/spec/dummy/app/controllers/lists_controller.rb

@@ -19,6 +19,13 @@ class ListsController < ApplicationController
     end
   end
 
+  def update
+    broadcast do
+      @list = List.find(params[:id])
+      @list.update(list_params)
+    end
+  end
+
   def destroy
     broadcast do
       @list = List.find(params[:id]).destroy

data/spec/dummy/app/models/list.rb

@@ -3,4 +3,6 @@ class List < ActiveRecord::Base
   entangle
 
   has_many :items, dependent: :destroy
+
+  validates :name, presence: true
 end

data/spec/dummy/db/migrate/20150316034305_drop_messages.rb

@@ -0,0 +1,13 @@
+class DropMessages < ActiveRecord::Migration
+  def self.up
+    drop_table :messages
+  end
+
+  def self.down
+    create_table "messages", force: :cascade do |t|
+      t.text     "body"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150314055847) do
+ActiveRecord::Schema.define(version: 20150316034305) do
 
   create_table "barfoos", force: :cascade do |t|
     t.text     "body"
@@ -51,10 +51,4 @@ ActiveRecord::Schema.define(version: 20150314055847) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "messages", force: :cascade do |t|
-    t.text     "body"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
 end

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

@@ -7,14 +7,6 @@ angular.module('entangledTest', [
 
 .config(function($routeProvider) {
   $routeProvider
-    .when('/', {
-      templateUrl: 'views/messages/index.html',
-      controller: 'MessagesCtrl'
-    })
-    .when('/messages/:id', {
-      templateUrl: 'views/messages/show.html',
-      controller: 'MessageCtrl'
-    })
     .when('/lists', {
       templateUrl: 'views/lists/index.html',
       controller: 'ListsCtrl'
@@ -24,6 +16,6 @@ angular.module('entangledTest', [
       controller: 'ListCtrl'
     })
     .otherwise({
-      redirectTo: '/'
+      redirectTo: '/lists'
     });
 })

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

@@ -179,6 +179,8 @@ angular.module('entangled', [])
   // of the index action on the server where the
   // Resources can be retrieved.
   var Entangled = function(webSocketUrl) {
+    this.className = 'Entangled';
+
     // Store the root URL that sockets
     // will connect to
     this.webSocketUrl = webSocketUrl;

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

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

data/spec/dummy/public/index.html

@@ -10,11 +10,8 @@
   <script src="bower_components/angular-route/angular-route.js"></script>
   <script src="app/entangled/entangled.js"></script>
   <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/services/entangled_test.js

@@ -0,0 +1,263 @@
+'use strict';
+
+describe('Entangled', function() {
+  beforeEach(module('entangled'));
+
+  var $injector,
+  Entangled,
+  List;
+
+  beforeEach(inject(function() {
+    $injector = angular.injector(['entangled']);
+    Entangled = $injector.get('Entangled');
+
+    List = new Entangled('ws://localhost:3000/lists');
+    List.hasMany('items');
+  }));
+
+  describe('.className', function() {
+    it('is "Entangled"', function() {
+      expect(List.className).toBe('Entangled');
+    });
+  });
+
+  describe('.new', function() {
+    it('instantiates a new list with given values', function() {
+      var list = List.new({ name: 'foo' });
+      expect(list).toBeDefined();
+      expect(list.name).toBe('foo');
+    });
+  });
+
+  describe('.all', function() {
+    it('fetches all lists', function(done) {
+      List.all(function(lists) {
+        expect(lists).toEqual(jasmine.any(Array));
+        done();
+      });
+    });
+  });
+
+  describe('.create', function() {
+    it('creates a list', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        expect(list.id).toBeDefined();
+        expect(list.created_at).toBeDefined();
+        done();
+      });
+    });
+
+    it('receives validation messages', function(done) {
+      // Leave out name, causing model validations
+      // in ActiveRecord to fail
+      List.create({}, function(list) {
+        expect(list.errors.name.indexOf("can't be blank") > -1).toBeTruthy();
+        done();
+      });
+    });
+  });
+
+  describe('.find', function() {
+    it('finds a list', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        List.find(list.id, function(list) {
+          expect(list.id).toBeDefined();
+          expect(list.created_at).toBeDefined();
+          done();
+        });
+      });
+    });
+  });
+
+  describe('#$save', function() {
+    describe('new record', function() {
+      it('saves a new list', function(done) {
+        var list = List.new({ name: 'foo' });
+
+        list.$save(function() {
+          expect(list.id).toBeDefined();
+          expect(list.created_at).toBeDefined();
+          done();
+        });
+      });
+
+      it('receives validation messages', function(done) {
+        // Leave out name, causing model validations
+        // in ActiveRecord to fail
+        var list = List.new();
+
+        list.$save(function() {
+          expect(list.errors.name.indexOf("can't be blank") > -1).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('existing record', function() {
+      it('updates an existing list', function(done) {
+        List.create({ name: 'foo' }, function(list) {
+          list.name = 'new name';
+          var oldUpdatedAt = list.updated_at;
+
+          list.$save(function() {
+            expect(list.name).toBe('new name');
+            expect(list.updated_at).not.toEqual(oldUpdatedAt);
+            done();
+          });
+        });
+      });
+
+      it('receives validation messages', function(done) {
+        List.create({ name: 'foo' }, function(list) {
+          // Make invalid by setting the name to an
+          // empty string, causing model validations
+          // in ActiveRecord to fail
+          list.name = '';
+          var oldUpdatedAt = list.updated_at;
+
+          list.$save(function() {
+            // Assert that the list was not updated
+            // by the server
+            expect(list.updated_at).toBe(oldUpdatedAt);
+            expect(list.errors.name.indexOf("can't be blank") > -1).toBeTruthy();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  describe('#$update', function() {
+    it('updates a list in place', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        var oldUpdatedAt = list.updated_at;
+
+        list.$update({ name: 'new name' }, function() {
+          expect(list.name).toBe('new name');
+          expect(list.updated_at).not.toEqual(oldUpdatedAt);
+          done();
+        });
+      });
+    });
+
+    it('receives validation messages', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        var oldUpdatedAt = list.updated_at;
+
+        // Make invalid by setting the name to an
+        // empty string, causing model validations
+        // in ActiveRecord to fail
+        list.$update({ name: '' }, function() {
+          // Assert that the list was not updated
+          // by the server
+          expect(list.updated_at).toBe(oldUpdatedAt);
+          expect(list.errors.name.indexOf("can't be blank") > -1).toBeTruthy();
+          done();
+        });
+      });
+    });
+  });
+
+  describe('#$destroy', function() {
+    it('destroys a list', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        list.$destroy(function() {
+          // If successfully destroyed, it won't be
+          // included in the collection of all records
+          // anymore
+          List.all(function(lists) {
+            expect(lists.indexOf(list)).toBe(-1);
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  describe('#$valid', function() {
+    var list;
+
+    beforeEach(function() {
+      list = List.new();
+    });
+
+    describe('valid record', function() {
+      it('is true', function() {
+        list.errors = {};
+        expect(list.$valid()).toBeTruthy();
+      });
+    });
+
+    describe('invalid record', function() {
+      it('is false', function() {
+        list.errors = {
+          name: ["can't be blank"]
+        };
+
+        expect(list.$valid()).not.toBeTruthy();
+      });
+    });
+  });
+
+  describe('#$invalid', function() {
+    var list;
+
+    beforeEach(function() {
+      list = List.new();
+    });
+
+    describe('valid record', function() {
+      it('is false', function() {
+        list.errors = {};
+        expect(list.$invalid()).not.toBeTruthy();
+      });
+    });
+
+    describe('invalid record', function() {
+      it('is true', function() {
+        list.errors = {
+          name: ["can't be blank"]
+        };
+
+        expect(list.$invalid()).toBeTruthy();
+      });
+    });
+  });
+
+  describe('#$persisted', function() {
+    var list;
+
+    beforeEach(function() {
+      list = List.new();
+    });
+
+    describe('persisted record', function() {
+      it('is true', function() {
+        list.id = 1;
+        expect(list.$persisted()).toBeTruthy();
+      });
+    });
+
+    describe('unpersisted record', function() {
+      it('is false', function() {
+        expect(list.$persisted()).not.toBeTruthy();
+      });
+    });
+  });
+
+  describe('Associations', function() {
+    it('has many items', function(done) {
+      List.create({ name: 'foo' }, function(list) {
+        // Assert that relationship defined
+        expect(list.items).toBeDefined();
+
+        // Assert that relationship is also
+        // an instance of Entangled, meaning
+        // in turn that all class and instance
+        // methods are available on it
+        expect(list.items().className).toBe('Entangled');
+        done();
+      });
+    });
+  });
+});