chasqui 0.1.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb216d9f86e895b3a2c48b686a9d3d92f991cf8
-  data.tar.gz: e736ccd90ee44c1aa827c4d59e09136ea63f9958
+  metadata.gz: f308ee6114cf27680f344bbb770e4eeee946f467
+  data.tar.gz: 749dbc74254f92306c8204f799a99d54d5e83017
 SHA512:
-  metadata.gz: d174c6cb4f929a2135f86fe7bf4c06e32d8f66088e25d18fa4048b872aaaa9430888f7cb5f901665dff430064dd24772164fb1b19aa6b48f3b3e74f7fa9d14a2
-  data.tar.gz: e4e64b8ee8453138def77a8f229e3fb002f0e794d2c0e0013db5eaa12bdd6bae46e109d707e95b024a6dae4081dbdcfcf2ff7288ea4ea5c9f8ce4ba55eb19532
+  metadata.gz: a9fe9a92bba7c1be6ef419fae3f0adbb3db94010b966773b5b32d127a5e43302a6b01bb522f33b0bfd4d291fe389d2da47576a9197cd93a172fdadff875e519b
+  data.tar.gz: f7957a3fd5ea629fcb5ac05f5cb80a1d8231385ee7dddf1f8b8dd9a349be580a3b5a1e7908be04ae21be682b9d84af4fd3433ab92b3199b02a348059c1b47803

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: "bundle exec rspec --tag ~integration" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 

data/Rakefile

@@ -2,22 +2,12 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 require 'resque/tasks'
-task 'resque:setup' => :environment
+task 'resque:setup' => :resque_integration_environment
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-task :environment do
-  $LOAD_PATH.unshift './lib'
-  require 'bundler/setup'
-  require 'chasqui'
-
-  if ENV['CHASQUI_ENV'] == 'test'
-    require './spec/integration/subscribers'
-  end
-
-  require 'resque'
-  Resque.redis = ENV['REDIS_URL'] if ENV['REDIS_URL']
-  Resque.redis.namespace = 'chasqui'
+task :resque_integration_environment do
+  require './spec/integration/setup/resque'
 end

data/lib/chasqui/broker.rb

@@ -1,19 +1,23 @@
 require 'timeout'
 
 class Chasqui::Broker
-  attr_reader :config
+  attr_reader :config, :redis, :redis_namespace
 
   extend Forwardable
-  def_delegators :@config, :redis, :inbox, :logger
+  def_delegators :@config, :inbox, :logger
 
   ShutdownSignals = %w(INT QUIT ABRT TERM).freeze
 
-  # To prevent unsuspecting clients from blocking forever, the broker uses
-  # it's own private redis connection.
   def initialize
     @shutdown_requested = nil
     @config = Chasqui.config.dup
-    @config.redis = Redis.new @config.redis.client.options
+    @redis_namespace = @config.redis.namespace
+
+    # The broker uses it's own private redis connection for two reasons:
+    # 1. subscribers may use a different (or no) redis namespace than chasqui
+    # 2. sharing the connection with unsuspecting clients could result in
+    #    the broker blocking forever
+    @redis = Redis.new @config.redis.client.options
   end
 
   def start

data/lib/chasqui/multi_broker.rb

@@ -2,11 +2,11 @@ class Chasqui::MultiBroker < Chasqui::Broker
 
   def forward_event
     event = receive or return
-    queues = subscriber_queues event
+    subscribers = subscribers_for(event)
 
     redis.multi do
-      queues.each do |queue|
-        dispatch event, queue
+      subscribers.each do |subscriber_id|
+        dispatch event, subscriber_id
       end
       redis.rpop(in_progress_queue)
     end
@@ -15,16 +15,23 @@ class Chasqui::MultiBroker < Chasqui::Broker
   end
 
   def in_progress_queue
-    "#{inbox}:in_progress"
+    to_key inbox, 'in_progress'
+  end
+
+  def inbox_queue
+    to_key inbox
   end
 
   private
 
   def receive
     event = retry_failed_event || dequeue
-    logger.debug "received event: #{event['event']}, on channel: #{event['channel']}"
 
-    JSON.parse event
+    if event
+      JSON.parse(event).tap do |e|
+        logger.debug "received event: #{e['event']}, on channel: #{e['channel']}"
+      end
+    end
   end
 
   def retry_failed_event
@@ -36,21 +43,40 @@ class Chasqui::MultiBroker < Chasqui::Broker
   end
 
   def dequeue
-    redis.brpoplpush(inbox, in_progress_queue, timeout: config.broker_poll_interval).tap do |event|
+    redis.brpoplpush(inbox_queue, in_progress_queue, timeout: config.broker_poll_interval).tap do |event|
       if event.nil?
         logger.debug "reached timeout for broker poll interval: #{config.broker_poll_interval} seconds"
       end
     end
   end
 
-  def dispatch(event, queue)
-    job = { class: "Chasqui::Subscriber__#{queue}", args: [event] }.to_json
-    logger.debug "dispatching event to queue: #{queue}, with job: #{job}"
-    redis.rpush "queue:#{queue}", job
+  def dispatch(event, subscriber_id)
+    backend, queue = subscriber_id.split('/', 2)
+    job = build_job queue, event
+
+    logger.debug "dispatching event queue=#{queue} backend=#{backend} job=#{job}"
+
+    case backend
+    when 'resque'
+      redis.rpush queue, job
+    when 'sidekiq'
+      redis.lpush queue, job
+    end
+  end
+
+  def build_job(queue, event)
+    {
+      class: "Chasqui::#{Chasqui.subscriber_class_name(queue)}",
+      args: [event]
+    }.to_json
+  end
+
+  def subscribers_for(event)
+    redis.smembers to_key('subscribers', event['channel'])
   end
 
-  def subscriber_queues(event)
-    redis.smembers "subscribers:#{event['channel']}"
+  def to_key(*args)
+    ([redis_namespace] + args).join(':')
   end
 
 end

data/lib/chasqui/version.rb

@@ -1,3 +1,3 @@
 module Chasqui
-  VERSION = "0.1.0"
+  VERSION = "0.8.0"
 end

data/lib/chasqui/workers/resque_worker.rb

@@ -1,40 +1,25 @@
-class Chasqui::ResqueWorker
+module Chasqui
+  class ResqueWorker < Worker
+    class << self
 
-  class << self
-
-    # Factory method to create a Resque worker class for a Chasqui::Subscriber instance.
-    def create(subscriber)
-      find_or_build_worker(subscriber).tap do |worker|
-        worker.class_eval do
-          @queue = subscriber.queue
-          @subscriber = subscriber
-
-          def self.perform(event)
-            @subscriber.perform Resque.redis, event
-          end
-        end
+      def namespace
+        Resque.redis.namespace
       end
-    end
 
-    private
+      # Factory method to create a Resque worker class for a Chasqui::Subscriber instance.
+      def create(subscriber)
+        find_or_build_worker(subscriber, Chasqui::ResqueWorker).tap do |worker|
+          worker.class_eval do
+            @queue = subscriber.queue
+            @subscriber = subscriber
 
-    def find_or_build_worker(subscriber)
-      class_name = class_name_for subscriber
-
-      if Chasqui.const_defined? class_name
-        Chasqui.const_get class_name
-      else
-        Class.new(Chasqui::ResqueWorker).tap do |worker|
-          Chasqui.const_set class_name, worker
+            def self.perform(event)
+              @subscriber.perform Resque.redis, event
+            end
+          end
         end
       end
-    end
 
-    def class_name_for(subscriber)
-      queue_name_constant = subscriber.queue.gsub(/[^\w]/, '_')
-      "Subscriber__#{queue_name_constant}".to_sym
     end
-
   end
-
 end

data/lib/chasqui/workers/sidekiq_worker.rb

@@ -1,25 +1,33 @@
-class Chasqui::SidekiqWorker
+module Chasqui
+  class SidekiqWorker < Worker
+    class << self
 
-  class << self
+      def namespace
+        Sidekiq.redis { |r| r.respond_to?(:namespace) ? r.namespace : nil }
+      end
 
-    def create(subscriber)
-      Class.new(Chasqui::SidekiqWorker) do
-        include Sidekiq::Worker
-        sidekiq_options queue: subscriber.queue
-        @subscriber = subscriber
+      def create(subscriber)
+        find_or_build_worker(subscriber, Chasqui::SidekiqWorker).tap do |worker|
+          worker.class_eval do
+            include Sidekiq::Worker
+            sidekiq_options queue: subscriber.queue
+            @subscriber = subscriber
 
-        def perform(event)
-          self.class.subscriber.perform "TODO: redis", event
-        end
+            def perform(event)
+              Sidekiq.redis do |r|
+                self.class.subscriber.perform r, event
+              end
+            end
 
-        private
+            private
 
-        def self.subscriber
-          @subscriber
+            def self.subscriber
+              @subscriber
+            end
+          end
         end
       end
-    end
 
+    end
   end
-
 end

data/lib/chasqui/workers/worker.rb

@@ -0,0 +1,34 @@
+module Chasqui
+  class Worker
+    class << self
+
+      def namespace
+        raise NotImplementedError
+      end
+
+      def create(subscriber)
+        raise NotImplementedError
+      end
+
+      def subscriber=(subscriber)
+        raise NotImplementedError
+      end
+
+      protected
+
+      def find_or_build_worker(subscriber, superclass)
+        class_name = Chasqui.subscriber_class_name(subscriber.queue)
+
+        if Chasqui.const_defined? class_name
+          Chasqui.logger.warn "redefining subscriber class Chasqui::#{class_name}"
+          Chasqui.send :remove_const, class_name
+        end
+
+        Class.new(superclass).tap do |worker|
+          Chasqui.const_set class_name, worker
+        end
+      end
+
+    end
+  end
+end

data/lib/chasqui.rb

@@ -9,6 +9,7 @@ require "chasqui/config"
 require "chasqui/broker"
 require "chasqui/multi_broker"
 require "chasqui/subscriber"
+require "chasqui/workers/worker"
 require "chasqui/workers/resque_worker"
 require "chasqui/workers/sidekiq_worker"
 
@@ -37,8 +38,8 @@ module Chasqui
 
       register_subscriber(queue, channel).tap do |sub|
         sub.evaluate(&block) if block_given?
-        Chasqui::ResqueWorker.create sub
-        redis.sadd "subscribers:#{channel}", queue
+        worker = create_worker(sub)
+        redis.sadd "subscribers:#{channel}", subscriber_id(worker, queue)
       end
     end
 
@@ -46,6 +47,11 @@ module Chasqui
       subscribers[queue.to_s]
     end
 
+    def subscriber_class_name(queue)
+      queue_name_constant = queue.split(':').last.gsub(/[^\w]/, '_')
+      "Subscriber__#{queue_name_constant}".to_sym
+    end
+
     def create_worker(subscriber)
       case config.worker_backend
       when :resque
@@ -60,6 +66,11 @@ module Chasqui
 
     private
 
+    def subscriber_id(worker, queue)
+      queue_name = [worker.namespace, 'queue', queue].compact.join(':')
+      "#{config.worker_backend}/#{queue_name}"
+    end
+
     def register_subscriber(queue, channel)
       subscribers[queue.to_s] ||= Subscriber.new queue, channel
     end

data/spec/integration/pubsub_examples.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+shared_examples 'pubsub' do |namespace, start_workers_method|
+
+  def events_to_publish
+    [
+      { event: 'user.signup',    data: ['Kelly'] },
+      { event: 'account.credit', data: [1337, 'Kelly'] },
+      { event: 'account.debit',  data: [10, 'Kelly'] },
+      { event: 'user.signup',    data: ['Travis'] },
+      { event: 'account.debit',  data: [9000, 'Kelly'] },
+      { event: 'user.cancel',    data: ['Kelly'] },
+      { event: 'account.credit', data: [42, 'Travis'] },
+    ]
+  end
+
+  def expected_events
+    {
+      'app1' => [
+        { event: 'user.signup', data: ['Kelly'] },
+        { event: 'user.signup', data: ['Travis'] },
+      ],
+      'app2' => [
+        { event: 'account.credit', data: [1337, 'Kelly'] },
+        { event: 'account.debit',  data: [10, 'Kelly'] },
+        { event: 'account.debit',  data: [9000, 'Kelly'] },
+        { event: 'user.cancel',    data: ['Kelly'] },
+        { event: 'account.credit', data: [42, 'Travis'] },
+      ],
+    }
+  end
+
+  before do
+    @subscriber_queues = %w(app1 app2)
+    @redis_url = 'redis://localhost:6379/13'
+    @redis = Redis.new url: @redis_url
+    @redis.keys('*').each { |k| @redis.del k }
+
+    Chasqui.configure do |c|
+      c.channel = 'integration'
+      c.redis = @redis_url
+    end
+
+    @pids = []
+    send start_workers_method
+
+    # Wait for subscribers to register before starting the broker so we don't miss events.
+    sleep 1
+
+    start_chasqui_broker
+  end
+
+  after do
+    terminate_child_processes
+  end
+
+  it 'works' do
+    events_to_publish.each do |event|
+      Chasqui.publish event[:event], *event[:data]
+    end
+
+    begin
+      Timeout::timeout(10) do
+        expected_events.each do |subscriber_queue, events|
+          events.each do |expected|
+            _, payload = @redis.blpop "#{namespace}:#{subscriber_queue}:event_log"
+            actual = JSON.parse payload
+            expect(actual['event']).to eq(expected[:event])
+            expect(actual['data']).to eq(expected[:data])
+          end
+        end
+      end
+    rescue TimeoutError
+      terminate_child_processes
+      fail "Failed to process all events in a timely manner."
+    end
+  end
+
+  def start_chasqui_broker
+    @pids << fork do
+      exec './bin/chasqui',
+        '--logfile', 'tmp/integration.log',
+        '--redis', @redis_url,
+        '--debug'
+    end
+  end
+
+  def start_resque_workers
+    @subscriber_queues.each do |queue|
+      @pids << fork do
+        ENV['CHASQUI_ENV'] = 'test'
+        ENV['QUEUE'] = queue
+        ENV['TERM_CHILD'] = '1'
+        ENV['INTERVAL'] = '1'
+        ENV['REDIS_NAMESPACE'] = "resque:#{queue}"
+        ENV['REDIS_URL'] = @redis_url
+        exec 'bundle', 'exec', 'rake', 'resque:work'
+      end
+    end
+  end
+
+  def terminate_child_processes
+    Timeout::timeout(10) do
+      @pids.each { |pid| kill 'TERM', pid rescue nil }
+    end
+  rescue TimeoutError
+    @pids.each { |pid| kill 'KILL', pid rescue nil }
+    fail "One or more child processes failed to terminate in a timely manner"
+  end
+
+  def kill(signal, pid)
+    Process.kill signal, pid
+    unless signal == 'KILL'
+      pid, status = Process.waitpid2 pid, 0
+      expect(status.exitstatus).to eq(0)
+    end
+  end
+
+end

data/spec/integration/resque_spec.rb

@@ -1,84 +1,8 @@
 require 'spec_helper'
+require 'integration/pubsub_examples'
 
-describe "Chasqui resque integration" do
-
-  PUBLISH_EVENTS = [
-    { event: 'user.signup',    data: ['Kelly'] },
-    { event: 'account.credit', data: [1337, 'Kelly'] },
-    { event: 'account.debit',  data: [10, 'Kelly'] },
-    { event: 'user.signup',    data: ['Travis'] },
-    { event: 'account.debit',  data: [9000, 'Kelly'] },
-    { event: 'user.cancel',    data: ['Kelly'] },
-    { event: 'account.credit', data: [42, 'Travis'] },
-  ]
-
-  EXPECTED_EVENTS = {
-    'app1' => [
-      { event: 'user.signup', data: ['Kelly'] },
-      { event: 'user.signup', data: ['Travis'] },
-    ],
-    'app2' => [
-      { event: 'account.credit', data: [1337, 'Kelly'] },
-      { event: 'account.debit',  data: [10, 'Kelly'] },
-      { event: 'account.debit',  data: [9000, 'Kelly'] },
-      { event: 'user.cancel',    data: ['Kelly'] },
-      { event: 'account.credit', data: [42, 'Travis'] },
-    ],
-  }
-
-  before do
-    @subscriber_queues = %w(app1 app2)
-    @redis_url = 'redis://localhost:6379/13'
-    @redis = Redis.new url: @redis_url
-    @redis.keys('*').each { |k| @redis.del k }
-
-    Chasqui.configure do |c|
-      c.channel = 'integration'
-      c.redis = @redis_url
-    end
-
-    @pids = []
-    start_resque_workers
-
-    # Wait for subscribers to register before starting the broker so we don't miss events.
-    sleep 1
-
-    start_chasqui_broker
-  end
-
-  after do
-    terminate_child_processes
-  end
-
-  it 'works' do
-    PUBLISH_EVENTS.each do |event|
-      Chasqui.publish event[:event], *event[:data]
-    end
-
-    begin
-      Timeout::timeout(10) do
-        EXPECTED_EVENTS.each do |subscriber_queue, events|
-          events.each do |expected|
-            _, payload = @redis.blpop "chasqui:#{subscriber_queue}:event_log"
-            actual = JSON.parse payload
-            expect(actual['event']).to eq(expected[:event])
-            expect(actual['data']).to eq(expected[:data])
-          end
-        end
-      end
-    rescue TimeoutError
-      fail "Failed to process all events in a timely manner."
-    end
-  end
-
-  def start_chasqui_broker
-    @pids << fork do
-      exec './bin/chasqui',
-        '--logfile', 'tmp/resque-spec.log',
-        '--redis', @redis_url,
-        '--debug'
-    end
-  end
+describe "resque integration", integration: true do
+  include_examples 'pubsub', :resque, :start_resque_workers
 
   def start_resque_workers
     @subscriber_queues.each do |queue|
@@ -86,28 +10,11 @@ describe "Chasqui resque integration" do
         ENV['CHASQUI_ENV'] = 'test'
         ENV['QUEUE'] = queue
         ENV['TERM_CHILD'] = '1'
-        ENV['INTERVAL'] = '0.1'
+        ENV['INTERVAL'] = '1'
         ENV['REDIS_NAMESPACE'] = "resque:#{queue}"
         ENV['REDIS_URL'] = @redis_url
         exec 'bundle', 'exec', 'rake', 'resque:work'
       end
     end
   end
-
-  def terminate_child_processes
-    Timeout::timeout(10) do
-      @pids.each { |pid| kill 'TERM', pid rescue nil }
-    end
-  rescue TimeoutError
-    @pids.each { |pid| kill 'KILL', pid rescue nil }
-    fail "One or more child processes failed to terminate in a timely manner"
-  end
-
-  def kill(signal, pid)
-    Process.kill signal, pid
-    unless signal == 'KILL'
-      pid, status = Process.waitpid2 pid, 0
-      expect(status.exitstatus).to eq(0)
-    end
-  end
 end

data/spec/integration/setup/resque.rb

@@ -0,0 +1,8 @@
+require 'chasqui'
+Chasqui.config.worker_backend = :resque
+
+require 'resque'
+Resque.redis = ENV['REDIS_URL'] if ENV['REDIS_URL']
+Resque.redis.namespace = :resque
+
+require './spec/integration/setup/subscribers'

data/spec/integration/setup/sidekiq.rb

@@ -0,0 +1,10 @@
+require 'chasqui'
+require 'sidekiq'
+
+Chasqui.config.worker_backend = :sidekiq
+
+Sidekiq.configure_server do |config|
+  config.redis = { url: ENV['REDIS_URL'], namespace: ENV['REDIS_NAMESPACE'] }
+end
+
+require './spec/integration/setup/subscribers'

data/spec/integration/sidekiq_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'integration/pubsub_examples'
+
+if sidekiq_supported_ruby_version?
+  describe "sidekiq integration", integration: true do
+    include_examples 'pubsub', :sidekiq, :start_sidekiq_workers
+
+    def start_sidekiq_workers
+      @pids << fork do
+        ENV['REDIS_URL'] = @redis_url
+        ENV['REDIS_NAMESPACE'] = 'sidekiq'
+
+        exec 'bundle', 'exec', 'sidekiq',
+          '--concurrency', '1',
+          '--environment', 'test',
+          '--queue', 'app1',
+          '--queue', 'app2',
+          '--logfile', 'tmp/sidekiq-spec.log',
+          '--require', './spec/integration/setup/sidekiq.rb',
+          '--verbose'
+      end
+    end
+  end
+end

data/spec/lib/chasqui/broker_spec.rb

@@ -7,4 +7,8 @@ describe Chasqui::Broker do
   it 'forwards events to subscriber queues' do
     expect(-> { broker.forward_event }).to raise_error(NotImplementedError)
   end
+
+  it 'does not use a redis namespace' do
+    expect(broker.redis).not_to respond_to(:namespace)
+  end
 end

data/spec/lib/chasqui/multi_broker_spec.rb

@@ -2,7 +2,12 @@ require 'spec_helper'
 
 describe Chasqui::MultiBroker do
   let(:broker) { Chasqui::MultiBroker.new }
-  before { reset_chasqui }
+
+  before do
+    reset_chasqui
+    Chasqui.config.worker_backend = :resque
+    Resque.redis.namespace = nil
+  end
 
   describe '#forward_event' do
     before do
@@ -16,18 +21,18 @@ describe Chasqui::MultiBroker do
       Chasqui.publish 'foo.bar', 'A'
       broker.forward_event
 
-      expect(redis.llen('inbox')).to eq(0)
+      expect(nnredis.llen(broker.inbox_queue)).to eq(0)
 
-      expect(redis.llen('queue:queue1')).to eq(1)
-      expect(redis.llen('queue:queue2')).to eq(0)
-      expect(redis.llen('queue:queue3')).to eq(1)
+      expect(nnredis.llen('queue:queue1')).to eq(1)
+      expect(nnredis.llen('queue:queue2')).to eq(0)
+      expect(nnredis.llen('queue:queue3')).to eq(1)
 
       event = { 'event' => 'foo.bar', 'channel' => 'app1', 'data' => ['A'] }
 
-      job1 = JSON.parse redis.rpop('queue:queue1')
+      job1 = JSON.parse nnredis.lpop('queue:queue1')
       expect(job1['args']).to include(event)
 
-      job3 = JSON.parse redis.rpop('queue:queue3')
+      job3 = JSON.parse nnredis.lpop('queue:queue3')
       expect(job3['args']).to include(event)
     end
 
@@ -40,7 +45,7 @@ describe Chasqui::MultiBroker do
           Chasqui.config.channel = 'app2'
           Chasqui.publish 'foo.bar', 'A'
 
-          job = JSON.parse redis.brpop('queue:queue2')[1]
+          job = JSON.parse nnredis.blpop('queue:queue2')[1]
           expect(job).to include('class' => 'Chasqui::Subscriber__queue2')
           expect(job).to include('args' =>
             [{ 'event' => 'foo.bar', 'channel' => 'app2', 'data' => ['A'] }])
@@ -57,17 +62,22 @@ describe Chasqui::MultiBroker do
       allow(broker.redis).to receive(:smembers).and_raise(Redis::ConnectionError)
 
       expect(-> { broker.forward_event }).to raise_error(Redis::ConnectionError)
-      expect(redis.llen('queue:queue2')).to eq(0)
-      expect(redis.llen(broker.in_progress_queue)).to eq(1)
+      expect(nnredis.llen('queue:queue2')).to eq(0)
+      expect(nnredis.llen(broker.in_progress_queue)).to eq(1)
 
       allow(broker.redis).to receive(:smembers).and_call_original
       broker.forward_event
