pipeline_toolkit 1.2.22 → 1.2.23

data/README.markdown

@@ -140,3 +140,12 @@ To make the steps available to your application's cucumber features simply put t
   * Tidy up logging. Feels horrible that we're insisting that SysLogger is used. Want to abstract this out and let user decide which logging framework to use. Also we're hard coding that logs are output to ~/pipeline_toolkit. yuk.
   
   * Add tmp path as a argument (hardcoded to /tmp at mo)
+
+  * Tidy up error handling. Should raise custom (and more descriptive) error messages. Particularly for broken pipes 
+  
+  * Refactor /lib/amqp modules. Don't like it how they assume an 'options' variable exists 
+
+  * Write tests around queue setup for msg_push and msg_sub
+  
+  
+  

data/lib/pipeline_toolkit/amqp/abstract.rb

@@ -94,6 +94,7 @@ module PipelineToolkit
       #                           routing messages depending on the exchange configuration.
       # 
       def bind_queue(routing_key = '')
+        routing_key = options[:queue].split(":").last if options[:queue] && options[:queue].include?(":")
         DefaultLogger.debug("Amqp::Abstract#bind_queue(routing_key = '')") if options[:env] == "development"
         unless routing_key.nil? || routing_key.empty?
           @queue.bind(@exchange, :key => routing_key)

data/lib/pipeline_toolkit/amqp/reader.rb

@@ -24,7 +24,7 @@ module PipelineToolkit
         @channel.prefetch(25) 
         initialize_exchange
         initialize_queue
-        bind_queue
+        bind_queue()
       end
     
       ##

data/lib/pipeline_toolkit/cucumber/amqp.rb

@@ -29,11 +29,12 @@ module PipelineToolkit
         @mq.queue(queue).status[:message_count]
       end
     
-      def send_messages(exchange, messages)
-        exchange = @mq.exchange(exchange, :type => :fanout)
+      def send_messages(exchange, messages, exchange_type = :fanout)
+        exchange = @mq.exchange(exchange, :passive => true, :type => exchange_type)
         messages.each do |message|
+          opts = message.has_key?('routing_key') ? {:key => message['routing_key']} : {}
           message.default = nil
-          exchange.publish(MessageCoder.encode(message))
+          exchange.publish(MessageCoder.encode(message), opts)
         end
       end
 

data/lib/pipeline_toolkit/cucumber/amqp_steps.rb

@@ -17,6 +17,11 @@ When /^I input these messages to exchange "(\w+)":$/ do |queue, messages|
   @amqp.send_messages(queue, input_messages)
 end
 
+When /^I input these messages to exchange "(\w+)" of type "(\w+)":$/ do |queue, type, messages| 
+  input_messages = messages.hashes
+  @amqp.send_messages(queue, input_messages, type.to_sym)
+end
+
 Then /^these messages are on queue "(\w+)":$/ do |queue, expected_messages|
   received_messages = @amqp.receive_messages(queue, expected_messages.rows.size)
   expected_messages.diff!(received_messages.map! { |h| h.keys_and_values_as_strings }  )

data/lib/pipeline_toolkit/message_command.rb

@@ -109,6 +109,9 @@ module PipelineToolkit
       else
         process_standard(message)
       end
+    rescue MessagePack::UnpackError => e
+      DefaultLogger.error("Couldn't unpack message: #{message.inspect}")
+      raise e
     end
   
     ##

data/lib/pipeline_toolkit/message_sink.rb

@@ -13,7 +13,7 @@ module PipelineToolkit
     
     # Sort key order
     def format_message(message)
-      message = message.sort { |a, b| a[0].to_s <=> a[1].to_s }
+      message = message.sort { |a, b| a[0].to_s <=> b[0].to_s }
       str = "{"
       message.each_with_index do |item, i|
         str << "#{item[0].inspect}:#{item[1].inspect}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 22
-  version: 1.2.22
+  - 23
+  version: 1.2.23
 platform: ruby
 authors: 
 - Aisha Fenton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +12:00
+date: 2010-09-08 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency