magicbus 0.0.2 → 0.0.3

data/README.md

@@ -0,0 +1,4 @@
+magicbus
+========
+
+Sinatra-ready RabbitMQ wrapper for message routing with AMQP.

data/lib/magicbus.rb

@@ -2,112 +2,13 @@ module MagicBus
   
   require 'amqp'
 
+  require_relative 'magicbus/subscriber'
+  require_relative 'magicbus/publisher'
+  
   def self.connect(params = { host: '127.0.0.1' })
     EM.next_tick do
       Subscriber.connection = AMQP.connect(*params)
     end
   end
-  
-  class Publisher
-
-    class << self
-      attr_accessor :conection
-    end
-
-    def self.scatter(group, action, model, &block)
-
-      MagicBus::Subscriber.connected_users(group).each do |user_id|
-        user = User.find(user_id)
-        self.send_to(user_id, 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)
-      end
-
-    end
-
-    def self.send_to(user_id, action, model, data)
-
-      data = { action: action, model: model, data: data }
-
-      self.publish(user_id, data)
-
-    end
-
-    private
-
-    def self.publish(user_id, data)
-      channel = MagicBus::Subscriber.channels[user_id]
-      exchange = channel.default_exchange
-      exchange.publish(data.to_json, routing_key: user_id)
-    end
-    
-  end
-
-  class Subscriber
-
-    class << self
-      attr_accessor :connection
-      attr_accessor :channels
-      attr_accessor :clients
-    end
-    
-    self.channels, self.clients = {}, {}
-
-    def self.connected_users(group)
-
-      connected_users = []
-
-      group.users.each do |user|
-        if self.clients[user.id.to_s]
-          connected_users << user.id.to_s
-        end
-      end
-
-      connected_users
-
-    end
-
-    def self.subscribe(user_id, out)
-      
-      unless channels[user_id]
-        
-        channels[user_id] = AMQP::Channel.new(connection)
-        channel = channels[user_id]
-      
-        queue = channel.queue(user_id, auto_delete: true)
-
-        queue.subscribe do |payload|
-          self.clients[user_id].each do |client|
-            client << "data: #{payload}\n\n"
-          end
-        end
-
-      end
-      
-      self.clients[user_id] ||= []
-      self.clients[user_id] << out
-      self.clients[user_id].length
-
-    end
-
-    def self.unsubscribe(user_id, client_id)
-
-      if self.clients[user_id][client_id]
-        self.clients[user_id].delete_at(client_id)
-      end
-
-      if self.clients[user_id].length == 0
-        self.clients.unsubscribe(user_id)
-      end
-
-    end
-
-  end
 
 end

data/lib/magicbus/publisher.rb

@@ -0,0 +1,53 @@
+class MagicBus::Publisher
+
+  class << self
+    attr_accessor :conection
+  end
+
+  def self.scatter(group, action, model, &block)
+
+    warn 'Scattering message'
+    
+    MagicBus::Subscriber.connected_users(group).each do |user_id|
+      user = User.find(user_id)
+      self.send_to(user_id, action, model, block.call(user))
+    end
+
+  end
+
+  def self.broadcast(group, action, model, data = nil)
+
+    warn 'Broadcasting message'
+    
+    MagicBus::Subscriber.connected_users(group).each do |user_id|
+      self.send_to(user_id, action, model, data)
+    end
+
+  end
+
+  def self.send_to(user_id, action, model, data)
+
+    warn 'Sending data to client'
+    
+    data = { action: action, model: model, data: data }
+
+    self.publish(user_id, data)
+
+  end
+
+  private
+
+  def self.publish(user_id, data)
+    
+    user_id = user_id.to_s
+    
+    channel = MagicBus::Subscriber.channels[user_id]
+    
+    if channel
+      exchange = channel.default_exchange
+      exchange.publish(data.to_json, routing_key: user_id)
+    end
+    
+  end
+  
+end

data/lib/magicbus/subscriber.rb

@@ -0,0 +1,66 @@
+class MagicBus::Subscriber
+
+  class << self
+    attr_accessor :connection
+    attr_accessor :channels
+    attr_accessor :clients
+  end
+
+  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
+
+    if channels[user_id].status == :closed ||
+      channels[user_id].nil?
+
+      channels[user_id] = AMQP::Channel.new(connection)
+      channel = channels[user_id]
+
+      queue = channel.queue(user_id, auto_delete: true)
+
+      queue.subscribe do |payload|
+        self.clients[user_id].each do |client|
+          client << "data: #{payload}\n\n"
+        end
+      end
+
+    end
+
+    self.clients[user_id] ||= []
+    self.clients[user_id] << out
+    self.clients[user_id].length
+
+  end
+
+  def self.unsubscribe(user_id, client_id)
+
+    user_id = user_id.to_s
+
+    if self.clients[user_id][client_id]
+      self.clients[user_id].delete_at(client_id)
+    end
+
+    if self.clients[user_id].length == 0
+      self.channels[user_id].close
+      self.clients.unsubscribe(user_id)
+    end
+
+  end
+
+end

data/lib/magicbus/version.rb

@@ -1,5 +1,5 @@
 module MagicBus
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magicbus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -35,6 +35,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/magicbus/publisher.rb
+- lib/magicbus/subscriber.rb
 - lib/magicbus/version.rb
 - lib/magicbus.rb
 - README.md