rabbit_jobs 0.7.9 → 0.8.0

data/examples/client

@@ -7,20 +7,22 @@ require File.expand_path('../../lib/rabbit_jobs', __FILE__)
 
 class MyCurrentJob
   include RJ::Job
-  def self.perform(count)
+  queue :failover_test
+  def perform(count)
   end
 end
 
 RJ.configure { |c|
   c.queue "failover_test"
-  c.server "amqp://localhost/bunny"
+  c.server "amqp://localhost/rj"
 }
 
 i = 0
 loop do
   puts "publishing job #{i}"
   begin
-    RJ.publish_to(:failover_test, MyCurrentJob, i)
+    # RJ.publish_to(:failover_test, MyCurrentJob, i)
+    MyCurrentJob.perform_async(i)
   rescue Exception => e
     # RJ::Publisher.amqp_connection.stop
     puts e.message

data/examples/configuration.rb

@@ -18,7 +18,7 @@ class MyJob < RabbitJobs::Job
 
   expires_in 60 # dont perform this job after 60 seconds
 
-  def self.perform(time)
+  def perform(time)
     puts "This job was published at #{}"
   end
 end

data/examples/worker

@@ -7,7 +7,7 @@ require File.expand_path('../../lib/rabbit_jobs', __FILE__)
 
 class MyCurrentJob
   include RJ::Job
-  def self.perform(count = 0)
+  def perform(count = 0)
     puts count
     # RJ.publish_to(:default, MyCurrentJob, count - 1) if count > 0
   end
@@ -15,7 +15,7 @@ end
 
 RJ.configure { |c|
   c.queue "failover_test"
-  c.server "amqp://localhost/bunny"
+  c.server "amqp://localhost/rj"
 }
 
 worker = RJ::Worker.new

data/lib/rabbit_jobs/consumer/job_consumer.rb

@@ -2,46 +2,41 @@
 module RabbitJobs
   module Consumer
     class JobConsumer
+      include RabbitJobs::Helpers
+
       def process_message(delivery_info, properties, payload)
         job, *error_args = RJ::Job.parse(payload)
 
         if job.is_a?(Symbol)
           report_error(job, *error_args)
-          # case @job
-          # when :not_found
-          # when :parsing_error
-          # when :error
-          # end
         else
           if job.expired?
             RJ.logger.warn "Job expired: #{job.to_ruby_string}"
-            false
           else
             job.run_perform
           end
         end
-
         true
       end
-    end
 
-    def log_error(msg)
-      RJ.logger.error msg
-    end
+      def log_error(msg)
+        RJ.logger.error msg
+      end
 
-    def report_error(error_type, *args)
-      case error_type
-      when :not_found
-        log_error "Cannot find job class '#{args.first}'"
-      when :parsing_error
-        log_error "Cannot initialize job. Json parsing error."
-        log_error "Data received: #{args.first.inspect}"
-      when :error
-        ex, payload = args
-        log_error "Cannot initialize job."
-        log_error ex.message
-        log_error _cleanup_backtrace(ex.backtrace).join("\n")
-        log_error "Data received: #{payload.inspect}"
+      def report_error(error_type, *args)
+        case error_type
+        when :not_found
+          log_error "Cannot find job class '#{args.first}'"
+        when :parsing_error
+          log_error "Cannot initialize job. Json parsing error."
+          log_error "Data received: #{args.first.inspect}"
+        when :error
+          ex, payload = args
+          log_error "Cannot initialize job."
+          log_error ex.message
+          log_error _cleanup_backtrace(ex.backtrace).join("\n")
+          log_error "Data received: #{payload.inspect}"
+        end
       end
     end
   end

data/lib/rabbit_jobs/job.rb

@@ -18,7 +18,7 @@ module RabbitJobs
         begin
           start_time = Time.now
           RabbitJobs.logger.info "Started to perform #{self.to_ruby_string}"
-          self.class.perform(*params)
+          self.perform(*params)
           execution_time = Time.now - start_time
           RabbitJobs.logger.info "     Job completed #{self.to_ruby_string} in #{execution_time} seconds."
         rescue
@@ -117,6 +117,23 @@ module RabbitJobs
           @rj_on_error_hooks << proc_or_symbol
         end
       end
+
+      def queue(routing_key)
+        raise ArgumentError unless routing_key.present?
+        @rj_queue = routing_key.to_sym
+      end
+
+      def perform_async(*args)
+        RJ::Publisher.publish_to(@rj_queue || :jobs, self, *args)
+      end
+
+      def serialize_job(*params)
+        {
+          'class' => self.to_s,
+          'opts' => {'created_at' => Time.now.to_i},
+          'params' => params
+        }.to_json
+      end
     end
 
     def self.parse(payload)

data/lib/rabbit_jobs/publisher.rb

@@ -15,12 +15,7 @@ module RabbitJobs
       routing_key = routing_key.to_sym unless routing_key.is_a?(Symbol)
       raise ArgumentError.new("routing_key=#{routing_key}") unless RabbitJobs.config[:queues][routing_key]
 
-      payload = {
-        'class' => klass.to_s,
-        'opts' => {'created_at' => Time.now.to_i},
-        'params' => params
-        }.to_json
-
+      payload = klass.serialize_job(*params)
       direct_publish_to(routing_key, payload)
     end
 
@@ -39,24 +34,13 @@ module RabbitJobs
       true
     end
 
-    def queue_status(routing_key)
-      raise ArgumentError unless routing_key.present?
-
-      routing_key = routing_key.to_sym
-      queue_declare_ok = connection.default_channel.queue_declare(routing_key, RabbitJobs.config[:queues][routing_key].merge(passive: true))
-      {
-        message_count: queue_declare_ok.message_count,
-        consumer_count: queue_declare_ok.consumer_count
-      }
-    end
-
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys.present?
 
       messages_count = 0
-
       routing_keys.map(&:to_sym).each do |routing_key|
-        messages_count += queue_status(routing_key)[:message_count].to_i
+        queue = connection.default_channel.queue(routing_key, RabbitJobs.config[:queues][routing_key])
+        messages_count += queue.status[:message_count].to_i
         connection.default_channel.queue_purge(routing_key)
       end
 

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

data/spec/fixtures/jobs.rb

@@ -2,12 +2,14 @@
 
 class TestJob
   include RJ::Job
+  def perform
+  end
 end
 
 class PrintTimeJob
   include RJ::Job
 
-  def self.perform(time)
+  def perform(time)
     puts "Running job queued at #{time}"
   end
 end
@@ -15,7 +17,7 @@ end
 class JobWithExpire
   include RJ::Job
   expires_in 60*60 # expires in 1 hour
-  def self.perform
+  def perform
 
   end
 end
@@ -23,7 +25,7 @@ end
 class ExpiredJob
   include RJ::Job
 
-  def self.perform
+  def perform
 
   end
 end
@@ -31,7 +33,7 @@ end
 class JobWithPublish
   include RJ::Job
 
-  def self.perform(param = 0)
+  def perform(param = 0)
     if param < 5
       puts "publishing job #{param}"
       RJ.publish_to :rspec_durable_queue, JobWithPublish, param + 1
@@ -53,7 +55,7 @@ class JobWithErrorHook
     puts 'last hook'
   end
 
-  def self.perform
+  def perform
     raise "Job raised an error at #{Time.now}"
   end
 end

data/spec/integration/worker_spec.rb

@@ -2,34 +2,6 @@
 require 'spec_helper'
 
 describe RabbitJobs::Worker do
-  it 'should listen for messages' do
-    RabbitJobs.configure do |c|
-      c.server 'amqp://localhost/rj'
-      c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
-    end
-
-    RJ::Publisher.purge_queue('rspec_durable_queue')
-    count = 5
-    5.times {
-      RabbitJobs.publish_to(:rspec_durable_queue, PrintTimeJob, Time.now)
-    }
-
-    Timecop.freeze(Time.now - 4600) {
-      5.times { RabbitJobs.publish_to(:rspec_durable_queue, JobWithExpire) }
-    }
-
-    RabbitJobs.publish_to(:rspec_durable_queue, JobWithErrorHook)
-
-    worker = RabbitJobs::Worker.new
-    RJ.logger.level = Logger::FATAL
-
-    mock(PrintTimeJob).perform(anything).times(5)
-    mock(JobWithErrorHook).perform
-    dont_allow(JobWithExpire).perform
-    worker.work(1) # work for 1 second
-    RJ::Publisher.purge_queue('rspec_durable_queue')
-  end
-
   it 'should allow to publish jobs from worker' do
     RabbitJobs.configure do |c|
       c.server 'amqp://localhost/rj'

data/spec/unit/error_mailer_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe RabbitJobs::ErrorMailer do
+  describe '#report_error' do
+    it 'logs error raised in #send_letter' do
+      mock(RabbitJobs::ErrorMailer).enabled? { true }
+      mock(RabbitJobs::ErrorMailer).send_letter(anything, anything) { raise 'hello' }
+
+      mock(RabbitJobs.logger).error(anything)
+      RabbitJobs::ErrorMailer.report_error(TestJob.new, StandardError.new)
+    end
+  end
+end

data/spec/unit/job_consumer_spec.rb

@@ -0,0 +1,63 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe RabbitJobs::Consumer::JobConsumer do
+  let(:consumer) { RabbitJobs::Consumer::JobConsumer.new }
+  let(:job) { TestJob.new }
+
+  describe '#process_message' do
+    it 'parses job' do
+      payload = TestJob.serialize_job
+      mock(RJ::Job).parse(payload) { job }
+      consumer.process_message(:delivery_info, :properties, payload)
+    end
+    it 'reports parsing errors' do
+      payload = "some bad json data"
+      mock(consumer).report_error(:parsing_error, payload)
+      consumer.process_message(:delivery_info, :properties, payload).should == true
+    end
+    it 'skips expired jobs' do
+      payload = TestJob.serialize_job
+      job
+      mock(TestJob).new { job }
+      mock(job).expired? { true }
+      dont_allow(job).run_perform
+      consumer.process_message(:delivery_info, :properties, payload)
+    end
+
+    it 'executes job.perform' do
+      payload = TestJob.serialize_job
+      job
+      mock(TestJob).new { job }
+      mock(job).run_perform
+      consumer.process_message(:delivery_info, :properties, payload)
+    end
+  end
+
+  describe '#log_error' do
+    it 'logs error with RJ.logger' do
+      mock(RJ.logger).error("hello")
+      consumer.log_error 'hello'
+    end
+  end
+
+  describe '#report_error' do
+    it "accepts error type :not_found" do
+      lambda { consumer.report_error(:not_found, 'klass_name') }.should_not raise_error
+    end
+
+    it "accepts error type :parsing_error" do
+      lambda { consumer.report_error(:parsing_error, 'payload data') }.should_not raise_error
+    end
+
+    it "accepts error type :error" do
+      exception = nil
+      begin
+        raise 'testing'
+      rescue Exception => e
+        exception = e
+      end
+      lambda { consumer.report_error(:error, exception, 'payload data') }.should_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &17412060 !ruby/object:Gem::Requirement
+  requirement: &4081060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: *17412060
+  version_requirements: *4081060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17409580 !ruby/object:Gem::Requirement
+  requirement: &4074840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17409580
+  version_requirements: *4074840
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &17800900 !ruby/object:Gem::Requirement
+  requirement: &4466480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17800900
+  version_requirements: *4466480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17799580 !ruby/object:Gem::Requirement
+  requirement: &4465120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17799580
+  version_requirements: *4465120
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -97,6 +97,8 @@ files:
 - spec/integration/worker_spec.rb
 - spec/spec_helper.rb
 - spec/unit/configuration_spec.rb
+- spec/unit/error_mailer_spec.rb
+- spec/unit/job_consumer_spec.rb
 - spec/unit/job_spec.rb
 - spec/unit/mailer_spec.rb
 - spec/unit/rabbit_jobs_spec.rb
@@ -115,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1527066833663791632
+      hash: 3460661242446233476
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1527066833663791632
+      hash: 3460661242446233476
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11