brightbox-warren 0.5 → 0.7

data/spec/warren/queue_spec.rb

@@ -2,92 +2,72 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Warren::Queue do
   
-  it "should require raise exception with no connection details" do
-    lambda {
-      Warren::Queue.connection
-    }.should raise_error(Warren::Queue::NoConnectionDetails)
-  end
-  
-  it "should require connection details to publish" do
-    lambda {
-      Warren::Queue.publish("", "")
-    }.should raise_error(Warren::Queue::NoConnectionDetails)
-  end
-  
-  it "should require connection details to subscribe" do
-    lambda {
-      Warren::Queue.subscribe("") { true }
-    }.should raise_error(Warren::Queue::NoConnectionDetails)
-  end
-  
-  it "should set connection details" do
-    conn = new_connection
-    
-    Warren::Queue.connection = conn
-    Warren::Queue.connection.should == conn
-  end
-  
-  it "should publish to a queue" do
-    Warren::Queue.connection = new_connection
-    
-    Warren::Queue.should_receive(:do_connect).with(true, nil).and_return(true)
-    Warren::Queue.publish("queue", "payload")
-  end
-  
-  it "should publish to a default queue" do
-    Warren::Queue.connection = new_connection(:default_queue => "queue")
+  describe "connection" do
     
-    Warren::Queue.should_receive(:do_connect).with(true, nil).and_return(true)
-    Warren::Queue.publish(:default, "payload")
-  end
-    
-  it "should publish to a queue with a block" do
-    Warren::Queue.connection = new_connection
-    
-    blk = Proc.new { true }
-    
-    Warren::Queue.should_receive(:do_connect).with(true, blk).and_return(true)
-    Warren::Queue.publish("queue", "payload", &blk)
-  end
-  
-  describe "subscribing" do
-    
-    it "should require a block to be passed" do
-      Warren::Queue.connection = new_connection
-      
-      lambda {
-        Warren::Queue.subscribe("queue")
-      }.should raise_error(Warren::Queue::NoBlockGiven)
+    before(:all) do
+      @conn = stub 'connection'
     end
     
-    it "should subscribe to a queue" do
-      Warren::Queue.connection = new_connection
+    it "should create a new Warren::Connection if one doesn't exist" do
+      Warren::Connection.should_receive(:new).and_return(@conn)
       
-      Warren::Queue.should_receive(:do_connect).with(false).and_return(true)
-      Warren::Queue.subscribe("queue") { true }
+      Warren::Queue.connection.should == @conn
     end
     
-    it "should subscribe to the default queue" do
-      Warren::Queue.connection = new_connection(:default_queue => "queue")
+    it "should only create a connection once" do
+      # Already created the connection object in the first it
+      Warren::Connection.should_not_receive(:new)
       
-      Warren::Queue.should_receive(:do_connect).with(false).and_return(true)
-      Warren::Queue.subscribe(:default) { true }
+      Warren::Queue.connection.should == @conn
+      Warren::Queue.connection.should == @conn
     end
-    
-  end
-  
-  private
-  
-  def new_connection opts = {}
-    Warren::Connection.new(details.merge(opts))
   end
-  
-  def details
-    {
-      :user  => "user",
-      :pass  => "pass",
-      :vhost => "main",
-    }
+
+  describe "adapter" do
+
+    before(:each) do
+      @adapter = mock 'adapter', :publish => "publish", :subscribe => "subscribe"
+      Warren::Queue.adapter = @adapter
+    end
+
+    it "should have an adapter set" do
+      Warren::Queue.adapter.should == @adapter
+    end
+
+    it "should pass publish through to the adapter" do
+      @adapter.should_receive(:publish)
+      Warren::Queue.publish.should == "publish"
+    end
+
+    it "should pass arguments through to adapter#publish" do
+      @adapter.should_receive(:publish).with("foo", "bar")
+
+      Warren::Queue.publish("foo", "bar").should == "publish"
+    end
+
+    it "should pass a block through to adapter#publish" do
+      block = lambda { true }
+      @adapter.should_receive(:publish).with("foo", "bar", block)
+
+      Warren::Queue.publish("foo", "bar", block).should == "publish"
+    end
+
+    it "should pass subscribe through to the adapter" do
+      @adapter.should_receive(:subscribe)
+      Warren::Queue.subscribe.should == "subscribe"
+    end
+
+    it "should pass arguments through to adapter#subscribe" do
+      @adapter.should_receive(:subscribe).with("foo", "bar")
+
+      Warren::Queue.subscribe("foo", "bar").should == "subscribe"
+    end
+
+    it "should pass a block through to adapter#subscribe" do
+      block = lambda { true }
+      @adapter.should_receive(:subscribe).with("foo", "bar", block)
+
+      Warren::Queue.subscribe("foo", "bar", block).should == "subscribe"
+    end
   end
-  
 end

data/spec/warren/warren_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Warren do
+  
+  it "should have a default environment" do
+    WARREN_ENV.should == "development"
+  end
+
+end

data/warren.gemspec

@@ -2,26 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warren}
-  s.version = "0.5"
+  s.version = "0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caius Durling, David Smalley"]
-  s.date = %q{2009-03-13}
+  s.date = %q{2009-06-12}
   s.description = %q{Library for pushing messages onto and off RabbitMQ queues}
   s.email = %q{support@brightbox.co.uk}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/warren/connection.rb", "lib/warren/message_filter.rb", "lib/warren/message_filters/shared_secret.rb", "lib/warren/message_filters/yaml.rb", "lib/warren/queue.rb", "lib/warren.rb", "tasks/rdoc.rake", "tasks/rspec.rake"]
-  s.files = ["CHANGELOG", "examples/authed/receiver.rb", "examples/authed/secret.rb", "examples/authed/sender.rb", "examples/simple/mass_sender.rb", "examples/simple/receiver.rb", "examples/simple/sender.rb", "lib/warren/connection.rb", "lib/warren/message_filter.rb", "lib/warren/message_filters/shared_secret.rb", "lib/warren/message_filters/yaml.rb", "lib/warren/queue.rb", "lib/warren.rb", "LICENCE", "Manifest", "Rakefile", "readme.rdoc", "spec/hash_extend.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/warren/connection_spec.rb", "spec/warren/message_filter_spec.rb", "spec/warren/queue_spec.rb", "tasks/rdoc.rake", "tasks/rspec.rake", "warren.gemspec"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["CHANGELOG", "lib/warren/adapters/amqp_adapter.rb", "lib/warren/adapters/bunny_adapter.rb", "lib/warren/connection.rb", "lib/warren/filters/shared_secret.rb", "lib/warren/filters/yaml.rb", "lib/warren/message_filter.rb", "lib/warren/queue.rb", "lib/warren.rb", "LICENSE", "tasks/rdoc.rake", "tasks/rspec.rake"]
+  s.files = ["CHANGELOG", "examples/authed/receiver.rb", "examples/authed/secret.rb", "examples/authed/sender.rb", "examples/simple/amqp_mass_sender.rb", "examples/simple/amqp_receiver.rb", "examples/simple/amqp_sender.rb", "examples/simple/bunny_receiver.rb", "examples/simple/bunny_sender.rb", "lib/warren/adapters/amqp_adapter.rb", "lib/warren/adapters/bunny_adapter.rb", "lib/warren/connection.rb", "lib/warren/filters/shared_secret.rb", "lib/warren/filters/yaml.rb", "lib/warren/message_filter.rb", "lib/warren/queue.rb", "lib/warren.rb", "LICENSE", "Manifest", "Rakefile", "readme.rdoc", "spec/spec.opts", "spec/spec_helper.rb", "spec/warren/connection_spec.rb", "spec/warren/queue_spec.rb", "spec/warren/warren_spec.rb", "tasks/rdoc.rake", "tasks/rspec.rake", "warren.gemspec"]
   s.homepage = %q{http://github.com/brightbox/warren}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Warren", "--main", "readme.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{warren}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Library for pushing messages onto and off RabbitMQ queues}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<amqp>, [">= 0.6.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-warren
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "0.7"
 platform: ruby
 authors: 
 - Caius Durling, David Smalley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,12 +30,15 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
+- lib/warren/adapters/amqp_adapter.rb
+- lib/warren/adapters/bunny_adapter.rb
 - lib/warren/connection.rb
+- lib/warren/filters/shared_secret.rb
+- lib/warren/filters/yaml.rb
 - lib/warren/message_filter.rb
-- lib/warren/message_filters/shared_secret.rb
-- lib/warren/message_filters/yaml.rb
 - lib/warren/queue.rb
 - lib/warren.rb
+- LICENSE
 - tasks/rdoc.rake
 - tasks/rspec.rake
 files: 
@@ -43,29 +46,32 @@ files:
 - examples/authed/receiver.rb
 - examples/authed/secret.rb
 - examples/authed/sender.rb
-- examples/simple/mass_sender.rb
-- examples/simple/receiver.rb
-- examples/simple/sender.rb
+- examples/simple/amqp_mass_sender.rb
+- examples/simple/amqp_receiver.rb
+- examples/simple/amqp_sender.rb
+- examples/simple/bunny_receiver.rb
+- examples/simple/bunny_sender.rb
+- lib/warren/adapters/amqp_adapter.rb
+- lib/warren/adapters/bunny_adapter.rb
 - lib/warren/connection.rb
+- lib/warren/filters/shared_secret.rb
+- lib/warren/filters/yaml.rb
 - lib/warren/message_filter.rb
-- lib/warren/message_filters/shared_secret.rb
-- lib/warren/message_filters/yaml.rb
 - lib/warren/queue.rb
 - lib/warren.rb
-- LICENCE
+- LICENSE
 - Manifest
 - Rakefile
 - readme.rdoc
-- spec/hash_extend.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/warren/connection_spec.rb
-- spec/warren/message_filter_spec.rb
 - spec/warren/queue_spec.rb
+- spec/warren/warren_spec.rb
 - tasks/rdoc.rake
 - tasks/rspec.rake
 - warren.gemspec
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/brightbox/warren
 post_install_message: 
 rdoc_options: 
@@ -94,7 +100,7 @@ requirements: []
 rubyforge_project: warren
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Library for pushing messages onto and off RabbitMQ queues
 test_files: []
 

data/examples/simple/receiver.rb

@@ -1,17 +0,0 @@
-require "rubygems"
-require File.expand_path(File.dirname(__FILE__) + "/../lib/warren")
-
-Signal.trap("INT") { AMQP.stop { EM.stop } }
-Signal.trap("TERM") { AMQP.stop { EM.stop } }
-
-# Listen to the main queue
-q = "main"
-puts "Listening to the #{q} queue."
-
-# Setup the connection directly this time
-Warren::Queue.connection = {:user => "caius", :pass => "caius", :vhost => "/"}
-
-# And attach a block for new messages to fire
-Warren::Queue.subscribe(q) do |msg|
-  p [Time.now, msg]
-end

data/spec/hash_extend.rb

@@ -1,9 +0,0 @@
-class Hash
-  def except(*blacklist)
-    self.reject {|key, value| blacklist.include?(key) }
-  end
-
-  def only(*whitelist)
-    self.reject {|key, value| !whitelist.include?(key) }
-  end
-end

data/spec/warren/message_filter_spec.rb

@@ -1,84 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-# Needed for some tests later on
-class Foo
-  def self.pack msg
-    msg
-  end
-
-  def self.unpack msg
-    msg
-  end
-end
-
-describe Warren::MessageFilter do
-  
-  before(:each) do
-    Warren::MessageFilter.reset_filters
-  end
-  
-  describe "Managing Filters" do
-    it "should have YAML as a filter by default" do
-      fs = Warren::MessageFilter.filters
-
-      fs.should have(1).element
-      fs.first.should == Warren::MessageFilter::Yaml
-    end
-
-    it "should add additional filters to the stack" do
-      Warren::MessageFilter.should respond_to(:<<)
-      Warren::MessageFilter << Foo
-      fs = Warren::MessageFilter.filters
-
-      fs.should have(2).elements
-      fs.first.should == Warren::MessageFilter::Yaml
-      fs.last.should == Foo
-    end
-  end
-  
-  describe "calling filters to send message" do
-    
-    it "should YAML by default" do
-      @msg = "message"
-      Warren::MessageFilter::Yaml.should_receive(:pack).with(@msg).and_return("yamled")
-      
-      Warren::MessageFilter.pack(@msg)
-    end
-    
-    it "should call each filter in turn when packing" do
-      @msg = "message"
-      
-      Foo.should_receive(:pack).with(@msg).and_return("fooed")
-      Warren::MessageFilter::Yaml.should_receive(:pack).with("fooed").and_return("yamled")
-      
-      Warren::MessageFilter << Foo
-      
-      Warren::MessageFilter.pack(@msg).should == "yamled"
-    end
-    
-  end
-  
-  describe "calling filters to unpack message" do
-    it "should un-YAML by default" do
-      @msg = "yamled"
-      
-      Warren::MessageFilter::Yaml.should_receive(:unpack).with("yamled").and_return("message")
-      
-      Warren::MessageFilter.unpack(@msg).should == "message"
-    end
-    
-    it "should run all unpack filters" do
-      @msg = "yamled message"
-      
-      Warren::MessageFilter::Yaml.should_receive(:unpack).with("yamled message").and_return("fooed")
-      Foo.should_receive(:unpack).with("fooed").and_return("message")
-      
-      Warren::MessageFilter << Foo
-      Warren::MessageFilter.filters.should == [Warren::MessageFilter::Yaml, Foo]
-      
-      Warren::MessageFilter.unpack(@msg).should == "message"
-    end
-  end
-    
-end
-