queueing_rabbit 0.2.0 → 0.2.1

data/lib/queueing_rabbit/extensions/direct_exchange.rb

@@ -11,7 +11,7 @@ module QueueingRabbit
       module ClassMethods
         def exchange_options
           @exchange_options ||= {}
-          @exchange_options.update(:type => :direct)
+          @exchange_options.merge(:type => :direct)
         end
 
         def binding_options

data/lib/queueing_rabbit/job.rb

@@ -1,50 +1,92 @@
 module QueueingRabbit
+  module InheritableClassVariables
+    def inheritable_variables(*args)
+      @inheritable_variables ||= [:inheritable_variables]
+      @inheritable_variables += args
+    end
+
+    def inherited(subclass)
+      @inheritable_variables ||= []
+      @inheritable_variables.each do |var|
+        if !subclass.instance_variable_get("@#{var}") ||
+           subclass.instance_variable_get("@#{var}").empty?
+          subclass.instance_variable_set("@#{var}",
+                                         instance_variable_get("@#{var}"))
+        end
+      end
+    end
+  end
 
   module Job
+    def self.extended(othermod)
+      othermod.extend(QueueingRabbit::InheritableClassVariables)
+
+      othermod.class_eval do
+        inheritable_variables :queue_name, :queue_options, :channel_options,
+                              :exchange_name, :exchange_options,
+                              :binding_options, :listening_options,
+                              :publishing_defaults
+      end
+    end
 
     def queue(*args)
+      @queue_options ||= {}
       if args.first.kind_of?(Hash)
-        @queue_options = args.first
+        @queue_options.update(args.first)
+      elsif args.count > 1
+        name, options = args
+        @queue_name = name
+        @queue_options.update(options)
       else
-        @queue_name, @queue_options = args
+        @queue_name = args.first
       end
     end
 
     def queue_name
-      @queue_name ||= self.name.split('::')[-1]
+      @queue_name || (self.name.split('::')[-1] if self.name)
     end
 
     def queue_options
-      @queue_options ||= {}
+      @queue_options || {}
     end
 
     def queue_size
       QueueingRabbit.queue_size(self)
     end
 
-    def channel(options={})
-      @channel_options = options
+    def channel(options = {})
+      @channel_options ||= {}
+      @channel_options.update(options)
     end
 
     def channel_options
       @channel_options ||= {}
     end
 
-    def exchange(name, options = {})
-      @exchange_name = name
-      @exchange_options = options
+    def exchange(*args)
+      @exchange_options ||= {}
+      if args.first.kind_of?(Hash)
+        @exchange_options.update(args.first)
+      elsif args.count > 1
+        name, options = args
+        @exchange_name = name
+        @exchange_options.update(options)
+      else
+        @exchange_name = args.first
+      end
     end
 
     def exchange_name
-      @exchange_name
+      @exchange_name || ''
     end
 
     def exchange_options
-      @exchange_options ||= {}
+      @exchange_options || {}
     end
 
     def bind(options = {})
-      @binding_options = options
+      @binding_options ||= {}
+      @binding_options.update(options)
     end
 
     def binding_options
@@ -60,17 +102,24 @@ module QueueingRabbit
     end
 
     def listen(options = {})
-      @listening_options = options
+      @listening_options ||= {}
+      @listening_options.update(options)
+    end
+    alias_method :subscribe, :listen
+
+    def publish(options = {})
+      @publishing_defaults ||= {}
+      @publishing_defaults.update(options)
     end
 
-    def publishing_defaults(options = {})
-      @publishing_defaults ||= options.merge(:routing_key => queue_name.to_s)
+    def publishing_defaults
+      @publishing_defaults ||= {}
+      {:routing_key => queue_name.to_s}.merge(@publishing_defaults)
     end
 
     def enqueue(payload, options = {})
       QueueingRabbit.enqueue(self, payload, publishing_defaults.merge(options))
     end
-    alias_method :publish, :enqueue
 
   end
 

data/lib/queueing_rabbit/tasks.rb

@@ -16,7 +16,7 @@ namespace :queueing_rabbit do
 
     begin
       worker = QueueingRabbit::Worker.new(*jobs)
-    rescue QueueingRabbit::NoJobError
+    rescue QueueingRabbit::JobNotPresentError, QueueingRabbit::JobNotFoundError
       abort "set JOB env var, e.g. $ JOB=ExportDataJob,CompressFileJob " \
             "rake queueing_rabbit:work"
     end

data/lib/queueing_rabbit/version.rb

@@ -1,3 +1,3 @@
 module QueueingRabbit
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/integration/configuration_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe 'Configuring jobs' do
+  context 'when a job is inherited from a base class' do
+    let(:base_class) {
+      Class.new(QueueingRabbit::AbstractJob) do
+        exchange 'exchange_name', :durable => true
+        channel :prefetch => 15
+        queue :durable => true
+        bind :ack => true
+        publish :persistent => true
+      end
+    }
+
+    let(:job_class) {
+      Class.new(base_class) do
+        queue 'queue_name'
+      end
+    }
+
+    subject { job_class }
+
+    its(:queue_name) { should == 'queue_name' }
+    its(:exchange_name) { should == 'exchange_name' }
+    its(:queue_options) { should include(:durable => true) }
+    its(:binding_options) { should include(:ack => true) }
+    its(:publishing_defaults) { should include(:persistent => true) }
+    its(:channel_options) { should include(:prefetch => 15) }
+  end
+
+  context 'when cascading attributes', :ruby => '1.8.7' do
+    let(:base_class) {
+      Class.new(QueueingRabbit::AbstractJob) do
+        exchange 'exchange_name', :durable => true
+        channel :prefetch => 15
+        queue :durable => true
+        bind :ack => true
+        publish :persistent => true
+      end
+    }
+
+    let(:job_class) {
+      Class.new(base_class) do
+        channel :use_publisher_confirms => true
+        queue 'queue_name', :durable => false
+        bind :ack => false
+      end
+    }
+
+    subject { job_class }
+
+    its(:channel_options) { should include(:use_publisher_confirms => true,
+                                           :prefetch => 15) }
+    its(:queue_options) { should include(:durable => false) }
+    its(:binding_options) { should include(:ack => false) }
+    its(:publishing_defaults) { should include(:persistent => true) }
+
+  end
+
+  context 'when using an extension' do
+    let(:job_class) {
+      Class.new(QueueingRabbit::AbstractJob) do
+        include QueueingRabbit::JobExtensions::DirectExchange
+        queue 'queue_name'
+        exchange 'exchange_name'
+      end
+    }
+
+    subject { job_class }
+
+    its(:exchange_name) { should == 'exchange_name' }
+    its(:exchange_options) { should include(:type => :direct) }
+    its(:binding_options) { should include(:routing_key => 'queue_name')}
+  end
+end

data/spec/integration/persistent_asynchronous_publishing_and_consuming_spec.rb

@@ -15,7 +15,7 @@ describe "Persistent asynchronous publishing and consuming" do
       Class.new(PrintLineJob) do
         queue 'persistent_print_line_job'
         listen :ack => true
-        publishing_defaults :persistent => true
+        publish :persistent => true
         channel :use_publisher_confirms => true
 
         def perform

data/spec/unit/queueing_rabbit/job_spec.rb

@@ -27,7 +27,6 @@ describe QueueingRabbit::AbstractJob do
   it { should respond_to(:listen) }
   it { should respond_to(:listen).with(1).argument }
   it { should respond_to(:publishing_defaults) }
-  it { should respond_to(:publishing_defaults).with(1).argument }
 
   its(:queue_name) { should == 'test_queue' }
   its(:queue_options) { should include(:durable => true) }

data/spec/unit/queueing_rabbit/jobs/abstract_job_spec.rb

@@ -27,7 +27,6 @@ describe QueueingRabbit::AbstractJob do
   it { should respond_to(:listen) }
   it { should respond_to(:listen).with(1).argument }
   it { should respond_to(:publishing_defaults) }
-  it { should respond_to(:publishing_defaults).with(1).argument }
 
   its(:queue_name) { should == 'test_queue' }
   its(:queue_options) { should include(:durable => true) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_rabbit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -121,6 +121,7 @@ files:
 - queueing_rabbit.gemspec
 - spec/integration/asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_with_retries_spec.rb
+- spec/integration/configuration_spec.rb
 - spec/integration/direct_exchange_asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/jobs/print_line_job.rb
 - spec/integration/json_job_asynchronous_publishing_and_consuming_spec.rb
@@ -159,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1551199674468222580
+      hash: -615049155772679483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1551199674468222580
+      hash: -615049155772679483
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -178,6 +179,7 @@ summary: QueueingRabbit is an AMQP-based queueing system
 test_files:
 - spec/integration/asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/asynchronous_publishing_and_consuming_with_retries_spec.rb
+- spec/integration/configuration_spec.rb
 - spec/integration/direct_exchange_asynchronous_publishing_and_consuming_spec.rb
 - spec/integration/jobs/print_line_job.rb
 - spec/integration/json_job_asynchronous_publishing_and_consuming_spec.rb