pipeline_toolkit 1.2.9 → 1.2.10

data/README.markdown

@@ -96,12 +96,19 @@ Pipeline toolkit also includes pre-canned cucumber steps for you to test your ma
 
         Given I run this machine with acknowledgements:
         Given I run this machine without acknowledgements:
-        When I input these messages:
-        When I input these messages with ack_ids:
-        Then these messages are passed on:
-        Then these messages are acknowledged:
+
+        When I input these messages: (table)
+        When I input these messages with ack_ids: (table)
+        When I input these messages without ack_ids: (table)
+
+        When I input this messages: (json string)
+        When I input these messages with ack_ids: (json string)
+        When I input these messages without ack_ids: (json string)
+
+        Then these messages are passed on: (table)
+        Then these messages are acknowledged: (table)
     
-        Given an amqp server running at "localhost" on port 1234
+        Given an amqp server running on "localhost" at port 1234
         Given amqp queue "queue-name" is empty
         When I input these messages to exchange "queue-name"
         Then these messages are on queue "queue-name"

data/lib/pipeline_toolkit/cucumber/amqp_steps.rb

@@ -1,4 +1,4 @@
-Given /^an amqp server running at "(\w+)" on port (\d+)$/ do |host, port|
+Given /^an amqp server running on "(\w+)" at port (\d+)$/ do |host, port|
   @amqp = PipelineToolkit::Cucumber::AMQP.new
   @amqp.start(host, port)
 end

data/lib/pipeline_toolkit/cucumber/io_process.rb

@@ -7,8 +7,8 @@ module PipelineToolkit
     # talks messages. 
     class IOProcess
       
-      def run(command)
-        @process = BackgroundProcess.run("ruby -rubygems bin/#{command}")
+      def run(command, path = "bin")
+        @process = BackgroundProcess.run("ruby -rubygems #{path}/#{command}")
         # wait for process to start
         sleep(0.5)
         raise @process.stderr.gets unless @process.running?

data/lib/pipeline_toolkit/cucumber/machine.rb

@@ -10,8 +10,8 @@ module PipelineToolkit
       
       attr_reader :use_acknowledgements
 
-      def run(command, use_acknowledgements = true)
-        super(command)
+      def run(command, use_acknowledgements = true, path = "bin")
+        super(command, path)
 
         @use_acknowledgements = use_acknowledgements
         setup_system        

data/lib/pipeline_toolkit/cucumber/machine_steps.rb

@@ -9,10 +9,23 @@ After do
   @process.kill unless @process.nil?
 end
 
-When /^I input these messages with(out)? ack_ids?:$/ do |without_acks_ids, messages|
+# Lets you use JSON to express a complex message 
+When /^I input this message$/ do |json_str|
+  @process.input_messages([JSON.parse(json_str)], false)
+end
+
+When /^I input this message with(out)? ack_ids$/ do |without_acks_ids, json_str|
+  @process.input_messages([JSON.parse(json_str)], !without_acks_ids)
+end
+
+When /^I input these messages with(out)? ack_ids:$/ do |without_acks_ids, messages|
   @process.input_messages(messages.hashes, !without_acks_ids)
 end
 
+When /^I input these messages:$/ do |messages|
+  @process.input_messages(messages.hashes, false)
+end
+
 Then /^these messages are passed on:$/ do |expected_msgs|
   received_messages = @process.get_messages(expected_msgs.rows.size)
   # turn everything into str
@@ -20,6 +33,14 @@ Then /^these messages are passed on:$/ do |expected_msgs|
   expected_msgs.diff!(received_messages)
 end
 
+# Lets you use JSON to express a complex message 
+Then /^this message is passed on$/ do |expected_msg|
+  received_message = @process.get_messages(1).first
+  # turn everything into str
+  received_message.each { |k,v| received_message[k] = v.to_s }
+  received_message.should == JSON.parse(expected_msg)
+end
+
 Then /^these messages are acknowledged:$/ do |expected_msgs|
   received_messages = @process.get_acknowledged_messages(expected_msgs.rows.size)
   # turn everything into str
@@ -27,3 +48,4 @@ Then /^these messages are acknowledged:$/ do |expected_msgs|
   expected_msgs.diff!(received_messages)
 end
 
+

data/lib/pipeline_toolkit/cucumber/pipeline_io.rb

@@ -8,6 +8,8 @@ module PipelineToolkit
     # is being included in a IOProcess or subclass of.
     module PipelineIO
       
+      attr_reader :all_messages
+      
       # Gets output from process, and decodes it into a pipeline message 
       def get_messages(number, timeout = 5)
         output_msgs = []
@@ -15,6 +17,10 @@ module PipelineToolkit
           msg = MessageCoder.decode(line)
           output_msgs << msg
         end
+        
+        @all_messages ||= []
+        @all_messages << output_msgs
+        
         output_msgs
       end
 

data/lib/pipeline_toolkit/message_coder.rb

@@ -6,6 +6,12 @@ module PipelineToolkit
   #
   class MessageCoder
   
+    # Replace illegal chars (because we're using a line orientated procotol)
+    TRANSLATION = {
+      "\r" => "@@r",
+      "\n" => "@@n",
+    }
+  
     ##
     # Encode the hash message
     #
@@ -14,9 +20,9 @@ module PipelineToolkit
     def self.encode(message)
       # NB: Using Msgpack because it's 9-10x faster than altnatives
       # See http://gist.github.com/190849
-      MessagePack.pack(message)
-      # str.gsub!("\n", "?n")
-      # str.gsub!("\r", "?r")
+      str = MessagePack.pack(message)
+      str.gsub!(/[#{TRANSLATION.keys.join}]/) { |c| TRANSLATION[c] }
+      str
     end
 
     ##
@@ -26,6 +32,7 @@ module PipelineToolkit
     # 
     def self.decode(str)
       str.chomp!
+      str.gsub!(/#{TRANSLATION.values.join("|")}/) { |s| TRANSLATION.invert[s] }
       obj = MessagePack.unpack(str)
 
       obj = case obj

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 10
+  version: 1.2.10
 platform: ruby
 authors: 
 - Aisha Fenton