ragnar 0.2.1 → 0.2.2

data/lib/ragnar/exchange.rb

@@ -1,30 +1,30 @@
 module Ragnar
   class Exchange
-    
+
     attr_reader :exchange, :channel, :type, :name, :options
     attr_accessor :queue_prefix
-    
+
     def initialize type, name, opts={}
       @type, @name, @options = type, name, opts
     end
-    
+
     def publish routing_key, message, opts={}
       EM.schedule do
         Ragnar::Connector.connect unless Ragnar::Connector.connected?
-        
+
         connection = Ragnar::Connector.connection
         channel = AMQP::Channel.new(connection)
         exchange = channel.__send__(@type, @name, @options)
-      
+
         channel.queue(@name).bind(exchange, opts.merge(:routing_key => routing_key))
         exchange.publish(message, opts.merge(:routing_key => routing_key))
       end
     end
-    
+
     # Takes a subscription key or queue/routing options
     #
     #   exchange.subscribe('the.key') # => queue name and routing key are 'the.key'
-    #   exchange.subscribe(:queue => 'my.queue', :routing_key => 'message.*.pattern') 
+    #   exchange.subscribe(:queue => 'my.queue', :routing_key => 'message.*.pattern')
     #
     def subscribe name, subscribe_opts={}, &block
       if name.is_a?(Hash)
@@ -35,19 +35,16 @@ module Ragnar
         queue_name = queue_prefix.nil? ? name : '%s.%s' % [queue_prefix, name]
         routing_key = name
       end
-   
+
       EM.schedule do
         Ragnar::Connector.connect unless Ragnar::Connector.connected?
-        
+
         connection = Ragnar::Connector.connection
         channel = AMQP::Channel.new(connection)
         exchange = channel.__send__(@type, @name, @options)
-        
+
         channel.queue(queue_name).bind(exchange, :routing_key => routing_key).subscribe(subscribe_opts, &block)
       end
     end
-    
-    
-    
   end
 end

data/lib/ragnar/simple_queue.rb

@@ -13,14 +13,18 @@ module Ragnar
       }
     end
 
-    # Publish to a topic exchange. Defaults to 'events'
-    def self.publish(message, route, exchange, exchange_type='topic')
+    # Note this method does not bind a queue to an exchange, therefore it's
+    # required that the queue/exchange are already bound before calling this
+    # method
+    def self.publish(message, route, exchange, opts={})
+      # delete the exchange type from the options or set it to topic
+      exchange_type = opts.delete(:exchange_type) { 'topic' }
       @publish_mutex ||= ::Mutex.new
 
       @publish_mutex.synchronize do
         ::Bunny.run(options) do |bunny|
           exchange = bunny.exchange(exchange, :type => exchange_type)
-          exchange.publish(message, :key => route)
+          exchange.publish(message, opts.merge(:key => route))
         end
       end
     end

data/lib/ragnar/version.rb

@@ -1,3 +1,3 @@
 module Ragnar
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/ragnar.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency 'amqp', '~>0.7.1'
+  s.add_dependency 'amqp'
   s.add_dependency 'bunny'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'evented-spec', '~>0.4.1'

data/spec/lib/ragnar/connector_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'ragnar/connector'
+require 'ragnar.rb'
 
 describe Ragnar::Connector do
   include EventedSpec::SpecHelper
@@ -10,6 +10,8 @@ describe Ragnar::Connector do
 
   before(:each) do
     Ragnar::Connector.connection = nil
+    Ragnar::Connector.host = nil
+    Ragnar::Connector.port = nil
   end
 
   describe '.connect' do
@@ -24,10 +26,6 @@ describe Ragnar::Connector do
     end
 
     context 'deprecated configuration methods' do
-      before(:each) do
-        Ragnar::Connector.host = 'localhost'
-        Ragnar::Connector.port = '5762'
-      end
 
       it 'can set host and port and have a connection' do
         AMQP.stub(:connect)

data/spec/lib/ragnar/exchange_spec.rb

@@ -5,13 +5,13 @@ require 'ragnar/exchange'
 describe Ragnar::Exchange do
   include EventedSpec::SpecHelper
   include EventedSpec::AMQPSpec
-  
-  
+
+
   describe '.new' do
     it 'creates a channel and exchange' do
       opts = {:durable => true}
       name = 'exch_name'
-      
+
       Ragnar::Connector.should_receive(:connection).and_return(connection = mock('connection'))
       AMQP::Channel.should_receive(:new).with(connection).and_return(channel = mock('channel'))
       channel.should_receive(:topic).with(name, opts)
@@ -19,7 +19,7 @@ describe Ragnar::Exchange do
       done
     end
   end
-  
+
   describe '#queue_prefix' do
     it 'sets a temporary queue prefix' do
       exch = Ragnar::Exchange.new(:topic, 'name')
@@ -28,11 +28,11 @@ describe Ragnar::Exchange do
       done
     end
   end
-  
+
   describe '#subscribe' do
     let(:exch) { Ragnar::Exchange.new(:topic, 'name') }
     let(:subscription_block) { Proc.new {|m| true } }
-    
+
     it 'binds a queue to the channel and assigns the subscription to the queue' do
       exch.channel.should_receive(:queue).with('the.event.name').and_return(queue = mock('queue'))
       queue.should_receive(:bind).with(exch.exchange, :routing_key => 'the.event.name').and_return(binding = mock('binding'))
@@ -40,7 +40,7 @@ describe Ragnar::Exchange do
       exch.subscribe('the.event.name', subscription_block)
       done
     end
-    
+
     it 'uses the queue_prefix if present when setting the queue name' do
       exch.queue_prefix = :my_service
       exch.channel.should_receive(:queue).with('my_service.the.event.name').and_return(queue = mock('queue'))
@@ -49,7 +49,7 @@ describe Ragnar::Exchange do
       exch.subscribe('the.event.name')
       done
     end
-    
+
     it 'accepts a hash for queue name and routing key' do
       exch.queue_prefix = :my_service
       exch.channel.should_receive(:queue).with('the.queue.name').and_return(queue = mock('queue'))
@@ -58,7 +58,7 @@ describe Ragnar::Exchange do
       exch.subscribe(:queue => 'the.queue.name', :routing_key => 'the.event.#')
       done
     end
-    
+
     it 'cannot subscribe if a name is not given' do
       exch.queue_prefix = :my_service
       exch.channel.should_not_receive(:queue)
@@ -67,7 +67,7 @@ describe Ragnar::Exchange do
       }.should raise_error(/Invalid queue name/)
       done
     end
-    
+
     it 'uses' do
       exch.queue_prefix = :my_service
       exch.channel.should_not_receive(:queue)
@@ -77,7 +77,7 @@ describe Ragnar::Exchange do
       done
     end
   end
-  
+
   describe '#publish' do
     it 'publishes messages to the exchange' do
       exch = Ragnar::Exchange.new(:topic, 'name')
@@ -87,5 +87,5 @@ describe Ragnar::Exchange do
       done
     end
   end
-  
-end
+
+end

data/spec/lib/ragnar/simple_queue_spec.rb

@@ -22,12 +22,19 @@ describe Ragnar::SimpleQueue do
 
     before(:each) { ::Bunny.stub(:run).and_yield(bunny_mock) }
 
-    it %{publishes a message} do
+    it 'publishes a message' do
       message = 'publish me'
       route = 'to.the.batcave'
       bunny_exchange.should_receive(:publish).with(message, {:key => route})
       described_class.publish(message, route, 'event_exchange')
     end
 
+    it 'sends all options on to bunny' do
+      message = 'publish me'
+      route = 'to.the.batcave'
+      options = {:priority => 10, :bad => 'option'}
+      bunny_exchange.should_receive(:publish).with(message, options.merge(:key => route))
+      described_class.publish(message, route, 'event_exchange', options)
+    end
   end
 end

data/spec/lib/ragnar_spec.rb

@@ -4,7 +4,7 @@ require 'ragnar'
 describe Ragnar do
   include EventedSpec::SpecHelper
   include EventedSpec::AMQPSpec
-  
+
   describe '.exchange' do
     context 'when the exchange does not exist' do
       it 'creates a new exchange' do
@@ -14,7 +14,7 @@ describe Ragnar do
         done
       end
     end
-    
+
     context 'when the exchange already has been created locally' do
       it 'creates a new exchange' do
         exch = Ragnar.exchange(:topic, 'exch_name')
@@ -22,19 +22,19 @@ describe Ragnar do
         done
       end
     end
-    
+
     context 'when passed a block with embedded subscriptions' do
       it 'registers the subscriptions with the exchange' do
         subscriber = Proc.new{|message| true }
         exchange = Ragnar::Exchange.new(:topic, 'events')
         Ragnar.should_receive(:exchange).and_yield(exchange)
-        
+
         exchange.should_receive(:queue_prefix=).with(:my_service)
         exchange.should_receive(:subscribe).with('the.message.route.1', &subscriber)
         exchange.should_receive(:subscribe).with('the.message.route.2', &subscriber)
         exchange.should_receive(:subscribe).with('the.message.route.3', &subscriber)
         exchange.should_receive(:subscribe).with('the.message.route.4', &subscriber)
-        
+
         Ragnar.exchange(:topic, 'events') do |x|
           x.queue_prefix = :my_service
           x.subscribe('the.message.route.1', &subscriber)
@@ -42,12 +42,12 @@ describe Ragnar do
           x.subscribe('the.message.route.3', &subscriber)
           x.subscribe('the.message.route.4', &subscriber)
         end
-        
+
         done
       end
     end
   end
-  
+
 end
 
 describe Ragnar::Config do
@@ -120,4 +120,4 @@ describe Ragnar::Config do
     end
   end
 end
-  
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ragnar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000Z
+date: 2012-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2157572600 !ruby/object:Gem::Requirement
+  requirement: &2153569340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157572600
+  version_requirements: *2153569340
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &2157572160 !ruby/object:Gem::Requirement
+  requirement: &2153568860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157572160
+  version_requirements: *2153568860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157571700 !ruby/object:Gem::Requirement
+  requirement: &2153566140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157571700
+  version_requirements: *2153566140
 - !ruby/object:Gem::Dependency
   name: evented-spec
-  requirement: &2157571200 !ruby/object:Gem::Requirement
+  requirement: &2153564580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2157571200
+  version_requirements: *2153564580
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2157570780 !ruby/object:Gem::Requirement
+  requirement: &2153563000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157570780
+  version_requirements: *2153563000
 description: Provide top-level pub/sub methods with RabbitMQ (AMQP) for interacting
   with a larger service ecosystem
 email: