rabbit_jobs 0.7.7 → 0.7.8

data/Gemfile

@@ -9,5 +9,4 @@ group :development do
   gem 'rspec', '~> 2.8'
   gem 'rr'
   gem 'simplecov', require: false
-  gem 'pry'
 end

data/build

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'fileutils'
+
+abort("rspec tests failed.") unless system("COVERAGE=true && bundle exec rspec")
+
+coverage_dir = File.expand_path('../coverage', __FILE__)
+FileUtils.move(coverage_dir, ENV['CC_BUILD_ARTIFACTS']) if ENV['CC_BUILD_ARTIFACTS']

data/examples/client

@@ -22,9 +22,10 @@ loop do
   begin
     RJ.publish_to(:failover_test, MyCurrentJob, i)
   rescue Exception => e
-    RJ::Publisher.amqp_connection.stop
+    # RJ::Publisher.amqp_connection.stop
     puts e.message
     puts e.backtrace.join("\r\n")
+    raise $!
   end
   i += 1
   sleep 1

data/lib/rabbit_jobs/publisher.rb

@@ -30,9 +30,11 @@ module RabbitJobs
     end
 
     def direct_publish_to(routing_key, payload, ex = {})
+      check_connection
       begin
         exchange = get_exchange(ex)
         exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym}))
+        # channel.wait_for_confirms
       rescue
         RJ.logger.warn $!.message
         RJ.logger.warn $!.backtrace.join("\n")
@@ -52,7 +54,7 @@ module RabbitJobs
         queue_name = RJ.config.queue_name(routing_key)
         queue = connection.queue(queue_name, RJ.config[:queues][routing_key])
         messages_count += queue.status[:message_count]
-        queue.delete
+        queue.purge
       end
 
       messages_count
@@ -65,7 +67,12 @@ module RabbitJobs
     end
 
     def connection
-      settings[:connection] ||= AmqpHelper.prepare_connection
+      unless settings[:connection]
+        settings[:connection] = Bunny.new(RJ.config.server, :heartbeat_interval => 5)
+        settings[:connection].start
+        # settings[:channel].confirm_select
+      end
+      settings[:connection]
     end
 
     def exchanges
@@ -78,10 +85,14 @@ module RabbitJobs
 
       if ex.size > 0
         exchange_opts = Configuration::DEFAULT_EXCHANGE_PARAMS.merge(ex[:params] || {}).merge({type: (ex[:type] || :direct)})
-        exchanges[ex[:name]] ||= connection.channel.exchange(ex[:name].to_s, exchange_opts)
+        exchanges[ex[:name]] ||= connection.default_channel.exchange(ex[:name].to_s, exchange_opts)
       else
-        exchanges[ex[:name]] ||= connection.channel.default_exchange
+        exchanges[ex[:name]] ||= connection.default_channel.default_exchange
       end
     end
+
+    def check_connection
+      raise unless connection.connected?
+    end
   end
 end

data/lib/rabbit_jobs/version.rb

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

data/spec/integration/publisher_spec.rb

@@ -7,7 +7,7 @@ describe RabbitJobs::Publisher do
 
   before(:each) do
     RabbitJobs.configure do |c|
-      c.server 'amqp://localhost/'
+      c.server 'amqp://localhost/rj'
       c.queue 'rspec_queue'
       c.queue 'rspec_queue2'
       c.queue 'rspec_queue3'
@@ -17,12 +17,14 @@ describe RabbitJobs::Publisher do
   end
 
   it 'should publish message to queue' do
-    RJ.publish(TestJob, 'some', 'other', 'params')
+    RJ.publish_to(:rspec_queue, TestJob, 'some', 'other', 'params')
+    # sleep 0.1
     RJ.purge_queue('rspec_queue').should == 1
   end
 
   it 'should accept symbol as queue name' do
     RJ.publish_to(:rspec_queue, TestJob)
+    # sleep 0.1
     RJ.purge_queue('rspec_queue').should == 1
   end
 
@@ -30,23 +32,26 @@ describe RabbitJobs::Publisher do
     RJ.publish_to(:rspec_queue, TestJob)
     RJ.publish_to(:rspec_queue2, TestJob)
     RJ.publish_to(:rspec_queue3, TestJob)
+    # sleep 0.1
     RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 3
   end
 
   it 'should publish job with *params' do
     RJ.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
+    # sleep 0.1
     RJ.purge_queue(:rspec_queue).should == 1
   end
 
   it 'should publish 1000 messages in one second' do
-    count = 1000
+    count = 100
     published = 0
     time = Benchmark.measure {
       count.times {
         RJ.publish_to(:rspec_queue, TestJob)
       }
+      # sleep 0.1
       removed = RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3)
-      removed.should == 1000
+      removed.should == 100
     }
     puts time
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &19664540 !ruby/object:Gem::Requirement
+  requirement: &9230940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: *19664540
+  version_requirements: *9230940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19793220 !ruby/object:Gem::Requirement
+  requirement: &9229700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19793220
+  version_requirements: *9229700
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &19792060 !ruby/object:Gem::Requirement
+  requirement: &9349960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19792060
+  version_requirements: *9349960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19791140 !ruby/object:Gem::Requirement
+  requirement: &9697740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19791140
+  version_requirements: *9697740
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -68,6 +68,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- build
 - examples/bunny
 - examples/bunny_server
 - examples/client
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4333502300834498874
+      hash: -1729098954943910884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4333502300834498874
+      hash: -1729098954943910884
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11