witch 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4aec34f53b5eefdb9e1ef701556c0b9834f23ae
-  data.tar.gz: 99bf4a228960cc0e830136b57e00562e4254b5fc
+  metadata.gz: a844251fad9136572ae168e4ccec604679651caf
+  data.tar.gz: 51f9b573a0bfcb8b59885ed2d88e5c518455d7b4
 SHA512:
-  metadata.gz: 3b6c2d058d1fc8c524756b0662b65f7d7d4a601902e96c699b886b96348a47e9e2291f2514df161e95e13d4368d411b3ae3828c7ccad8726e5fcc6e3952bdcd2
-  data.tar.gz: a55381d307d1c6cea404640a135da9d553730074b39807d5397e5f35c6b13cba06e3c87b8f0c80ef554bcb08878ab58654fcb3df1567d936f1f7ff5ecc810ad8
+  metadata.gz: 47e2ab33086fa1b4bc303dd5fddd3fdb3abca21d43dd263a4ba7db1990bf23bd2236d61eb37552febae197018277c674f8a8490391ffa11fa41e824e36ae4f5f
+  data.tar.gz: 015e88a9dbb40aaa85f321bb086a3d809c249811252429d0803f7a7a60d26101ed3147f6cc0ce98c173ebe155ef5d426ff3b3683041bd39c526f868e2ebd3638

data/examples/puma/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'puma'
+gem 'witch', :path => '../..'

data/examples/puma/config.ru

@@ -0,0 +1,21 @@
+require 'bundler/setup'
+require 'witch'
+
+class HelloWorld
+  def initialize
+    @response_text = 'Hello World!'
+
+    Witch.init(:logger => Logger.new(STDOUT))
+
+    Witch.on('change_text') do |text|
+      puts 'Got new text: ' + text
+      @response_text = text
+    end
+  end
+
+  def call(env)
+    [200, {"Content-Type" => "text/html"}, [@response_text]]
+  end
+end
+
+run HelloWorld.new

data/examples/puma/update.rb

@@ -0,0 +1,8 @@
+require 'bundler/setup'
+require 'witch'
+
+text = ARGV[0] || "Random number: #{rand(100)}"
+puts "Updating new text: #{text}"
+
+Witch.init 
+Witch.publish 'change_text', text

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Witch
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/witch.rb

@@ -1,5 +1,5 @@
 require 'redis'
-require 'json'
+require 'logger'
 
 module Witch
 
@@ -10,12 +10,21 @@ module Witch
     def init(options = {})
       raise 'Already initialized!' if @queue
       @queue     = options.delete(:queue) || 'eventstream'
+      @logger    = options.delete(:logger)
       @options   = options
       @callbacks = {:once => {}, :on => {}}
       @channels  = []
+      @thread    = nil
       @id = Socket.gethostname + '-' + $$.to_s
     end
 
+    def reset
+      return unless @queue
+      disconnect # clears @callbacks[:once]
+      @callbacks[:on] = {}
+      @queue = nil
+    end
+
     def once(*events, &block)
       raise 'Not initialized' unless @callbacks
       events.each do |event|
@@ -43,21 +52,23 @@ module Witch
     end
 
     def publish(event, data = nil)
+      raise 'Not initialized' unless @queue
+
       str = event + '___' + data.to_s
 
       lock.synchronize do
         # first, send to everyone on the main queue
-        puts '[publisher] Publishing on queue ' + @queue
+        logger.debug '[publisher] Publishing on queue ' + @queue
         connection.publish(@queue, str)
 
         # if one or more clients are subscribed to the 'once' queue, choose one and notify.
         if consumer = connection.smembers('subscribers:' + event.to_s).shuffle.first
           # connection.publish(['events', event, subscriber].join(':'), data)
-          puts "[publisher] Found consumer for #{event}: #{consumer}"
+          logger.info "[publisher] Found consumer for #{event}: #{consumer}"
           count = connection.publish(consumer, str)
 
           if count == 0
-            puts "[publisher] Consumer #{consumer} disconnected! Removing and retrying..."
+            logger.warn "[publisher] Consumer #{consumer} disconnected! Removing and retrying..."
             connection.srem('subscribers:' + event.to_s, consumer)
             raise ConsumerDisconnected, "name: #{consumer}"
           end
@@ -69,11 +80,23 @@ module Witch
       retry
     end
 
+    def wait
+      @thread.join
+    end
+
     def disconnect
       return unless @id
+
       @callbacks[:once].keys.each do |event|
         unregister_from(event)
       end
+
+      return unless @thread
+
+      logger.warn '[consumer] Disconnecting!'
+      lock.synchronize do
+        @thread.kill 
+      end
     end
 
     private
@@ -81,31 +104,37 @@ module Witch
     def register_for(event)
       lock.synchronize do
         count = connection.sadd('subscribers:' + event.to_s, @id)
-        puts "[consumer] Registered. Queue contains #{count} listeners."
+        logger.debug "[consumer] Registered. Queue contains #{count} listeners."
       end
