pipeline_toolkit 1.2.18 → 1.2.19

data/lib/pipeline_toolkit/cucumber/amqp_steps.rb

@@ -19,5 +19,5 @@ 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)
+  expected_messages.diff!(received_messages.map! { |h| h.keys_and_values_as_strings }  )
 end

data/lib/pipeline_toolkit/cucumber/machine_steps.rb

@@ -32,17 +32,13 @@ end
 
 Then /^these messages are passed on:$/ do |expected_msgs|
   received_messages = @process.get_messages(expected_msgs.rows.size)
-  # turn everything into str
-  received_messages.map! { |h| h.each { |k,v| h[k] = v.to_s }}
-  expected_msgs.diff!(received_messages)
+  expected_msgs.diff!(received_messages.map! { |h| h.keys_and_values_as_strings })
 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)
+  received_message.keys_and_values_as_strings.should == JSON.parse(expected_msg)
 end
 
 Then /^these messages are acknowledged:$/ do |expected_msgs|

data/lib/pipeline_toolkit/util/indifferent_hash.rb

@@ -1,15 +1,23 @@
 class IndifferentHash < Hash
   # extended so that value is returned regardless if key is symbol or string, and all values are set as symbols
   def initialize(hash)
-    self.merge!(hash)
+    self.merge!( Hash[hash.map { |k,v| [k.to_sym, v] }] )
   end
 
   def [](key)
-    super(key.to_s) || super(key.to_sym)
+    super(key.to_sym)
   end
 
   def []=(key, value)
     super(key.to_sym, value)
   end
 
+  def keys_and_values_as_strings
+    Hash[self.map { |k,v| [k.to_s, v.to_s] }]
+  end
+
+  def has_key?(key)
+    super(key.to_sym)  
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 18
-  version: 1.2.18
+  - 19
+  version: 1.2.19
 platform: ruby
 authors: 
 - Aisha Fenton