danielsdeleo-moqueue 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2

data/lib/moqueue/mock_exchange.rb

@@ -32,7 +32,10 @@ module Moqueue
     end
     
     def acked_messages
-      @acked_messages ||= []
+      attached_queues.map do |q|
+        q = q.first if q.kind_of?(Array)
+        q.acked_messages
+      end.flatten
     end
     
     def attach_queue(queue, opts={})
@@ -46,7 +49,7 @@ module Moqueue
     def publish(message, opts={})
       require_routing_key(opts) if topic
       matching_queues(opts).each do |q| 
-        ack_message(q.receive(message, prepare_header_opts(opts)))
+        q.receive(message, prepare_header_opts(opts))
       end
     end
     
@@ -56,10 +59,6 @@ module Moqueue
         
     private
     
-    def ack_message(message)
-      acked_messages << message if message
-    end
-    
     def routing_keys_match?(binding_key, message_key)
       BindingKey.new(binding_key).matches?(message_key)
     end
@@ -111,4 +110,4 @@ module Moqueue
     end
   end
   
-end
+end

data/lib/moqueue/mock_queue.rb

@@ -35,8 +35,7 @@ module Moqueue
       if callback = message_handler_callback
         headers = MockHeaders.new(header_opts)
         callback.call(*(callback.arity == 1 ? [message] : [headers, message]))
-        received_messages << message
-        @ack_msgs && headers.received_ack? ? message : nil
+        received_messages_and_headers << {:message => message, :headers => headers}
       else
         receive_message_later(message, header_opts)
       end
@@ -56,10 +55,10 @@ module Moqueue
     
     def publish(message, opts = {})
       if message_handler_callback
-        real_publish(message)
+        receive(message)
       else
         deferred_publishing_fibers << Fiber.new do
-          real_publish(message)
+          receive(message)
         end
       end
     end
@@ -68,13 +67,19 @@ module Moqueue
       exchange.attach_queue(self, key)
       self
     end
+
+    def received_messages_and_headers
+      @received_messages_and_headers ||= []
+    end
     
     def received_messages
-      @received_messages ||= []
+      received_messages_and_headers.map{|r| r[:message] }
     end
     
     def acked_messages
-      @acked_messages ||= []
+      received_messages_and_headers.map do |r|
+        r[:message] if @ack_msgs && r[:headers].received_ack?
+      end
     end
     
     def run_callback(*args)
@@ -116,11 +121,6 @@ module Moqueue
       end
     end
     
-    def real_publish(message)
-      response = receive(message)
-      acked_messages << response if response
-    end
-    
   end
   
-end
+end

data/moqueue.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{moqueue}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel DeLeo"]
-  s.date = %q{2009-07-24}
+  s.date = %q{2009-07-29}
   s.description = %q{Mocktacular Companion to AMQP Library. Happy TATFTing!}
   s.email = %q{dan@kallistec.com}
   s.extra_rdoc_files = ["README.rdoc"]

data/spec/examples/ack_spec.rb

@@ -13,7 +13,7 @@ require File.dirname(__FILE__) + '/example_helper'
 describe Moqueue, "when running the ack example" do
   include ExampleHelper
   
-  def run_ack_example
+  def run_ack_example(&perform_ack)
     AMQP.start(:host => 'localhost') do
       MQ.queue('awesome').publish('Totally rad 1')
       MQ.queue('awesome').publish('Totally rad 2')
@@ -32,7 +32,7 @@ describe Moqueue, "when running the ack example" do
           #puts "#{m} (ignored, redelivered later)"
         else
           #puts "received message: " + m
-          h.ack
+          perform_ack.call(h)
         end
       end
     end
@@ -50,11 +50,44 @@ describe Moqueue, "when running the ack example" do
   
   it "should get the correct result without errors" do
     Timeout::timeout(2) do
-      run_ack_example
+      run_ack_example {|h| h.ack }
     end
     q = MQ.queue('awesome')
+    q.should have(3).acked_messages
     q.received_ack_for_message?('Totally rad 1').should be_true
     q.received_ack_for_message?('Totally rad 2').should be_true
     q.received_ack_for_message?('Totally rad 3').should be_true
   end
-end
+
+  it "should be able to ack in an EM.next_tick" do
+    Timeout::timeout(2) do
+      run_ack_example do |h|
+        EM.next_tick { h.ack }
+      end
+    end
+    q = MQ.queue('awesome')
+    q.should have(3).acked_messages
+    q.received_ack_for_message?('Totally rad 1').should be_true
+    q.received_ack_for_message?('Totally rad 2').should be_true
+    q.received_ack_for_message?('Totally rad 3').should be_true
+  end
+
+  it "should be able to ack in an EM.defer callback" do
+    Timeout::timeout(2) do
+      run_ack_example do |h|
+        EM.defer(proc {
+            1337
+          },
+          proc { |result|
+            result.should == 1337
+            h.ack
+          })
+      end
+    end
+    q = MQ.queue('awesome')
+    q.should have(3).acked_messages
+    q.received_ack_for_message?('Totally rad 1').should be_true
+    q.received_ack_for_message?('Totally rad 2').should be_true
+    q.received_ack_for_message?('Totally rad 3').should be_true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: danielsdeleo-moqueue
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel DeLeo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - spec/unit/overloads_spec.rb
 has_rdoc: false
 homepage: http://github.com/danielsdeleo/moqueue
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -79,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Mocktacular Companion to AMQP Library. Happy TATFTing!