rabbitmq-jruby-client 0.1.7 → 0.6.0

data/README

@@ -5,13 +5,12 @@ See more at http://www.rabbitmq.com
 
 Getting Started
 ===============
-1. Make sure you can install RubyGem from GitHub (you only have to do this once): jruby -S gem sources -a http://gems.github.com
-2. Install and start RabbitMQ (see below)
-3. Install JRuby RabbitMQ Client: jruby -S gem install jerryluk-rabbitmq-jruby-client
+1. Install and start RabbitMQ (see below)
+2. Install JRuby RabbitMQ Client: jruby -S gem install rabbitmq-jruby-client
 
 Example Usage
 =============
-gem 'jerryluk-rabbitmq-jruby-client'
+gem 'rabbitmq-jruby-client'
 require 'rabbitmq_client'
 
 # Initializes the new client and connect to the server
@@ -46,10 +45,7 @@ end
 Installing RabbitMQ on OS X
 ===========================
 1. Install MacPorts
-2. sudo port install erlang
-3. wget http://www.rabbitmq.com/releases/rabbitmq-server/v1.5.3/rabbitmq-server-generic-unix-1.5.3.tar.gz
-4. tar zxvf rabbitmq-server-1.5.3.tar.gz
-5. sudo mv rabbitmq_server-1.5.3 /opt/local/lib/erlang/lib
+2. sudo port install rabbitmq-server
 
 To run RabbitMQ
-6. sudo /opt/local/lib/erlang/lib/rabbitmq_server-1.5.3/sbin/rabbitmq-server
+3. sudo rabbitmq-server

data/lib/rabbitmq_client.rb

@@ -45,13 +45,17 @@ class RabbitMQClient
     end
     
     def bind(exchange, routing_key='')
+      raise RabbitMQClientError, "queue and exchange has different durable property" unless @durable == exchange.durable
       @routing_key = routing_key
       @exchange = exchange
-      raise RabbitMQClientError, "queue and exchange has different durable property" unless @durable == exchange.durable
       @channel.queue_bind(@name, @exchange.name, @routing_key)
       self
     end
     
+    def unbind
+      @channel.queue_unbind(@name, @exchange.name, @routing_key) if @exchange
+    end
+    
     # Set props for different type of message. Currently they are:
     # RabbitMQClient::MessageProperties::MINIMAL_BASIC
     # RabbitMQClient::MessageProperties::MINIMAL_PERSISTENT_BASIC
@@ -106,6 +110,14 @@ class RabbitMQClient
       end
     end
     
+    def purge
+      @channel.queue_purge(@name)
+    end
+    
+    def delete
+      @channel.queue_delete(@name)
+    end
+    
     protected
     def auto_bind
       unless @exchange
@@ -124,7 +136,8 @@ class RabbitMQClient
       @type = type
       @durable = durable
       @channel = channel
-      @channel.exchange_declare(@name, type.to_s, durable)
+      # Declare a non-passive, auto-delete exchange
+      @channel.exchange_declare(@name, type.to_s, false, durable, true, nil)
       self
     end
   end
@@ -169,6 +182,7 @@ class RabbitMQClient
   end
   
   def disconnect
+    @queues.values.each { |q| q.unbind }
     @channel.close
     @connection.close
     @connection = nil

data/spec/rabbitmq_client_spec.rb

@@ -24,21 +24,32 @@ describe RabbitMQClient do
     exchange.should_not be_nil
   end
   
+  # Commented out because it does not return in RSpec
+  # it "should be able to delete the queue" do
+  #   client = RabbitMQClient.new
+  #   queue = client.queue('test_queue')
+  #   exchange = client.exchange('test_exchange', 'direct')
+  #   queue.delete
+  #   lambda {
+  #     queue.publish('Hello World')
+  #   }.should raise_error
+  # end
+  
   describe Queue, "Basic non-persistent queue" do
     before(:each) do
       @queue = @client.queue('test_queue')
       @exchange = @client.exchange('test_exchange', 'direct')
     end
     
-    it "should able to create a queue" do
+    it "should be able to create a queue" do
       @queue.should_not be_nil
     end
     
-    it "should able to bind to an exchange" do
+    it "should be able to bind to an exchange" do
       @queue.bind(@exchange).should_not be_nil
     end
     
-    it "should able to publish and retrieve a message" do
+    it "should be able to publish and retrieve a message" do
       @queue.bind(@exchange)
       @queue.publish('Hello World')
       @queue.retrieve.should == 'Hello World'
@@ -46,6 +57,14 @@ describe RabbitMQClient do
       @queue.retrieve.should == '人大'
     end
     
+    it "should be able to purge the queue" do
+      @queue.publish('Hello World')
+      @queue.publish('Hello World')
+      @queue.publish('Hello World')
+      @queue.purge
+      @queue.retrieve.should == nil
+    end
+    
     it "should able to subscribe with a callback function" do
       a = 0
       @queue.bind(@exchange)
@@ -58,7 +77,7 @@ describe RabbitMQClient do
       a.should == 3
     end
     
-    it "should able to subscribe to a queue using loop_subscribe" do
+    it "should be able to subscribe to a queue using loop_subscribe" do
       a = 0
       @queue.bind(@exchange)
       Thread.new do
@@ -96,21 +115,21 @@ describe RabbitMQClient do
       @exchange = @client.exchange('test_durable_exchange', 'fanout', true)
     end
     
-    it "should able to create a queue" do
+    it "should be able to create a queue" do
       @queue.should_not be_nil
     end
     
-    it "should able to bind to an exchange" do
+    it "should be able to bind to an exchange" do
       @queue.bind(@exchange).should_not be_nil
     end
     
-    it "should able to publish and retrieve a message" do
+    it "should be able to publish and retrieve a message" do
       @queue.bind(@exchange)
       @queue.persistent_publish('Hello World')
       @queue.retrieve.should == 'Hello World'
     end
     
-    it "should able to subscribe with a callback function" do
+    it "should be able to subscribe with a callback function" do
       a = 0
       @queue.bind(@exchange)
       @queue.subscribe do |v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rabbitmq-jruby-client
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.6.0
 platform: ruby
 authors: 
   - Jerry Luk