chasqui 0.9.3 → 1.0.0.pre.rc1

data/spec/support/fake_queue_adapter.rb

@@ -0,0 +1,3 @@
+class FakeQueueAdapter
+  include Chasqui::QueueAdapter
+end

data/spec/support/fake_subscriber.rb

@@ -1,4 +1,5 @@
-class FakeSubscriber < Chasqui::Subscriber
+class FakeSubscriber
+  include Chasqui::Subscriber
   attr_reader :events
 
   def initialize(queue, channel)

data/spec/support/shared_examples/queue_adapter_examples.rb

@@ -0,0 +1,13 @@
+shared_examples 'a queue adapter' do
+  it 'implements bind' do
+    method = described_class.instance_method :bind
+    expect(method).not_to be_nil
+    expect(method.arity).to eq(1)
+  end
+
+  it 'implements unbind' do
+    method = described_class.instance_method :unbind
+    expect(method).not_to be_nil
+    expect(method.arity).to eq(1)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chasqui
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0.pre.rc1
 platform: ruby
 authors:
 - Jordan Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -152,6 +152,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/chasqui
 - bin/console
 - chasqui.gemspec
@@ -159,15 +160,15 @@ files:
 - examples/upstart.conf
 - lib/chasqui.rb
 - lib/chasqui/broker.rb
+- lib/chasqui/brokers/redis_broker.rb
 - lib/chasqui/cli.rb
 - lib/chasqui/config.rb
-- lib/chasqui/multi_broker.rb
+- lib/chasqui/queue_adapter.rb
+- lib/chasqui/queue_adapters/redis_queue_adapter.rb
 - lib/chasqui/subscriber.rb
-- lib/chasqui/subscription.rb
+- lib/chasqui/subscriptions.rb
 - lib/chasqui/version.rb
-- lib/chasqui/workers/resque_worker.rb
-- lib/chasqui/workers/sidekiq_worker.rb
-- lib/chasqui/workers/worker.rb
+- lib/chasqui/worker.rb
 - spec/integration/pubsub_examples.rb
 - spec/integration/resque_spec.rb
 - spec/integration/setup/resque.rb
@@ -175,18 +176,21 @@ files:
 - spec/integration/setup/subscribers.rb
 - spec/integration/sidekiq_spec.rb
 - spec/lib/chasqui/broker_spec.rb
+- spec/lib/chasqui/brokers/redis_broker_spec.rb
 - spec/lib/chasqui/cli_spec.rb
 - spec/lib/chasqui/config_spec.rb
-- spec/lib/chasqui/multi_broker_spec.rb
+- spec/lib/chasqui/fake_queue_adapter_spec.rb
+- spec/lib/chasqui/queue_adapters/redis_queue_adapter_spec.rb
 - spec/lib/chasqui/subscriber_spec.rb
-- spec/lib/chasqui/subscription_spec.rb
-- spec/lib/chasqui/workers/resque_worker_spec.rb
-- spec/lib/chasqui/workers/sidekiq_worker_spec.rb
+- spec/lib/chasqui/subscriptions_spec.rb
+- spec/lib/chasqui/worker_spec.rb
 - spec/lib/chasqui_spec.rb
 - spec/spec_helper.rb
 - spec/support/chasqui_spec_helpers.rb
 - spec/support/fake_logger.rb
+- spec/support/fake_queue_adapter.rb
 - spec/support/fake_subscriber.rb
+- spec/support/shared_examples/queue_adapter_examples.rb
 - spec/support/sidekiq_compatibility_check.rb
 - tmp/.keep
 homepage: https://github.com/jbgo/chasqui
@@ -204,12 +208,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Chasqui is a simple, lightweight, persistent implementation of the publish-subscribe
@@ -222,16 +226,19 @@ test_files:
 - spec/integration/setup/subscribers.rb
 - spec/integration/sidekiq_spec.rb
 - spec/lib/chasqui/broker_spec.rb
+- spec/lib/chasqui/brokers/redis_broker_spec.rb
 - spec/lib/chasqui/cli_spec.rb
 - spec/lib/chasqui/config_spec.rb
-- spec/lib/chasqui/multi_broker_spec.rb
+- spec/lib/chasqui/fake_queue_adapter_spec.rb
+- spec/lib/chasqui/queue_adapters/redis_queue_adapter_spec.rb
 - spec/lib/chasqui/subscriber_spec.rb
-- spec/lib/chasqui/subscription_spec.rb
-- spec/lib/chasqui/workers/resque_worker_spec.rb
-- spec/lib/chasqui/workers/sidekiq_worker_spec.rb
+- spec/lib/chasqui/subscriptions_spec.rb
+- spec/lib/chasqui/worker_spec.rb
 - spec/lib/chasqui_spec.rb
 - spec/spec_helper.rb
 - spec/support/chasqui_spec_helpers.rb
 - spec/support/fake_logger.rb
+- spec/support/fake_queue_adapter.rb
 - spec/support/fake_subscriber.rb
+- spec/support/shared_examples/queue_adapter_examples.rb
 - spec/support/sidekiq_compatibility_check.rb

data/lib/chasqui/subscription.rb

@@ -1,53 +0,0 @@
-module Chasqui
-  class Subscription
-    attr_reader :queue, :channel, :subscriber_type
-
-    def initialize(queue, channel, subscriber_type=Chasqui::Subscriber)
-      @queue = queue
-      @channel = channel
-      @subscriber_type = subscriber_type
-    end
-
-    def subscription_id
-      queue_name = [worker.namespace, 'queue', queue].compact.join(':')
-      "#{worker_backend}/#{queue_name}"
-    end
-
-    def subscriber
-      @subscriber ||= subscriber_type.new queue, channel
-    end
-
-    def worker
-      case worker_backend
-      when :resque
-        Chasqui::ResqueWorker.create subscriber
-      when :sidekiq
-        Chasqui::SidekiqWorker.create subscriber
-      else
-        raise ConfigurationError.new(
-          "Please choose a supported worker_backend. Choices: #{supported_worker_backends}")
-      end
-    end
-
-    private
-
-    def worker_backend
-      Chasqui.config.worker_backend || find_first_available_worker_backend
-    end
-
-    def find_first_available_worker_backend
-      if Object.const_defined? :Sidekiq
-        :sidekiq
-      elsif Object.const_defined? :Resque
-        :resque
-      end
-    end
-
-    SUPPORTED_WORKER_BACKENDS = [:resque, :sidekiq].freeze
-
-    def supported_worker_backends
-      SUPPORTED_WORKER_BACKENDS.join(', ')
-    end
-
-  end
-end

data/lib/chasqui/workers/resque_worker.rb

@@ -1,25 +0,0 @@
-module Chasqui
-  class ResqueWorker < Worker
-    class << self
-
-      def namespace
-        Resque.redis.namespace
-      end
-
-      # 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 self.perform(event)
-              @subscriber.perform Resque.redis, event
-            end
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/chasqui/workers/sidekiq_worker.rb

@@ -1,45 +0,0 @@
-module Chasqui
-  class SidekiqWorker < Worker
-    class << self
-
-      def namespace
-        Sidekiq.redis { |r| r.respond_to?(:namespace) ? r.namespace : nil }
-      end
-
-      def create(subscriber)
-        register_sidekiq_queue subscriber.queue
-
-        find_or_build_worker(subscriber, Chasqui::SidekiqWorker).tap do |worker|
-          define_worker_class worker, subscriber
-        end
-      end
-
-      private
-
-      def define_worker_class(worker, subscriber)
-        worker.class_eval do
-          include Sidekiq::Worker
-          sidekiq_options queue: subscriber.queue
-          @subscriber = subscriber
-
-          def perform(event)
-            Sidekiq.redis do |r|
-              self.class.subscriber.perform r, event
-            end
-          end
-
-          private
-
-          def self.subscriber
-            @subscriber
-          end
-        end
-      end
-
-      def register_sidekiq_queue(queue_name)
-        Sidekiq.redis { |r| r.sadd 'queues', queue_name }
-      end
-
-    end
-  end
-end

data/lib/chasqui/workers/worker.rb

@@ -1,34 +0,0 @@
-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/spec/lib/chasqui/subscription_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Chasqui::Subscription do
-
-  def new_subscription(queue='default')
-    Chasqui::Subscription.new queue, 'fake-channel', FakeSubscriber
-  end
-
-  describe '#worker' do
-    it 'raises when no worker backend configured' do
-      Chasqui.config.worker_backend = nil
-      allow_any_instance_of(Chasqui::Subscription).to receive(
-        :worker_backend).and_return(nil)
-
-      expect(-> {
-        new_subscription.worker
-      }).to raise_error(Chasqui::ConfigurationError)
-    end
-
-    it 'creates a resque worker' do
-      Chasqui.config.worker_backend = :resque
-      worker = new_subscription('resque-queue').worker
-      expect(worker.new).to be_kind_of(Chasqui::ResqueWorker)
-    end
-
-    if sidekiq_supported_ruby_version?
-      it 'creates a sidekiq worker' do
-        Chasqui.config.worker_backend = :sidekiq
-        worker = new_subscription('sidekiq-queue').worker
-        expect(worker.new).to be_kind_of(Chasqui::SidekiqWorker)
-      end
-    end
-  end
-
-end

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

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'resque'
-
-describe Chasqui::ResqueWorker do
-  let(:subscriber) { FakeSubscriber.new 'my-queue', 'my.channel'}
-
-  describe '.create' do
-    it 'configures a new worker' do
-      worker_class = Chasqui::ResqueWorker.create(subscriber)
-      expect(worker_class.name).to eq('Chasqui::Subscriber__my_queue')
-      expect(worker_class.ancestors).to include(Chasqui::ResqueWorker)
-      expect(worker_class.instance_variable_get(:@queue)).to eq('my-queue')
-    end
-  end
-
-  describe '.perform' do
-    let(:worker) { Chasqui::ResqueWorker.create(subscriber) }
-
-    it 'delegates to the subscriber' do
-      event = { 'event' => 'foo', 'data' => ['bar'] }
-      worker.perform event
-      received_event = subscriber.events.shift
-      expect(received_event).to eq(event)
-    end
-  end
-
-end

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

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-if sidekiq_supported_ruby_version?
-
-  describe Chasqui::SidekiqWorker do
-    let(:subscriber) { FakeSubscriber.new 'my-queue', 'my.channel'}
-
-    describe '.create' do
-      before { flush_redis }
-
-      it 'configures a new worker' do
-        worker_class = Chasqui::SidekiqWorker.create(subscriber)
-        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)
-        expect(redis_no_namespace.smembers 'queues').to eq(['my-queue'])
-      end
-    end
-
-    describe '#perform' do
-      let(:worker_class) { Chasqui::SidekiqWorker.create(subscriber) }
-
-      it 'delegates to the subscriber' do
-        event = { 'event' => 'foo', 'data' => ['bar'] }
-        worker = worker_class.new
-        worker.perform event
-        received_event = subscriber.events.shift
-        expect(received_event).to eq(event)
-      end
-    end
-  end
-
-end