entangled 0.0.22 → 0.0.23

data/spec/models/list_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe List, type: :model do
   describe 'Methods' do
     let(:list) { List.create(name: 'foo') }
 
-    describe '#channel' do
+    describe '#member_channel' do
       it 'has the right channel' do
         expect(list.member_channel).to eq "/lists/#{list.to_param}"
       end
@@ -28,4 +28,110 @@ RSpec.describe List, type: :model do
       end
     end
   end
+
+  describe '#entangle' do
+    let(:stub_redis) do
+      mock("redis").tap do |redis|
+        redis.stubs(:publish)
+        Redis.stubs(:new).returns(redis)
+      end
+    end
+
+    describe 'creation' do
+      let(:list) { List.create(name: 'foo') }
+
+      it 'broadcasts the creation to the collection channel' do
+        redis = stub_redis
+
+        expect(redis).to have_received(:publish).with(
+          list.collection_channel, {
+            action: :create,
+            resource: list
+          }.to_json
+        )
+      end
+
+      it 'broadcasts the creation to the member channel' do
+        redis = stub_redis
+
+        expect(redis).to have_received(:publish).with(
+          list.member_channel, {
+            action: :create,
+            resource: list
+          }.to_json
+        )
+      end
+    end
+
+    describe 'update' do
+      let!(:list) { List.create(name: 'foo') }
+
+      it 'broadcasts the update to the collection channel' do
+        redis = stub_redis
+
+        list.update(name: 'bar')
+
+        expect(redis).to have_received(:publish).with(
+          list.collection_channel, {
+            action: :update,
+            resource: list
+          }.to_json
+        )
+      end
+
+      it 'broadcasts the update to the member channel' do
+        redis = stub_redis
+
+        list.update(name: 'bar')
+
+        expect(redis).to have_received(:publish).with(
+          list.member_channel, {
+            action: :update,
+            resource: list
+          }.to_json
+        )
+      end
+    end
+
+    describe 'destruction' do
+      let!(:list) { List.create(name: 'foo') }
+
+      it 'broadcasts the destruction to the collection channel' do
+        redis = stub_redis
+
+        list.destroy
+
+        expect(redis).to have_received(:publish).with(
+          list.collection_channel, {
+            action: :destroy,
+            resource: list
+          }.to_json
+        )
+      end
+
+      it 'broadcasts the destruction to the member channel' do
+        redis = stub_redis
+        
+        list.destroy
+
+        expect(redis).to have_received(:publish).with(
+          list.member_channel, {
+            action: :destroy,
+            resource: list
+          }.to_json
+        )
+      end
+    end
+  end
+
+  describe '#as_json' do
+    it 'includes errors' do
+      list = List.create
+      expect(list.as_json["errors"][:name]).to include "can't be blank"
+    end
+  end
+
+  describe 'Validations' do
+    it { is_expected.to validate_presence_of :name }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Dennis Charles Hackethal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,6 @@ files:
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/items_controller.rb
 - spec/dummy/app/controllers/lists_controller.rb
-- spec/dummy/app/controllers/messages_controller.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/bar.rb
 - spec/dummy/app/models/barfoo.rb
@@ -232,34 +231,27 @@ files:
 - spec/dummy/db/migrate/20150223004852_create_barfoos.rb
 - spec/dummy/db/migrate/20150314054548_create_lists.rb
 - spec/dummy/db/migrate/20150314055847_create_items.rb
+- spec/dummy/db/migrate/20150316034305_drop_messages.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/.keep
 - spec/dummy/public/Gruntfile.js
 - spec/dummy/public/app/app.js
 - spec/dummy/public/app/controllers/list.js
 - spec/dummy/public/app/controllers/lists.js
-- spec/dummy/public/app/controllers/message.js
-- spec/dummy/public/app/controllers/messages.js
 - spec/dummy/public/app/entangled/entangled.js
 - spec/dummy/public/app/services/list.js
-- spec/dummy/public/app/services/message.js
 - spec/dummy/public/bower.json
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/index.html
 - spec/dummy/public/package.json
-- spec/dummy/public/test/controllers/lists_test.js
-- spec/dummy/public/test/controllers/messages_test.js
+- spec/dummy/public/test/services/entangled_test.js
 - spec/dummy/public/views/lists/index.html
 - spec/dummy/public/views/lists/show.html
-- spec/dummy/public/views/messages/index.html
-- spec/dummy/public/views/messages/show.html
 - spec/helpers/redis_spec.rb
 - spec/models/inclusion_exclusion_spec.rb
 - spec/models/item_spec.rb
 - spec/models/list_spec.rb
-- spec/models/message_spec.rb
 - spec/routing/inclusion_exclusion_routing_spec.rb
-- spec/routing/messages_routing_spec.rb
 - spec/routing/nested_routing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dchacke/entangled
@@ -293,7 +285,6 @@ test_files:
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/items_controller.rb
 - spec/dummy/app/controllers/lists_controller.rb
-- spec/dummy/app/controllers/messages_controller.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/bar.rb
 - spec/dummy/app/models/barfoo.rb
@@ -333,33 +324,26 @@ test_files:
 - spec/dummy/db/migrate/20150223004852_create_barfoos.rb
 - spec/dummy/db/migrate/20150314054548_create_lists.rb
 - spec/dummy/db/migrate/20150314055847_create_items.rb
+- spec/dummy/db/migrate/20150316034305_drop_messages.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/.keep
 - spec/dummy/public/Gruntfile.js
 - spec/dummy/public/app/app.js
 - spec/dummy/public/app/controllers/list.js
 - spec/dummy/public/app/controllers/lists.js
-- spec/dummy/public/app/controllers/message.js
-- spec/dummy/public/app/controllers/messages.js
 - spec/dummy/public/app/entangled/entangled.js
 - spec/dummy/public/app/services/list.js
-- spec/dummy/public/app/services/message.js
 - spec/dummy/public/bower.json
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/index.html
 - spec/dummy/public/package.json
-- spec/dummy/public/test/controllers/lists_test.js
-- spec/dummy/public/test/controllers/messages_test.js
+- spec/dummy/public/test/services/entangled_test.js
 - spec/dummy/public/views/lists/index.html
 - spec/dummy/public/views/lists/show.html
-- spec/dummy/public/views/messages/index.html
-- spec/dummy/public/views/messages/show.html
 - spec/helpers/redis_spec.rb
 - spec/models/inclusion_exclusion_spec.rb
 - spec/models/item_spec.rb
 - spec/models/list_spec.rb
-- spec/models/message_spec.rb
 - spec/routing/inclusion_exclusion_routing_spec.rb
-- spec/routing/messages_routing_spec.rb
 - spec/routing/nested_routing_spec.rb
 - spec/spec_helper.rb

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

@@ -1,41 +0,0 @@
-# This controller serves as fully restful example
-# controller with all five actions
-class MessagesController < ApplicationController
-  include Entangled::Controller
-
-  def index
-    broadcast do
-      @messages = Message.all
-    end
-  end
-
-  def show
-    broadcast do
-      @message = Message.find(params[:id])
-    end
-  end
-
-  def create
-    broadcast do
-      @message = Message.create(message_params)
-    end
-  end
-
-  def update
-    broadcast do
-      @message = Message.find(params[:id])
-      @message.update(message_params)
-    end
-  end
-
-  def destroy
-    broadcast do
-      @message = Message.find(params[:id]).destroy
-    end
-  end
-
-private
-  def message_params
-    params.require(:message).permit(:body)
-  end
-end

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

@@ -1,15 +0,0 @@
-'use strict';
-
-angular.module('entangledTest')
-
-.controller('MessageCtrl', function($scope, $routeParams, Message) {
-  $scope.update = function() {
-    $scope.message.$save();
-  };
-
-  Message.find($routeParams.id, function(message) {
-    $scope.$apply(function() {
-      $scope.message = message;
-    });
-  });
-});

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

@@ -1,23 +0,0 @@
-'use strict';
-
-angular.module('entangledTest')
-
-.controller('MessagesCtrl', function($scope, Message) {
-  $scope.message = Message.new();
-
-  $scope.create = function() {
-    $scope.message.$save(function() {
-      $scope.message = Message.new();
-    });
-  };
-
-  $scope.destroy = function(message) {
-    message.$destroy();
-  };
-
-  Message.all(function(messages) {
-    $scope.$apply(function() {
-      $scope.messages = messages;
-    });
-  });
-});

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

@@ -1,7 +0,0 @@
-'use strict';
-
-angular.module('entangledTest')
-
-.factory('Message', function(Entangled) {
-  return new Entangled('ws://localhost:3000/messages');
-});

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

@@ -1,87 +0,0 @@
-'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/test/controllers/messages_test.js

@@ -1,249 +0,0 @@
-'use strict';
-
-// Consider making heavy use of mocks instead;
-// the tests currently run asynchronously and
-// heavily influence each other, making them
-// hard to maintain. As suggested on this page
-// (https://docs.angularjs.org/guide/unit-testing),
-// it seems that using mocks enables you to extend
-// other modules so they are synchronous. Not
-// sure if that would isolate the tests, but
-// something is definitely needed to isolate them
-
-describe('MessagesCtrl', function () {
-  beforeEach(module('entangledTest'));
-
-  var MessagesCtrl,
-    scope,
-    Message;
-
-  beforeEach(inject(function ($controller, $rootScope, $injector) {
-    scope = $rootScope.$new();
-    MessagesCtrl = $controller('MessagesCtrl', {
-      $scope: scope
-    }),
-    Message = $injector.get('Message');
-  }));
-
-  it('assigns a blank message', function() {
-    expect(scope.message).toBeDefined();
-  });
-
-  it('assigns all messages', function(done) {
-    Message.all(function(messages) {
-      expect(messages).toEqual(jasmine.any(Array));
-      done();
-    });
-  });
-
-  it('can find a message', function(done) {
-    // Create message
-    Message.create({ body: 'foo' }, function(message) {
-      // Assert creation was successful
-      expect(message.$persisted()).toBeTruthy();
-
-      // Find message
-      Message.find(message.id, function(message) {
-        expect(message).toBeDefined();
-        done();
-      });
-    });
-  });
-
-  it('can save the blank message', function(done) {
-    setTimeout(function() {
-      var oldLength = scope.messages.length;
-
-      // Assert it's a new message
-      expect(scope.message.id).not.toBeDefined();
-
-      // Be sure to pass validations in the back end
-      scope.message.body = 'foo';
-
-      // Save it
-      scope.message.$save(function() {
-        setTimeout(function() {
-          // Make sure that the message was added to the collection
-          expect(scope.messages.length).toBe(oldLength + 1);
-
-          // Make sure that it has been persisted and new attributes
-          // were sent over from the back end and updated here
-          setTimeout(function() {
-            expect(scope.message.id).toBeDefined();
-            expect(scope.message.created_at).toBeDefined();
-            expect(scope.message.updated_at).toBeDefined();
-            done();
-          }, 100);
-        }, 100);
-      });      
-    }, 100);
-  });
-
-  it('can instantiate and save a message in one go with $create', function(done) {
-    Message.create({ body: 'foo' }, function(message) {
-      expect(message.$persisted()).toBeTruthy();
-      done();
-    });
-  });
-
-  it('can update an existing message', function(done) {
-    setTimeout(function() {
-      // Pick first message
-      var message = scope.messages[0];
-
-      // Assert that message has been persisted before
-      expect(message.id).toBeDefined();
-
-      // Remember old updated_at
-      var oldUpdatedAt = message.updated_at;
-
-      // Update it
-      message.body = 'new body';
-      message.$save(function() {
-        setTimeout(function() {
-          // Assert that message was updated across collection
-          expect(scope.messages[0].body).toBe('new body');
-
-          // Assert that message was actually updated in back end
-          // and attributes have been updated here
-          expect(scope.message.updated_at).not.toBe(oldUpdatedAt);
-          done();
-        }, 100);
-      });
-    }, 100);
-  });
-
-  it('gets validation errors', function(done) {
-    setTimeout(function() {
-      // Pick first message
-      var message = scope.messages[0];
-
-      // Assert that message has been persisted before
-      expect(message.id).toBeDefined();
-
-      // Update it so it won't pass validations in the back end
-      message.body = '';
-
-      // Remember old updated_at
-      var oldUpdatedAt = message.updated_at;
-
-      // Save it
-      message.$save(function() {
-        // Assert that message was not updated on server
-        expect(message.updated_at).toBe(oldUpdatedAt);
-
-        // Assert that the message has error messages attached
-        // to it
-        expect(message.errors.body).toEqual(["can't be blank"])
-
-        done();
-      });
-    }, 100);
-  });
-
-  it('checks for validity with $valid()', function() {
-    var message = Message.new();
-
-    // Message should be valid without erros
-    expect(message.$valid()).toBeTruthy();
-
-    message.errors = {
-      body: ["can't be blank"]
-    };
-
-    // Message should not be valid because errors
-    // are attached
-    expect(message.$valid()).not.toBeTruthy();
-
-    // Message should be valid if errors property
-    // present but not filled
-    message.errors = {};
-    expect(message.$valid()).toBeTruthy();
-  });
-
-  it('checks for invalidity with $invalid()', function() {
-    var message = Message.new();
-
-    // Message should not be invalid without errors
-    expect(message.$invalid()).not.toBeTruthy();
-
-    message.errors = {
-      body: ["can't be blank"]
-    };
-
-    // Message should be invalid because errors
-    // are attached
-    expect(message.$invalid()).toBeTruthy();
-
-    // Message should not be invalid if errors property
-    // present but not filled
-    message.errors = {};
-    expect(message.$invalid()).not.toBeTruthy();
-  });
-
-  it('can destroy an existing message', function(done) {
-    setTimeout(function() {
-      // Pick first message
-      var message = scope.messages[0];
-
-      // Assert that message has been persisted before
-      expect(message.id).toBeDefined();
-
-      var oldLength = scope.messages.length;
-
-      message.$destroy(function() {
-        setTimeout(function() {
-          expect(scope.messages.length).toBe(oldLength - 1);
-          done();
-        }, 100);
-      });
-      done();
-    }, 100);
-  });
-
-  it('can destroy a message and receives it in the callback', function(done) {
-    Message.create({ body: 'foo' }, function(message) {
-      expect(message.$persisted()).toBeTruthy();
-
-      message.$destroy(function(message) {
-        expect(message).toBeDefined();
-        done();
-      });
-    });
-  });
-
-  it('can check for persistence', function() {
-    // Instantiate record and mimic persistence
-    var message = Message.new({ id: 1 });
-
-    expect(message.$persisted()).toBeTruthy();
-  });
-
-  it('can check for lack of persistence', function() {
-    // Instantiate record and mimic lack of persistence
-    var message = Message.new({ id: undefined });
-
-    expect(message.$persisted()).not.toBeTruthy();
-  });
-
-  it('can update a message in place', function(done) {
-    // Create message
-    Message.create({ body: 'foo' }, function(message) {
-      // Assert that creation was successful
-      expect(message.$persisted()).toBeTruthy();
-
-      // Remember updated_at
-      var oldUpdatedAt = message.updated_at;
-
-      // Update
-      message.$update({ body: 'new body' }, function() {
-        // Assert that body was updated
-        expect(message.body).toBe('new body');
-
-        // Assert that updated_at is new
-        expect(message.updated_at).not.toEqual(oldUpdatedAt);
-        done();
-      })
-    });
-  });
-});