entangled 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586788052b78442155a29cddff0aae0f026aac68
-  data.tar.gz: 1f57814b47022e219d8748de39cd7c93b88e19b1
+  metadata.gz: acd43415d53bc33e46fb87ca6e22b18398048798
+  data.tar.gz: 915a582c9aa65fcc3b55abac9a7977a97cccbf0c
 SHA512:
-  metadata.gz: e54a0366f09853ce373e4c93959b555bf5fe21beffb801636b558661e4edb09a8a3d1449dc1ec3f318cc0bb061d5608683f90445a6fdb71dfcebba5fc013aa99
-  data.tar.gz: b99b7c7b1644f38385bf0d85a364822b62ae422f6fb8ac85c291f18994ce7ed1019571012a6a2f10f21fd564105f15aba89b703be5d579fc502b6de19fc680dc
+  metadata.gz: 31b7560bb4a78329766122f4a58ba345f60f39364b9324ed0b915214d25504eaf33de5655d6ecb6aa620b35ea223d8a9e2c4f09ab7b9358fcb4e4bb64f277508
+  data.tar.gz: 341d2d3360966b6c9edf75561e76a0b5bf64a804f799ebb255d486b7263ae94010cb8a3cabed95562aa356b484572d9316f0e37a53ecd66c41c6083444ab143a

data/lib/entangled/controller.rb

@@ -4,10 +4,6 @@ require 'tubesock/hijack'
 module Entangled
   module Controller
     include Tubesock::Hijack
-
-    module ClassMethods
-      
-    end
     
     module InstanceMethods
       include Entangled::Helpers
@@ -31,6 +27,26 @@ module Entangled
         resources_name.singularize
       end
 
+      # Channel name for collection of resources, used in index
+      # action
+      def collection_channel
+        resources_name
+      end
+
+      # Channel name for single resource, used in show action
+      def member_channel
+        instance = member
+        "#{resources_name}/#{instance.to_param}"
+      end
+
+      def collection
+        instance_variable_get(:"@#{resources_name}")
+      end
+
+      def member
+        instance_variable_get(:"@#{resource_name}")
+      end
+
       # Broadcast events to every connected client
       def broadcast(&block)
         # Use hijack to handle sockets
@@ -60,16 +76,17 @@ module Entangled
             # ...then @tacos will be broadcast to all connected
             # clients. The variable name, in this example,
             # has to be "@tacos"
-            if instance_variable_get(:"@#{resources_name}")
+            if collection
               redis_thread = Thread.new do
-                redis.subscribe resources_name do |on|
+                redis.subscribe collection_channel do |on|
+                  # Broadcast messages to all connected clients
                   on.message do |channel, message|
                     tubesock.send_data message
                   end
 
-                  # Broadcast collection to all connected clients
+                  # Send message to whoever just subscribed
                   tubesock.send_data({
-                    resources: instance_variable_get(:"@#{resources_name}")
+                    resources: collection
                   }.to_json)
                 end
               end
@@ -98,15 +115,18 @@ module Entangled
 
             # ...then @taco will be broadcast to all connected clients.
             # The variable name, in this example, has to be "@taco"
-            if instance_variable_get(:"@#{resource_name}")
+            if member
               redis_thread = Thread.new do
-                redis.subscribe "#{resources_name}/#{instance_variable_get(:"@#{resource_name}").id}" do |on|
+                redis.subscribe member_channel do |on|
+                  # Broadcast messages to all connected clients
                   on.message do |channel, message|
                     tubesock.send_data message
                   end
 
-                  # Broadcast single resource to all connected clients
-                  tubesock.send_data({ resource: instance_variable_get(:"@#{resource_name}") }.to_json)
+                  # Send message to whoever just subscribed
+                  tubesock.send_data({
+                    resource: member
+                  }.to_json)
                 end
               end
 
@@ -122,7 +142,7 @@ module Entangled
           # happens in the model's callback
           when 'create'
             tubesock.onmessage do |m|
-              params[resource_name.to_sym] = JSON.parse(m).symbolize_keys
+              params[resource_name.to_sym] = JSON.parse(m)
               yield
             end
 
@@ -132,7 +152,7 @@ module Entangled
           # id, created_at, and updated_at should not be included in params.
           when 'update'
             tubesock.onmessage do |m|
-              params[resource_name.to_sym] = JSON.parse(m).except('id', 'created_at', 'updated_at', 'webSocketUrl').symbolize_keys
+              params[resource_name.to_sym] = JSON.parse(m)
               yield
             end
 
@@ -150,7 +170,6 @@ module Entangled
     end
     
     def self.included(receiver)
-      receiver.extend         ClassMethods
       receiver.send :include, InstanceMethods
     end
   end

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'bourne'
 require 'byebug'
-# require 'factory_girl_rails'
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Dennis Charles Hackethal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -9830,6 +9830,7 @@ files:
 - spec/dummy/public/test/controllers/messages_test.js
 - spec/dummy/public/views/messages/index.html
 - spec/dummy/public/views/messages/show.html
+- spec/dummy/tmp/pids/server.pid
 - spec/models/inclusion_exclusion_spec.rb
 - spec/models/message_spec.rb
 - spec/routing/inclusion_exclusion_routing_spec.rb
@@ -19515,6 +19516,7 @@ test_files:
 - spec/dummy/public/views/messages/show.html
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/dummy/tmp/pids/server.pid
 - spec/models/inclusion_exclusion_spec.rb
 - spec/models/message_spec.rb
 - spec/routing/inclusion_exclusion_routing_spec.rb