-      expect(redis.llen('queue:queue2')).to eq(1)
+      expect(nnredis.llen('queue:queue2')).to eq(1)
 
-      job = JSON.parse redis.rpop('queue:queue2')
+      job = JSON.parse nnredis.lpop('queue:queue2')
       expect(job['args']).to include(
         'event' => 'foo', 'channel' => 'app2', 'data' => ['process'])
-      expect(redis.llen(broker.in_progress_queue)).to eq(0)
+      expect(nnredis.llen(broker.in_progress_queue)).to eq(0)
+    end
+
+    it 'works when queue is empty' do
+      Chasqui.config.broker_poll_interval = 1
+      expect(-> { broker.forward_event }).not_to raise_error
     end
   end
 end

data/spec/lib/chasqui/workers/sidekiq_worker_spec.rb

@@ -8,8 +8,9 @@ if sidekiq_supported_ruby_version?
     describe '.create' do
       it 'configures a new worker' do
         worker_class = Chasqui::SidekiqWorker.create(subscriber)
-        expect(worker_class.included_modules).to include(Sidekiq::Worker)
+        expect(worker_class.name).to eq('Chasqui::Subscriber__my_queue')
         expect(worker_class.sidekiq_options).to include('queue' => 'my-queue')
+        expect(worker_class.included_modules).to include(Sidekiq::Worker)
         expect(worker_class.new).to be_kind_of(Chasqui::SidekiqWorker)
       end
     end

data/spec/lib/chasqui_spec.rb

@@ -124,39 +124,6 @@ describe Chasqui do
     end
   end
 
-  describe '.subscribe' do
-    before { reset_chasqui }
-
-    it 'saves subscriptions' do
-      sub1 = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.admin'
-      sub2 = Chasqui.subscribe queue: 'app2-queue', channel: 'com.example.admin'
-      sub3 = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.video'
-
-      queues = Chasqui.redis.smembers "subscribers:com.example.admin"
-      expect(queues.sort).to eq(['app1-queue', 'app2-queue'])
-
-      queues = Chasqui.redis.smembers "subscribers:com.example.video"
-      expect(queues).to eq(['app1-queue'])
-
-      expect(Chasqui.subscriber('app1-queue')).to eq(sub1)
-      expect(Chasqui.subscriber('app2-queue')).to eq(sub2)
-      expect(sub1).to eq(sub3)
-    end
-
-    it 'returns a subscriber' do
-      subscriber = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.admin'
-      expect(subscriber).to be_kind_of(Chasqui::Subscriber)
-    end
-
-    it 'yields a subscriber configuration context' do
-      $context = nil
-      Chasqui.subscribe queue: 'foo', channel: 'bar' do
-        $context = self
-      end
-      expect($context).to be_kind_of(Chasqui::Subscriber)
-    end
-  end
-
   describe '.create_worker' do
     let(:subscriber) { j }
 
@@ -182,4 +149,70 @@ describe Chasqui do
       end
     end
   end
+
+  describe '.subscribe' do
+    before do
+      reset_chasqui
+      Chasqui.config.worker_backend = :resque
+    end
+
+    context 'resque worker subscriptions' do
+      before { Resque.redis.namespace = 'blah' }
+
+      it 'creates subscriptions using the appropriate redis namespace' do
+        sub1 = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.admin'
+        sub2 = Chasqui.subscribe queue: 'app2-queue', channel: 'com.example.admin'
+        sub3 = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.video'
+
+        queues = Chasqui.redis.smembers "subscribers:com.example.admin"
+        expect(queues.sort).to eq(['resque/blah:queue:app1-queue', 'resque/blah:queue:app2-queue'])
+
+        queues = Chasqui.redis.smembers "subscribers:com.example.video"
+        expect(queues).to eq(['resque/blah:queue:app1-queue'])
+
+        expect(Chasqui.subscriber('app1-queue')).to eq(sub1)
+        expect(Chasqui.subscriber('app2-queue')).to eq(sub2)
+        expect(sub1).to eq(sub3)
+      end
+    end
+
+    if sidekiq_supported_ruby_version?
+      context 'sidekiq worker subscriptions' do
+        before do
+          Chasqui.config.worker_backend = :sidekiq
+        end
+
+        it 'creates subscriptions using the appropriate redis namespace' do
+          Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.admin'
+          queues = Chasqui.redis.smembers "subscribers:com.example.admin"
+          expect(queues.sort).to eq(['sidekiq/queue:app1-queue'])
+
+          Sidekiq.redis = { url: redis.client.options[:url], namespace: 'foobar' }
+          Chasqui.subscribe queue: 'app2-queue', channel: 'com.example.video'
+          queues = Chasqui.redis.smembers "subscribers:com.example.video"
+          expect(queues.sort).to eq(['sidekiq/foobar:queue:app2-queue'])
+        end
+      end
+    end
+
+    it 'returns a subscriber' do
+      subscriber = Chasqui.subscribe queue: 'app1-queue', channel: 'com.example.admin'
+      expect(subscriber).to be_kind_of(Chasqui::Subscriber)
+    end
+
+    it 'yields a subscriber configuration context' do
+      $context = nil
+      Chasqui.subscribe queue: 'foo', channel: 'bar' do
+        $context = self
+      end
+      expect($context).to be_kind_of(Chasqui::Subscriber)
+    end
+  end
+
+  describe '.subscriber_class_name' do
+    it 'transforms queue name into a subscribe class name' do
+      expect(Chasqui.subscriber_class_name('my-queue')).to eq(:Subscriber__my_queue)
+      expect(Chasqui.subscriber_class_name('queue:my-queue')).to eq(:Subscriber__my_queue)
+    end
+  end
 end

data/spec/support/chasqui_spec_helpers.rb

@@ -7,15 +7,20 @@ module ChasquiSpecHelpers
 
   def reset_config
     Chasqui.instance_variable_set(:@config, nil)
-    Chasqui.config.logger = open('/dev/null', 'w+')
+    Chasqui.config.logger = './tmp/test.log'
   end
 
   def redis
     Chasqui.redis
   end
 
+  def redis_no_namespace
+    redis.redis
+  end
+  alias nnredis redis_no_namespace
+
   def flush_redis
-    redis.keys('*').each { |k| redis.del k }
+    nnredis.keys('*').each { |k| nnredis.del k }
   end
 
 end

data/spec/support/fake_logger.rb

@@ -1,5 +1,6 @@
 class FakeLogger
   attr_accessor :progname
+
   def info(*args, &block)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chasqui
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jordan Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -150,8 +150,13 @@ files:
 - lib/chasqui/version.rb
 - lib/chasqui/workers/resque_worker.rb
 - lib/chasqui/workers/sidekiq_worker.rb
+- lib/chasqui/workers/worker.rb
+- spec/integration/pubsub_examples.rb
 - spec/integration/resque_spec.rb
-- spec/integration/subscribers.rb
+- spec/integration/setup/resque.rb
+- spec/integration/setup/sidekiq.rb
+- spec/integration/setup/subscribers.rb
+- spec/integration/sidekiq_spec.rb
 - spec/lib/chasqui/broker_spec.rb
 - spec/lib/chasqui/cli_spec.rb
 - spec/lib/chasqui/config_spec.rb
@@ -192,8 +197,12 @@ specification_version: 4
 summary: Chasqui is a simple, lightweight, persistent implementation of the publish-subscribe
   (pub/sub) messaging pattern for service oriented architectures.
 test_files:
+- spec/integration/pubsub_examples.rb
 - spec/integration/resque_spec.rb
-- spec/integration/subscribers.rb
+- spec/integration/setup/resque.rb
+- spec/integration/setup/sidekiq.rb
+- spec/integration/setup/subscribers.rb
+- spec/integration/sidekiq_spec.rb
 - spec/lib/chasqui/broker_spec.rb
 - spec/lib/chasqui/cli_spec.rb
 - spec/lib/chasqui/config_spec.rb