magicbus 0.0.7 → 0.0.9

data/lib/magicbus.rb

@@ -5,10 +5,14 @@ module MagicBus
   require_relative 'magicbus/subscriber'
   require_relative 'magicbus/publisher'
   
+  class << self
+    attr_accessor :connection
+  end
+  
   def self.connect(params = { host: '127.0.0.1' })
     EM.next_tick do
-      Subscriber.connection = AMQP.connect(*params)
+      self.connection = AMQP.connect(*params)
     end
   end
 
-end
+end

data/lib/magicbus/publisher.rb

@@ -1,23 +1,30 @@
 class MagicBus::Publisher
 
   class << self
-    attr_accessor :conection
+    attr_accessor :connection
     attr_accessor :channels
   end
 
-  def self.scatter(group, action, model, &block)
+  self.channels = {}
   
-    MagicBus::Subscriber.connected_users(group).each do |user_id|
+  def self.scatter(group, action, model, &block)
+    
+    users = group.users.map(&:id).map(&:to_s)
+    
+    users.each do |user_id|
       user = User.find(user_id)
-      self.send_to(user_id, action, model, block.call(user))
+      self.send_to(user.id.to_s, action, model, block.call(user))
     end
 
   end
 
   def self.broadcast(group, action, model, data = nil)
     
-    MagicBus::Subscriber.connected_users(group).each do |user_id|
-      self.send_to(user_id, action, model, data)
+    users = group.users.map(&:id).map(&:to_s)
+    
+    users.each do |user_id|
+      user = User.find(user_id)
+      self.send_to(user.id.to_s, action, model, data)
     end
 
   end
@@ -25,7 +32,6 @@ class MagicBus::Publisher
   def self.send_to(user_id, action, model, data)
     
     data = { action: action, model: model, data: data }
-
     self.publish(user_id, data)
 
   end
@@ -35,7 +41,11 @@ class MagicBus::Publisher
   def self.publish(user_id, data)
     
     user_id = user_id.to_s
-    channels[user_id] ||= AMQP::Channel.new(connection)
+    
+    unless channels[user_id]
+      channels[user_id] = AMQP::Channel.new(MagicBus.connection)
+    end
+    
     channel = channels[user_id]
     exchange = channel.fanout('syme')
     exchange.publish(data.to_json)

data/lib/magicbus/subscriber.rb

@@ -6,22 +6,10 @@ class MagicBus::Subscriber
     attr_accessor :clients
   end
 
+  require 'securerandom'
+  
   self.channels, self.clients = {}, {}
 
-  def self.connected_users(group)
-
-    connected_users = []
-
-    group.users.each do |user|
-      if self.channels[user.id.to_s]
-        connected_users << user.id.to_s
-      end
-    end
-
-    connected_users
-
-  end
-
   def self.subscribe(user_id, out)
 
     user_id = user_id.to_s
@@ -29,22 +17,28 @@ class MagicBus::Subscriber
     if channels[user_id].nil? ||
        channels[user_id].status == :closed
 
-      channels[user_id] = AMQP::Channel.new(connection)
-      channel = channels[user_id]
-      exchange = channel.fanout('syme')
-
-      queue = channel.queue(user_id, auto_delete: true)
-      .bind(exchange).subscribe do |payload|
-        self.clients[user_id].each do |client|
-          client << "data: #{payload}\n\n"
-        end
-      end
-
+      channels[user_id] = AMQP::Channel.new(MagicBus.connection)
+      
     end
-
-    self.clients[user_id] ||= []
-    self.clients[user_id] << out
-    self.clients[user_id].length
+    
+    channel = channels[user_id]
+    exchange = channel.fanout('syme')
+    
+    self.clients[user_id] ||= {}
+    
+    client_id = SecureRandom.uuid
+    
+    self.clients[user_id][client_id] = out
+    
+    queue = channel.queue(client_id)
+    .bind(exchange).subscribe do |payload|
+      
+      self.clients[user_id][client_id] << 
+      "data: #{payload}\n\n"
+      
+    end
+    
+    client_id
 
   end
 
@@ -53,7 +47,7 @@ class MagicBus::Subscriber
     user_id = user_id.to_s
 
     if self.clients[user_id][client_id]
-      self.clients[user_id].delete_at(client_id)
+      self.clients[user_id][client_id] = nil
     end
 
     if self.clients[user_id].length == 0

data/lib/magicbus/version.rb

@@ -1,5 +1,5 @@
 module MagicBus
 
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magicbus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: