rabbit_jobs 0.1.9 → 0.1.10

data/lib/rabbit_jobs/amqp_helpers.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+require 'uri'
 
 module RabbitJobs
   module AmqpHelpers
@@ -15,7 +16,7 @@ module RabbitJobs
         block.call(connection, exchange)
 
       else
-        AMQP.start(RJ.config.url) do |connection|
+        AMQP.start(RJ.config.connection_options) do |connection|
 
           channel = AMQP::Channel.new(connection)
 

data/lib/rabbit_jobs/configuration.rb

@@ -72,6 +72,23 @@ module RabbitJobs
       @data[name]
     end
 
+    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'
+      }
+    end
+
     def mail_errors_to(email = nil)
       if email
         @data[:mail_errors_to] = email
@@ -100,6 +117,7 @@ module RabbitJobs
       if value
         raise ArgumentError unless value.is_a?(String) && value != ""
         @data[:url] = value.to_s
+        @data[:connection_options] = nil
       else
         @data[:url] || 'amqp://localhost'
       end

data/lib/rabbit_jobs/publisher.rb

@@ -60,8 +60,7 @@ module RabbitJobs
     def self.with_bunny(&block)
       raise ArgumentError unless block
 
-      uri = URI.parse(RJ.config.url)
-      Bunny.run(url: RJ.config.url, host: uri.host, logging: false) do |bunny|
+      Bunny.run(RJ.config.connection_options.merge({logging: false})) do |bunny|
         block.call(bunny)
       end
     end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70247572694120 !ruby/object:Gem::Requirement
+  requirement: &70306208435960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70247572694120
+  version_requirements: *70306208435960
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70247572693100 !ruby/object:Gem::Requirement
+  requirement: &70306208435000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70247572693100
+  version_requirements: *70306208435000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70247572691320 !ruby/object:Gem::Requirement
+  requirement: &70306208433540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247572691320
+  version_requirements: *70306208433540
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70247572689800 !ruby/object:Gem::Requirement
+  requirement: &70306208431520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247572689800
+  version_requirements: *70306208431520
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2922787991343531885
+      hash: -1920366200643648067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2922787991343531885
+      hash: -1920366200643648067
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15