rabbit_jobs 0.7.3 → 0.7.4

data/examples/bunny

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# -*- encoding : utf-8 -*-
+
+require 'bunny'
+
+
+b = Bunny.new "amqp://localhost/bunny", heartbeat: 2
+b.start
+channel = b.create_channel
+# channel.confirm_select
+exchange = channel.default_exchange
+
+i = 0
+loop do
+  puts "publishing hello #{i}"
+  begin
+    exchange.publish("hello #{i}", routing_key: "hello")
+    # channel.wait_for_confirms
+  rescue Exception => e
+    puts e.message
+    puts e.backtrace.join("\r\n")
+  end
+  i += 1
+  sleep 1
+end
+
+b.stop

data/examples/bunny_server

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# -*- encoding : utf-8 -*-
+
+require 'bunny'
+
+# RJ.configure { |c|
+#   c.queue "failover_test"
+#   c.server "amqp://localhost/bunny"
+# }
+
+
+b = Bunny.new "amqp://localhost/bunny"
+b.start
+channel = b.create_channel
+queue = channel.queue("hello", durable: true)
+
+queue.subscribe do |delivery_info, properties, payload|
+  puts "got #{payload}"
+end
+
+loop do
+  sleep 1
+end

data/examples/client

@@ -19,7 +19,13 @@ RJ.configure { |c|
 i = 0
 loop do
   puts "publishing job #{i}"
-  RJ.publish_to(:failover_test, MyCurrentJob, i)
+  begin
+    RJ.publish_to(:failover_test, MyCurrentJob, i)
+  rescue Exception => e
+    RJ::Publisher.amqp_connection.stop
+    puts e.message
+    puts e.backtrace.join("\r\n")
+  end
   i += 1
   sleep 1
 end

data/lib/rabbit_jobs/amqp_helper.rb

@@ -8,7 +8,7 @@ module RabbitJobs
     class << self
 
       def prepare_connection
-        conn = Bunny.new(RJ.config.server)
+        conn = Bunny.new(RJ.config.server, :heartbeat_interval => 5)
         conn.start unless conn.connected? || conn.connecting?
         conn
       end

data/lib/rabbit_jobs/configuration.rb

@@ -63,7 +63,6 @@ module RabbitJobs
     def initialize
       @data = {
         error_log: true,
-        workers: {},
         server: 'amqp://localhost/',
         prefix: 'rabbit_jobs',
         queues: {}
@@ -125,25 +124,6 @@ module RabbitJobs
       end
     end
 
-    def workers
-      @data[:workers] ||= {}
-    end
-
-    def worker(name, params = {})
-      raise ArgumentError.new("name is #{name.inspect}") unless name && name.is_a?(String) && name != ""
-      raise ArgumentError.new("params is #{params.inspect}") unless params && params.is_a?(Hash)
-      raise ArgumentError.new("params should have :instances and :queues keys.") unless params[:instances] && params[:queues]
-
-      name = name.downcase.to_sym
-
-      @data[:workers] ||= {}
-      if @data[:workers][name]
-        @data[:workers][name].merge!(params)
-      else
-        @data[:workers][name] = params
-      end
-    end
-
     def routing_keys
       @data[:queues].keys
     end

data/lib/rabbit_jobs/helpers.rb

@@ -2,6 +2,15 @@
 
 module RabbitJobs
   module Helpers
+    def _cleanup_backtrace(trace_lines)
+      if defined?(Rails) && Rails.respond_to?(:root)
+        rails_root_path = Rails.root.to_s
+        trace_lines.dup.keep_if { |l| l[rails_root_path] }
+      else
+        trace_lines
+      end
+    end
+
     def symbolize_keys!(hash)
       hash.inject({}) do |options, (key, value)|
         options[(key.to_sym rescue key) || key] = value

data/lib/rabbit_jobs/job.rb

@@ -26,7 +26,7 @@ module RabbitJobs::Job
       rescue
         RJ.logger.warn $!.message
         RJ.logger.warn(self.to_ruby_string)
-        RJ.logger.warn RJ::Util.cleanup_backtrace($!.backtrace).join("\n")
+        RJ.logger.warn _cleanup_backtrace($!.backtrace).join("\n")
         run_on_error_hooks($!)
         RabbitJobs::ErrorMailer.report_error(self, $!)
       end
@@ -122,7 +122,7 @@ module RabbitJobs::Job
     rescue
       RJ.logger.warn "Cannot initialize job."
       RJ.logger.warn $!.message
-      RJ.logger.warn RJ::Util.cleanup_backtrace($!.backtrace).join("\n")
+      RJ.logger.warn _cleanup_backtrace($!.backtrace).join("\n")
       RJ.logger.warn "Data received: #{payload.inspect}"
       :error
     end

data/lib/rabbit_jobs/publisher.rb

@@ -14,13 +14,17 @@ module RabbitJobs
       Thread.current[:rj_publisher_connection] ||= AmqpHelper.prepare_connection
     end
 
+    def amqp_channel
+      Thread.current[:rj_publisher_channel] ||= amqp_connection.create_channel
+    end
+
     def cleanup
       conn = Thread.current[:rj_publisher_connection]
       conn.close if conn && conn.status != :not_connected
       Thread.current[:rj_publisher_connection] = nil
     end
 
-    def publish_to(routing_key, klass, *params, &block)
+    def publish_to(routing_key, klass, *params)
       raise ArgumentError.new("klass=#{klass.inspect}") unless klass && (klass.is_a?(Class) || klass.is_a?(String))
       raise ArgumentError.new("routing_key=#{routing_key}") unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String)) && !!RJ.config[:queues][routing_key.to_sym]
 
@@ -30,19 +34,19 @@ module RabbitJobs
         'params' => params
         }.to_json
 
-      direct_publish_to(RJ.config.queue_name(routing_key.to_sym), payload, &block)
+      direct_publish_to(RJ.config.queue_name(routing_key.to_sym), payload)
     end
 
-    def direct_publish_to(routing_key, payload, ex = {}, &block)
+    def direct_publish_to(routing_key, payload, ex = {})
       ex = {name: ex} if ex.is_a?(String)
       raise ArgumentError.new("Need to pass exchange name") if ex.size > 0 && ex[:name].to_s.empty?
 
       begin
         exchange = if ex.size > 0
           exchange_opts = Configuration::DEFAULT_EXCHANGE_PARAMS.merge(ex[:params] || {}).merge({type: (ex[:type] || :direct)})
-          amqp_connection.channel.exchange(ex[:name].to_s, exchange_opts)
+          amqp_channel.exchange(ex[:name].to_s, exchange_opts)
         else
-          amqp_connection.channel.default_exchange
+          amqp_channel.default_exchange
         end
 
         exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym}))
@@ -52,11 +56,10 @@ module RabbitJobs
         raise $!
       end
 
-      yield if block_given?
       true
     end
 
-    def purge_queue(*routing_keys, &block)
+    def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
       messages_count = 0
@@ -69,8 +72,6 @@ module RabbitJobs
         queue.delete
       end
 
-      yield(messages_count) if block_given?
-
       messages_count
     end
   end

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs.rb

@@ -4,7 +4,6 @@ require 'rake'
 
 require 'rabbit_jobs/version'
 
-require 'rabbit_jobs/util'
 require 'rabbit_jobs/helpers'
 require 'rabbit_jobs/amqp_helper'
 require 'rabbit_jobs/configuration'
@@ -24,13 +23,12 @@ module RabbitJobs
     RJ::Publisher.publish_to(routing_key, klass, *params)
   end
 
-  def direct_publish_to(routing_key, payload, ex = {}, &block)
-    RJ::Publisher.direct_publish_to(routing_key, payload, ex, &block)
-    yield if block_given?
+  def direct_publish_to(routing_key, payload, ex = {})
+    RJ::Publisher.direct_publish_to(routing_key, payload, ex)
   end
 
-  def purge_queue(*routing_keys, &block)
-    RJ::Publisher.purge_queue(*routing_keys, &block)
+  def purge_queue(*routing_keys)
+    RJ::Publisher.purge_queue(*routing_keys)
   end
 
   attr_writer :logger

data/spec/fixtures/config.yml

@@ -1,5 +1,5 @@
 rabbit_jobs:
-  url: amqp://example.com/vhost
+  server: amqp://example.com/vhost
   prefix: 'rabbit_jobs'
   queues:
     durable_queue:

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ end
 
 require 'rr'
 require 'timecop'
+require 'action_mailer'
 
 require 'rabbit_jobs'
 require 'fixtures/jobs'

data/spec/unit/configuration_spec.rb

@@ -6,7 +6,7 @@ describe RabbitJobs::Configuration do
     RabbitJobs.configure do |c|
       c.disable_error_log
 
-      c.url "amqp://somehost.lan"
+      c.server "amqp://somehost.lan"
 
       c.prefix 'my_prefix'
 
@@ -16,20 +16,22 @@ describe RabbitJobs::Configuration do
 
     RabbitJobs.config.to_hash.should == {
       error_log: false,
-      url: "amqp://somehost.lan",
+      server: "amqp://somehost.lan",
       prefix: "my_prefix",
       queues: {
-        "durable_queue" => {
-          durable: true,
+        durable_queue: {
           auto_delete: false,
+          exclusive: false,
+          durable: true,
           ack: true,
           arguments: {"x-ha-policy"=>"all"}
         },
-        "fast_queue" => {
-          durable: false,
+        fast_queue: {
           auto_delete: true,
+          exclusive: false,
+          durable: false,
           ack: false
-        },
+        }
       }
     }
   end
@@ -38,17 +40,19 @@ describe RabbitJobs::Configuration do
     RabbitJobs.config.load_file(File.expand_path('../../fixtures/config.yml', __FILE__))
 
     RabbitJobs.config.to_hash.should == {
-      url: "amqp://example.com/vhost",
-      prefix: "my_prefix",
+      prefix: "rabbit_jobs",
+      server: "amqp://example.com/vhost",
       queues: {
-        "durable_queue" => {
+        durable_queue: {
           durable: true,
+          exclusive: false,
           auto_delete: false,
           ack: true,
           arguments: {"x-ha-policy"=>"all"}
         },
-        "fast_queue" => {
+        fast_queue: {
           durable: false,
+          exclusive: false,
           auto_delete: true,
           ack: false
         }
@@ -56,18 +60,12 @@ describe RabbitJobs::Configuration do
     }
   end
 
-  it 'use default config' do
+  it 'use default values for #server and #prefix' do
     RabbitJobs.config.to_hash.should == {
       error_log: true,
-      url: "amqp://localhost/",
+      server: "amqp://localhost/",
       prefix: "rabbit_jobs",
-      queues: {
-        "default" => {
-          auto_delete: false,
-          ack: true,
-          durable: true
-        }
-      }
+      queues: {}
     }
   end
 
@@ -76,6 +74,5 @@ describe RabbitJobs::Configuration do
     RabbitJobs.config.server.should == 'amqp://localhost/'
     RabbitJobs.config.routing_keys.should == []
     RabbitJobs.config.prefix.should == 'rabbit_jobs'
-    RabbitJobs.config.queue_name('default').should == 'rabbit_jobs#default'
   end
 end

data/spec/unit/mailer_spec.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
-require 'action_mailer'
 
 describe RabbitJobs::ErrorMailer do
   describe '#enabled?' do

data/spec/unit/rabbit_jobs_spec.rb

@@ -1,11 +1,12 @@
 # -*- encoding : utf-8 -*-
+require 'spec_helper'
 
 describe RabbitJobs do
   it 'should pass publish methods to publisher' do
-    mock(RabbitJobs::Publisher).publish(TestJob, nil, 1, 2, "string")
-    RabbitJobs.publish(TestJob, nil, 1, 2, "string")
+    mock(RJ::Publisher).publish_to('default_queue', TestJob, nil, 1, 2, "string")
+    RJ.publish_to('default_queue', TestJob, nil, 1, 2, "string")
 
-    mock(RabbitJobs::Publisher).publish_to('default_queue', TestJob, nil, 1, 2, "string")
-    RabbitJobs.publish_to('default_queue', TestJob, nil, 1, 2, "string")
+    mock(RJ::Publisher).direct_publish_to('default_queue', 'hello', {name: "my_exchange"})
+    RJ.direct_publish_to('default_queue', 'hello', {name: "my_exchange"})
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,23 @@ date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &7390960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: *7390960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0.pre8
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7387480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7387480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &7410080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7410080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &7407360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7407360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -68,6 +88,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/bunny
+- examples/bunny_server
 - examples/client
 - examples/configuration.rb
 - examples/worker
@@ -81,7 +103,6 @@ files:
 - lib/rabbit_jobs/publisher.rb
 - lib/rabbit_jobs/scheduler.rb
 - lib/rabbit_jobs/tasks.rb
-- lib/rabbit_jobs/util.rb
 - lib/rabbit_jobs/version.rb
 - lib/rabbit_jobs/worker.rb
 - lib/tasks/rabbit_jobs.rake
@@ -112,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3473426678828030662
+      hash: -1591772843040716923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,11 +142,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3473426678828030662
+      hash: -1591772843040716923
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Background jobs on RabbitMQ
-test_files: []
+test_files:
+- spec/fixtures/config.yml
+- spec/fixtures/jobs.rb
+- spec/fixtures/schedule.yml
+- spec/integration/publisher_spec.rb
+- spec/integration/scheduler_spec.rb
+- spec/integration/worker_spec.rb
+- spec/spec_helper.rb
+- spec/unit/configuration_spec.rb
+- spec/unit/job_spec.rb
+- spec/unit/mailer_spec.rb
+- spec/unit/rabbit_jobs_spec.rb
+- spec/unit/worker_spec.rb

data/lib/rabbit_jobs/util.rb

@@ -1,18 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module RabbitJobs
-  class Util
-    class << self
-
-      def cleanup_backtrace(trace_lines)
-        if defined?(Rails) && Rails.respond_to?(:root)
-          rails_root_path = Rails.root.to_s
-          trace_lines.dup.keep_if { |l| l[rails_root_path] }
-        else
-          trace_lines
-        end
-      end
-
-    end
-  end
-end