version bump and updated history

HISTORY.mkd

@@ -1,4 +1,9 @@
-0.2.1 - April 18, 2001
+0.2.2 - April 18, 2011
+------------------
+Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 
+Required pony in the gem so you don't have to include it in your app.
+
+0.2.1 - April 18, 2011
 ------------------
 Stopped returning only the 'results' array when listing things, because this would cause us to not have access to page numbers, total counts, etc.
 

README.mkd

@@ -6,11 +6,15 @@ Installation
 ------------
     gem install assistly
 
+What's new in 0.2.2?
+------------------
+Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 
+Required pony in the gem so you don't have to include it in your app.
+
 What's new in 0.2.1?
 ------------------
 Stopped returning only the 'results' array when listing things, because this would cause us to not have access to page numbers, total counts, etc.
 
-
 What's new in 0.2.0?
 ------------------
 Added support for Topics, Articles, and Macros, which is currently all that is available in the Assistly API.

lib/assistly/version.rb

@@ -1,4 +1,4 @@
 module Assistly
   # The version of the gem
-  VERSION = '0.2.1'.freeze unless defined?(::Assistly::VERSION)
+  VERSION = '0.2.2'.freeze unless defined?(::Assistly::VERSION)
 end

spec/assistly/client/interaction_spec.rb

@@ -149,15 +149,15 @@
 
         context "with customer headers set" do
           before do
-            @email = @client.create_outbound_interaction("customer@example.com", "Need help?", "Sorry we missed you in chat today.", :headers => { "x-assistly-interaction-user-agent" => "12345"})
+            @custom_email = @client.create_outbound_interaction("customer@example.com", "Need help?", "Sorry we missed you in chat today.", :headers => { "x-assistly-interaction-user-agent" => "12345"})
           end
 
           it "should merge the custom headers" do
-            @email.last.should have_header("x-assistly-interaction-user-agent","12345")
+            @custom_email.last.should have_header("x-assistly-interaction-user-agent","12345")
           end
 
           it "should preserve the existing headers" do
-            @email.last.should have_header("x-assistly-customer-email","customer@example.com")
+            @custom_email.last.should have_header("x-assistly-customer-email","customer@example.com")
           end
         end
       end