rabbit_jobs 0.0.9 → 0.1.0

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 group :development do
   gem 'actionmailer', '>= 3.0'
 
+  gem 'timecop'
   gem 'rspec', '~> 2.8'
   gem 'rr'
   gem 'autotest'

data/lib/rabbit_jobs/amqp_helpers.rb

@@ -7,18 +7,27 @@ module RabbitJobs
     def amqp_with_exchange(&block)
       raise ArgumentError unless block
 
-      AMQP.start(host: RJ.config.host) do |connection|
-        channel  = AMQP::Channel.new(connection)
-
-        channel.on_error do |ch, channel_close|
-          puts "Channel-level error: #{channel_close.reply_text}, shutting down..."
-          connection.close { EM.stop }
-        end
-
+      connection = AMQP.connection
+      if connection && connection.open?
+        channel = AMQP::Channel.new(connection)
         exchange = channel.direct(RJ.config[:exchange], RJ.config[:exchange_params])
-
         # go work
         block.call(connection, exchange)
+
+      else
+        AMQP.start(host: RJ.config.host) do |connection|
+
+          channel = AMQP::Channel.new(connection)
+
+          channel.on_error do |ch, channel_close|
+            puts "Channel-level error: #{channel_close.reply_text}, shutting down..."
+            connection.close { EM.stop }
+          end
+
+          exchange = channel.direct(RJ.config[:exchange], RJ.config[:exchange_params])
+          # go work
+          block.call(connection, exchange)
+        end
       end
     end
 

data/lib/rabbit_jobs/job.rb

@@ -10,7 +10,7 @@ module RabbitJobs::Job
     base.extend (ClassMethods)
 
     def initialize(*perform_params)
-      self.params = *perform_params
+      self.params = perform_params
       self.opts = {}
     end
 
@@ -35,10 +35,10 @@ module RabbitJobs::Job
           self.class.perform(*params)
           # RJ.logger.debug 'after perform'
         rescue
-          RJ.logger.warn($!.inspect)
-          RabbitJobs::ErrorMailer.send(self, $!)
-
+          RJ.logger.warn(self.inspect)
+          RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))
           run_on_error_hooks($!)
+          RabbitJobs::ErrorMailer.send(self, $!)
         end
         exit!
       end
@@ -47,17 +47,18 @@ module RabbitJobs::Job
     def run_on_error_hooks(error)
       if self.class.rj_on_error_hooks
         self.class.rj_on_error_hooks.each do |proc_or_symbol|
+          proc = proc_or_symbol
           if proc_or_symbol.is_a?(Symbol)
-            self.send(proc_or_symbol, error, *params)
+            proc = self.method(proc_or_symbol)
+          end
+
+          case proc.arity
+          when 0
+            proc.call()
+          when 1
+            proc.call(error)
           else
-            case proc_or_symbol.arity
-            when 0
-              proc_or_symbol.call()
-            when 1
-              proc_or_symbol.call(error)
-            else
-              proc_or_symbol.call(error, *params)
-            end
+            proc.call(error, *params)
           end
         end
       end
@@ -65,7 +66,6 @@ module RabbitJobs::Job
 
     def payload
       {'class' => self.class.to_s, 'opts' => (self.opts || {}), 'params' => params}.to_json
-      # ([self.class.to_s] + params).to_json
     end
 
     def expires_in
@@ -108,7 +108,7 @@ module RabbitJobs::Job
     begin
       encoded = JSON.parse(payload)
       job_klass = constantize(encoded['class'])
-      job = job_klass.new(*encoded['params'])
+      job = encoded['params'].count > 0 ? job_klass.new(*encoded['params']) : job_klass.new
       job.opts = encoded['opts']
       job
     rescue

data/lib/rabbit_jobs/publisher.rb

@@ -3,23 +3,56 @@
 require 'json'
 require 'amqp'
 require 'eventmachine'
+require 'bunny'
 
 module RabbitJobs
   module Publisher
     extend self
     extend AmqpHelpers
 
-    def publish(klass, opts = {}, *params)
+    def publish(klass, *params)
       key = RJ.config.routing_keys.first
-      publish_to(key, klass, opts, *params)
+      publish_to(key, klass, *params)
     end
 
-    def publish_to(routing_key, klass, opts = {}, *params)
-      raise ArgumentError unless klass && routing_key && klass.is_a?(Class)# && (routing_key.is_a?(Hash) || routing_key.is_a?(String))
-      opts ||= {}
+    def publish_to(routing_key, klass, *params)
+      raise ArgumentError unless klass && routing_key && klass.is_a?(Class) && (routing_key.is_a?(Symbol) || routing_key.is_a?(String))
 
       job = klass.new(*params)
-      job.opts = opts
+      job.opts = {'created_at' => Time.now.to_i}
+
+      b = Bunny.new(host: RJ.config.host, logging: false)
+      b.start
+
+      exchange = b.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
+      queue = b.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+      queue.bind(exchange)
+
+      exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
+      b.stop
+    end
+
+    def purge_queue(*routing_keys)
+      raise ArgumentError unless routing_keys && routing_keys.count > 0
+
+      b = Bunny.new(host: RJ.config.host, logging: false)
+      b.start
+
+      messages_count = 0
+      routing_keys.each do |routing_key|
+        queue = b.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+        messages_count += queue.status[:message_count]
+        queue.purge
+      end
+      b.stop
+      return messages_count
+    end
+
+    def publish_to2(routing_key, klass, *params)
+      raise ArgumentError unless klass && routing_key && klass.is_a?(Class) && (routing_key.is_a?(Hash) || routing_key.is_a?(String))
+
+      job = klass.new(*params)
+      job.opts = {}
 
       dont_stop_em = defined?(EM) && EM.reactor_running?
       dont_close_connection = AMQP.connection && AMQP.connection.open?
@@ -41,7 +74,7 @@ module RabbitJobs
       end
     end
 
-    def purge_queue(*routing_keys)
+    def purge_queue2(*routing_keys)
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
       dont_stop_em = defined?(EM) && EM.reactor_running?
@@ -55,7 +88,6 @@ module RabbitJobs
           routing_key = routing_key.to_s
           queue = exchange.channel.queue(RabbitJobs.config.queue_name(routing_key), RabbitJobs.config[:queues][routing_key])
           queue.bind(exchange, :routing_key => routing_key)
-
           queue.status do |number_of_messages, number_of_consumers|
             messages_count += number_of_messages
             queue.purge {

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/rabbit_jobs.rb

@@ -17,12 +17,12 @@ require 'logger'
 module RabbitJobs
   extend self
 
-  def publish(klass, opts = {}, *params)
-    RabbitJobs::Publisher.publish(klass, opts, *params)
+  def publish(klass, *params)
+    RabbitJobs::Publisher.publish(klass, *params)
   end
 
-  def publish_to(routing_key, klass, opts = {}, *params)
-    RabbitJobs::Publisher.publish_to(routing_key, klass, opts, *params)
+  def publish_to(routing_key, klass, *params)
+    RabbitJobs::Publisher.publish_to(routing_key, klass, *params)
   end
 
   attr_writer :logger

data/rabbit_jobs.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.version       = RabbitJobs::VERSION
 
   gem.add_dependency "amqp", "~> 0.9"
+  gem.add_dependency "bunny", "~> 0.7"
   gem.add_dependency "rake"
   gem.add_dependency "rufus-scheduler", "~> 2.0"
 end

data/spec/fixtures/schedule.yml

@@ -1,13 +1,13 @@
 do_a_job:
   cron: "* * * * *" # run every minute
   queue: queue_name
-  class: MyJobClass
+  class: TestJob
   args: "string to be passed to MyJobClass.perform"
   description: "Description is not supported yet"
 
 another_job:
   every: 1h # run every 1 hour
   queue: queue_name
-  class: MyJobClass
+  class: TestJob
   args: "string to be passed to MyJobClass.perform"
   description: "Description is not supported yet"

data/spec/integration/publisher_spec.rb

@@ -16,7 +16,7 @@ describe RabbitJobs::Publisher do
   end
 
   it 'should publish message to queue' do
-    RabbitJobs.publish(TestJob, nil, 'some', 'other', 'params')
+    RabbitJobs.publish(TestJob, 'some', 'other', 'params')
     RabbitJobs::Publisher.purge_queue('rspec_queue').should == 1
   end
 
@@ -33,7 +33,7 @@ describe RabbitJobs::Publisher do
   end
 
   it 'should publish job with *params' do
-    RabbitJobs.publish_to(:rspec_queue, JobWithArgsArray, nil, 'first value', :some_symbol, 123, 'and string')
+    RabbitJobs.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
     RabbitJobs::Publisher.purge_queue(:rspec_queue).should == 1
   end
 end

data/spec/integration/worker_spec.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
-
+require 'timecop'
 require 'eventmachine'
+
 describe RabbitJobs::Worker do
   it 'should listen for messages' do
     RabbitJobs.configure do |c|
@@ -9,12 +10,15 @@ describe RabbitJobs::Worker do
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 
-    5.times { RabbitJobs.publish(PrintTimeJob, nil, Time.now) }
-    5.times { RabbitJobs.publish(ExpiredJob, { :expires_at => Time.now - 10 }) }
+    RJ::Publisher.purge_queue('rspec_durable_queue')
+
+    5.times { RabbitJobs.publish(PrintTimeJob, Time.now) }
+    Timecop.freeze(Time.now - 4600) { 5.times { RabbitJobs.publish(JobWithExpire) } }
     1.times { RabbitJobs.publish(JobWithErrorHook) }
     worker = RabbitJobs::Worker.new
 
     worker.work(1) # work for 1 second
+    RJ::Publisher.purge_queue('rspec_durable_queue')
   end
 
   it 'should allow to publish jobs from worker' do
@@ -23,6 +27,8 @@ describe RabbitJobs::Worker do
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 
+    RJ::Publisher.purge_queue('rspec_durable_queue')
+
     RabbitJobs.publish(JobWithPublish)
     worker = RabbitJobs::Worker.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70108928613220 !ruby/object:Gem::Requirement
+  requirement: &70362685237960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70108928613220
+  version_requirements: *70362685237960
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: &70362685237460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70362685237460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70108932737200 !ruby/object:Gem::Requirement
+  requirement: &70362685237080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108932737200
+  version_requirements: *70362685237080
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70108932736660 !ruby/object:Gem::Requirement
+  requirement: &70362685236540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108932736660
+  version_requirements: *70362685236540
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com