bmabey-rosetta_queue 0.2.0 → 0.3.3

data/lib/rosetta_queue/adapters/base.rb

@@ -2,7 +2,7 @@ module RosettaQueue
   module Gateway
 
     class BaseAdapter
-  
+
       protected
 
         def options_for(message_handler)
@@ -13,7 +13,7 @@ module RosettaQueue
           raise DestinationNotFound.new("Missing destination!") unless message_handler.destination
           @dest ||= Destinations.lookup(message_handler.destination.to_sym)
         end
-        
+
         def filter_receiving(msg)
           Filters.process_receiving(msg)
         end
@@ -21,7 +21,7 @@ module RosettaQueue
         def filter_sending(msg)
           Filters.process_sending(msg)
         end
-  
+
     end
   end
 end

data/lib/rosetta_queue/adapters/beanstalk.rb

@@ -2,7 +2,7 @@ require 'beanstalk-client'
 
 module RosettaQueue
   module Gateway
-  
+
     class BeanstalkAdapter < BaseAdapter
 
       def ack(msg)
@@ -22,7 +22,7 @@ module RosettaQueue
         msg.delete
         msg
       end
-      
+
       def receive_once(destination=nil, opts={})
         receive.body
       end
@@ -39,14 +39,14 @@ module RosettaQueue
           message_handler.on_message(filter_receiving(msg))
         end
       end
-      
+
       def send_message(destination, message, options)
-        RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")        
+        RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
         @conn.put(message)
       end
 
       private
-      
+
         def running(&block)
           loop(&block)
         end

data/lib/rosetta_queue/adapters/fake.rb

@@ -1,6 +1,6 @@
 module RosettaQueue
   module Gateway
-    
+
     class FakeAdapter
 
       def initialize
@@ -10,17 +10,17 @@ module RosettaQueue
       def send_message(queue, message, headers)
         @messages << {'queue' => queue, 'message' => RosettaQueue::Filters::process_receiving(message), 'headers' => headers}
       end
-  
+
       def messages_sent_to(queue)
         (queue ? @messages.select{|message| message['queue'] == queue} : @messages).map{|m| m['message']}
       end
-  
+
       def queues
         @messages.map {|message| message['queue']}
       end
 
     end
-    
+
   end
-  
+
 end

data/lib/rosetta_queue/adapters/null.rb

@@ -1,8 +1,8 @@
 module RosettaQueue
   module Gateway
-    
+
     # The null adapter lets all send messages enter into the ether and so is ideal for modes
-    # when you do not want to incur the overhead of a real adapter.  You can not consume with 
+    # when you do not want to incur the overhead of a real adapter.  You can not consume with
     # this adapter however.
     #
     # In your RosettaQueue definition block, and your using rails, you could base your adapter type on Rails.env:
@@ -18,11 +18,11 @@ module RosettaQueue
     #     a.type = "null"
     #   end
     # end
-    # 
-    # (if you follow this example and are using stories be sure 
+    #
+    # (if you follow this example and are using stories be sure
     # to set ENV["RUNNING_STORIES"] = "true" in your helper.rb or env.rb file)
     class NullAdapter
-                    
+
       def initialize(adapter_settings)
         # no-op
       end
@@ -30,15 +30,15 @@ module RosettaQueue
       def disconnect
         # no-op
       end
-      
+
       def receive
         raise "Null Adpater is in use, you can not consume messages!"
       end
-      
+
       def receive_with(message_handler)
         raise "Null Adpater is in use, you can not consume messages!"
       end
-      
+
       def send_message(queue, message, options)
         # no-op
       end
@@ -46,7 +46,7 @@ module RosettaQueue
       def subscribe(queue, options)
         # no-op
       end
-          
+
       def unsubscribe(queue)
         # no-op
       end

data/lib/rosetta_queue/adapters/stomp.rb

@@ -2,19 +2,20 @@ require 'stomp'
 
 module RosettaQueue
   module Gateway
-  
+
     class StompAdapter < BaseAdapter
 
       def ack(msg)
+        raise AdapterException, "Unable to ack client because message-id is blank.  Are your message handler options correct? (i.e., :ack => 'client')" if msg.headers["message-id"].nil?
         @conn.ack(msg.headers["message-id"])
       end
 
       def initialize(adapter_settings = {})
-        raise "Missing adapter settings" if adapter_settings.empty?
-        @conn = Stomp::Connection.open(adapter_settings[:user], 
-                                       adapter_settings[:password], 
-                                       adapter_settings[:host], 
-                                       adapter_settings[:port], 
+        raise AdapterException, "Missing adapter settings" if adapter_settings.empty?
+        @conn = Stomp::Connection.open(adapter_settings[:user],
+                                       adapter_settings[:password],
+                                       adapter_settings[:host],
+                                       adapter_settings[:port],
                                        true)
       end
 
@@ -28,7 +29,7 @@ module RosettaQueue
         ack(msg) unless options[:ack].nil?
         msg
       end
-      
+
       def receive_once(destination, opts)
         subscribe(destination, opts)
         msg = receive(opts).body
@@ -50,26 +51,38 @@ module RosettaQueue
           Thread.current[:processing] = false
         end
       end
-      
+
       def send_message(destination, message, options)
-        RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")        
+        RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
         @conn.send(destination, message, options)
       end
 
       def subscribe(destination, options)
         @conn.subscribe(destination, options)
       end
-          
+
       def unsubscribe(destination)
         @conn.unsubscribe(destination)
       end
-      
+
       private
-      
+
         def running(&block)
           loop(&block)
         end
 
     end
+
+    class StompAdapterProxy
+
+      def initialize(adapter, msg)
+        @adapter, @msg = adapter, msg
+      end
+
+      def ack
+        @adapter.ack(@msg)
+      end
+    end
+
   end
 end

data/lib/rosetta_queue/base.rb

@@ -1,5 +1,5 @@
 module RosettaQueue
-  
+
   class Base
 
     def disconnect
@@ -12,4 +12,4 @@ module RosettaQueue
      end
 
   end
-end
+end

data/lib/rosetta_queue/consumer.rb

@@ -3,17 +3,17 @@ module RosettaQueue
 
     def self.receive(destination, options = {})
       RosettaQueue::Adapter.instance.receive_once(Destinations.lookup(destination), options)
-      
+
       rescue Exception=>e
         RosettaQueue.logger.error("Caught exception in Consumer.receive: #{$!}\n" + e.backtrace.join("\n\t"))
     end
 
     def self.delete(destination, options={})
       RosettaQueue::Adapter.instance.delete(Destinations.lookup(destination), options)
-      
+
       rescue Exception=>e
         RosettaQueue.logger.error("Caught exception in Consumer.delete: #{$!}\n" + e.backtrace.join("\n\t"))
-    end 
+    end
 
     def initialize(message_handler)
       @message_handler = message_handler
@@ -21,7 +21,7 @@ module RosettaQueue
 
     def receive
       connection.receive_with(@message_handler)
-      
+
       rescue Exception=>e
         RosettaQueue.logger.error("Caught exception in Consumer#receive: #{$!}\n" + e.backtrace.join("\n\t"))
     end

data/lib/rosetta_queue/consumer_managers/base.rb

@@ -1,22 +1,24 @@
 module RosettaQueue
-  
+
   class BaseManager
     attr_reader :consumers
 
     class << self
       def create
-        yield self.new
+        manager = self.new
+        yield manager
+        manager
       end
     end
-    
+
     def initialize
       @consumers  = {}
     end
-    
+
     def add(message_handler)
       key = message_handler.class.to_s.underscore.to_sym
       @consumers[key] = Consumer.new(message_handler)
     end
-    
-  end  
+
+  end
 end

data/lib/rosetta_queue/consumer_managers/evented.rb

@@ -2,9 +2,9 @@ require 'rosetta_queue/consumer_managers/base'
 require 'mq'
 
 module RosettaQueue
-  
+
   class EventedManager < BaseManager
-    
+
     def start
       EM.run {
         trap_interruptions
@@ -19,20 +19,20 @@ module RosettaQueue
         end
       }
     end
-    
+
     def stop
       RosettaQueue.logger.info("Shutting down event machine...")
       EM.stop
     end
 
     private
-    
+
       def trap_interruptions
         trap("INT") {
           RosettaQueue.logger.warn("Interrupt received.  Shutting down...")
           EM.stop
         }
-        
+
         trap("TERM") {
           RosettaQueue.logger.warn("Interrupt received.  Shutting down...")
           EM.stop

data/lib/rosetta_queue/consumer_managers/threaded.rb

@@ -25,10 +25,10 @@ module RosettaQueue
     def join_threads
       @threads.each { |thread| thread.join }
     end
-    
+
     def shutdown_requested
       RosettaQueue.logger.error "Shutdown requested, starting to prune threads..."
-      
+
       while @threads.any? { |n, t| t.alive? }
         RosettaQueue.logger.info "Calling stop_threads"
         stop_threads
@@ -73,7 +73,7 @@ module RosettaQueue
             Thread.pass
           end
         end
-      end      
+      end
     end
 
     def stop_threads
@@ -86,8 +86,8 @@ module RosettaQueue
           next
         end
         RosettaQueue.logger.debug("#{key} Stopping thread #{thread} and disconnecting the consumer")
-        @consumers[key].disconnect
         thread.kill
+        @consumers[key].disconnect
       end
     end
   end

data/lib/rosetta_queue/core_ext/string.rb

@@ -7,11 +7,11 @@ class String
       self.first.downcase + camelize(self)[1..-1]
     end
   end
-  
+
   def classify
     camelize(self.sub(/.*\./, ''))
   end
-  
+
   def underscore
     self.gsub(/::/, '/').
          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -19,4 +19,4 @@ class String
          tr("-", "_").
          downcase
   end
-end
+end

data/lib/rosetta_queue/core_ext/time.rb

@@ -0,0 +1,20 @@
+require 'time'
+
+class Time
+
+  DATE_FORMATS = {
+    :db           => "%Y-%m-%d %H:%M:%S",
+    :number       => "%Y%m%d%H%M%S",
+    :time         => "%H:%M",
+    :short        => "%d %b %H:%M",
+    :long         => "%B %d, %Y %H:%M",
+    :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") },
+    :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
+  }
+
+  def to_formatted_s(format = :default)
+    return to_default_s unless formatter = DATE_FORMATS[format]
+    formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
+  end
+
+end

data/lib/rosetta_queue/destinations.rb

@@ -1,7 +1,7 @@
 module RosettaQueue
 
   class Destinations
-    
+
     @dest = {}
 
     class << self
@@ -10,25 +10,25 @@ module RosettaQueue
       def define
         yield self
       end
-      
+
       def clear
         @dest.clear
       end
-      
+
       def lookup(dest_name)
         mapping = dest[dest_name.to_sym]
         raise "No destination mapping for '#{dest_name}' has been defined!" unless mapping
         return mapping
       end
-      
+
       def map(key, dest)
         @dest[key] = dest
       end
-      
+
       def queue_names
         @dest.values
       end
     end
 
   end
-end
+end