famoseagle-carrot 0.5.0 → 0.6.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 0
-:minor: 5
+:minor: 6

data/lib/amqp/exchange.rb

@@ -1,10 +1,11 @@
 module Carrot::AMQP
   class Exchange
-    attr_accessor :server, :type, :name, :opts, :key
+    attr_reader :server, :type, :name, :opts, :key, :carrot
 
-    def initialize(server, type, name, opts = {})
-      @server, @type, @name, @opts = server, type, name, opts
+    def initialize(carrot, type, name, opts = {})
+      @server, @type, @name, @opts = carrot.server, type, name, opts
       @key = opts[:key]
+      @carrot = carrot
 
       unless name == "amq.#{type}" or name == ''
         server.send_frame(
@@ -40,6 +41,7 @@ module Carrot::AMQP
       server.send_frame(
         Protocol::Exchange::Delete.new({ :exchange => name, :nowait => true }.merge(opts))
       )
+      carrot.exchanges.delete(name)
     end
 
     def reset

data/lib/amqp/queue.rb

@@ -1,12 +1,13 @@
 module Carrot::AMQP
   class Queue
-    attr_reader :name, :server
+    attr_reader :name, :server, :carrot
     attr_accessor :delivery_tag
 
-    def initialize(server, name, opts = {})
-      @server = server
+    def initialize(carrot, name, opts = {})
+      @server = carrot.server
       @opts   = opts
       @name   = name
+      @carrot = carrot
       server.send_frame(
         Protocol::Queue::Declare.new({ :queue => name, :nowait => true }.merge(opts))
       )
@@ -78,11 +79,12 @@ module Carrot::AMQP
       server.send_frame(
         Protocol::Queue::Delete.new({ :queue => name, :nowait => true }.merge(opts))
       )
+      carrot.queues.delete(name)
     end
 
   private
     def exchange
-      @exchange ||= Exchange.new(server, :direct, '', :key => name)
+      @exchange ||= Exchange.new(carrot, :direct, '', :key => name)
     end
 
     def bindings

data/lib/carrot.rb

@@ -34,7 +34,7 @@ class Carrot
   end
   
   def queue(name, opts = {})
-    queues[name] ||= AMQP::Queue.new(server, name, opts)
+    queues[name] ||= AMQP::Queue.new(self, name, opts)
   end
 
   def stop
@@ -46,15 +46,15 @@ class Carrot
   end
 
   def direct(name = 'amq.direct', opts = {})
-    exchanges[name] ||= Exchange.new(server, :direct, name, opts)
+    exchanges[name] ||= AMQP::Exchange.new(self, :direct, name, opts)
   end
 
   def topic(name = 'amq.topic', opts = {})
-    exchanges[name] ||= Exchange.new(server, :topic, name, opts)
+    exchanges[name] ||= AMQP::Exchange.new(self, :topic, name, opts)
   end
 
   def headers(name = 'amq.match', opts = {})
-    exchanges[name] ||= Exchange.new(server, :headers, name, opts)
+    exchanges[name] ||= AMQP::Exchange.new(self, :headers, name, opts)
   end
 
   def exchanges

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: famoseagle-carrot
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Amos Elliston