rabbit_jobs 0.1.15 → 0.2.0.pre1

data/examples/configuration.rb

@@ -6,8 +6,6 @@ require 'json'
 RabbitJobs.configure do |c|
   c.url        "amqp://localhost/"
 
-  c.exchange 'test_exchange', durable: true, auto_delete: false
-
   c.queue 'rabbit_jobs_test1', durable: true, auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}
   c.queue 'rabbit_jobs_test2', durable: true, auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}
   c.queue 'rabbit_jobs_test3', durable: true, auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}

data/lib/rabbit_jobs/amqp_helper.rb

@@ -0,0 +1,57 @@
+# -*- encoding : utf-8 -*-
+require 'amqp'
+require 'uri'
+
+module RabbitJobs
+  class AmqpHelper
+
+    class << self
+      # Calls given block with initialized amqp connection.
+      def with_amqp
+        raise ArgumentError unless block_given?
+
+        if EM.reactor_running?
+          yield false
+        else
+          AMQP.start(RJ.config.url) {
+            yield true
+          }
+        end
+      end
+
+      def prepare_channel
+        unless AMQP.channel
+          create_channel
+        else
+          create_channel unless AMQP.channel.open?
+        end
+      end
+
+      private
+
+      def url_from_opts(opts = {})
+        s = ""
+        s << opts[:scheme]
+        s << "://"
+        s << "#{opts[:user]}@" if opts[:user] && opts[:user] != 'guest'
+        s << opts[:host]
+        s << ":#{opts[:port]}" unless (opts[:scheme] == 'amqp' && opts[:port] == 5672) || (opts[:scheme] == 'amqps' && opts[:port] == 5673)
+        s << opts[:vhost]
+      end
+
+      def create_channel
+        AMQP.channel = AMQP::Channel.new(AMQP.connection, auto_recovery: true)
+
+        AMQP.connection.on_recovery do |conn, opts|
+          url = url_from_opts opts
+          RJ.logger.warn "[network failure] Connection to #{url} established."
+        end
+        AMQP.connection.on_tcp_connection_loss do |conn, opts|
+          url = url_from_opts opts
+          RJ.logger.warn "[network failure] Trying to reconnect to #{url}..."
+          conn.reconnect(false, 2)
+        end
+      end
+    end
+  end
+end

data/lib/rabbit_jobs/configuration.rb

@@ -1,13 +1,14 @@
 # -*- encoding : utf-8 -*-
 require 'yaml'
+require 'uri'
 
 module RabbitJobs
 
   extend self
 
-  def configure(&block)
+  def configure
     @@configuration ||= Configuration.new
-    block.call(@@configuration)
+    yield @@configuration if block_given?
   end
 
   def config
@@ -27,8 +28,8 @@ module RabbitJobs
 
     unless @@configuration
       self.configure do |c|
-        c.url 'amqp://localhost/'
-        c.exchange 'rabbit_jobs', auto_delete: false, durable: true
+        c.url 'amqp://localhost'
+        c.prefix 'rabbit_jobs'
       end
     end
 
@@ -44,14 +45,9 @@ module RabbitJobs
       ack: true
     }
 
-    DEFAULT_EXCHANGE_PARAMS = {
-      auto_delete: false,
-      durable: true
-    }
-
     DEFAULT_MESSAGE_PARAMS = {
       persistent: true,
-      nowait: false,
+      mandatory: true,
       immediate: false
     }
 
@@ -62,9 +58,8 @@ module RabbitJobs
     def initialize
       @data = {
         error_log: true,
-        url: 'amqp://localhost/',
-        exchange: 'rabbit_jobs',
-        exchange_params: DEFAULT_EXCHANGE_PARAMS,
+        url: 'amqp://localhost',
+        prefix: 'rabbit_jobs',
         queues: {}
       }
     end
@@ -76,18 +71,10 @@ module RabbitJobs
     def connection_options
       return @data[:connection_options] if @data[:connection_options]
 
-      ports = {'amqp' => 5672, 'amqps' => 5671}
-      uri = URI.parse(self.url)
-
-      raise "Unknown scheme" unless ports.keys.include?(uri.scheme.downcase)
-
-      @data[:connection_options] = {
-        host: uri.host || 'localhost',
-        port: uri.port || ports[uri.scheme.downcase],
-        vhost: uri.path || '/',
-        user: uri.user || 'guest',
-        password: uri.password || 'guest'
-      }
+      @data[:connection_options] = AMQP::Client.parse_connection_uri(url)
+      @data[:vhost] ||= "/"
+      @data[:vhost] = "/" if @data[:vhost].empty?
+      @data[:connection_options]
     end
 
     def mail_errors_to(email = nil)
@@ -118,19 +105,18 @@ module RabbitJobs
       if value
         raise ArgumentError unless value.is_a?(String) && value != ""
         @data[:url] = value.to_s
-        @data[:connection_options] = nil
+        @data.delete :connection_options
       else
-        @data[:url] || 'amqp://localhost/'
+        @data[:url] || 'amqp://localhost'
       end
     end
 
-    def exchange(value = nil, params = {})
+    def prefix(value = nil)
       if value
         raise ArgumentError unless value.is_a?(String) && value != ""
-        @data[:exchange] = value.downcase
-        @data[:exchange_params] = DEFAULT_EXCHANGE_PARAMS.merge(params)
+        @data[:prefix] = value.downcase
       else
-        @data[:exchange]
+        @data[:prefix]
       end
     end
 
@@ -153,13 +139,15 @@ module RabbitJobs
 
     def init_default_queue
       queue('default', DEFAULT_QUEUE_PARAMS) if @data[:queues].empty?
-      key = @data[:queues].keys.first
     end
 
-    alias_method :default_queue, :init_default_queue
+    def default_queue
+      queue('default', DEFAULT_QUEUE_PARAMS) if @data[:queues].empty?
+      key = @data[:queues].keys.first
+    end
 
     def queue_name(routing_key)
-      [@data[:exchange], routing_key].join('#')
+      [@data[:prefix], routing_key].join('#')
     end
 
     def load_file(filename)
@@ -176,11 +164,10 @@ module RabbitJobs
       elsif defined?(Rails) && yaml[Rails.env.to_s]
         convert_yaml_config(yaml[Rails.env.to_s])
       else
-        @data = {url: nil, exchange: nil, queues: {}}
-        %w(url exchange mail_errors_to mail_errors_from).each do |m|
+        @data = {url: nil, prefix: nil, queues: {}}
+        %w(url prefix mail_errors_to mail_errors_from).each do |m|
           self.send(m, yaml[m])
         end
-        exchange yaml['exchange'], symbolize_keys!(yaml['exchange_params'])
         yaml['queues'].each do |name, params|
           queue name, symbolize_keys!(params) || {}
         end

data/lib/rabbit_jobs/error_mailer.rb

@@ -2,7 +2,11 @@
 module RabbitJobs
   class ErrorMailer
     def self.enabled?
-      defined?(ActionMailer) && !!RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty?
+      !!(
+        defined?(ActionMailer) && \
+        RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty? && \
+        RabbitJobs.config.mail_errors_to && !RabbitJobs.config.mail_errors_to.empty?
+      )
     end
 
     def self.report_error(job, error = $!)

data/lib/rabbit_jobs/job.rb

@@ -14,29 +14,16 @@ module RabbitJobs::Job
       self.opts = {}
     end
 
-    attr_accessor :params, :opts, :child_pid
+    attr_accessor :params, :opts
 
     def run_perform
-      if @child_pid = fork
-        srand # Reseeding
-        RJ.logger.info "Forked #{@child_pid} at #{Time.now} to process #{self.class}.perform(#{ params.map(&:inspect).join(', ') })"
-        Process.wait(@child_pid)
-        yield if block_given?
-      else
-        $0 = "##{@child_pid} #{self.class}.perform(#{ params.map(&:inspect).join(', ') }) #{$0}"
-        begin
-          RJ.__after_fork_callbacks.each do |callback|
-            callback.call()
-          end
-
-          self.class.perform(*params)
-        rescue
-          RJ.logger.warn(self.inspect)
-          RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))
-          run_on_error_hooks($!)
-          RabbitJobs::ErrorMailer.report_error(self, $!)
-        end
-        exit!
+      begin
+        self.class.perform(*params)
+      rescue
+        RJ.logger.warn(self.inspect)
+        RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))
+        run_on_error_hooks($!)
+        RabbitJobs::ErrorMailer.report_error(self, $!)
       end
     end
 
@@ -104,14 +91,18 @@ module RabbitJobs::Job
     begin
       encoded = JSON.parse(payload)
       job_klass = constantize(encoded['class'])
-      job = encoded['params'].count > 0 ? job_klass.new(*encoded['params']) : job_klass.new
+      job = job_klass.new(*encoded['params'])
       job.opts = encoded['opts']
       job
+    rescue NameError
+      RJ.logger.error "Cannot find job class '#{encoded['class']}'"
+      :not_found
     rescue
       RJ.logger.error "JOB INIT ERROR at #{Time.now.to_s}:"
       RJ.logger.error $!.inspect
       RJ.logger.error $!.backtrace
       RJ.logger.error "message: #{payload.inspect}"
+      nil
     end
   end
 end

data/lib/rabbit_jobs/publisher.rb

@@ -3,27 +3,23 @@
 require 'json'
 require 'amqp'
 require 'eventmachine'
-require 'bunny'
 require 'uri'
 
 module RabbitJobs
   module Publisher
     extend self
-    extend AmqpHelpers
 
     def publish(klass, *params)
       publish_to(RJ.config.default_queue, klass, *params)
     end
 
     def publish_to(routing_key, klass, *params)
-      raise ArgumentError unless klass && (klass.is_a?(Class) || klass.is_a?(String))
-      raise ArgumentError unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String))
+      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_s]
 
       begin
-        with_bunny do |bunny|
-          exchange = bunny.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
-          queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
-          queue.bind(exchange, :routing_key => routing_key.to_s)
+        AmqpHelper.with_amqp do |stop_em|
+          AmqpHelper.prepare_channel
 
           payload = {
             'class' => klass.to_s,
@@ -31,9 +27,14 @@ module RabbitJobs
             'params' => params
             }.to_json
 
-          exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
+          AMQP::Exchange.default.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: RJ.config.queue_name(routing_key.to_s)})) do
+            if stop_em
+              AMQP.connection.disconnect { EM.stop }
+            end
+          end
         end
       rescue
+        raise $!
         RJ.logger.warn $!.inspect
         RJ.logger.warn $!.backtrace.join("\n")
       end
@@ -45,24 +46,27 @@ module RabbitJobs
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
       messages_count = 0
-      with_bunny do |bunny|
+
+      count = routing_keys.count
+
+      AmqpHelper.with_amqp do |stop_em|
         routing_keys.each do |routing_key|
-          queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
-          messages_count += queue.status[:message_count]
-          queue.purge
+          queue = AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+          queue.status do |messages, consumers|
+            # messages_count += messages
+            queue.purge do |ret|
+              raise "Cannot purge queue #{routing_key.to_s}." unless ret.is_a?(AMQ::Protocol::Queue::PurgeOk)
+              messages_count += ret.message_count
+              count -= 1
+              if count == 0 && stop_em
+                AMQP.connection.disconnect { EM.stop }
+              end
+            end
+          end
         end
       end
-      return messages_count
-    end
 
-    private
-    def self.with_bunny(&block)
-      raise ArgumentError unless block
-
-      # raise RJ.config.connection_options.inspect
-      Bunny.run(RJ.config.connection_options.merge({logging: false})) do |bunny|
-        block.call(bunny)
-      end
+      return messages_count
     end
   end
 end

data/lib/rabbit_jobs/scheduler.rb

@@ -6,7 +6,6 @@ require 'yaml'
 
 module RabbitJobs
   class Scheduler
-    include AmqpHelpers
 
     attr_accessor :pidfile, :background, :schedule, :process_name
 
@@ -88,7 +87,14 @@ module RabbitJobs
       $0 = self.process_name || "rj_scheduler"
 
       processed_count = 0
-      amqp_with_exchange do |connection, exchange|
+      AmqpHelper.with_amqp do |connection, stop_em|
+        channel = AMQP::Channel.new(connection)
+
+        channel.on_error do |ch, channel_close|
+          puts "Channel-level error: #{channel_close.reply_text}, shutting down..."
+          connection.disconnect { EM.stop }
+        end
+
         load_schedule!
 
         check_shutdown = Proc.new {
@@ -154,19 +160,6 @@ module RabbitJobs
 
     def shutdown!
       shutdown
-      kill_child
-    end
-
-    def kill_child
-      if @job && @job.child_pid
-        # RJ.logger.warn "Killing child at #{@child}"
-        if Kernel.system("ps -o pid,state -p #{@job.child_pid}")
-          Process.kill("KILL", @job.child_pid) rescue nil
-        else
-          # RJ.logger.warn "Child #{@child} not found, restarting."
-          # shutdown
-        end
-      end
     end
   end
 end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.15"
+  VERSION = "0.2.0.pre1"
 end

data/lib/rabbit_jobs/worker.rb

@@ -2,8 +2,6 @@
 
 module RabbitJobs
   class Worker
-    include AmqpHelpers
-
     attr_accessor :pidfile, :background, :process_name, :worker_pid
 
     # Workers should be initialized with an array of string queue
@@ -39,15 +37,16 @@ module RabbitJobs
       RJ.logger.info("Connecting to amqp...")
 
       begin
-        amqp_with_exchange do |connection, exchange|
-          exchange.channel.prefetch(1)
+        AmqpHelper.with_amqp do |stop_em|
+          AmqpHelper.prepare_channel
+          AMQP.channel.prefetch(1)
 
           check_shutdown = Proc.new {
             if @shutdown
               RJ.logger.info "Processed jobs: #{processed_count}"
               RJ.logger.info "Stopping worker ##{Process.pid}..."
 
-              connection.close {
+              AMQP.connection.disconnect {
                 File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
                 RJ.logger.info "##{Process.pid} stopped."
                 RJ.logger.close
@@ -60,24 +59,28 @@ module RabbitJobs
           }
 
           queues.each do |routing_key|
-            queue = make_queue(exchange, routing_key)
+            queue = AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key])
 
-            RJ.logger.info "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
+            RJ.logger.info "Worker ##{Process.pid} <= #{RJ.config.queue_name(routing_key)}"
 
             explicit_ack = !!RJ.config[:queues][routing_key][:ack]
 
             queue.subscribe(ack: explicit_ack) do |metadata, payload|
               @job = RJ::Job.parse(payload)
 
-              unless @job.expired?
-                @job.run_perform
-                processed_count += 1
+              if @job == :not_found
+                metadata.ack if explicit_ack
               else
-                RJ.logger.info "Job expired: #{@job.inspect}"
+                if @job.expired?
+                  RJ.logger.info "Job expired: #{@job.inspect}"
+                else
+                  @job.run_perform
+                  processed_count += 1
+                end
+
+                metadata.ack if explicit_ack
               end
 
-              metadata.ack if explicit_ack
-
               check_shutdown.call
             end
           end
@@ -140,14 +143,6 @@ module RabbitJobs
 
     def shutdown!
       shutdown
-      kill_child
-    end
-
-    def kill_child
-      if @job && @job.child_pid
-        RJ.logger.info "Killing child #{@job.child_pid} at #{Time.now}"
-        Process.kill("KILL", @job.child_pid) rescue nil
-      end
     end
   end
 end

data/lib/rabbit_jobs.rb

@@ -4,7 +4,7 @@ require 'rabbit_jobs/version'
 
 require 'rabbit_jobs/util'
 require 'rabbit_jobs/helpers'
-require 'rabbit_jobs/amqp_helpers'
+require 'rabbit_jobs/amqp_helper'
 require 'rabbit_jobs/configuration'
 require 'rabbit_jobs/error_mailer'
 
@@ -30,17 +30,6 @@ module RabbitJobs
   def logger
     @logger ||= Logger.new $stdout
   end
-
-  def after_fork(&block)
-    raise ArgumentError.new("No block passed to after_fork") unless block_given?
-    @@after_fork_callbacks ||= []
-
-    @@after_fork_callbacks << block
-  end
-
-  def __after_fork_callbacks
-    @@after_fork_callbacks ||= []
-  end
 end
 
 RJ = RabbitJobs

data/rabbit_jobs.gemspec

@@ -18,7 +18,6 @@ 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/config.yml

@@ -1,9 +1,6 @@
 rabbit_jobs:
   url: amqp://example.com/vhost
-  exchange: 'my_exchange'
-  exchange_params:
-    durable: true
-    auto_delete: false
+  prefix: 'rabbit_jobs'
   queues:
     durable_queue:
       durable: true

data/spec/integration/publisher_spec.rb

@@ -7,8 +7,7 @@ describe RabbitJobs::Publisher do
 
   before(:each) do
     RabbitJobs.configure do |c|
-      c.url 'amqp://localhost/'
-      c.exchange 'test'
+      c.url 'amqp://localhost'
       c.queue 'rspec_queue'
       c.queue 'rspec_queue2'
       c.queue 'rspec_queue3'

data/spec/integration/worker_spec.rb

@@ -6,7 +6,7 @@ require 'eventmachine'
 describe RabbitJobs::Worker do
   it 'should listen for messages' do
     RabbitJobs.configure do |c|
-      c.exchange 'test_durable', auto_delete: false, durable: true
+      c.prefix 'test_durable'
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 
@@ -23,7 +23,7 @@ describe RabbitJobs::Worker do
 
   it 'should allow to publish jobs from worker' do
     RabbitJobs.configure do |c|
-      c.exchange 'test_durable', auto_delete: false, durable: true
+      c.prefix 'test_durable'
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 

data/spec/unit/configuration_spec.rb

@@ -8,7 +8,7 @@ describe RabbitJobs::Configuration do
 
       c.url "amqp://somehost.lan"
 
-      c.exchange 'my_exchange', durable: true, auto_delete: false
+      c.prefix 'my_prefix'
 
       c.queue 'durable_queue', durable: true,  auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}
       c.queue 'fast_queue',    durable: false, auto_delete: true,  ack: false
@@ -17,11 +17,7 @@ describe RabbitJobs::Configuration do
     RabbitJobs.config.to_hash.should == {
       error_log: false,
       url: "amqp://somehost.lan",
-      exchange: "my_exchange",
-      exchange_params: {
-        durable: true,
-        auto_delete: false
-      },
+      prefix: "my_prefix",
       queues: {
         "durable_queue" => {
           durable: true,
@@ -43,11 +39,7 @@ describe RabbitJobs::Configuration do
 
     RabbitJobs.config.to_hash.should == {
       url: "amqp://example.com/vhost",
-      exchange: "my_exchange",
-      exchange_params: {
-        durable: true,
-        auto_delete: false
-      },
+      prefix: "my_prefix",
       queues: {
         "durable_queue" => {
           durable: true,
@@ -68,11 +60,7 @@ describe RabbitJobs::Configuration do
     RabbitJobs.config.to_hash.should == {
       error_log: true,
       url: "amqp://localhost",
-      exchange: "rabbit_jobs",
-      exchange_params: {
-        auto_delete: false,
-        durable: true
-      },
+      prefix: "rabbit_jobs",
       queues: {
         "default" => {
           auto_delete: false,
@@ -86,8 +74,8 @@ describe RabbitJobs::Configuration do
   it 'returns settings on some methods' do
     RabbitJobs.config.error_log == true
     RabbitJobs.config.url.should == 'amqp://localhost'
-    RabbitJobs.config.routing_keys.should == ['default']
-    RabbitJobs.config.exchange.should == 'rabbit_jobs'
+    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

@@ -7,9 +7,10 @@ describe RabbitJobs::ErrorMailer do
     it 'should be enabled when use setup email' do
       RabbitJobs::ErrorMailer.enabled?.should == false
       RabbitJobs.configure do |c|
-        c.mail_errors_to 'dev@example.com', 'app@example.com'
+        c.mail_errors_to 'dev@example.com'
+        c.mail_errors_from 'app@example.com'
       end
-      puts RJ.config.inspect
+
       RabbitJobs::ErrorMailer.enabled?.should == true
     end
   end

data/spec/unit/worker_spec.rb

@@ -38,23 +38,5 @@ describe RabbitJobs::Worker do
       @worker.shutdown
       @worker.instance_variable_get('@shutdown').should == true
     end
-
-    it '#shutdown! should kill child process' do
-      mock(@worker.kill_child)
-      mock(@worker.shutdown)
-
-      @worker.shutdown!
-    end
-
-    it '#kill_child' do
-      job = TestJob.new()
-      job.instance_variable_set '@child_pid', 123123
-      @worker.instance_variable_set('@job', job)
-
-      mock(Kernel).system("ps -o pid,state -p #{123123}") { true }
-      mock(Process).kill("KILL", 123123)
-
-      @worker.kill_child
-    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.15
-  prerelease: 
+  version: 0.2.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +74,7 @@ files:
 - Rakefile
 - examples/configuration.rb
 - lib/rabbit_jobs.rb
-- lib/rabbit_jobs/amqp_helpers.rb
+- lib/rabbit_jobs/amqp_helper.rb
 - lib/rabbit_jobs/configuration.rb
 - lib/rabbit_jobs/error_mailer.rb
 - lib/rabbit_jobs/helpers.rb
@@ -129,16 +113,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4442654216517974901
+      hash: -1227131973983864781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4442654216517974901
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/rabbit_jobs/amqp_helpers.rb

@@ -1,52 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'uri'
-
-module RabbitJobs
-  module AmqpHelpers
-
-    # Calls given block with initialized amqp
-    def amqp_with_exchange(&block)
-      raise ArgumentError unless block
-
-      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(RJ.config.connection_options) 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
-
-    def amqp_with_queue(routing_key, &block)
-      raise ArgumentError unless routing_key && block
-
-      amqp_with_exchange do |connection, exchange|
-        queue = make_queue(exchange, routing_key.to_s)
-
-        # go work
-        block.call(connection, queue)
-      end
-    end
-
-    def make_queue(exchange, routing_key)
-      queue = exchange.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key])
-      queue.bind(exchange, :routing_key => routing_key)
-      queue
-    end
-  end
-end