+    rescue => e
+      logger.error '[consumer] Register error: ' +  e.inspect
     end
 
     def unregister_from(event)
       lock.synchronize do
-        puts "[consumer] Unregistering from #{event} processing queue."
+        logger.debug "[consumer] Unregistering from #{event} processing queue."
         connection.srem('subscribers:' + event.to_s, @id)
       end
     rescue => e
-      puts e.inspect
+      logger.error '[consumer] Unregister error: ' +  e.inspect
     end
 
     def listen(type, queue)
       lock.synchronize do
-        puts "[consumer] Subscribing to queue #{queue} on new thread..."
+        logger.debug "[consumer] Subscribing to queue #{queue} on new thread..."
         @channels.push(queue)
-        Thread.new do
+        @thread = Thread.new do
           # connection.subscribe(['events' + event + id].join(':')) do |on|
           connection.subscribe(queue) do |on|
             on.subscribe do |channel, subscriptions|
-
-              puts "[consumer] Subscribed to #{channel} (#{subscriptions} subscriptions)"
+              logger.info "[consumer] Subscribed to #{channel} (#{subscriptions} subscriptions)"
               raise "Existing subscribers!" if subscriptions > 1
             end
+
+           on.unsubscribe do |channel, subscriptions|
+              logger.info "Unsubscribed from ##{channel} (#{subscriptions} subscriptions)"
+            end
+
             on.message do |channel, msg|
               process(type, msg)
             end
@@ -114,26 +143,25 @@ module Witch
       end
     rescue => e
       @channels.delete(queue)
-      puts e.message
+      logger.error '[consumer] ' +  e.message
     end
 
     def process(type, msg)
       parts = msg.split('___')
-      data = parts[1] ? JSON.parse(parts[1]) : nil
-      fire_callbacks(type, parts[0], data)
+      fire_callbacks(type, parts[0], parts[1])
     rescue => e
-      puts "[consumer] Error parsing message: #{e.message}"
+      logger.error "[consumer] Error parsing message: #{e.message}"
     end
 
     def fire_callbacks(type, event, data)
       return if @callbacks.nil?
-      lock.synchronize do
+      # lock.synchronize do
         (@callbacks[type][event.to_sym] || []).each do |callback|
           callback.call(data)
         end
-      end
+      # end
     rescue => e
-      puts "[consumer] Error firing callback: #{e.message}"
+      logger.error "[consumer] Error firing callback: #{e.message}"
     end
 
     def lock
@@ -149,6 +177,10 @@ module Witch
       @channels.include?(queue)
     end
 
+    def logger
+      @logger || Logger.new(nil)
+    end
+
   end
 
 end

data/spec/witch/witch_spec.rb

@@ -2,43 +2,89 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe 'witch' do
 
-  before do
-    @called = {}
+  before(:each) do
+    Witch.reset
   end
 
   after(:all) do
     # Witch.disconnect
   end
 
-  def register(type)
-    Witch.init
-    Witch.send(type, 'some_event') do
-      # puts 'calledxxxxxxxxx'
-      @called[$$] = true
+  def register(type, event_name)
+    Witch.send(type, event_name) do
+      @called[event_name] = {} unless @called[event_name]
+      @called[event_name][$$] = true
+      sleep 0.1
+      puts Witch.disconnect
     end
-    sleep 0.1
+  end
+
+  describe 'init' do
+
+    it 'works if called once' do
+      expect do
+        Witch.init
+      end.not_to raise_error
+    end
+
+    it 'fires error if called twice' do
+      expect do
+        Witch.init
+        Witch.init
+      end.to raise_error('Already initialized!')
+    end
+
   end
 
   describe 'once' do
 
+    before do
+      Witch.init(:logger => Logger.new(STDOUT))
+      @called = {}
+    end
+
     describe 'single process' do
 
-      before do
-        register :once
+      describe 'single listener' do
+
+        before do
+          register(:once, 'some_event')
+        end
+
+        it 'fires event once' do
+          Witch.publish 'some_event'
+          Witch.wait
+          expect(@called['some_event'].keys.count).to be(1)
+          expect(@called['some_event'].keys.first).to be($$)
+        end
+
       end
 
-      it 'fires event once' do
-        puts 'publishing'
-        Witch.publish 'some_event'
-        puts @called.inspect
-        # @called.keys.should == $$
+      describe 'multiple listeners' do
+
+        before do
+          register(:once, 'some_other_event')
+          register(:once, 'some_other_event')
+        end
+
+        it 'fires event once' do
+          Witch.publish 'some_other_event'
+          Witch.wait
+          expect(@called['some_other_event'].keys.count).to be(1)
+          expect(@called['some_other_event'].keys.first).to be($$)
+        end
+
       end
 
     end
 
     describe 'multi process' do
 
-      it 'fires event once' do
+      describe 'single listener per process' do
+
+      end
+
+      describe 'multiple listeners per process' do
 
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: witch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- examples/puma/Gemfile
+- examples/puma/config.ru
+- examples/puma/update.rb
 - lib/version.rb
 - lib/witch.rb
 - sandbox/api.rb