ragnar 0.0.1 → 0.0.2

data/lib/ragnar/exchange.rb

@@ -14,14 +14,21 @@ module Ragnar
       @exchange.publish(message, opts.merge(:routing_key => routing_key))
     end
     
-    def subscribe name, opts={}, &block
-      @channel.queue(queue_name(name)).bind(@exchange, :routing_key => name).subscribe(opts, &block)
-    end
-    
-    private
-    
-    def queue_name name
-      queue_prefix.nil? ? name : '%s.%s' % [queue_prefix, name]
+    # 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') 
+    #
+    def subscribe name, subscribe_opts={}, &block
+      if name.is_a?(Hash)
+        queue_name = name[:queue] or raise 'Invalid queue name'
+        routing_key = name[:routing_key]
+      else
+        raise 'Invalid queue name' if name.nil? or name.strip.empty?
+        queue_name = queue_prefix.nil? ? name : '%s.%s' % [queue_prefix, name]
+        routing_key = name
+      end
+      @channel.queue(queue_name).bind(@exchange, :routing_key => routing_key).subscribe(subscribe_opts, &block)
     end
     
   end

data/lib/ragnar/version.rb

@@ -1,3 +1,3 @@
 module Ragnar
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/ragnar/exchange_spec.rb

@@ -29,18 +29,18 @@ describe Ragnar::Exchange do
   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 = Ragnar::Exchange.new(:topic, 'name')
-      subscription = Proc.new {|message| true }
       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'))
-      binding.should_receive(:subscribe).with(subscription)
-      exch.subscribe('the.event.name', subscription)
+      binding.should_receive(:subscribe).with(subscription_block)
+      exch.subscribe('the.event.name', subscription_block)
       done
     end
     
     it 'uses the queue_prefix if present when setting the queue name' do
-      exch = Ragnar::Exchange.new(:topic, 'name')
       exch.queue_prefix = :my_service
       exch.channel.should_receive(:queue).with('my_service.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'))
@@ -48,6 +48,33 @@ 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'))
+      queue.should_receive(:bind).with(exch.exchange, :routing_key => 'the.event.#').and_return(binding = mock('binding'))
+      binding.should_receive(:subscribe)
+      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)
+      expect {
+        exch.subscribe(nil)
+      }.should raise_error(/Invalid queue name/)
+      done
+    end
+    
+    it 'uses' do
+      exch.queue_prefix = :my_service
+      exch.channel.should_not_receive(:queue)
+      expect {
+        exch.subscribe(nil)
+      }.should raise_error(/Invalid queue name/)
+      done
+    end
   end
   
   describe '#publish' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - BJ Neislen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -06:00
+date: 2011-05-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency