entangled 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad9b5cc25344895ee783f55c630d30b1d445abb
-  data.tar.gz: 73520ca797c54e54e7b6ddb919448ced2814a873
+  metadata.gz: 3ea4626c7d1bb040d403f4da6b8b64021c81a29f
+  data.tar.gz: 639932af1572cfd2006295af882d23519e0c1f00
 SHA512:
-  metadata.gz: f50e3e90e995d47e4dc85b47eddfe44edf1aac69050571663afb69c1e1467210048b4607ddaec9b8abf5b9a595b6a88292b860b8a7019fa0a32fcaba220258a4
-  data.tar.gz: f8cfa4d6a52154aa26b6da60e7d0f149a38f6e5f2277f932487b3a1852b8894b93073ac48c745bcf1614f93eccfbc5fd0f1179c259fd3c98ee329b64951151e5
+  metadata.gz: 034e96b2cb4f1748c4ef748448974e1b54fd2fcaa7db7ff469eae55d45365ec5cee0da26daaacae459b2d903bc698b1e610547bfd56d52e61e2ba904acfdf196
+  data.tar.gz: 55d59ceeeddb3277e3d971db4926b10270e0e591062ce738b4dc2b9f7db8fc39bba89cf56b257bde97ff0542f342e59f353d793b192e5ff4f5a8bd11b45028ed

data/README.md

@@ -150,6 +150,12 @@ class MessagesController < ApplicationController
     end
   end
 
+  # def custom_action
+  #   broadcast do
+  #     # do whatever
+  #   end
+  # end
+
 private
   def message_params
     # params logic here
@@ -165,6 +171,7 @@ Note the following:
 - The instance variables are sent to clients as stringified JSON
 - Strong parameters are expected
 - The path to your controllers' index action has to match the model's channel for the collection, and the path to your controller's show action has to match the model's channel for a single member (which it will automatically if you stay RESTful)
+- You can add custom actions on top of the five RESTful ones; JSON sent through sockets is available in the params hash
 
 ### Server
 
@@ -277,7 +284,6 @@ The gem relies heavily on convention over configuration and currently only works
 ## Development Priorities
 The following features are to be implemented next:
 
-- Parse tubesock message `m` if available and assign to params in other controller actions before yield
 - Make broadcast method non-blocking using [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby); update Readme and repo description accordingly
 - Add compatibility table for Ruby/Angular/JS versions
 - Make prefix of create path `create_message` instead of `create_messages`

data/entangled.gemspec

@@ -28,13 +28,17 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'byebug', '~> 3.5'
   s.add_development_dependency 'bourne', '~> 1.6'
   s.add_development_dependency 'puma', '~> 2.11'
-  s.add_dependency 'tubesock', '~> 0.2'
   s.add_dependency 'rails', '~> 4.0'
+
+  # To handle channels
   s.add_dependency 'redis', '~> 3.2'
 
+  # To handle websockets
+  s.add_dependency 'tubesock', '~> 0.2'
+
   # To convert hashes from snake case to camel case
   s.add_dependency 'awrence', '~> 0.1'
 
   # To convert hashes from camel case to snake case
-  s.add_dependency 'plissken', '~> 0.2.0'
+  s.add_dependency 'plissken', '~> 0.2'
 end

data/lib/entangled/controller.rb

@@ -156,7 +156,7 @@ module Entangled
           # happens in the model's callback
           when 'create'
             tubesock.onmessage do |m|
-              params[resource_name.to_sym] = JSON.parse(m)
+              set_resource_params(m)
               yield
 
               # Send resource that was just created back to client. The resource
@@ -177,7 +177,7 @@ module Entangled
           # with attributes sent to the socket
           when 'update'
             tubesock.onmessage do |m|
-              params[resource_name.to_sym] = JSON.parse(m)
+              set_resource_params(m)
               yield
 
               # Send resource that was just updated back to client. The resource
@@ -212,6 +212,10 @@ module Entangled
           # of the socket. Other custom actions can be added through this
           else
             tubesock.onmessage do |m|
+              # If message was sent, attach to params (rescue exception if
+              # message not valid JSON or message not present)
+              params.merge!(JSON.parse(m)) rescue nil
+
               yield
 
               close_db_connection
@@ -219,6 +223,10 @@ module Entangled
           end
         end
       end
+
+      def set_resource_params(message_from_socket)
+        params[resource_name.to_sym] = JSON.parse(message_from_socket)
+      end
     end
     
     def self.included(receiver)

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

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

@@ -7,7 +7,9 @@ angular.module('entangledTest')
 
   $scope.create = function() {
     $scope.list.$save(function() {
-      $scope.list = List.new();
+      $scope.$apply(function() {
+        $scope.list = List.new();
+      });
     });
   };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Dennis Charles Hackethal
@@ -123,47 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: tubesock
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: tubesock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: awrence
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 description: Makes Rails real time through websockets as a gem in the backend and
   as an Angular library in the front end.
 email: