rabbit_jobs 0.7.4 → 0.7.5

data/lib/rabbit_jobs/publisher.rb

@@ -10,14 +10,6 @@ module RabbitJobs
   module Publisher
     extend self
 
-    def amqp_connection
-      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
@@ -38,17 +30,8 @@ module RabbitJobs
     end
 
     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_channel.exchange(ex[:name].to_s, exchange_opts)
-        else
-          amqp_channel.default_exchange
-        end
-
+        exchange = get_exchange(ex)
         exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym}))
       rescue
         RJ.logger.warn $!.message
@@ -74,5 +57,31 @@ module RabbitJobs
 
       messages_count
     end
+
+    private
+
+    def settings
+      Thread.current[:rj_publisher] ||= {}
+    end
+
+    def connection
+      settings[:connection] ||= AmqpHelper.prepare_connection
+    end
+
+    def exchanges
+      settings[:exchanges] ||= {}
+    end
+
+    def get_exchange(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?
+
+      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)
+      else
+        exchanges[ex[:name]] ||= connection.channel.default_exchange
+      end
+    end
   end
 end

data/lib/rabbit_jobs/scheduler.rb

@@ -36,7 +36,7 @@ module RabbitJobs
           interval_types.each do |interval_type|
             if !config[interval_type].nil? && config[interval_type].length > 0
               RJ.logger.info "queueing #{config['class']} (#{name})"
-              rufus_scheduler.send(interval_type, config[interval_type]) do
+              rufus_scheduler.send(interval_type, config[interval_type], blocking: true) do
                 publish_from_config(config)
               end
               interval_defined = true

data/lib/rabbit_jobs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16643800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0.pre8
+  version_requirements: *16643800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16640820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *16640820
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16639760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *16639760
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &16638180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *16638180
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -133,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1591772843040716923
+      hash: 333706062697991268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,23 +122,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1591772843040716923
+      hash: 333706062697991268
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Background jobs on RabbitMQ
-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
+test_files: []