carnivore-rabbitmq 0.1.0-java → 0.1.2-java

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+# v0.1.2
+* Include option to provide routing key
+* Only start message collection if source is receiving
+* Parse payload within collector on receipt
+
 # v0.1.0
 * Initial release

data/lib/carnivore-rabbitmq/message_collector.rb

@@ -30,10 +30,16 @@ module Carnivore
         # @return [TrueClass]
         def collect_messages
           queue.subscribe(:block => true, :ack => true) do |info, metadata, payload|
+            begin
+              payload = MultiJson.load(payload)
+            rescue MultiJson::ParseError
+              warn 'Received payload not in JSON format. Failed to parse!'
+            end
             debug "Message received: #{payload.inspect}"
             debug "Message info: #{info.inspect}"
             debug "Message metadata: #{metadata.inspect}"
             message_queue << {:info => info, :metadata => metadata, :payload => payload}
+            debug "Sending new messages signal to: #{notify} (current queue size: #{message_queue.size})"
             notify.signal(:new_messages)
           end
           true

data/lib/carnivore-rabbitmq/rabbitmq.rb

@@ -18,6 +18,8 @@ module Carnivore
       attr_reader :channel
       # @return [MarchHare::Queue, Bunny::Queue] current queue
       attr_reader :queue
+      # @return [String] routing key
+      attr_reader :routing_key
       # @return [Queue] message queue
       attr_reader :message_queue
       # @return [Carnviore::Source::Rabbitmq::MessageCollector] message collector
@@ -28,32 +30,33 @@ module Carnivore
 
       # RabbitMQ source setup
       #
-      # @param args [Hash] initialization configuration
-      # @option args [String] :queue name of queue
-      # @option args [String] :exchange name of exchange
-      # @option args [Hash] :connection configuration hash for connection
-      # @option args [String, Symbol] :force_library :bunny or :march_hare
-      def setup(args={})
+      # @param init_args [Hash] initialization configuration
+      # @option init_args [String] :queue name of queue
+      # @option init_args [String] :exchange name of exchange
+      # @option init_args [Hash] :connection configuration hash for connection
+      # @option init_args [String, Symbol] :force_library :bunny or :march_hare
+      def setup(init_args={})
         require 'carnivore-rabbitmq/message_collector'
         @args = args.dup
         @message_queue = Queue.new
         @queue_name = args[:queue]
         @exchange_name = args[:exchange]
-        @notifier = Celluloid::Signals.new
         debug "Creating Rabbitmq source instance <#{name}>"
       end
 
       # Connect to the remote server
       def connect
         establish_connection
-        start_collector
       end
 
       # Start the message collection
       def start_collector
-        @message_collector = MessageCollector.new(queue, message_queue, current_actor)
-        self.link message_collector
-        message_collector.async.collect_messages
+        unless(@collecting)
+          @collecting = true
+          @message_collector = MessageCollector.new(queue, message_queue, current_actor)
+          self.link message_collector
+          message_collector.async.collect_messages
+        end
       end
 
       # Restart collector if unexpectedly failed
@@ -71,8 +74,8 @@ module Carnivore
       #
       # @return [TrueClass]
       def collector_teardown
-        connection.close
-        if(message_collector.alive?)
+        connection.close if connection
+        if(message_collector && message_collector.alive?)
           message_collector.terminate
         end
         true
@@ -99,7 +102,9 @@ module Carnivore
         connection.start
         @channel = connection.create_channel
         @exchange = channel.topic(args[:exchange])
-        @queue = channel.queue(args[:queue], :auto_delete => false).bind(exchange) # TODO: Add topic key
+        @queue = channel.queue(args[:queue], :auto_delete => false).
+          bind(exchange, :routing_key => routing_key)
+        @routing_key = args.fetch(:routing_key, '_default')
         @connection
       end
 
@@ -107,6 +112,7 @@ module Carnivore
       #
       # @return [Hash] payload
       def receive(*_)
+        start_collector
         while(message_queue.empty?)
           wait(:new_messages)
         end
@@ -118,7 +124,7 @@ module Carnivore
       # @param payload [Object]
       def transmit(payload, *_)
         payload = MultiJson.dump(payload) unless payload.is_a?(String)
-        queue.publish(payload)
+        queue.publish(payload, :routing_key => routing_key)
       end
 
       # Confirm message processing

data/lib/carnivore-rabbitmq/version.rb

@@ -4,6 +4,6 @@ module Carnivore
     class Version < Gem::Version
     end
     # Current version of library
-    VERSION = Version.new('0.1.0')
+    VERSION = Version.new('0.1.2')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore